From 2904ec146d241273f38738cc081a983167b3ae5e Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Wed, 9 Jul 2014 04:01:37 -0400 Subject: [PATCH] Implemented Automatic Versioning in Build Script 1. Changed build.gradle so that it edits the version numbers in mod_pocketDim.java and mcmod.info. 2. Changed mod_pocketDim to use a placeholder for its version number and fixed an annotation that was wrong. It would cause our mod_pocketDim instance to not initialize properly. I removed what seemed to be workarounds that were hiding the problem. 3. Fixed space in TileEntityDimDoor.invalidate() and corrected a non-static access to a static field in mod_pocketDim. 4. Changed mcmod.info so that it users placeholders for the mod version and MC version values. --- build.gradle | 12 ++++----- .../mod_pocketDim/mod_pocketDim.java | 7 +++-- .../tileentities/TileEntityDimDoor.java | 27 ++++++++++--------- src/main/resources/mcmod.info | 4 +-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 6d68944..abc1771 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,8 @@ buildscript { apply plugin: 'forge' - - version = "2.2.4-" + System.getenv("BUILD_NUMBER") -group= "com.stevenrs11.dimdoors" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group = "com.stevenrs11.dimdoors" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "DimensionalDoors" minecraft { @@ -28,17 +26,19 @@ sourceCompatibility = '1.6' processResources { - // replace stuff in mcmod.info, nothing else + // Replace stuff $version and $mcversion in mcmod.info and mod_pocketDim.java from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' + include 'mod_pocketDim.java' - // replace version and mcversion + // Replace version and mcversion expand 'version':project.version, 'mcversion':project.minecraft.version } - // copy everything else, thats not the mcmod.info + // Copy everything else from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' + exclude 'mod_pocketDim.java' } } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 62dd845..95dce46 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -97,7 +97,7 @@ serverPacketHandlerSpec = @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ServerPacketHandler.class)) public class mod_pocketDim { - public static final String version = "1.6.4-R2.2.4"; + public static final String version = "$version"; public static final String modid = "dimdoors"; //TODO need a place to stick all these constants @@ -107,8 +107,8 @@ public class mod_pocketDim @SidedProxy(clientSide = "StevenDimDoors.mod_pocketDimClient.ClientProxy", serverSide = "StevenDimDoors.mod_pocketDim.CommonProxy") public static CommonProxy proxy; - @Instance("PocketDimensions") - public static mod_pocketDim instance = new mod_pocketDim(); + @Instance(mod_pocketDim.modid) + public static mod_pocketDim instance; public static Block transientDoor; public static Block warpDoor; @@ -169,7 +169,6 @@ public class mod_pocketDim @EventHandler public void onPreInitialization(FMLPreInitializationEvent event) { - instance = this; //This should be the FIRST thing that gets done. String path = event.getSuggestedConfigurationFile().getAbsolutePath().replace(modid, "DimDoors"); diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java index 115aa64..fe478b6 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java @@ -36,19 +36,20 @@ public class TileEntityDimDoor extends DDTileEntityBase } return null; } - - public void invalidate() - { - this.tileEntityInvalid = true; - - if(this.worldObj.getBlockId(xCoord, yCoord, zCoord)==0&&!this.worldObj.isRemote) - { - if(PocketManager.getLink(xCoord, yCoord, zCoord, worldObj)!=null) - { - mod_pocketDim.instance.fastRiftRegenerator.registerRiftForRegen(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId); - } - } - } + + @Override + public void invalidate() + { + this.tileEntityInvalid = true; + + if(this.worldObj.getBlockId(xCoord, yCoord, zCoord)==0&&!this.worldObj.isRemote) + { + if(PocketManager.getLink(xCoord, yCoord, zCoord, worldObj)!=null) + { + mod_pocketDim.fastRiftRegenerator.registerRiftForRegen(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId); + } + } + } @Override public void readFromNBT(NBTTagCompound nbt) diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 92ac4ad..7a43be9 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -6,10 +6,10 @@ "modid": "dimdoors", "name": "Dimensional Doors", "description": "Bend and twist reality itself, creating pocket dimensions, rifts, and much more", -"version": "1.6.4-R2.2.4", +"version": "$version", "credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu", "logoFile": "/dimdoors_logo.png", -"mcversion": "", +"mcversion": "$mcversion", "url": "http://www.minecraftforum.net/topic/1650007-147smpssplan-dimensional-doors-v110-physics-what-physics-updated-with-fancy-opengl/", "updateUrl": "", "authors": [ "StevenRS11", "SenseiKiwi" ],