diff --git a/plutocore/src/main/java/cz/tefek/pluto/PlutoApplication.java b/plutocore/src/main/java/cz/tefek/pluto/PlutoApplication.java index 5dcbae4..c212bfa 100644 --- a/plutocore/src/main/java/cz/tefek/pluto/PlutoApplication.java +++ b/plutocore/src/main/java/cz/tefek/pluto/PlutoApplication.java @@ -6,14 +6,14 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL33; -import cz.tefek.io.modloader.ModLoaderCore; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; -import cz.tefek.l10n.PlutoL10n; import cz.tefek.pluto.engine.buffer.GLFWImageUtil; import cz.tefek.pluto.engine.display.Display; import cz.tefek.pluto.engine.display.DisplayBuilder; import cz.tefek.pluto.engine.input.InputBus; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; +import cz.tefek.pluto.l10n.PlutoL10n; +import cz.tefek.pluto.modloader.ModLoaderCore; public abstract class PlutoApplication { diff --git a/plutoframebuffer/src/main/java/cz/tefek/pluto/engine/graphics/gl/fbo/Framebuffer.java b/plutoframebuffer/src/main/java/cz/tefek/pluto/engine/graphics/gl/fbo/Framebuffer.java index 72a3c2e..4358371 100644 --- a/plutoframebuffer/src/main/java/cz/tefek/pluto/engine/graphics/gl/fbo/Framebuffer.java +++ b/plutoframebuffer/src/main/java/cz/tefek/pluto/engine/graphics/gl/fbo/Framebuffer.java @@ -5,8 +5,8 @@ import java.util.List; import org.lwjgl.opengl.GL33; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class Framebuffer { diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/PlutoGUIMod.java b/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/PlutoGUIMod.java index 7fff0d0..dcc103a 100644 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/PlutoGUIMod.java +++ b/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/PlutoGUIMod.java @@ -1,15 +1,5 @@ package cz.tefek.pluto.engine.graphics; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.asl.resource.ResourceSubscriber; -import cz.tefek.io.modloader.Mod; -import cz.tefek.io.modloader.ModEntry; -import cz.tefek.io.modloader.ModLoaderCore; -import cz.tefek.io.modloader.event.ModPreLoad; -import cz.tefek.io.modloader.event.ModPreLoadEvent; -import cz.tefek.io.modloader.event.ModUnload; -import cz.tefek.io.modloader.event.ModUnloadEvent; -import cz.tefek.io.pluto.debug.Logger; import cz.tefek.pluto.engine.graphics.font.FontManager; import cz.tefek.pluto.engine.graphics.font.FontShader; import cz.tefek.pluto.engine.graphics.texture.MagFilter; @@ -18,6 +8,16 @@ import cz.tefek.pluto.engine.graphics.texture.WrapMode; import cz.tefek.pluto.engine.graphics.texture.texture2d.RectangleTexture; import cz.tefek.pluto.engine.gui.font.FontRenderer; import cz.tefek.pluto.engine.shader.RenderShaderBuilder; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.asl.resource.ResourceSubscriber; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.modloader.Mod; +import cz.tefek.pluto.modloader.ModEntry; +import cz.tefek.pluto.modloader.ModLoaderCore; +import cz.tefek.pluto.modloader.event.ModPreLoad; +import cz.tefek.pluto.modloader.event.ModPreLoadEvent; +import cz.tefek.pluto.modloader.event.ModUnload; +import cz.tefek.pluto.modloader.event.ModUnloadEvent; /** * @author 493msi diff --git a/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/font/FontManager.java b/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/font/FontManager.java index b2d37ee..b26746d 100644 --- a/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/font/FontManager.java +++ b/plutogui/src/main/java/cz/tefek/pluto/engine/graphics/font/FontManager.java @@ -6,9 +6,6 @@ import java.util.Map; import java.io.BufferedReader; import java.nio.file.Files; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.engine.graphics.texture.MagFilter; import cz.tefek.pluto.engine.graphics.texture.MinFilter; import cz.tefek.pluto.engine.graphics.texture.Texture; @@ -16,6 +13,9 @@ import cz.tefek.pluto.engine.graphics.texture.WrapMode; import cz.tefek.pluto.engine.graphics.texture.texture2d.RectangleTexture; import cz.tefek.pluto.engine.gui.font.CharacterInfo; import cz.tefek.pluto.engine.gui.font.Font; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class FontManager { diff --git a/plutoio2/pom.xml b/plutoio2/pom.xml deleted file mode 100644 index a80bdab..0000000 --- a/plutoio2/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - 4.0.0 - cz.tefek - plutoio2 - 0.2 - plutoio2 - - 11 - UTF-8 - UTF-8 - 3.2.3 - - - - lwjgl-natives-linux-amd64 - - - unix - amd64 - - - - natives-linux - - - - lwjgl-natives-macos-amd64 - - - mac - amd64 - - - - natives-macos - - - - lwjgl-natives-windows-amd64 - - - windows - amd64 - - - - natives-windows - - - - lwjgl-natives-windows-x86 - - - windows - x86 - - - - natives-windows-x86 - - - - - - - org.lwjgl - lwjgl-bom - ${lwjgl.version} - import - pom - - - - - - commons-io - commons-io - 2.6 - - - com.google.code.gson - gson - 2.8.5 - - - - com.google.guava - guava - 28.0-jre - - - - org.apache.commons - commons-lang3 - 3.9 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 11 - UTF-8 - - - - - \ No newline at end of file diff --git a/plutolib/pom.xml b/plutolib/pom.xml new file mode 100644 index 0000000..e9f8111 --- /dev/null +++ b/plutolib/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + cz.tefek + plutolib + 0.3 + plutolib + + 11 + UTF-8 + UTF-8 + + + + commons-io + commons-io + 2.6 + + + com.google.code.gson + gson + 2.8.5 + + + + com.google.guava + guava + 28.0-jre + + + + org.apache.commons + commons-lang3 + 3.9 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + UTF-8 + + + + + \ No newline at end of file diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/MiniTime.java b/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java similarity index 96% rename from plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/MiniTime.java rename to plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java index 0d7f6a6..d034081 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/MiniTime.java +++ b/plutolib/src/main/java/cz/tefek/pluto/chrono/MiniTime.java @@ -1,4 +1,4 @@ -package cz.tefek.pluto.engine.chrono; +package cz.tefek.pluto.chrono; import java.util.concurrent.TimeUnit; diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/package-info.java b/plutolib/src/main/java/cz/tefek/pluto/chrono/package-info.java similarity index 68% rename from plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/package-info.java rename to plutolib/src/main/java/cz/tefek/pluto/chrono/package-info.java index 9f0edec..b2e2f9c 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/chrono/package-info.java +++ b/plutolib/src/main/java/cz/tefek/pluto/chrono/package-info.java @@ -4,4 +4,4 @@ * @author 493msi * */ -package cz.tefek.pluto.engine.chrono; +package cz.tefek.pluto.chrono; diff --git a/plutoio2/src/main/java/cz/tefek/pluto/eventsystem/EventData.java b/plutolib/src/main/java/cz/tefek/pluto/eventsystem/EventData.java similarity index 100% rename from plutoio2/src/main/java/cz/tefek/pluto/eventsystem/EventData.java rename to plutolib/src/main/java/cz/tefek/pluto/eventsystem/EventData.java diff --git a/plutoio2/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java b/plutolib/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java similarity index 100% rename from plutoio2/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java rename to plutolib/src/main/java/cz/tefek/pluto/eventsystem/lambda/LambdaEventFactory.java diff --git a/plutoio2/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java b/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java similarity index 100% rename from plutoio2/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEvent.java diff --git a/plutoio2/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java b/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java similarity index 96% rename from plutoio2/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java rename to plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java index 59f59ef..50670c4 100644 --- a/plutoio2/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java +++ b/plutolib/src/main/java/cz/tefek/pluto/eventsystem/staticmode/StaticPlutoEventManager.java @@ -10,9 +10,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; /** * A universal event manager. Register an event {@link Annotation} of your diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/Resource.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/Resource.java similarity index 94% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/Resource.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/Resource.java index 2b205c5..0f8d17b 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/Resource.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/Resource.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource; +package cz.tefek.pluto.io.asl.resource; /** * Allows loading a resource from the file system location defined by the diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddress.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddress.java similarity index 98% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddress.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddress.java index 74f9112..fbc86ff 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddress.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddress.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource; +package cz.tefek.pluto.io.asl.resource; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,9 @@ import java.util.stream.Collectors; import java.nio.file.FileSystems; import java.nio.file.Path; -import cz.tefek.io.modloader.ModLoaderCore; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; +import cz.tefek.pluto.modloader.ModLoaderCore; /** * Resource address is a universal key for all resource and file loading. You diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddressTypeAdapter.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddressTypeAdapter.java similarity index 93% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddressTypeAdapter.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddressTypeAdapter.java index b785d92..2618ee1 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceAddressTypeAdapter.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceAddressTypeAdapter.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource; +package cz.tefek.pluto.io.asl.resource; import java.io.IOException; diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceHelper.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceHelper.java similarity index 86% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceHelper.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceHelper.java index 75b2609..818926d 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceHelper.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceHelper.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource; +package cz.tefek.pluto.io.asl.resource; /** * Doesn't do much right now. Just holds the default resource location. diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceSubscriber.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceSubscriber.java similarity index 91% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceSubscriber.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceSubscriber.java index bf801b5..3fa1cbd 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/ResourceSubscriber.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/ResourceSubscriber.java @@ -1,6 +1,6 @@ -package cz.tefek.io.asl.resource; +package cz.tefek.pluto.io.asl.resource; -import cz.tefek.io.modloader.Mod; +import cz.tefek.pluto.modloader.Mod; /** * Allows access to resources using {@link ResourceAddress}. Requires a diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/IIdentifiable.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/IIdentifiable.java similarity index 67% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/IIdentifiable.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/IIdentifiable.java index 492109b..5b31474 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/IIdentifiable.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/IIdentifiable.java @@ -1,6 +1,6 @@ -package cz.tefek.io.asl.resource.raid; +package cz.tefek.pluto.io.asl.resource.raid; -import cz.tefek.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; public interface IIdentifiable { diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/RAID.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/RAID.java similarity index 96% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/RAID.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/RAID.java index 5455e66..74a871d 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/raid/RAID.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/raid/RAID.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource.raid; +package cz.tefek.pluto.io.asl.resource.raid; import java.util.ArrayList; import java.util.HashMap; diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceImage.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceImage.java similarity index 82% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceImage.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceImage.java index 0c2f16a..d8fe2b9 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceImage.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceImage.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.resource.type; +package cz.tefek.pluto.io.asl.resource.type; import java.awt.image.BufferedImage; import java.io.File; @@ -6,11 +6,11 @@ import java.io.IOException; import javax.imageio.ImageIO; -import cz.tefek.io.asl.resource.Resource; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.asl.resource.ResourceHelper; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; +import cz.tefek.pluto.io.asl.resource.Resource; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.asl.resource.ResourceHelper; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; /** * {@link ResourceAddress} in, {@link BufferedImage} out. diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceInputStream.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceInputStream.java similarity index 72% rename from plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceInputStream.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceInputStream.java index 8cdc98b..7b2b0d9 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/resource/type/ResourceInputStream.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/resource/type/ResourceInputStream.java @@ -1,13 +1,13 @@ -package cz.tefek.io.asl.resource.type; +package cz.tefek.pluto.io.asl.resource.type; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import cz.tefek.io.asl.resource.Resource; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; +import cz.tefek.pluto.io.asl.resource.Resource; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; /** * {@link ResourceAddress} in, {@link InputStream} out. diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/textio/TextIn.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextIn.java similarity index 87% rename from plutoio2/src/main/java/cz/tefek/io/asl/textio/TextIn.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextIn.java index 6815155..2498ab0 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/textio/TextIn.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextIn.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.textio; +package cz.tefek.pluto.io.asl.textio; import java.io.File; import java.net.URI; @@ -8,8 +8,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.pluto.debug.Logger; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.logger.Logger; /** * A simple text file reader. Apart from generic methods of loading, you can use diff --git a/plutoio2/src/main/java/cz/tefek/io/asl/textio/TextOut.java b/plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextOut.java similarity index 90% rename from plutoio2/src/main/java/cz/tefek/io/asl/textio/TextOut.java rename to plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextOut.java index 2b8dd9e..75a45ec 100644 --- a/plutoio2/src/main/java/cz/tefek/io/asl/textio/TextOut.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/asl/textio/TextOut.java @@ -1,4 +1,4 @@ -package cz.tefek.io.asl.textio; +package cz.tefek.pluto.io.asl.textio; import java.io.FileOutputStream; import java.io.IOException; diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/ISeverity.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/ISeverity.java similarity index 71% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/ISeverity.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/ISeverity.java index ff0cd57..1bfd725 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/ISeverity.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/ISeverity.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; public interface ISeverity { diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/Logger.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/Logger.java similarity index 90% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/Logger.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/Logger.java index ecf1d71..7cc8091 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/Logger.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/Logger.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; import java.io.File; import java.io.FileOutputStream; @@ -6,8 +6,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; -import cz.tefek.io.asl.resource.ResourceHelper; -import cz.tefek.io.asl.textio.TextOut; +import cz.tefek.pluto.io.asl.resource.ResourceHelper; +import cz.tefek.pluto.io.asl.textio.TextOut; /** * Logger. 'nuff said. diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/Severity.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/Severity.java similarity index 89% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/Severity.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/Severity.java index 106a0cc..76c3aed 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/Severity.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/Severity.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; /** * Message severity. diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/SmartSeverity.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/SmartSeverity.java similarity index 96% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/SmartSeverity.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/SmartSeverity.java index 2482cc2..7ee618d 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/SmartSeverity.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/SmartSeverity.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; /** * A more visual way to denote what's actually happening. diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdErrSplitStream.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/StdErrSplitStream.java similarity index 96% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdErrSplitStream.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/StdErrSplitStream.java index 977f34c..e08fcdb 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdErrSplitStream.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/StdErrSplitStream.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; import java.io.IOException; import java.io.OutputStream; diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdOutSplitStream.java b/plutolib/src/main/java/cz/tefek/pluto/io/logger/StdOutSplitStream.java similarity index 96% rename from plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdOutSplitStream.java rename to plutolib/src/main/java/cz/tefek/pluto/io/logger/StdOutSplitStream.java index 67f9c2b..02705c4 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/debug/StdOutSplitStream.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/logger/StdOutSplitStream.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.debug; +package cz.tefek.pluto.io.logger; import java.io.IOException; import java.io.OutputStream; diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/pp/InvalidPlutoPackageException.java b/plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/InvalidPlutoPackageException.java similarity index 90% rename from plutoio2/src/main/java/cz/tefek/io/pluto/pp/InvalidPlutoPackageException.java rename to plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/InvalidPlutoPackageException.java index ac66e44..bd4d791 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/pp/InvalidPlutoPackageException.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/InvalidPlutoPackageException.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.pp; +package cz.tefek.pluto.io.pluto.pp; /** * Thrown when a provided package definition is for some reason not valid. diff --git a/plutoio2/src/main/java/cz/tefek/io/pluto/pp/PlutoPackage.java b/plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/PlutoPackage.java similarity index 97% rename from plutoio2/src/main/java/cz/tefek/io/pluto/pp/PlutoPackage.java rename to plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/PlutoPackage.java index 310163f..89f7e3f 100644 --- a/plutoio2/src/main/java/cz/tefek/io/pluto/pp/PlutoPackage.java +++ b/plutolib/src/main/java/cz/tefek/pluto/io/pluto/pp/PlutoPackage.java @@ -1,4 +1,4 @@ -package cz.tefek.io.pluto.pp; +package cz.tefek.pluto.io.pluto.pp; public class PlutoPackage { diff --git a/plutoio2/src/main/java/cz/tefek/l10n/PlutoL10n.java b/plutolib/src/main/java/cz/tefek/pluto/l10n/PlutoL10n.java similarity index 92% rename from plutoio2/src/main/java/cz/tefek/l10n/PlutoL10n.java rename to plutolib/src/main/java/cz/tefek/pluto/l10n/PlutoL10n.java index fd76a6f..61b29ac 100644 --- a/plutoio2/src/main/java/cz/tefek/l10n/PlutoL10n.java +++ b/plutolib/src/main/java/cz/tefek/pluto/l10n/PlutoL10n.java @@ -1,11 +1,11 @@ -package cz.tefek.l10n; +package cz.tefek.pluto.l10n; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class PlutoL10n { diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/Mod.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/Mod.java similarity index 91% rename from plutoio2/src/main/java/cz/tefek/io/modloader/Mod.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/Mod.java index a627db2..4544bc3 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/Mod.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/Mod.java @@ -1,8 +1,8 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; -import cz.tefek.io.asl.resource.ResourceSubscriber; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.pp.PlutoPackage; +import cz.tefek.pluto.io.asl.resource.ResourceSubscriber; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.pluto.pp.PlutoPackage; /** * Mod object. Can be used to create a {@link ResourceSubscriber}. diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/ModClassLoader.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModClassLoader.java similarity index 93% rename from plutoio2/src/main/java/cz/tefek/io/modloader/ModClassLoader.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/ModClassLoader.java index 6988278..180032e 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/ModClassLoader.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModClassLoader.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; import java.util.ArrayList; import java.util.Arrays; @@ -10,9 +10,9 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; -import cz.tefek.io.asl.resource.ResourceHelper; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.asl.resource.ResourceHelper; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; /** * Class-loads all valid mods. The only requirement for the mod is to have a diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/ModEntry.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModEntry.java similarity index 92% rename from plutoio2/src/main/java/cz/tefek/io/modloader/ModEntry.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/ModEntry.java index 0e84a60..b2e33dc 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/ModEntry.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModEntry.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/ModInstaller.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModInstaller.java similarity index 91% rename from plutoio2/src/main/java/cz/tefek/io/modloader/ModInstaller.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/ModInstaller.java index f93ed27..051047e 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/ModInstaller.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModInstaller.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; import java.util.ArrayList; import java.util.Arrays; @@ -11,9 +11,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import cz.tefek.io.asl.resource.ResourceHelper; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.asl.resource.ResourceHelper; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; /** * Unzips mod packages from the packages folder into the mods folder. WIP diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/ModLoaderCore.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java similarity index 89% rename from plutoio2/src/main/java/cz/tefek/io/modloader/ModLoaderCore.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java index 1a6d954..d263688 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/ModLoaderCore.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoaderCore.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; import java.util.ArrayList; import java.util.Collections; @@ -6,18 +6,18 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import cz.tefek.io.asl.resource.ResourceHelper; -import cz.tefek.io.modloader.event.ModLoad; -import cz.tefek.io.modloader.event.ModLoadEvent; -import cz.tefek.io.modloader.event.ModPostLoad; -import cz.tefek.io.modloader.event.ModPostLoadEvent; -import cz.tefek.io.modloader.event.ModPreLoad; -import cz.tefek.io.modloader.event.ModPreLoadEvent; -import cz.tefek.io.modloader.event.ModUnload; -import cz.tefek.io.modloader.event.ModUnloadEvent; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.eventsystem.staticmode.StaticPlutoEventManager; +import cz.tefek.pluto.io.asl.resource.ResourceHelper; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; +import cz.tefek.pluto.modloader.event.ModLoad; +import cz.tefek.pluto.modloader.event.ModLoadEvent; +import cz.tefek.pluto.modloader.event.ModPostLoad; +import cz.tefek.pluto.modloader.event.ModPostLoadEvent; +import cz.tefek.pluto.modloader.event.ModPreLoad; +import cz.tefek.pluto.modloader.event.ModPreLoadEvent; +import cz.tefek.pluto.modloader.event.ModUnload; +import cz.tefek.pluto.modloader.event.ModUnloadEvent; public class ModLoaderCore { diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/ModLoadingPhase.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoadingPhase.java similarity index 81% rename from plutoio2/src/main/java/cz/tefek/io/modloader/ModLoadingPhase.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoadingPhase.java index daa3145..78dcfd8 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/ModLoadingPhase.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/ModLoadingPhase.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader; +package cz.tefek.pluto.modloader; public enum ModLoadingPhase { diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java similarity index 87% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoad.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java index d43cf1f..c7ef6d4 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoad.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java similarity index 69% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoadEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java index 30cd90c..77e52c9 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModLoadEvent.java @@ -1,7 +1,7 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; -import cz.tefek.io.modloader.ModEntry; import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.modloader.ModEntry; /** * Instances are passed to {@link ModEntry ModEntries} on load. Currently does diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java similarity index 87% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoad.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java index c8bf14d..be0e5b6 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoad.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java similarity index 77% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoadEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java index 93995f5..1cddaba 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPostLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPostLoadEvent.java @@ -1,10 +1,10 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import java.util.ArrayList; import java.util.List; -import cz.tefek.io.modloader.ModEntry; import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.modloader.ModEntry; /** * Instances are passed to {@link ModEntry ModEntries} on post-load. diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoad.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java similarity index 87% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoad.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java index a2ef67e..7070f79 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoad.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoad.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java similarity index 67% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoadEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java index 701a57c..7b4e448 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModPreLoadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModPreLoadEvent.java @@ -1,10 +1,10 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import java.util.List; -import cz.tefek.io.modloader.Mod; -import cz.tefek.io.modloader.ModEntry; import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.modloader.Mod; +import cz.tefek.pluto.modloader.ModEntry; /** * Instances are passed to {@link ModEntry ModEntries} on load. Carries a list diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnload.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java similarity index 87% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnload.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java index 30bea11..0592183 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnload.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnload.java @@ -1,4 +1,4 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnloadEvent.java b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java similarity index 70% rename from plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnloadEvent.java rename to plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java index f73aec8..c41c2ad 100644 --- a/plutoio2/src/main/java/cz/tefek/io/modloader/event/ModUnloadEvent.java +++ b/plutolib/src/main/java/cz/tefek/pluto/modloader/event/ModUnloadEvent.java @@ -1,7 +1,7 @@ -package cz.tefek.io.modloader.event; +package cz.tefek.pluto.modloader.event; -import cz.tefek.io.modloader.ModEntry; import cz.tefek.pluto.eventsystem.EventData; +import cz.tefek.pluto.modloader.ModEntry; /** * Instances are passed to {@link ModEntry ModEntries} on mod unload. diff --git a/plutoio2/src/main/java/cz/tefek/tpl/TPJImage.java b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPJImage.java similarity index 89% rename from plutoio2/src/main/java/cz/tefek/tpl/TPJImage.java rename to plutolib/src/main/java/cz/tefek/pluto/tpl/TPJImage.java index 04e141a..85a0f88 100644 --- a/plutoio2/src/main/java/cz/tefek/tpl/TPJImage.java +++ b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPJImage.java @@ -1,4 +1,4 @@ -package cz.tefek.tpl; +package cz.tefek.pluto.tpl; public class TPJImage { diff --git a/plutoio2/src/main/java/cz/tefek/tpl/TPL.java b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java similarity index 93% rename from plutoio2/src/main/java/cz/tefek/tpl/TPL.java rename to plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java index e6efa60..5ba1c23 100644 --- a/plutoio2/src/main/java/cz/tefek/tpl/TPL.java +++ b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPL.java @@ -1,4 +1,4 @@ -package cz.tefek.tpl; +package cz.tefek.pluto.tpl; import java.awt.Graphics2D; import java.awt.image.BufferedImage; @@ -11,9 +11,9 @@ import java.nio.ByteOrder; import javax.imageio.ImageIO; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; /** * Quick ABGR (8-bit per channel, 32 bits per pixel) texture loader for OpenGL diff --git a/plutoio2/src/main/java/cz/tefek/tpl/TPNImage.java b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java similarity index 88% rename from plutoio2/src/main/java/cz/tefek/tpl/TPNImage.java rename to plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java index 89ec5e2..7468cbf 100644 --- a/plutoio2/src/main/java/cz/tefek/tpl/TPNImage.java +++ b/plutolib/src/main/java/cz/tefek/pluto/tpl/TPNImage.java @@ -1,4 +1,4 @@ -package cz.tefek.tpl; +package cz.tefek.pluto.tpl; import java.nio.ByteBuffer; diff --git a/plutomesher/src/main/java/cz/tefek/pluto/engine/graphics/gl/vao/VertexArray.java b/plutomesher/src/main/java/cz/tefek/pluto/engine/graphics/gl/vao/VertexArray.java index 8470cb8..77d6836 100644 --- a/plutomesher/src/main/java/cz/tefek/pluto/engine/graphics/gl/vao/VertexArray.java +++ b/plutomesher/src/main/java/cz/tefek/pluto/engine/graphics/gl/vao/VertexArray.java @@ -8,11 +8,11 @@ import java.util.Vector; import org.lwjgl.opengl.GL33; import org.lwjgl.system.MemoryUtil; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.engine.graphics.gl.DrawMode; import cz.tefek.pluto.engine.graphics.gl.vbo.ArrayBuffer; import cz.tefek.pluto.engine.graphics.gl.vbo.IndexArrayBuffer; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class VertexArray { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/PlutoShaderMod.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/PlutoShaderMod.java index 8ff540c..4b2cb21 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/PlutoShaderMod.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/PlutoShaderMod.java @@ -1,7 +1,7 @@ package cz.tefek.pluto.engine.shader; -import cz.tefek.io.modloader.ModEntry; import cz.tefek.pluto.engine.ModLWJGL; +import cz.tefek.pluto.modloader.ModEntry; @ModEntry(modid = PlutoShaderMod.MOD_ID, displayName = "PlutoShader", dependencies = { ModLWJGL.class }, version = "0.3", description = "Automated shader loader and manager.") public class PlutoShaderMod diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/RenderShaderBuilder.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/RenderShaderBuilder.java index 7a8c558..1662354 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/RenderShaderBuilder.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/RenderShaderBuilder.java @@ -5,10 +5,6 @@ import org.lwjgl.opengl.GL33; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.asl.resource.ResourceSubscriber; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.engine.shader.type.FragmentShader; import cz.tefek.pluto.engine.shader.type.VertexShader; import cz.tefek.pluto.engine.shader.uniform.Uniform; @@ -16,6 +12,10 @@ import cz.tefek.pluto.engine.shader.uniform.UniformBase; import cz.tefek.pluto.engine.shader.uniform.UniformMat4; import cz.tefek.pluto.engine.shader.uniform.auto.AutoViewportProjection; import cz.tefek.pluto.engine.shader.uniform.auto.AutomaticUniforms; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.asl.resource.ResourceSubscriber; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class RenderShaderBuilder { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderBase.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderBase.java index 60320bd..0371db2 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderBase.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderBase.java @@ -2,8 +2,8 @@ package cz.tefek.pluto.engine.shader; import org.lwjgl.opengl.GL33; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public abstract class ShaderBase implements IShaderProgram { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderCompiler.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderCompiler.java index 276ab67..fa30544 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderCompiler.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ShaderCompiler.java @@ -2,11 +2,11 @@ package cz.tefek.pluto.engine.shader; import org.lwjgl.opengl.GL33; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.asl.textio.TextIn; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.engine.shader.type.EnumShaderType; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.asl.textio.TextIn; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class ShaderCompiler { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/FragmentShader.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/FragmentShader.java index cb7a36f..363908c 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/FragmentShader.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/FragmentShader.java @@ -1,7 +1,7 @@ package cz.tefek.pluto.engine.shader.type; -import cz.tefek.io.asl.resource.ResourceAddress; import cz.tefek.pluto.engine.shader.ShaderCompiler; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; public final class FragmentShader implements IShader { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/GeometryShader.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/GeometryShader.java index 7526bf3..27e8436 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/GeometryShader.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/GeometryShader.java @@ -1,7 +1,7 @@ package cz.tefek.pluto.engine.shader.type; -import cz.tefek.io.asl.resource.ResourceAddress; import cz.tefek.pluto.engine.shader.ShaderCompiler; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; public final class GeometryShader implements IShader { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/VertexShader.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/VertexShader.java index ba9d0dd..e21ced1 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/VertexShader.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/type/VertexShader.java @@ -1,7 +1,7 @@ package cz.tefek.pluto.engine.shader.type; -import cz.tefek.io.asl.resource.ResourceAddress; import cz.tefek.pluto.engine.shader.ShaderCompiler; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; public final class VertexShader implements IShader { diff --git a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ubo/UniformBufferObject.java b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ubo/UniformBufferObject.java index 6b5c164..f15d88d 100644 --- a/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ubo/UniformBufferObject.java +++ b/plutoshader/src/main/java/cz/tefek/pluto/engine/shader/ubo/UniformBufferObject.java @@ -2,9 +2,9 @@ package cz.tefek.pluto.engine.shader.ubo; import org.lwjgl.opengl.GL33; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; import cz.tefek.pluto.engine.shader.ShaderBase; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public final class UniformBufferObject { diff --git a/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/PlutoSpriteSheetMod.java b/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/PlutoSpriteSheetMod.java index 8a90e02..f0757bf 100644 --- a/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/PlutoSpriteSheetMod.java +++ b/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/PlutoSpriteSheetMod.java @@ -1,18 +1,18 @@ package cz.tefek.pluto.engine.graphics; -import cz.tefek.io.asl.resource.ResourceSubscriber; -import cz.tefek.io.modloader.Mod; -import cz.tefek.io.modloader.ModEntry; -import cz.tefek.io.modloader.ModLoaderCore; -import cz.tefek.io.modloader.event.ModPreLoad; -import cz.tefek.io.modloader.event.ModPreLoadEvent; -import cz.tefek.io.modloader.event.ModUnload; -import cz.tefek.io.modloader.event.ModUnloadEvent; -import cz.tefek.io.pluto.debug.Logger; import cz.tefek.pluto.engine.ModLWJGL; import cz.tefek.pluto.engine.graphics.spritesheet.FramebufferTiledSpriteSheet; import cz.tefek.pluto.engine.shader.PlutoShaderMod; import cz.tefek.pluto.engine.shader.RenderShaderBuilder; +import cz.tefek.pluto.io.asl.resource.ResourceSubscriber; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.modloader.Mod; +import cz.tefek.pluto.modloader.ModEntry; +import cz.tefek.pluto.modloader.ModLoaderCore; +import cz.tefek.pluto.modloader.event.ModPreLoad; +import cz.tefek.pluto.modloader.event.ModPreLoadEvent; +import cz.tefek.pluto.modloader.event.ModUnload; +import cz.tefek.pluto.modloader.event.ModUnloadEvent; @ModEntry(modid = PlutoSpriteSheetMod.MOD_ID, version = "0.2", dependencies = { ModLWJGL.class, PlutoShaderMod.class }, author = "493msi", build = 1, displayName = "Pluto SpriteSheet", description = "A library to manage, store and draw sprites.") public class PlutoSpriteSheetMod diff --git a/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/spritesheet/TiledSpriteSheet.java b/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/spritesheet/TiledSpriteSheet.java index ff2a3d6..c69636e 100644 --- a/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/spritesheet/TiledSpriteSheet.java +++ b/plutospritesheet/src/main/java/cz/tefek/pluto/engine/graphics/spritesheet/TiledSpriteSheet.java @@ -2,11 +2,11 @@ package cz.tefek.pluto.engine.graphics.spritesheet; import java.util.Vector; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; import cz.tefek.pluto.engine.graphics.sprite.Sprite; import cz.tefek.pluto.engine.graphics.sprite.SpriteDisposable; import cz.tefek.pluto.engine.graphics.sprite.TileSprite; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; public abstract class TiledSpriteSheet extends SpriteSheet { diff --git a/plutostatic/pom.xml b/plutostatic/pom.xml index b900885..d3d1ff9 100644 --- a/plutostatic/pom.xml +++ b/plutostatic/pom.xml @@ -191,8 +191,8 @@ cz.tefek - plutoio2 - 0.2 + plutolib + 0.3 diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java b/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java index 1fdd108..3ef5bf3 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java @@ -2,7 +2,7 @@ package cz.tefek.pluto.engine; import org.lwjgl.Version; -import cz.tefek.io.modloader.ModEntry; +import cz.tefek.pluto.modloader.ModEntry; @ModEntry(modid = "modlwjgl", version = ModLWJGL.version, author = "The LWJGL team", displayName = "LWJGL", description = "The LWJGL library, without which the Pluto Engine wouldn't exist.") public class ModLWJGL 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 5376779..c04f2f7 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 @@ -3,7 +3,7 @@ package cz.tefek.pluto.engine.buffer; import org.lwjgl.BufferUtils; import org.lwjgl.glfw.GLFWImage; -import cz.tefek.tpl.TPL; +import cz.tefek.pluto.tpl.TPL; /** * A utility class to load image files for use in GLFW. diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/display/Display.java b/plutostatic/src/main/java/cz/tefek/pluto/engine/display/Display.java index 33fc8ab..41febe3 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/display/Display.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/display/Display.java @@ -11,9 +11,10 @@ import org.lwjgl.opengl.GL33; import org.lwjgl.opengl.GLDebugMessageARBCallback; import org.lwjgl.system.MemoryUtil; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; import cz.tefek.pluto.engine.gl.GLDebugInfo; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; +import cz.tefek.pluto.io.logger.SmartSeverity; /** * A wrapper class to provide abstraction over GLFW windows. @@ -200,7 +201,7 @@ public class Display public void invoke(int source, int type, int id, int severity, int length, long message, long userParam) { var mes = GLDebugMessageARBCallback.getMessage(length, message); - System.err.println(mes); + Logger.log(SmartSeverity.WARNING, mes); } }; diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/display/DisplayErrorCallback.java b/plutostatic/src/main/java/cz/tefek/pluto/engine/display/DisplayErrorCallback.java index e69f368..2b3aad7 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/display/DisplayErrorCallback.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/display/DisplayErrorCallback.java @@ -2,8 +2,8 @@ package cz.tefek.pluto.engine.display; import org.lwjgl.glfw.GLFWErrorCallback; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class DisplayErrorCallback extends GLFWErrorCallback { diff --git a/plutostatic/src/main/java/cz/tefek/pluto/engine/gl/GLDebugInfo.java b/plutostatic/src/main/java/cz/tefek/pluto/engine/gl/GLDebugInfo.java index fbf76a8..c90c6a1 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/gl/GLDebugInfo.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/gl/GLDebugInfo.java @@ -5,8 +5,8 @@ import org.lwjgl.opengl.ARBUniformBufferObject; import org.lwjgl.opengl.GL33; import org.lwjgl.opengl.GLCapabilities; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.SmartSeverity; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.SmartSeverity; public class GLDebugInfo { 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 1fc902d..b1aa19e 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 @@ -8,12 +8,12 @@ import org.lwjgl.system.MemoryUtil; import java.awt.image.BufferedImage; import java.nio.ByteBuffer; -import cz.tefek.io.asl.resource.ResourceAddress; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; -import cz.tefek.io.pluto.debug.SmartSeverity; -import cz.tefek.tpl.TPL; -import cz.tefek.tpl.TPNImage; +import cz.tefek.pluto.io.asl.resource.ResourceAddress; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; +import cz.tefek.pluto.io.logger.SmartSeverity; +import cz.tefek.pluto.tpl.TPL; +import cz.tefek.pluto.tpl.TPNImage; public abstract class Texture { diff --git a/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/texture2d/RectangleTexture.java b/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/texture2d/RectangleTexture.java index f5ce622..cecd903 100644 --- a/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/texture2d/RectangleTexture.java +++ b/plutotexturing/src/main/java/cz/tefek/pluto/engine/graphics/texture/texture2d/RectangleTexture.java @@ -4,10 +4,10 @@ import java.util.Arrays; import org.lwjgl.opengl.GL33; -import cz.tefek.io.pluto.debug.Logger; -import cz.tefek.io.pluto.debug.Severity; import cz.tefek.pluto.engine.graphics.texture.Texture; import cz.tefek.pluto.engine.graphics.texture.WrapMode; +import cz.tefek.pluto.io.logger.Logger; +import cz.tefek.pluto.io.logger.Severity; public class RectangleTexture extends Texture {