From e1d2afccd5496ce94048cb653343c09776bb94c4 Mon Sep 17 00:00:00 2001 From: Cricket Date: Thu, 12 Feb 2015 21:33:58 -0500 Subject: [PATCH] I have 2 done, I am not that creative --- .../com/cricketcraft/chisel/Features.java | 15 +++++++ .../chisel/init/ChiselBlocks.java | 37 ++---------------- .../resources/assets/chisel/lang/en_US.lang | 5 +++ .../textures/blocks/valentines/bricks.png | Bin 0 -> 512 bytes .../textures/blocks/valentines/companion.png | Bin 0 -> 504 bytes 5 files changed, 24 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/valentines/companion.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 415eeb4d..f8ff591c 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2454,6 +2454,21 @@ public enum Features { } }, + VALENTINES { + @Override void addBlocks() { + BlockCarvable valentines = (BlockCarvable) new BlockCarvable(Material.wood).setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F) + .setResistance(10F); + valentines.carverHelper.addVariation("tile.valentines.0.desc", 0, "valentines/bricks"); + valentines.carverHelper.addVariation("tile.valentines.1.desc", 1, "valentines/companion"); + valentines.carverHelper.registerAll(valentines, "valentines"); + Carving.chisel.registerOre("valentines", "blockValentines"); + } + + @Override void addRecipes() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.valentines, 8, 0), "***", "*X*", "***", '*', "stone", 'X', new ItemStack(Items.dye, 1, 9))); + } + }, + VOIDSTONE { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 49d0e78a..808de56b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -1,40 +1,9 @@ package com.cricketcraft.chisel.init; -import net.minecraft.block.Block; - import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.chisel.block.BlockCarvableGlowstone; -import com.cricketcraft.chisel.block.BlockCarvableIce; -import com.cricketcraft.chisel.block.BlockCarvableIcePillar; -import com.cricketcraft.chisel.block.BlockCarvableIceStairs; -import com.cricketcraft.chisel.block.BlockCarvableLayered; -import com.cricketcraft.chisel.block.BlockCarvablePackedIce; -import com.cricketcraft.chisel.block.BlockCarvablePackedIcePillar; -import com.cricketcraft.chisel.block.BlockCarvablePackedIceStairs; -import com.cricketcraft.chisel.block.BlockCarvablePane; -import com.cricketcraft.chisel.block.BlockCarvablePillar; -import com.cricketcraft.chisel.block.BlockCarvablePowered; -import com.cricketcraft.chisel.block.BlockCarvablePumpkin; -import com.cricketcraft.chisel.block.BlockCarvableSlab; -import com.cricketcraft.chisel.block.BlockCarvableStairs; -import com.cricketcraft.chisel.block.BlockCarvableTorch; -import com.cricketcraft.chisel.block.BlockCloud; -import com.cricketcraft.chisel.block.BlockConcrete; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.block.BlockLavastone; -import com.cricketcraft.chisel.block.BlockMarbleCarpet; -import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; -import com.cricketcraft.chisel.block.BlockMarbleWall; -import com.cricketcraft.chisel.block.BlockPresent; -import com.cricketcraft.chisel.block.BlockRoadLine; -import com.cricketcraft.chisel.block.BlockSnakestone; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.block.BlockWaterstone; - +import com.cricketcraft.chisel.block.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import net.minecraft.block.Block; @ObjectHolder(Chisel.MOD_ID) public final class ChiselBlocks { @@ -122,6 +91,8 @@ public final class ChiselBlocks { public static final BlockCarvable bloodRune = null; public static final BlockCarvable bloodBrick = null; + // Holidays + public static final BlockCarvable valentines = null; public static final BlockPresent present = null; // Arrays can't be final because of how @ObjectHolder works diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 782950ee..c7265062 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -29,6 +29,11 @@ item.upgrade_stack.desc=Allows it to manufacture stacks at a time #Chisel 2 +#Valentines +tile.chisel.valentines.name=Valentines Block +tile.valentines.0.desc=Valentines Bricks +tile.valentines.1.desc=If it speaks, I wouldn't touch it + #AntiBlocks tile.chisel.antiBlock.name=Anti Block tile.antiBlock.black.desc=Black Anti Block diff --git a/src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png b/src/main/resources/assets/chisel/textures/blocks/valentines/bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..57f3a8380893409da538007d6fbed96441cec970 GIT binary patch literal 512 zcmV+b0{{JqP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0dYx0K~y+TZIVArf>9KQ?-xq#iv$+FX(mB) z4Mq_}Btm5nnr1X4L@q5&5r%{s8Z;F(1kq45G*m-dLqqS|^ZJW}MDTDq_x!)-T=%`+ z4RUS2&LeoECor;h-ogpaAi zN^HWB6_rqo%)r%T;&0-m&4}k{K*`K(@j^sMH8nk$CE z)33M2wJkzdmLG(bUl z3;BcrgDODKy!8XfVwE8bP#h=#;VNEKOUUMD{8q3#`3PV*?8j;<5hqrMSPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0clA@K~y+TUD7vBgFzGo;Jq)wIl&El779c( zjyM4g4HuxH;skW?ErSq38m(WLdC7m-tR}nlbibJ`rkD4Nn?|Sou$?bwSM2Tm-Eq4m zzM5ZiF};N^0Sr6>wj3~;-HvjM$K8Sqq4-%ZZ%H|wK_9q)H@~~!_D@E{B4HN1Fb*2W ztzK7$?r?C_YW7CMcE2ZLDo_zetDg=My0bIe(|(yksZFVnJ+&=(kkJV~$1i}SWNdM+ z+4R9I5<+}$WlY{a&t60Q7(c`N_`%%{n+>wMv@ZNyv+};#q5cXCW-$UIlyukOcZPp# zz;OnIx&t*G0SEpH!WMMjoCLWzvw0lRltNAsUVvdYH_UwvR;bl*I8Bw2);jF`_iEu8 z!Jl21P7T)J^aSK`w*aa^a$at- u%4Ng)X=HBcd~KAfh=XpK&`YyfO}+p%2mms?OP?wL0000