diff --git a/build.gradle b/build.gradle index 680917f9..7b9ace36 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,8 @@ buildscript { apply plugin: 'forge' + + version = "2.1.1RC1" group= "com.stevenrs11.dimdoors" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "dimdoors" @@ -21,6 +23,9 @@ minecraft { version = "1.6.4-9.11.1.964" } +targetCompatibility = '1.7' +sourceCompatibility = '1.7' + processResources { // replace stuff in mcmod.info, nothing else @@ -39,6 +44,5 @@ processResources jar { - destinationDir = "build/dist/" - archiveName = "DimensionalDoors-$version.jar" + destinationDir = new File("build/dist/") } \ No newline at end of file diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java index 20902cdc..87c08ed9 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java @@ -80,4 +80,10 @@ public abstract class DDCommandBase extends CommandBase player.sendChatToPlayer(cmp); } + + @Override + public int compareTo(Object par1Obj) + { + return this.getCommandName().compareTo(((CommandBase)par1Obj).getCommandName()); + } } diff --git a/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java index bfc41402..26340c81 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java +++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java @@ -1,5 +1,4 @@ package StevenDimDoors.mod_pocketDimClient; -import net.minecraft.src.ModLoader; import StevenDimDoors.mod_pocketDim.CommonProxy; import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor; @@ -33,7 +32,6 @@ public class ClientProxy extends CommonProxy @Override public void printStringClient(String string) { - ModLoader.getMinecraftInstance().ingameGUI.getChatGUI().printChatMessage(string); } } \ No newline at end of file diff --git a/mcmod.info b/src/main/resources/mcmod.info similarity index 100% rename from mcmod.info rename to src/main/resources/mcmod.info