From 2c738b88ac244079afd0f147d79a1da62155fe7d Mon Sep 17 00:00:00 2001 From: 493msi <493msi@gmail.com> Date: Wed, 23 Sep 2020 17:31:03 +0200 Subject: [PATCH] Updated package names in [PlutoLib] --- UPDATE_NOTES.md | 6 ++++++ .../pluto/{eventsystem => event}/EventData.java | 2 +- .../lambda/LambdaEventFactory.java | 2 +- .../staticmode/StaticPlutoEvent.java | 4 ++-- .../staticmode/StaticPlutoEventManager.java | 4 ++-- .../java/cz/tefek/pluto/{ => io}/tpl/TPL.java | 2 +- .../cz/tefek/pluto/{ => io}/tpl/TPNImage.java | 2 +- .../cz/tefek/pluto/modloader/ModLoaderCore.java | 2 +- .../cz/tefek/pluto/modloader/event/ModLoad.java | 16 +++++++++------- .../pluto/modloader/event/ModLoadEvent.java | 2 +- .../tefek/pluto/modloader/event/ModPostLoad.java | 16 +++++++++------- .../pluto/modloader/event/ModPostLoadEvent.java | 2 +- .../tefek/pluto/modloader/event/ModPreLoad.java | 14 ++++++++++---- .../pluto/modloader/event/ModPreLoadEvent.java | 2 +- .../tefek/pluto/modloader/event/ModUnload.java | 2 +- .../pluto/modloader/event/ModUnloadEvent.java | 2 +- .../shader/uniform/auto/AutomaticUniforms.java | 4 ++-- .../tefek/pluto/engine/buffer/GLFWImageUtil.java | 2 +- .../pluto/engine/graphics/texture/Texture.java | 4 ++-- 19 files changed, 53 insertions(+), 37 deletions(-) rename plutolib/src/main/java/cz/tefek/pluto/{eventsystem => event}/EventData.java (61%) rename plutolib/src/main/java/cz/tefek/pluto/{eventsystem => event}/lambda/LambdaEventFactory.java (98%) rename plutolib/src/main/java/cz/tefek/pluto/{eventsystem => event}/staticmode/StaticPlutoEvent.java (84%) rename plutolib/src/main/java/cz/tefek/pluto/{eventsystem => event}/staticmode/StaticPlutoEventManager.java (98%) rename plutolib/src/main/java/cz/tefek/pluto/{ => io}/tpl/TPL.java (99%) rename plutolib/src/main/java/cz/tefek/pluto/{ => io}/tpl/TPNImage.java (98%) diff --git a/UPDATE_NOTES.md b/UPDATE_NOTES.md index dff8504..f4591a3 100644 --- a/UPDATE_NOTES.md +++ b/UPDATE_NOTES.md @@ -2,6 +2,12 @@ * `build.gradle` Extracted the version numbers into separate variables * `build.gradle` **[experimental]** `gradlew` should now automatically download JDK11 when needed * `build.gradle` Updated the build scripts and added source Maven publication +* `[PlutoLib]` Renamed the `cz.tefek.pluto.eventsystem` package to `cz.tefek.pluto.event` + * Moved all subpackages + * Updated all references +* `[PlutoLib]` Minor code cleanup in `cz.tefek.pluto.modloader.event` +* `[Pluto]` Moved `TPL` from `cz.tefek.pluto.tpl` to `cz.tefek.pluto.io.tpl` + * Updated all references * `[PlutoMesher]` Renamed all occurrences of `attrib` to `attribute` * Renamed `VertexArray#createArrayAttrib` to `VertexArray#createArrayAttribute` * Renamed `VertexArray#getVertexAttribs` to `VertexArray#getVertexAttributes` diff --git a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/EventData.java b/plutolib/src/main/java/cz/tefek/pluto/event/EventData.java similarity index 61% rename from plutolib/src/main/java/cz/tefek/pluto/eventsystem/EventData.java rename to plutolib/src/main/java/cz/tefek/pluto/event/EventData.java index a15f3ec..a37a41c 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/EventData.java +++ b/plutolib/src/main/java/cz/tefek/pluto/event/EventData.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.eventsystem; +package cz.tefek.pluto.event; /** * @author 493msi diff --git a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java b/plutolib/src/main/java/cz/tefek/pluto/event/lambda/LambdaEventFactory.java similarity index 98% rename from plutolib/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java rename to plutolib/src/main/java/cz/tefek/pluto/event/lambda/LambdaEventFactory.java index f878d1f..54128eb 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java +++ b/plutolib/src/main/java/cz/tefek/pluto/event/lambda/LambdaEventFactory.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.eventsystem.lambda; +package cz.tefek.pluto.event.lambda; import java.util.ArrayList; import java.util.List; diff --git a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java b/plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEvent.java similarity index 84% rename from plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEvent.java index 2d31dc4..f66ec28 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEvent.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.eventsystem.staticmode; +package cz.tefek.pluto.event.staticmode; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -6,7 +6,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; /** * @author 493msi diff --git a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java b/plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEventManager.java similarity index 98% rename from plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java rename to plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEventManager.java index b324de8..a26ab15 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java +++ b/plutolib/src/main/java/cz/tefek/pluto/event/staticmode/StaticPlutoEventManager.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.eventsystem.staticmode; +package cz.tefek.pluto.event.staticmode; import java.util.*; import java.util.Map.Entry; @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; import cz.tefek.pluto.io.logger.Logger; import cz.tefek.pluto.io.logger.SmartSeverity; diff --git a/plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java b/plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPL.java similarity index 99% rename from plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java rename to plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPL.java index 296c97f..0c8ec69 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPL.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.tpl; +package cz.tefek.pluto.io.tpl; import java.awt.Graphics2D; import java.awt.image.*; diff --git a/plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java b/plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPNImage.java similarity index 98% rename from plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java rename to plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPNImage.java index 18ba7a0..e10c4a4 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/tpl/TPNImage.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.tpl; +package cz.tefek.pluto.io.tpl; import java.nio.ByteBuffer; diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java index 902512f..c1225b4 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java @@ -6,7 +6,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEventManager; +import cz.tefek.pluto.event.staticmode.StaticPlutoEventManager; import cz.tefek.pluto.io.asl.resource.ResourceHelper; import cz.tefek.pluto.io.logger.Logger; import cz.tefek.pluto.io.logger.SmartSeverity; diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java index 12c72b1..873a2dc 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java @@ -1,20 +1,22 @@ package cz.tefek.pluto.modloader.event; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEvent; +import cz.tefek.pluto.event.staticmode.StaticPlutoEvent; -@Retention(RUNTIME) -@Target(METHOD) -@StaticPlutoEvent(passingParamClass = ModLoadEvent.class) /** + * Marks a static method as an event handler for mod loading. + * * @author 493msi * + * @since pre-alpha */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +@StaticPlutoEvent(passingParamClass = ModLoadEvent.class) public @interface ModLoad { diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java index d095b56..7ca34b9 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java @@ -1,6 +1,6 @@ package cz.tefek.pluto.modloader.event; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; import cz.tefek.pluto.modloader.ModEntry; /** diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java index 98fc6c7..3e453a0 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java @@ -1,20 +1,22 @@ package cz.tefek.pluto.modloader.event; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEvent; +import cz.tefek.pluto.event.staticmode.StaticPlutoEvent; -@Retention(RUNTIME) -@Target(METHOD) -@StaticPlutoEvent(passingParamClass = ModPostLoadEvent.class) /** + * Marks a static method as an event handler for mod post-loading. + * * @author 493msi * + * @since pre-alpha */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +@StaticPlutoEvent(passingParamClass = ModPostLoadEvent.class) public @interface ModPostLoad { diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java index dea04aa..63c5576 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java @@ -3,7 +3,7 @@ package cz.tefek.pluto.modloader.event; import java.util.ArrayList; import java.util.List; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; import cz.tefek.pluto.modloader.ModEntry; /** diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java index 10d6a69..435844a 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java @@ -3,18 +3,24 @@ package cz.tefek.pluto.modloader.event; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEvent; +import cz.tefek.pluto.event.staticmode.StaticPlutoEvent; + -@Retention(RUNTIME) -@Target(METHOD) -@StaticPlutoEvent(passingParamClass = ModPreLoadEvent.class) /** + * Marks a static method as an event handler for mod pre-loading. + * * @author 493msi * + * @since pre-alpha */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +@StaticPlutoEvent(passingParamClass = ModPreLoadEvent.class) public @interface ModPreLoad { diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java index de9963a..0308eeb 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java @@ -2,7 +2,7 @@ package cz.tefek.pluto.modloader.event; import java.util.List; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; import cz.tefek.pluto.modloader.Mod; import cz.tefek.pluto.modloader.ModEntry; diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java index 5f8925a..4ec8bf9 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java @@ -6,7 +6,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEvent; +import cz.tefek.pluto.event.staticmode.StaticPlutoEvent; @Retention(RUNTIME) @Target(METHOD) diff --git a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java index c41c2ad..440a95a 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java @@ -1,6 +1,6 @@ package cz.tefek.pluto.modloader.event; -import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.event.EventData; import cz.tefek.pluto.modloader.ModEntry; /** diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/uniform/auto/AutomaticUniforms.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/uniform/auto/AutomaticUniforms.java index 9614a5c..3bc84e4 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/uniform/auto/AutomaticUniforms.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/uniform/auto/AutomaticUniforms.java @@ -2,8 +2,8 @@ package cz.tefek.pluto.engine.shader.uniform.auto; import org.joml.Matrix4fc; -import cz.tefek.pluto.eventsystem.lambda.LambdaEventFactory; -import cz.tefek.pluto.eventsystem.lambda.LambdaEventFactory.LambdaEvent; +import cz.tefek.pluto.event.lambda.LambdaEventFactory; +import cz.tefek.pluto.event.lambda.LambdaEventFactory.LambdaEvent; public class AutomaticUniforms { diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/buffer/GLFWImageUtil.java b/plutostatic/src/main/java/cz/tefek/pluto/engine/buffer/GLFWImageUtil.java index 8b50459..6f1f825 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/buffer/GLFWImageUtil.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/buffer/GLFWImageUtil.java @@ -5,7 +5,7 @@ import org.lwjgl.glfw.GLFWImage; import java.nio.file.Path; -import cz.tefek.pluto.tpl.TPL; +import cz.tefek.pluto.io.tpl.TPL; /** * A utility class to load image files for use in GLFW. diff --git a/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/Texture.java b/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/Texture.java index d1a29b1..10c2adf 100644 --- a/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/Texture.java +++ b/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/Texture.java @@ -10,8 +10,8 @@ import java.util.Arrays; import cz.tefek.pluto.io.asl.resource.ResourceAddress; import cz.tefek.pluto.io.logger.Logger; import cz.tefek.pluto.io.logger.SmartSeverity; -import cz.tefek.pluto.tpl.TPL; -import cz.tefek.pluto.tpl.TPNImage; +import cz.tefek.pluto.io.tpl.TPL; +import cz.tefek.pluto.io.tpl.TPNImage; public abstract class Texture {