From 9b22b2a91cf14725332a01cf289ff49ab7ffc4d6 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 30 Oct 2015 19:41:24 -0400 Subject: [PATCH] #52 End stone not chiselable --- src/main/java/team/chisel/Features.java | 5 +++-- src/main/java/team/chisel/compat/Compatibility.java | 11 +---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 8f01d439..d02eb92b 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -704,7 +704,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - Carving.chisel.addVariation("end_stone", Blocks.end_stone, 0, -1); + Carving.chisel.addVariation("end_Stone", Blocks.end_stone, 0, -1); end_Stone.carverHelper.addVariation("tile.end_Stone.0.desc", 0, "endstone/end_bricks"); end_Stone.carverHelper.addVariation("tile.end_Stone.1.desc", 1, "endstone/chaoticBricks"); end_Stone.carverHelper.addVariation("tile.end_Stone.2.desc", 2, "endstone/CheckeredTile"); @@ -720,7 +720,8 @@ public enum Features { end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endStoneOrnate"); end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endStoneLargeTile"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); - Carving.chisel.registerOre("end_Stone", "end_Stone"); + end_Stone.carverHelper.registerOre("blockEndstone"); + Carving.chisel.registerOre("end_Stone", "blockEndstone"); } }, diff --git a/src/main/java/team/chisel/compat/Compatibility.java b/src/main/java/team/chisel/compat/Compatibility.java index 2a83dae9..509e47c4 100644 --- a/src/main/java/team/chisel/compat/Compatibility.java +++ b/src/main/java/team/chisel/compat/Compatibility.java @@ -5,25 +5,16 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - -import org.apache.logging.log4j.Level; - -import team.chisel.Chisel; import team.chisel.carving.Carving; -import team.chisel.init.ChiselBlocks; -import team.chisel.init.ChiselItems; import team.chisel.utils.RecipeUtil; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.google.common.collect.Maps; -import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; +import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry;