From 8bbb91e32dad6179e984906925850ad180ee11e0 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sat, 20 Dec 2014 12:08:51 +0000 Subject: [PATCH] Begin work on Chiselable Thaumcraft Arcane Stone :D --- .gitignore | 1 + .../java/com/cricketcraft/chisel/Chisel.java | 3 ++- .../cricketcraft/chisel/init/ModBlocks.java | 20 ++++++++++++++++-- .../resources/assets/chisel/lang/en_US.lang | 6 ++++++ .../textures/blocks/arcane/largetile.png | Bin 0 -> 3230 bytes .../textures/blocks/arcane/moon-thaumium.png | Bin 0 -> 3384 bytes .../chisel/textures/blocks/arcane/moon.png | Bin 0 -> 3374 bytes .../blocks/redstoneLamp/redstone_lamp_off.png | Bin 0 -> 616 bytes .../blocks/redstoneLamp/redstone_lamp_on.png | Bin 0 -> 682 bytes .../blocks/redstoneLamp/square-off.png | Bin 0 -> 3210 bytes .../blocks/redstoneLamp/square-on.png | Bin 0 -> 3556 bytes 11 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/arcane/moon.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_off.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/redstoneLamp/redstone_lamp_on.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-off.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/redstoneLamp/square-on.png 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 1b59cc90..f975ca78 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"); @@ -1553,6 +1556,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 0000000000000000000000000000000000000000..533294b11853c79a8083b427c19204073440e0e5 GIT binary patch literal 3230 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 Q7ytkO07*qoM6N<$f|MFB=Kufz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..36f73b014876c91246fbb883e1d06d55fa579a83 GIT binary patch literal 3384 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 Ef>#=Q8~^|S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..522765beb5b1343b8d44a04455f62a7e29584ccf GIT binary patch literal 616 zcmV-u0+;=XP)2Wf1 z#DtWi5)&2_0rjkmH~JOUW_NdW03h?bY6M3a5qVQcW^GNv$t@YDrA5{P=^}G>2B7#+ z*9HI*G;%V0Q)A4mXA@|uA$)sWz{f{u8xtCyO zicb%-IKH_EuP`>E<$&SPqHgqFsQCOKg%9_xqj#*EQ9`#G#-?ZTubp6kaxMn-s>jT3 z=b!Co!@%3SaeUvu!2p(-W<>8P5eKA{S+q+593@4p^dVcyd1j(^(#jlrw!c1)gXCqr zDk$je1coZ`UV!0uqJ1ZZu9=mlP0yEvGst=z{V#A1t&$(ThROi7#83q!>g#$n3M0KXa)wAA3}Dih=|?Pg{Q&0HY9%DFgt&vew1ZnVomUKL+u zOGqz@0T-$<8O8oWSwn4A!pKMy$S(<_KhyvI&c6Y32aAndQKl9E00007=PjV+3j403MF{S#s8#){@PCm)M?P?oHR20f(Ps4aE!xim`1VOfZ4 z8U#_0glHDcg|G(^7sL#8^mvYL#N$4_HCnw9{S*Z|L!^Gp5M8@%R5?m0A!p# z&PVS3U!xGqBe!Oyh<+Gq_8=K(!Or{;d{!9;9CWth=d>NRrgCfr^eE);av+uw;+;p1 z&CnRqn^D{_2{;fD*c#U(bW;KL{4p@KrJNJ$z$n^_#XcqGoMK9j^s8VNmvIhsr*>m~ zM2qPzG05dL3*l)M&a+l&UcjcW!ne^gn0H9gCeH4$%XkRmm#Y!Z1Zme-(|^yd z)?n5tp@Jk#PQYuf#1JFEOGhmgA!(EUja4PMqRCpd)a}Q{hz7AcYQ*j~Va6fJ3t(lG zT3zUqQ|sxEc*s0;N6vF_L5_4PWWBZELPiuiqfaVsMh#GG4-&;C|walk6)TG`i? z$z*McuKG1YB=beBoCDgm<>+CKVA!Ujty*}P;u8kgH5G836BHk&|2@us0DfWyw@uCh QbpQYW07*qoM6N<$g6nWOVgLXD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..498520167067bb93cbe8ae45ce36b4b984fa44cc GIT binary patch literal 3210 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..891f458a7825eb0116d6c8dd3e8b90ac53929806 GIT binary patch literal 3556 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 eNNeQnd;be;pH>vz2-Hdd0000