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 dcc103a..c01310f 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,5 +1,6 @@ package cz.tefek.pluto.engine.graphics; +import cz.tefek.pluto.Pluto; import cz.tefek.pluto.engine.graphics.font.FontManager; import cz.tefek.pluto.engine.graphics.font.FontShader; import cz.tefek.pluto.engine.graphics.texture.MagFilter; @@ -23,7 +24,12 @@ import cz.tefek.pluto.modloader.event.ModUnloadEvent; * @author 493msi * */ -@ModEntry(modid = PlutoGUIMod.MOD_ID, displayName = "Pluto Engine GUI Renderer", author = "Tefek", build = 2, dependencies = { PlutoSpriteSheetMod.class }, clientSupport = true, serverSupport = false, version = "0.2", description = "Everything GUI of PlutoEngine.") +@ModEntry(modid = PlutoGUIMod.MOD_ID, + displayName = "Pluto Engine GUI Renderer", + author = "Tefek", + dependencies = { PlutoSpriteSheetMod.class }, + version = Pluto.VERSION, + description = "Everything GUI of PlutoEngine.") public class PlutoGUIMod { public static final String MOD_ID = "plutogui"; diff --git a/plutolib/src/main/java/cz/tefek/pluto/Pluto.java b/plutolib/src/main/java/cz/tefek/pluto/Pluto.java index 77fc524..e11437e 100644 --- a/plutolib/src/main/java/cz/tefek/pluto/Pluto.java +++ b/plutolib/src/main/java/cz/tefek/pluto/Pluto.java @@ -3,4 +3,46 @@ package cz.tefek.pluto; public class Pluto { public static final boolean DEBUG_MODE = Boolean.valueOf(System.getProperty("cz.tefek.pluto.debug")); + + // TODO: Automate setting the version numbers with gradle + + /** + * The year version number, changes with breaking API changes. + * */ + public static final int VERSION_YEAR = 20; + + /** + * The major version number, changes with breaking API changes. + * */ + public static final int VERSION_MAJOR = 2; + + /** + * The minor version number, changes with backwards-compatible API changes. + * */ + public static final int VERSION_MINOR = 0; + + /** + * The patch number, changes with backwards-compatible fixes and patches. + * */ + public static final int VERSION_PATCH = 0; + + /** + * Denotes whether this build is a pre-release build. + * */ + public static final boolean PRERELEASE = true; + + /** + * The name of this pre-release, e.g. alpha, beta, RC and similar. + * */ + public static final String PRERELEASE_NAME = "alpha"; + + /** + * The pre-release patch number, incremented by 1 with *any* pre-release change. + * */ + public static final int PRERELEASE_PATCH = 1; + + /** + * The combined version string. + * */ + public static final String VERSION = VERSION_YEAR + "." + VERSION_MAJOR + "." + VERSION_MINOR + "." + VERSION_PATCH + (PRERELEASE ? "-" + PRERELEASE_NAME + "." + PRERELEASE_PATCH : ""); } diff --git a/plutoshader/build.gradle b/plutoshader/build.gradle index c1b25ea..7b7649b 100644 --- a/plutoshader/build.gradle +++ b/plutoshader/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java-library' -description = "" +description = "Automated shader loader and manager." dependencies { api project(":plutotexturing") 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 4b2cb21..101abe8 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,9 +1,14 @@ package cz.tefek.pluto.engine.shader; +import cz.tefek.pluto.Pluto; 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.") +@ModEntry(modid = PlutoShaderMod.MOD_ID, + displayName = "PlutoShader", + dependencies = { ModLWJGL.class }, + version = Pluto.VERSION, + description = "Automated shader loader and manager.") public class PlutoShaderMod { public static final String MOD_ID = "plutoshader"; diff --git a/plutospritesheet/build.gradle b/plutospritesheet/build.gradle index 2f4e28b..efc2de0 100644 --- a/plutospritesheet/build.gradle +++ b/plutospritesheet/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java-library' -description = "" +description = "A library to manage, store and draw sprites." dependencies { api project(":plutoframebuffer") 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 f0757bf..484bcf2 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,5 +1,6 @@ package cz.tefek.pluto.engine.graphics; +import cz.tefek.pluto.Pluto; import cz.tefek.pluto.engine.ModLWJGL; import cz.tefek.pluto.engine.graphics.spritesheet.FramebufferTiledSpriteSheet; import cz.tefek.pluto.engine.shader.PlutoShaderMod; @@ -14,7 +15,12 @@ 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.") +@ModEntry(modid = PlutoSpriteSheetMod.MOD_ID, + version = Pluto.VERSION, + dependencies = { ModLWJGL.class, PlutoShaderMod.class }, + author = "493msi", + displayName = "Pluto SpriteSheet", + description = "A library to manage, store and draw sprites.") public class PlutoSpriteSheetMod { public static final String MOD_ID = "plutospritesheet"; 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 3ef5bf3..da7e26a 100644 --- a/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java +++ b/plutostatic/src/main/java/cz/tefek/pluto/engine/ModLWJGL.java @@ -4,7 +4,11 @@ import org.lwjgl.Version; 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.") +@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 { public static final String version = Version.VERSION_MAJOR + "." + Version.VERSION_MINOR + "." + Version.VERSION_REVISION;