From 84b2b2b7a72e2a48f86b31dbb818bba3063bd026 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Sat, 18 May 2019 10:39:39 -0500 Subject: [PATCH] Add a few more ignored items and hardcode rail melting recipes This adds melting recipes for: * Clocks and compasses (redstone) * Shields and tripwire hooks (planks) * Silky cloth and immersive engineering hammers (string) * Immersive engineering tools (treated sticks) * Hoppers (chests) --- .../tconstruct/common/config/Config.java | 7 ++++++- .../tconstruct/smeltery/TinkerSmeltery.java | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/slimeknights/tconstruct/common/config/Config.java b/src/main/java/slimeknights/tconstruct/common/config/Config.java index 23d644bd940..6f8fa37ed62 100644 --- a/src/main/java/slimeknights/tconstruct/common/config/Config.java +++ b/src/main/java/slimeknights/tconstruct/common/config/Config.java @@ -58,7 +58,12 @@ private Config() { }; public static Set craftingStationBlacklist = Collections.emptySet(); public static String[] oredictMeltingIgnore = { - "stickWood" + "dustRedstone", + "plankWood", + "stickWood", + "stickTreatedWood", + "string", + "minecraft:chest:0" }; // Worldgen diff --git a/src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java index aed2cac718a..579f3b2ca09 100644 --- a/src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java @@ -4,7 +4,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.eventbus.Subscribe; - import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityEvoker; import net.minecraft.entity.monster.EntityIllusionIllager; @@ -36,15 +35,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; - import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.Logger; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; - import slimeknights.mantle.block.EnumBlock; import slimeknights.mantle.item.ItemBlockMeta; import slimeknights.mantle.pulsar.pulse.Pulse; @@ -95,6 +87,11 @@ import slimeknights.tconstruct.smeltery.tileentity.TileTinkerTank; import slimeknights.tconstruct.tools.TinkerMaterials; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; + @Pulse(id = TinkerSmeltery.PulseId, description = "The smeltery and items needed for it") public class TinkerSmeltery extends TinkerPulse { @@ -393,6 +390,12 @@ private void registerMeltingCasting() { TinkerRegistry.registerMelting(Items.IRON_HORSE_ARMOR, TinkerFluids.iron, Material.VALUE_Ingot * 4); TinkerRegistry.registerMelting(Items.GOLDEN_HORSE_ARMOR, TinkerFluids.gold, Material.VALUE_Ingot * 4); + // rails, some of these are caught through registerOredictMelting, but for consistency all are just registered here + TinkerRegistry.registerMelting(Blocks.RAIL, TinkerFluids.iron, Material.VALUE_Ingot * 6 / 16); + TinkerRegistry.registerMelting(Blocks.ACTIVATOR_RAIL, TinkerFluids.iron, Material.VALUE_Ingot); + TinkerRegistry.registerMelting(Blocks.DETECTOR_RAIL, TinkerFluids.iron, Material.VALUE_Ingot); + TinkerRegistry.registerMelting(Blocks.GOLDEN_RAIL, TinkerFluids.gold, Material.VALUE_Ingot); + // register stone toolpart melting for(IToolPart toolPart : TinkerRegistry.getToolParts()) { if(toolPart.canBeCasted()) {