From 31f5451a60a3dee1cb9b8afd92ca0cad5dd8b478 Mon Sep 17 00:00:00 2001 From: Cricket Date: Thu, 14 May 2015 20:50:46 -0400 Subject: [PATCH] Added EE3 EMC values --- .gitignore | 2 - build.gradle | 3 +- .../com/cricketcraft/chisel/Features.java | 36 ++--- .../chisel/compat/Compatibility.java | 152 ++++++++++++++++++ .../chisel/compat/WailaCompat.java | 1 - .../chisel/init/ChiselBlocks.java | 5 +- 6 files changed, 176 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 66c2c4f5..030d4da8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,9 @@ run #workspace saves asm -config logs screenshots mods -world lib libs diff --git a/build.gradle b/build.gradle index 903f8692..88b41ae7 100644 --- a/build.gradle +++ b/build.gradle @@ -56,11 +56,12 @@ repositories { } dependencies { - compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" + //compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev" compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev" + compile "com.pahimar.ee3:EquivalentExchange3:1.7.10-0.3.505:dev" } processResources diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 066f2ee7..951c8787 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1667,29 +1667,29 @@ public enum Features { @Override void addBlocks() { BlockCarvable imperial = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - imperial.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/imperialCamo"); - imperial.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/imperialCamoSecluded"); - imperial.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/imperialPlate"); - imperial.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/imperialCautionWhite"); - imperial.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/imperialCautionOrange"); + imperial.carverHelper.addVariation("tile.rebel.0.desc", 0, "rebel/imperialCamo"); + imperial.carverHelper.addVariation("tile.rebel.1.desc", 1, "rebel/imperialCamoSecluded"); + imperial.carverHelper.addVariation("tile.rebel.2.desc", 2, "rebel/imperialPlate"); + imperial.carverHelper.addVariation("tile.rebel.3.desc", 3, "rebel/imperialCautionWhite"); + imperial.carverHelper.addVariation("tile.rebel.4.desc", 4, "rebel/imperialCautionOrange"); //imperial.carverHelper.registerBlock(imperial, "imperial"); - imperial.carverHelper.registerAll(imperial, "nation"); + imperial.carverHelper.registerAll(imperial, "rebel"); BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - rebel.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/rebelCamo"); - rebel.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/rebelCamoSecluded"); - rebel.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/rebelPlate"); - rebel.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/rebelCautionWhite"); - rebel.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/rebelCautionRed"); + rebel.carverHelper.addVariation("tile.rebel.0.desc", 0, "rebel/rebelCamo"); + rebel.carverHelper.addVariation("tile.rebel.1.desc", 1, "rebel/rebelCamoSecluded"); + rebel.carverHelper.addVariation("tile.rebel.2.desc", 2, "rebel/rebelPlate"); + rebel.carverHelper.addVariation("tile.rebel.3.desc", 3, "rebel/rebelCautionWhite"); + rebel.carverHelper.addVariation("tile.rebel.4.desc", 4, "rebel/rebelCautionRed"); rebel.carverHelper.registerBlock(rebel, "rebel"); - rebel.carverHelper.registerVariations("nation", rebel); + rebel.carverHelper.registerVariations("rebel", rebel); - Carving.chisel.registerOre("nation", "nation"); + Carving.chisel.registerOre("rebel", "rebel"); } @Override void addRecipes() { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.nation, 32, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.rebel, 32, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', Items.iron_ingot, 'z', Items.gold_nugget })); } }, @@ -2690,13 +2690,13 @@ public enum Features { voidstone2.carverHelper.registerAll(voidstone2, "voidstone2"); Carving.chisel.registerOre("voidstone2", "voidstone2"); - BlockCarvable voidstoneRunic = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + BlockCarvable voidstonerunic = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); for (int i = 1; i < 16; i++) - voidstoneRunic.carverHelper.addVariation("tile.voidstoneRunic." + sGNames[i].replaceAll(" ", "").toLowerCase() + ".desc", i, "voidstone/runes/rune" + sGNames[i].replaceAll(" ", "")); - voidstoneRunic.carverHelper.registerAll(voidstoneRunic, "voidstoneRunic"); - voidstoneRunic.carverHelper.registerVariations("voidstone", voidstoneRunic); + voidstonerunic.carverHelper.addVariation("tile.voidstoneRunic." + sGNames[i].replaceAll(" ", "").toLowerCase() + ".desc", i, "voidstone/runes/rune" + sGNames[i].replaceAll(" ", "")); + voidstonerunic.carverHelper.registerAll(voidstonerunic, "voidstoneRunic"); + voidstonerunic.carverHelper.registerVariations("voidstone", voidstonerunic); Carving.chisel.registerOre("voidstoneRunic", "voidstoneRunic"); } diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index ec426cd6..43fd733a 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -2,6 +2,12 @@ package com.cricketcraft.chisel.compat; import java.util.Map; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.Features; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.cricketcraft.chisel.init.ChiselItems; +import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; +import cpw.mods.fml.common.FMLLog; import net.minecraft.block.Block; import com.cricketcraft.chisel.carving.Carving; @@ -10,6 +16,9 @@ import com.google.common.collect.Maps; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import org.apache.logging.log4j.Level; public class Compatibility { @@ -75,6 +84,10 @@ public class Compatibility { addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); addSupport("Botania", "endStoneBrick", "end_stone", 12, 0); + + if(Loader.isModLoaded("Equivalent Exchange 3")){ + loadEE3Values(); + } } public static void addSupport(String modname, String blockname, String name, int metadata, int order) { @@ -91,4 +104,143 @@ public class Compatibility { // ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestone, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); // ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestoneWall, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); } + + private static void loadEE3Values(){ + FMLLog.log(Chisel.MOD_ID, Level.INFO, "Oooh is that Equivalent Exchange I see?"); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselItems.ballomoss, 1), 16); + + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 1), 8); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 13), 8); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 0), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 1), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 2), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 3), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 4), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 1), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 2), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 3), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 4), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 12), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 13), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 14), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 15), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.present, 1, 4), 80); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 0), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 1), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 2), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 3), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 1), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 2), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 3), 24); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass2, 1), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 32); + + for(int x = 0; x < ChiselBlocks.pumpkin.length; x++){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.pumpkin[x], 1), 144); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.jackolantern[x], 1), 153); + } + + for(int x = 0; x < ChiselBlocks.torches.length; x++){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.torches[x], 1), 9); + } + + for(int x = 0; x < 10; x++){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.valentines, 1, x), 3); + } + + for(int x = 0 ; x < 16; x++){ + if(x <= 10)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.concrete, 1, x), 8); + if(x <= 14)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 5); + if(x < 14)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 7); + if(x < 12)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.dirt, 1, x), 1); + if(x < 5){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.rebel, 1, x), 39); + } + + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 29444); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 31444); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.limestone, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar, 1, x), 8); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar_slab, 1, x), 4); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone_scribbles, 1, x), 4); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stonebricksmooth, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.templeblock, 1, x), 108); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_templeblock, 1, x), 108); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glowstone, 1, x), 1536); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.woolen_clay, 1, x), 153); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock, 1, x), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexPlating, 1, x), 37); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.gold_block, 1, x), 18432); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_block, 1, x), 2304); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.laboratoryblock, 1, x), 33); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical, 1, x), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.tyrian, 1, x), 33); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexLargePlating, 1, x), 37); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.circuits, 1, x), 37); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); + + if(x < 15)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.warningSign, 1, x), 6); + + if(x < 4)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); + + for(int c = 0; c < ChiselBlocks.stainedGlass.length; c++){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlass[c], 1, x), 1); + } + + for(int c = 0; c < ChiselBlocks.stainedGlassPane.length; c++){ + if(x <= 13)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlassPane[c], 1, x), 1); + } + + if(x > 0) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cobblestone, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_cobblestone, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.netherrack, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.obsidian, 1, x), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone, 1, x), 4); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstonerunic, 1, x), 160); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.redstone_block, 1, x), 288); + if(x <= 8)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.bookshelf, 1, x), 528); + if (x <= 12) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diamond_block, 1, x), 73728); + if (x != 12) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.emerald_block, 1, x), 73728); + } + + for (int c = 0; c < ChiselBlocks.planks.length; c++) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.planks[c], 1, x), 8); + } + } + } + + for(int x = 0; x <= 6; x++){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.andesite, 1, x), 129); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diorite, 1, x), 257); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.granite, 1, x), 513); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, x), 9); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, 7), 9); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, x), 160); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, 7), 160); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, x), 256); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, 7), 256); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.waterstone, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice_pillar, 1, x), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, x), 96); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 7), 96); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 8), 96); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 9), 96); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, x), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 7), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 8), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, x), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 7), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 8), 32); + if(x > 0){ + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.brickCustom, 1, x), 256); + } + } + } } diff --git a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java index edffc005..de7c923d 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java +++ b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java @@ -45,7 +45,6 @@ public class WailaCompat implements IWailaDataProvider { return strings; } - @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { return tag; } diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 72d13bfb..d25aa8d2 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -33,7 +33,7 @@ public final class ChiselBlocks { public static final BlockCarvableGlowstone glowstone = null; public static final BlockCarvable lapis_block = null; public static final BlockCarvable emerald_block = null; - public static final BlockCarvable nation = null; + public static final BlockCarvable rebel = null; public static final BlockCarvable nether_brick = null; public static final BlockCarvable netherrack = null; public static final BlockCarvable mossy_cobblestone = null; @@ -70,15 +70,18 @@ public final class ChiselBlocks { public static final BlockCarvable voidstone = null; public static final BlockMultiLayer voidstone2 = null; + public static final BlockCarvable voidstonerunic = null; public static final BlockCarvablePillar voidstonePillar = null; public static final BlockCarvablePillar voidstonePillar2 = null; public static final BlockSnakestone stone_snakestone = null; public static final BlockSnakestone sand_snakestone = null; public static final BlockSnakestoneObsidian obsidian_snakestone = null; public static final BlockCarvable hexPlating = null; + public static final BlockCarvable hexLargePlating = null; public static final BlockCarvable technical = null; public static final BlockCarvableGlass technical2 = null; public static final BlockCarvable futura = null; + public static final BlockCarvable circuits = null; public static final BlockCarvable brickCustom = null; public static final BlockCarvableLayered warningSign = null; public static final BlockCarvable arcane = null;