diff --git a/dependencies.gradle b/dependencies.gradle index 3e96a7d054..4bf346096f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.305:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.319:dev") api("com.github.GTNewHorizons:Yamcl:0.7.4:dev") api("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.9.20:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.9.31:dev") implementation("net.glease:tc4recipelib:1.5.37:dev") @@ -15,33 +15,34 @@ dependencies { compileOnly("secondderivative.irontankminecarts:IronTankMinecarts:1.0.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.19:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.27-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.30-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.4.7:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") - compileOnly("com.github.GTNewHorizons:Chisel:2.17.14-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.13.14-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.17.18-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.13.15-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.12:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.8.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.17-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.6:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:MatterManipulator:0.1.14-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.7.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.10-GTNH:dev") - compileOnly("com.github.GTNewHorizons:Backhand:1.8.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Backhand:1.8.3:dev") { transitive = false } compileOnly("com.cubefury.vendingmachine:VendingMachine:0.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.28-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.30-GTNH:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") //compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Postea:1.2.2:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.4-GTNH:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.17-GTNH:dev") //uncomment to test RC and Forestry recipes - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.17:dev") - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.4:dev") + //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.20:dev") + //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.6:dev") // RecEx, for testing purposes //runtimeOnlyNonPublishable("com.github.GTNewHorizons:RecEx:1.1.5:dev") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee3125..61285a659d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java index 2fd939d5a5..619f42798f 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java @@ -5,8 +5,6 @@ import static gregtech.api.enums.Mods.UniversalSingularities; import static gregtech.api.util.GTModHandler.getModItem; -import net.minecraft.block.Block; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,10 +14,8 @@ import com.dreammaster.block.BlockList; import com.dreammaster.mantle.BookLoader; import com.dreammaster.tinkersConstruct.worldgen.ZincGravelWorldgen; -import com.gtnewhorizons.postea.api.BlockReplacementManager; import com.gtnewhorizons.postea.api.ItemStackReplacementManager; import com.gtnewhorizons.postea.api.TileEntityReplacementManager; -import com.gtnewhorizons.postea.utility.BlockConversionInfo; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -62,53 +58,22 @@ private static void registerAluminumBrassPosteaTransformers() { } private static void convertAluminumBrassBlock() { - String targetBlock = "TConstruct:MetalBlock"; ItemStack brassBlock = GTOreDictUnificator.get(OrePrefixes.block, Materials.Brass, 1L); - int brassBlockMeta = Items.feather.getDamage(brassBlock); - BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> { - if (blockConversionInfoOld.metadata == 7) { - BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo(); - blockConversionInfoNew.blockID = Item.getIdFromItem(brassBlock.getItem()); - blockConversionInfoNew.metadata = brassBlockMeta; - return blockConversionInfoNew; - } - return null; - }); - ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> { - if (tag.getShort("Damage") == 7) { - tag.setShort("id", (short) Item.getIdFromItem(brassBlock.getItem())); - tag.setShort("Damage", (short) brassBlockMeta); - return tag; - } - return tag; - }); + // also applies a corresponding block transform. + ItemStackReplacementManager.addSimpleReplacement("TConstruct:MetalBlock", 7, brassBlock, false); } private static void convertAluminumBrassItems() { ItemStack brassIngot = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L); ItemStack brassNugget = GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L); ItemStack brassDust = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L); - ItemStackReplacementManager.addItemReplacement("TConstruct:materials", tag -> { - switch (tag.getShort("Damage")) { - case 14: - tag.setShort("id", (short) Item.getIdFromItem(brassIngot.getItem())); - tag.setShort("Damage", (short) Items.feather.getDamage(brassIngot)); - break; - case 24: - tag.setShort("id", (short) Item.getIdFromItem(brassNugget.getItem())); - tag.setShort("Damage", (short) Items.feather.getDamage(brassNugget)); - break; - case 42: - tag.setShort("id", (short) Item.getIdFromItem(brassDust.getItem())); - tag.setShort("Damage", (short) Items.feather.getDamage(brassDust)); - break; - } - return tag; - }); + ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 14, brassIngot); + ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 24, brassNugget); + ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 42, brassDust); } private static void convertMoltenAluminumBrassInSmeltery() { - TileEntityReplacementManager.tileEntityTransformer("TConstruct.Smeltery", (tags, world) -> { + TileEntityReplacementManager.tileEntityTransformer("TConstruct.Smeltery", (tags, world, chunk) -> { NBTTagList liquidTag = tags.getTagList("Liquids", 10); for (int i = 0; i < liquidTag.tagCount(); i++) { NBTTagCompound nbt = liquidTag.getCompoundTagAt(i); @@ -127,30 +92,19 @@ private static void convertAluminumBrassSingularity() { 1, 32, missing); - ItemStackReplacementManager - .addItemReplacement("universalsingularities:universal.tinkersConstruct.singularity", tag -> { - if (tag.getShort("Damage") == 0) { - tag.setShort("id", (short) Item.getIdFromItem(roseGoldSingularity.getItem())); - tag.setShort("Damage", (short) roseGoldSingularity.getItemDamage()); - return tag; - } - return tag; - }); + ItemStackReplacementManager.addSimpleReplacement( + "universalsingularities:universal.tinkersConstruct.singularity", + 0, + roseGoldSingularity, + true); } private static void registerGravelOrePosteaTransformers() { - String targetBlock = "TConstruct:GravelOre"; - BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> { - BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo(); - blockConversionInfoNew.blockID = Block.getIdFromBlock(BlockList.ZincGravelOre.block); - blockConversionInfoNew.metadata = 0; - return blockConversionInfoNew; - }); - ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> { - tag.setShort("id", (short) Block.getIdFromBlock(BlockList.ZincGravelOre.block)); - tag.setShort("Damage", (short) 0); - return tag; - }); + ItemStackReplacementManager.addSimpleReplacement( + "TConstruct:GravelOre", + Item.getItemFromBlock(BlockList.ZincGravelOre.block), + 0, + false); } } diff --git a/src/main/java/com/dreammaster/travellersgear/TGConverter.java b/src/main/java/com/dreammaster/travellersgear/TGConverter.java index 60f94d5848..cdbb8b85e8 100644 --- a/src/main/java/com/dreammaster/travellersgear/TGConverter.java +++ b/src/main/java/com/dreammaster/travellersgear/TGConverter.java @@ -17,7 +17,7 @@ public class TGConverter { public static void doPostInitialization() { TileEntityReplacementManager.tileEntityTransformer( "TravellersGear.ArmorStand", - (tag, world) -> new BlockInfo(Blocks.chest, 0, TGConverter::chestTransformer)); + (tag, world, chunk) -> new BlockInfo(Blocks.chest, 0, TGConverter::chestTransformer)); } private static NBTTagCompound chestTransformer(NBTTagCompound oldTag) {