diff --git a/build.gradle b/build.gradle index d431eaf..d05b906 100644 --- a/build.gradle +++ b/build.gradle @@ -17,13 +17,26 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.0.0-beta5" +ext.configFile = file "build.properties" +configFile.withReader { + // Load config. It shall from now be referenced as simply config or project.config + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +version = config.minecraft_version + "-" + config.mod_version group= "locusway.overloadedarmorbar" archivesBaseName = "overloadedarmorbar" minecraft { - version = "1.7.10-10.13.4.1614-1.7.10" - runDir = "eclipse" + version = config.minecraft_version + "-" + config.forge_version + runDir = "run" + + replace "\${version}", project.version + replace "\${mcversion}", version + replace "(gradle_replace_mcversion,)", "[" + version + "]" + replace "(gradle_replace_forgeversion,)", "[" + config.forge_version + ",)" } dependencies { diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..8a807ec --- /dev/null +++ b/build.properties @@ -0,0 +1,3 @@ +mod_version=1.0.0 +minecraft_version=1.7.10 +forge_version=10.13.4.1614-1.7.10 \ No newline at end of file diff --git a/src/main/java/locusway/overloadedarmorbar/OverloadedArmorBar.java b/src/main/java/locusway/overloadedarmorbar/OverloadedArmorBar.java index e0e2a41..00cf69b 100644 --- a/src/main/java/locusway/overloadedarmorbar/OverloadedArmorBar.java +++ b/src/main/java/locusway/overloadedarmorbar/OverloadedArmorBar.java @@ -6,12 +6,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import locusway.overloadedarmorbar.proxy.CommonProxy; -@Mod(modid = OverloadedArmorBar.MODID, name = OverloadedArmorBar.MODNAME, version = OverloadedArmorBar.MODVERSION, useMetadata = true, guiFactory = OverloadedArmorBar.GUI_FACTORY_CLASS) +@Mod(modid = OverloadedArmorBar.MODID, name = OverloadedArmorBar.MODNAME, version = OverloadedArmorBar.VERSION, useMetadata = true, guiFactory = OverloadedArmorBar.GUI_FACTORY_CLASS) public class OverloadedArmorBar { public static final String MODID = "overloadedarmorbar"; public static final String MODNAME = "Overloaded Armor Bar"; - public static final String MODVERSION = "1.7.10-1.0.0-beta5"; + public static final String VERSION = "${version}"; public static final String GUI_FACTORY_CLASS = "locusway.overloadedarmorbar.client.gui.GuiFactory"; public static org.apache.logging.log4j.Logger logger; diff --git a/src/main/java/locusway/overloadedarmorbar/overlay/ArmorIcon.java b/src/main/java/locusway/overloadedarmorbar/overlay/ArmorIcon.java index 0e78fc8..450c9fc 100644 --- a/src/main/java/locusway/overloadedarmorbar/overlay/ArmorIcon.java +++ b/src/main/java/locusway/overloadedarmorbar/overlay/ArmorIcon.java @@ -13,12 +13,12 @@ public class ArmorIcon Type = HALF: The color of the left-hand side of the icon */ - public ArmorIconColor primaryArmorIconColor; + public final ArmorIconColor primaryArmorIconColor; /* Type = HALF: The color of the right-hand side of the icon */ - public ArmorIconColor secondaryArmorIconColor; + public final ArmorIconColor secondaryArmorIconColor; public ArmorIcon() diff --git a/src/main/java/locusway/overloadedarmorbar/overlay/OverlayEventHandler.java b/src/main/java/locusway/overloadedarmorbar/overlay/OverlayEventHandler.java index b592266..e285a83 100644 --- a/src/main/java/locusway/overloadedarmorbar/overlay/OverlayEventHandler.java +++ b/src/main/java/locusway/overloadedarmorbar/overlay/OverlayEventHandler.java @@ -31,7 +31,7 @@ private OverlayEventHandler() {} private final static int ARMOR_ICON_SIZE = 9; private final static int ARMOR_SECOND_HALF_ICON_SIZE = 4; - private Minecraft mc = Minecraft.getMinecraft(); + private final Minecraft mc = Minecraft.getMinecraft(); private ArmorIcon[] armorIcons; @SubscribeEvent(receiveCanceled = true)