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'
     }
 }
 

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");
 

src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java

@@ -37,6 +37,7 @@ public class TileEntityDimDoor extends DDTileEntityBase
 		 return null;
 	 }
 
+	@Override
 	public void invalidate()
 	{
 		this.tileEntityInvalid = true;
@@ -45,7 +46,7 @@ public class TileEntityDimDoor extends DDTileEntityBase
 		{
 			if(PocketManager.getLink(xCoord, yCoord, zCoord, worldObj)!=null)
 			{
-				 mod_pocketDim.instance.fastRiftRegenerator.registerRiftForRegen(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId);	 
+				mod_pocketDim.fastRiftRegenerator.registerRiftForRegen(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId);	 
 			}
 		}
 	}

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" ],