diff --git a/build.gradle b/build.gradle index 46f3fa0d7..b28cde254 100644 --- a/build.gradle +++ b/build.gradle @@ -65,8 +65,8 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.9.4-12.17.0.1921-1.9.4" - mappings = "snapshot_20160518" + version = "1.9.4-12.17.0.1950" + mappings = "snapshot_20160604" replace "@MODVERSION@", project.version // makeObfSourceJar = false useDepAts = true @@ -92,8 +92,8 @@ dependencies { compile 'RebornCore:RebornCore-1.9.4:+:dev' deobfCompile "mezz.jei:jei_1.9.4:+" compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" - //deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132" - //deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193" + deobfCompile "slimeknights.mantle:Mantle:1.9.4-0.10.1.jenkins142" + deobfCompile "slimeknights:TConstruct:1.9.4-2.3.1.jenkins229" } diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 274ba3b7e..98053bf09 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -4,6 +4,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import techreborn.client.render.parts.ClientPartLoader; +import techreborn.compat.tinkers.CompatModuleTinkers; import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; @@ -44,7 +45,7 @@ public class CompatManager registerCompact(StandalonePartCompact.class, "!reborncore-mcmultipart"); registerCompact(WailaMcMultiPartCompact.class, "reborncore-mcmultipart", "Waila", "!IC2"); registerCompact(CompatModuleWaila.class, "Waila"); - //registerCompact(CompatModuleTinkers.class, "tconstruct"); + registerCompact(CompatModuleTinkers.class, "tconstruct"); //registerCompact(CompatModulePsi.class, "Psi"); } diff --git a/toaddback/tinkers/CompatModuleTinkers.java b/src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java similarity index 100% rename from toaddback/tinkers/CompatModuleTinkers.java rename to src/main/java/techreborn/compat/tinkers/CompatModuleTinkers.java diff --git a/toaddback/tinkers/TinkersFluids.java b/src/main/java/techreborn/compat/tinkers/TinkersFluids.java similarity index 100% rename from toaddback/tinkers/TinkersFluids.java rename to src/main/java/techreborn/compat/tinkers/TinkersFluids.java diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 82c28747e..58f47fb04 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -241,7 +241,7 @@ public class TechRebornWorldGen implements IWorldGenerator { int chance = config.rubberTreeConfig.chance; boolean isValidSpawn = false; - Biome biomeGenBase = world.getBiomeGenForCoords(new BlockPos(chunkX * 16, 72, chunkZ * 16)); + Biome biomeGenBase = world.getBiomeForCoordsBody(new BlockPos(chunkX * 16, 72, chunkZ * 16)); if (BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP)) { // TODO check the config file for bounds on this, might cause