Skip to content

Commit

Permalink
Add a few more ignored items and hardcode rail melting recipes
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
KnightMiner committed May 18, 2019
1 parent 39819bb commit 84b2b2b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ private Config() {
};
public static Set<String> craftingStationBlacklist = Collections.emptySet();
public static String[] oredictMeltingIgnore = {
"stickWood"
"dustRedstone",
"plankWood",
"stickWood",
"stickTreatedWood",
"string",
"minecraft:chest:0"
};

// Worldgen
Expand Down
19 changes: 11 additions & 8 deletions src/main/java/slimeknights/tconstruct/smeltery/TinkerSmeltery.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {

Expand Down Expand Up @@ -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()) {
Expand Down

0 comments on commit 84b2b2b

Please sign in to comment.