From f0ad905c07e77fdffce3162628da5c1311adff3f Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 7 Jul 2014 15:43:53 +0100 Subject: [PATCH] Merge branch '1.7.10' into development Conflicts: build.properties src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/voice/VoiceConnection.java --- build.gradle | 31 ++++++++++++++----- build.properties | 10 +++--- etc/core/dependancies.info | 11 +++---- etc/core/mcmod.info | 4 +-- etc/generators/mcmod.info | 4 +-- etc/tools/mcmod.info | 4 +-- .../client/render/RenderTickHandler.java | 4 +-- src/main/java/mekanism/common/Mekanism.java | 7 ++--- .../java/mekanism/common/PacketHandler.java | 2 -- .../common/voice/VoiceConnection.java | 2 +- 10 files changed, 43 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index f4e25d5d0..8c0fc46ba 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" } -version = "${config.mod_version}.${System.env.BUILD_NUMBER}" +version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUILD_NUMBER ?: "homebaked") archivesBaseName = "MekanismAll" libsDirName = "../output" distsDirName = "../output" @@ -73,7 +73,6 @@ processResources } task coreJar(type: Jar) { - dependsOn 'reobf' baseName = 'Mekanism' manifest { @@ -81,30 +80,46 @@ task coreJar(type: Jar) { attributes 'FMLCorePluginContainsFMLMod': 'true' } - from 'etc/core' + from('etc/core') { + include '*.info' + expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version + } + from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { exclude 'mekanism/tools/**', 'mekanism/generators/**' } } task toolsJar(type: Jar) { - dependsOn 'reobf' baseName = 'MekanismTools' - from 'etc/tools' + + from('etc/tools') { + include '*.info' + expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version + } + from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { include 'mekanism/tools/**' } } task generatorsJar(type: Jar) { - dependsOn 'reobf' baseName = 'MekanismGenerators' - from 'etc/generators' + + from('etc/generators') { + include '*.info' + expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version + } + from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { include 'mekanism/generators/**' } } +coreJar.dependsOn('reobf') +toolsJar.dependsOn('reobf') +generatorsJar.dependsOn('reobf') + task MDKZip(type: Zip) { baseName = 'MDK' from sourceSets.main.java.srcDirs @@ -122,6 +137,6 @@ task releaseJars(type: Copy) { } task fullBuild(type: Delete) { - dependsOn 'releaseJars' delete reobf } +fullBuild.dependsOn('releaseJars') diff --git a/build.properties b/build.properties index 7d4563088..96642995a 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ -minecraft_version=1.7.2 -forge_version=10.12.2.1147 -FMP_version=1.1.0.288 -CCLIB_version=1.1.1.87 -NEI_version=1.0.1 +minecraft_version=1.7.10 +forge_version=10.13.0.1170 +FMP_version=1.1.0.296 +CCLIB_version=1.1.1.93 +NEI_version=1.0.2.15 mod_version=7.0.0 diff --git a/etc/core/dependancies.info b/etc/core/dependancies.info index 7a1b06264..a0009f1b9 100755 --- a/etc/core/dependancies.info +++ b/etc/core/dependancies.info @@ -1,9 +1,6 @@ { - "repo": "http://files.minecraftforge.net/ForgeMultipart/", - "file": "ForgeMultipart-universal-@MCVERSION@-@VERSION@.jar", - "dev": "ForgeMultipart-dev-@MCVERSION@-@VERSION@.jar", - "class": "codechicken.lib.asm.ASMHelper", - "version": "1.0.0.219", - "mcversion": "1.6.4", - "coreLib": false + "repo": "http://files.minecraftforge.net/maven/codechicken/ForgeMultipart/${mc_version}-${fmp_version}/", + "file": "ForgeMultipart-${mc_version}-${fmp_version}-universal.jar", + "dev": "ForgeMultipart-${mc_version}-${fmp_version}-dev.jar", + "class": "codechicken.multipart.MultipartMod" } \ No newline at end of file diff --git a/etc/core/mcmod.info b/etc/core/mcmod.info index c2e542bfb..22f95e2bb 100755 --- a/etc/core/mcmod.info +++ b/etc/core/mcmod.info @@ -3,8 +3,8 @@ "modid": "Mekanism", "name": "Mekanism", "description": "Energy, Armor, Tools, Weapons, Machines, Magic.", - "version": "7.0.0", - "mcversion": "1.7.2", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authors": [ "aidancbrady" diff --git a/etc/generators/mcmod.info b/etc/generators/mcmod.info index 3242ac92c..583cf4435 100755 --- a/etc/generators/mcmod.info +++ b/etc/generators/mcmod.info @@ -3,8 +3,8 @@ "modid": "MekanismGenerators", "name": "MekanismGenerators", "description": "Generators module of Mekanism.", - "version": "7.0.0", - "mcversion": "1.7.2", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authors": [ "aidancbrady" diff --git a/etc/tools/mcmod.info b/etc/tools/mcmod.info index b707d523f..6a0f4163e 100755 --- a/etc/tools/mcmod.info +++ b/etc/tools/mcmod.info @@ -3,8 +3,8 @@ "modid": "MekanismTools", "name": "MekanismTools", "description": "Tools module for Mekanism.", - "version": "7.0.0", - "mcversion": "1.7.2", + "version": "${version}", + "mcversion": "${mc_version}", "updateUrl": "", "authors": [ "aidancbrady" diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 586537b8b..207dcd417 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -81,7 +81,7 @@ public class RenderTickHandler { ItemStack stack = player.getEquipmentInSlot(3); - ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int x = scaledresolution.getScaledWidth(); int y = scaledresolution.getScaledHeight(); @@ -182,4 +182,4 @@ public class RenderTickHandler mc.effectRenderer.addEffect(fx); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c6986fef9..f65c35a0c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -157,8 +157,8 @@ import cpw.mods.fml.common.registry.GameRegistry; * */ @Mod(modid = "Mekanism", name = "Mekanism", version = "7.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", - dependencies = "required-after:Forge@[10.12.2.1147,); after:BuildCraft;after:IC2;after:CoFHCore;after:ComputerCraft;after:Galacticraft;" + - "after:MineFactoryReloaded;after:MetallurgyCore;after:Railcraft;after:Forestry") + dependencies = "after:BuildCraftAPI;after:IC2API;after:CoFHAPI|energy;after:ComputerCraft;after:Galacticraft API;" + + "after:MineFactoryReloaded;after:MetallurgyCore") public class Mekanism { /** Mekanism Packet Pipeline */ @@ -596,9 +596,6 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 12), new Object[] { "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[] { - "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" - })); for(RecipeType type : RecipeType.values()) { diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 996b80e12..69d770be9 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -78,8 +78,6 @@ public class PacketHandler { public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEK"); - private int packetsRegistered = 0; - public void initialize() { netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER); diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 4e16f9d0a..a68ab4acc 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -198,6 +198,6 @@ public class VoiceConnection extends Thread public EntityPlayerMP getPlayer() { - return server.getConfigurationManager().getPlayerForUsername(username); + return server.getConfigurationManager().func_152612_a(username); //TODO getPlayerForUsername } }