From ac4f7fdc29e8dff7f9847986002ff96003ebb3f9 Mon Sep 17 00:00:00 2001 From: Cricket Date: Fri, 2 Jan 2015 21:22:46 -0500 Subject: [PATCH] Added AlchemicalWizardry support --- src/main/java/com/cricketcraft/chisel/Chisel.java | 1 + .../chisel/compat/MarbleCompatibility.java | 12 ++++++++++++ .../com/cricketcraft/chisel/init/ModBlocks.java | 15 +++++++++++++++ .../com/cricketcraft/chisel/init/ModTabs.java | 3 ++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 8c82a22d..baecb94c 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -119,6 +119,7 @@ public class Chisel modsSupported.add("Twilight Forest"); modsSupported.add("appliedenergistics2"); modsSupported.add("Railcraft"); + modsSupported.add("AWWayOfTime"); File configFile = event.getSuggestedConfigurationFile(); Configurations.configExists = configFile.exists(); diff --git a/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java b/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java index 7e814c7a..eefd767f 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java @@ -108,6 +108,18 @@ public class MarbleCompatibility } }; + new ClassCompat("shukaro.artifice.ArtificeBlocks") + { + @Override + void action() throws Exception + { + Block[] blocks = (Block[]) cl.getField("blockLimestones").get(null); + + Carving.chisel.addVariation("limestone", blocks[0], 3, 99); + blocks[0].setHarvestLevel("chisel", 0, 3); + } + }; + new ClassBlockCompat("com.bluepowermod.init.BPBlocks", "marble") { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 373f3eb2..5226b4d1 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -94,6 +94,7 @@ public class ModBlocks { public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16]; public static BlockCarvable sign; public static BlockCarvable arcane; + public static BlockCarvable bloodRune; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; @@ -1691,6 +1692,20 @@ public class ModBlocks { Carving.chisel.registerOre("arcane", "arcane"); } + //Blood Magic + if(Configurations.featureEnabled("bloodRune") && Loader.isModLoaded("AWWayOfTime")){ + bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayOfTime", "bloodRune.blank"), 0, 0); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.0.desc"), 0, "bloodMagic/bloodRuneArranged"); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.1.desc"), 1, "bloodMagic/bloodRuneBricks"); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.2.desc"), 2, "bloodMagic/bloodRuneCarved"); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.3.desc"), 3, "bloodMagic/bloodRuneCarvedRadial"); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.4.desc"), 4, "bloodMagic/bloodRuneClassicPanel"); + bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.5.desc"), 5, "bloodMagic/bloodRuneTiles"); + bloodRune.carverHelper.register(bloodRune, "bloodRune"); + Carving.chisel.registerOre("bloodRune", "bloodRune"); + } + //Twilight Forest diff --git a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java b/src/main/java/com/cricketcraft/chisel/init/ModTabs.java index 1d5b074f..6e7bfa1c 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModTabs.java @@ -3,6 +3,7 @@ package com.cricketcraft.chisel.init; import com.cricketcraft.chisel.Chisel; import cpw.mods.fml.common.Loader; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; public class ModTabs { @@ -49,7 +50,7 @@ public class ModTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.planks[0]); + return Item.getItemFromBlock(Blocks.bookshelf); } };