diff --git a/.gitignore b/.gitignore index e0658084..018f47df 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ asm config logs screenshots +mods *.txt *.json diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 57e9dd99..67f12692 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -119,7 +119,7 @@ public class Chisel Configurations.refreshConfig(); ModTabs.load(); - ModBlocks.load(); + ModBlocks.preInit(); ModItems.load(); proxy.preInit(); } @@ -127,6 +127,7 @@ public class Chisel @EventHandler public void init(FMLInitializationEvent event) { + ModBlocks.init(); Crafting.init(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() { diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 1656d8ce..bc9b0f10 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -8,6 +8,8 @@ import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.item.ItemMarbleSlab; + +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -88,12 +90,13 @@ public class ModBlocks { public static BlockCarvable brickCustom; public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16]; public static BlockCarvable sign; + public static BlockCarvable arcane; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; - public static void load() + public static void preInit() { if(Configurations.featureEnabled("autoChisel")){ autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(ModTabs.tabChisel).setBlockName("autoChisel").setBlockTextureName(Chisel.MOD_ID + ":factory/circuit"); @@ -1552,6 +1555,19 @@ public class ModBlocks { sign.carverHelper.register(sign, "warningSign"); Carving.chisel.registerOre("warningSign", "warningSign"); } - + } + public static void init() + { + //Load AFTER Thaumcraft Blocks have loaded :P + if(Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft")) + { + arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 1, "arcane/largetile"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 2, "arcane/moon"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 3, "arcane/moon-thaumium"); + arcane.carverHelper.register(arcane, "arcane"); + Carving.chisel.registerOre("arcane", "arcane"); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index e653c3d4..a63b87fd 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -79,6 +79,12 @@ tile.voidstone2.7.desc=Beveled Voidstone tile.voidstonePillar2.name=Energised Voidstone Pillar tile.voidstonePillar2.0.desc=Striped Energised Voidstone Pillar +#Arcane +tile.arcane.name=Arcane Stone Block +tile.arcane.1.desc=Large Tile Arcane Stone +tile.arcane.2.desc=Arcane Stone with Engraved Moon +tile.arcane.3.desc=Arcane Stone with Thaumium Engraved Moon + #Waterstone tile.waterstone.name=Waterstone tile.waterstone.0.desc=Waterstone Bricks diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png b/src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png new file mode 100644 index 00000000..533294b1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png new file mode 100644 index 00000000..36f73b01 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png new file mode 100644 index 00000000..9fe98a63 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble0.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble0.png new file mode 100644 index 00000000..c09e6d20 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble1.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble1.png new file mode 100644 index 00000000..62cf3000 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble10.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble10.png new file mode 100644 index 00000000..57bd6748 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble11.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble11.png new file mode 100644 index 00000000..2498ef7d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble12.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble12.png new file mode 100644 index 00000000..26fd4440 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble13.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble13.png new file mode 100644 index 00000000..b6707fa3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble14.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble14.png new file mode 100644 index 00000000..ac314ac6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble14.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble15.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble15.png new file mode 100644 index 00000000..9a8466d0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble15.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble2.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble2.png new file mode 100644 index 00000000..22a1fb87 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble3.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble3.png new file mode 100644 index 00000000..8512d26f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble4.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble4.png new file mode 100644 index 00000000..75e16ecf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble5.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble5.png new file mode 100644 index 00000000..21e7ab4c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble6.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble6.png new file mode 100644 index 00000000..851871c9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble7.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble7.png new file mode 100644 index 00000000..8dbafc99 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble8.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble8.png new file mode 100644 index 00000000..2251ee9c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble9.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble9.png new file mode 100644 index 00000000..b3f3f725 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_off.png b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_off.png new file mode 100644 index 00000000..522765be Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_on.png b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_on.png new file mode 100644 index 00000000..9562ef3e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-off.png b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-off.png new file mode 100644 index 00000000..49852016 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-on.png b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-on.png new file mode 100644 index 00000000..891f458a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-on.png differ