From 940b98bed8cfbeae505d5f98bbf8b59fc57e8c2d Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 11:47:36 +0000 Subject: [PATCH 01/30] Reimplementing Warning Signs & Torches --- .../chisel/block/BlockCarvableTorch.java | 33 ++++++++++ .../chisel/init/ChiselBlocks.java | 2 + .../cricketcraft/chisel/init/Features.java | 61 ++++++++++++++++-- .../resources/assets/chisel/lang/en_US.lang | 17 +++++ .../chisel/textures/blocks/torch/torch1.png | Bin 0 -> 2933 bytes .../chisel/textures/blocks/torch/torch10.png | Bin 0 -> 3015 bytes .../chisel/textures/blocks/torch/torch2.png | Bin 0 -> 2950 bytes .../chisel/textures/blocks/torch/torch3.png | Bin 0 -> 3173 bytes .../chisel/textures/blocks/torch/torch4.png | Bin 0 -> 3270 bytes .../chisel/textures/blocks/torch/torch5.png | Bin 0 -> 3011 bytes .../chisel/textures/blocks/torch/torch6.png | Bin 0 -> 3024 bytes .../chisel/textures/blocks/torch/torch7.png | Bin 0 -> 3107 bytes .../chisel/textures/blocks/torch/torch8.png | Bin 0 -> 3228 bytes .../chisel/textures/blocks/torch/torch9.png | Bin 0 -> 3040 bytes .../chisel/textures/blocks/warning/acid.png | Bin 0 -> 4590 bytes .../chisel/textures/blocks/warning/base.png | Bin 0 -> 3699 bytes .../chisel/textures/blocks/warning/bio.png | Bin 0 -> 4759 bytes .../textures/blocks/warning/cryogenic.png | Bin 0 -> 1767 bytes .../chisel/textures/blocks/warning/death.png | Bin 0 -> 4947 bytes .../textures/blocks/warning/explosion.png | Bin 0 -> 5468 bytes .../chisel/textures/blocks/warning/fall.png | Bin 0 -> 4812 bytes .../textures/blocks/warning/falling.png | Bin 0 -> 4041 bytes .../chisel/textures/blocks/warning/fire.png | Bin 0 -> 4928 bytes .../textures/blocks/warning/generic.png | Bin 0 -> 4489 bytes .../textures/blocks/warning/illuminati.png | Bin 0 -> 1288 bytes .../textures/blocks/warning/noentry.png | Bin 0 -> 4986 bytes .../chisel/textures/blocks/warning/rad.png | Bin 0 -> 4816 bytes .../chisel/textures/blocks/warning/sound.png | Bin 0 -> 5128 bytes .../blocks/warning/underconstruction.png | Bin 0 -> 4852 bytes .../textures/blocks/warning/voltage.png | Bin 0 -> 4868 bytes 30 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch1.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch10.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch2.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch3.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch4.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch5.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch6.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch7.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch8.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/torch/torch9.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/acid.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/base.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/bio.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/cryogenic.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/death.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/explosion.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/fall.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/falling.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/fire.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/generic.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/illuminati.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/noentry.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/rad.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/sound.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/underconstruction.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/warning/voltage.png diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java new file mode 100644 index 00000000..bae70cd8 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -0,0 +1,33 @@ +package com.cricketcraft.chisel.block; + +import net.minecraft.block.BlockTorch; +import net.minecraft.client.renderer.texture.IIconRegister; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; + +public class BlockCarvableTorch extends BlockTorch implements ICarvable +{ + public CarvableHelper carverHelper; + private String texLocation; + + public BlockCarvableTorch() + { + super(); + + carverHelper = new CarvableHelper(); + } + @Override + public CarvableVariation getVariation(int metadata) { + return carverHelper.getVariation(metadata); + } + @Override + public void registerBlockIcons(IIconRegister icon){ + this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/"+ texLocation); + } + public void setInformation(String textureLocation){ + this.texLocation = textureLocation; + } +} \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 628b9a77..8a9ca03f 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -11,6 +11,7 @@ import com.cricketcraft.chisel.block.BlockCarvablePumpkin; import com.cricketcraft.chisel.block.BlockCarvableSand; 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; @@ -111,6 +112,7 @@ public final class ChiselBlocks { public static final BlockCarvable arcane = null; public static final BlockCarvable bloodRune = null; public static final BlockCarvableSand colored_sand = null; + public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16]; // Arrays can't be final because of how @ObjectHolder works public static BlockCarvable[] planks = new BlockCarvable[6]; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index d52f7e8e..b2bb96ba 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -1,5 +1,14 @@ package com.cricketcraft.chisel.init; +import static com.cricketcraft.chisel.init.ChiselBlocks.carpet_block; +import static com.cricketcraft.chisel.init.ChiselBlocks.jackolantern; +import static com.cricketcraft.chisel.init.ChiselBlocks.planks; +import static com.cricketcraft.chisel.init.ChiselBlocks.present; +import static com.cricketcraft.chisel.init.ChiselBlocks.pumpkin; +import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlass; +import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlassPane; +import static com.cricketcraft.chisel.init.ChiselBlocks.torch; +import static com.cricketcraft.chisel.utils.General.sGNames; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -25,6 +34,7 @@ import com.cricketcraft.chisel.block.BlockCarvablePumpkin; import com.cricketcraft.chisel.block.BlockCarvableSand; 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.BlockEldritch; @@ -70,9 +80,6 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import static com.cricketcraft.chisel.init.ChiselBlocks.*; -import static com.cricketcraft.chisel.utils.General.*; - public enum Features { AE_CERTUS_QUARTZ("appliedenergistics2") { @@ -132,6 +139,7 @@ public enum Features { AUTO_CHISEL { + @Override void addBlocks() { Block autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel").setCreativeTab(ChiselTabs.tabChisel).setBlockName("autoChisel"); GameRegistry.registerBlock(autoChisel, "autoChisel"); @@ -724,6 +732,7 @@ public enum Features { GLASS_STAINED { + @Override void addBlocks() { for (int i = 0; i < 16; i++) { final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase(); @@ -1769,6 +1778,7 @@ public enum Features { RC_QUARRIED_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + @Override void addBlocks() { Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 0, 0); Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 1, 1); @@ -2074,6 +2084,7 @@ public enum Features { TEMPLE_BLOCK_MOSSY { + @Override void addBlocks() { BlockCarvable mossy_templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) .setStepSound(Chisel.soundTempleFootstep); @@ -2221,6 +2232,7 @@ public enum Features { VOIDSTONE_PILLARS { + @Override void addBlocks() { BlockVoidstonePillar voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); @@ -2326,7 +2338,48 @@ public enum Features { boolean needsMetaRecipes() { return true; } - } + }, + + WARNING_SIGN { + @Override + void addBlocks() { + BlockCarvable sign = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.0.desc"), 0, "warning/rad"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.1.desc"), 1, "warning/bio"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.2.desc"), 2, "warning/fire"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.3.desc"), 3, "warning/explosion"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.4.desc"), 4, "warning/death"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.5.desc"), 5, "warning/falling"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.6.desc"), 6, "warning/fall"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.7.desc"), 7, "warning/voltage"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.8.desc"), 8, "warning/generic"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.9.desc"), 9, "warning/acid"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.10.desc"), 10, "warning/underconstruction"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.11.desc"), 11, "warning/sound"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.12.desc"), 12, "warning/noentry"); + sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.13.desc"), 13, "warning/cryogenic"); + sign.carverHelper.register(sign, "warningSign"); + Carving.chisel.registerOre("warningSign", "warningSign"); + } + @Override + void addRecipes() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.sign, 4, 0), new Object[]{"xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign})); + } + }, + + TORCH { + @Override + void addBlocks() { + Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); + for(int metadata = 0; metadata < 10; metadata++){ + torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(0.9375F).setBlockName("torch"); + torch[metadata].setInformation("torch" + (metadata + 1)); + GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1)); + Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1)); + } + Carving.chisel.registerOre("torch", "torch"); + } + }, ; diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index d02e9cb9..691bbec9 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -73,6 +73,23 @@ tile.voidstone.7.desc=Beveled Voidstone tile.voidstonePillar.name=Voidstone Pillar tile.voidstonePillar.0.desc=Striped Voidstone Pillar +-#Warning +tile.warningSign.name=Warning Sign +tile.warningSign.0.desc=Radiation +tile.warningSign.1.desc=Biohazard +tile.warningSign.2.desc=Fire +tile.warningSign.3.desc=Explosion +tile.warningSign.4.desc=Death +tile.warningSign.5.desc=Falling Objects +tile.warningSign.6.desc=Danger of Falling +tile.warningSign.7.desc=High Voltage +tile.warningSign.8.desc=Generic Warning +tile.warningSign.9.desc=Dangerous Chemicals +tile.warningSign.10.desc=Under Construction +tile.warningSign.11.desc=Loud Sounds +tile.warningSign.12.desc=No Entry +tile.warningSign.13.desc=Cryogenic Freezing in progress + #Energised Void Stone Blocks tile.voidstone2.name=Energised Voidstone tile.voidstone2.0.desc=Raw Energised Voidstone diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/torch1.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch1.png new file mode 100755 index 0000000000000000000000000000000000000000..fe5c5e6fc78e434461d81a115f054d3ce0eb1b82 GIT binary patch literal 2933 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 JPDHLkV1jzxrn3M5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/torch2.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch2.png new file mode 100755 index 0000000000000000000000000000000000000000..94357515f048f3e5619059afdd1392aabf1443c8 GIT binary patch literal 2950 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 Eg3~f3c>n+a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/torch5.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch5.png new file mode 100755 index 0000000000000000000000000000000000000000..0bd566c015b7d644913c0fe2c7936cdbf60a0e4c GIT binary patch literal 3011 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 FV1iYVnnVBq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/torch6.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch6.png new file mode 100755 index 0000000000000000000000000000000000000000..5eb4208c7205c7f1eda9942ed969654a07a557e8 GIT binary patch literal 3024 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 SD9hFW0000|D^_ww@lRz|vCuzLs)$;-`! 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/fire.png b/src/main/resources/assets/chisel/textures/blocks/warning/fire.png new file mode 100755 index 0000000000000000000000000000000000000000..a6bac0629710f8275a20b269055435b7b6ac7bfd GIT binary patch literal 4928 zcmV-G6Tj?EX>4Tx07%E3mUmQC*A|D*y?1({%`nm#dXp|Nfb=dP9RyJrW(F9_0K*JTY>22p zL=h1IMUbF?0i&TvtcYSED5zi$NDxqBFp8+CWJcCXe0h2A<>mLsz2Dkr?{oLrd!Mx~ z03=TzE-wX^0w9?u;0Jm*(^rK@(6Rjh26%u0rT{Qm>8ZX!?!iDLFE@L0LWj&=4?(nOT_siPRbOditRHZrp6?S8AgejFG^6va$=5K z|`EW#NwP&*~x4%_lS6VhL9s-#7D#h8C*`Lh;NHnGf9}t74chfY%+(L z4giWIwhK6{coCb3n8XhbbP@4#0C1$ZFF5847I3lz;zPNlq-OKEaq$AWE=!MYYHiJ+ zdvY?9I0Av8Ka-Wn(gPeepdb@piwLhwjRWWeSr7baCBSDM=|pK0Q5^$>Pur z|2)M1IPkCYSQ^NQ`z*pYmq4Rp8z$= z2uR(a0_5jDfT9oq5_wSE_22vEgAWDbn-``!u{igi1^xT3aEbVl&W-yV=Mor9X9@Wk zi)-R*3DAH5Bmou30~MeFbb%o-16IHmI084Y0{DSo5DwM?7KjJQfDbZ3F4znTKoQsl z_JT@K1L{E|XaOfc2RIEbfXm=IxC!on2Vew@gXdrdyaDqN1YsdEM1kZXRY(gmfXpBU zWDmJPK2RVO4n;$85DyYUxzHA<2r7jtp<1XB`W89`U4X7a1JFHa6qn9`(3jA6(BtSg7z~Dn(ZN_@JTc*z z1k5^2G3EfK6>}alfEmNgVzF3xtO3>z>xX4x1=s@Ye(W*qIqV>I9QzhW#Hr%UaPGJW z91oX=E5|kA&f*4f6S#T26kZE&gZIO;@!9wid_BGke*-^`pC?EYbO?5YU_t_6Gogae zLbybDNO(mg64i;;!~i0fxQSRnJWjkq93{RZ$&mC(E~H43khGI@gmj*CkMxR6CTo)& z$q{4$c_+D%e3AT^{8oY@VI<)t!Is!4Q6EtGo7CCWGzL)D>rQ4^>|)NiQ$)EQYB*=4e!vRSfKvS(yRXb4T4=0!`QmC#Pm zhG_4XC@*nZ!dbFoNz0PKC3A9$a*lEwxk9;CxjS<2<>~Tn@`>`hkG4N# zKjNU~z;vi{c;cwx$aZXSoN&@}N^m;n^upQ1neW`@Jm+HLvfkyqE8^^jVTFG14;RpP@{Py@g^4IZC^Zz~o6W||E74S6BG%z=?H;57x71R{; zCfGT+B=|vyZiq0XJ5(|>GPE&tF3dHoG;Cy*@v8N!u7@jxbHh6$uo0mV4H2`e-B#~i zJsxQhSr9q2MrTddnyYIS)+Vhz6D1kNj5-;Ojt+}%ivGa#W7aWeW4vOjV`f+`tbMHK zY)5t(dx~SnDdkMW+QpW}PR7~A?TMR;cZe^KpXR!7E4eQdJQHdX<`Vr9k0dT6g(bBn zMJ7e%MIVY;#n-+v{i@=tg`KfG`%5fK4(`J2;_VvR?Xdf3sdQ;h>DV6M zJ?&-mvcj_0d!zPVEnik%vyZS(xNoGwr=oMe=Kfv#KUBt7-l=k~YOPkP-cdbwfPG-_ zpyR=o8s(azn)ipehwj#T)V9}Y*Oec}9L_lWv_7=H_iM)2jSUJ7MGYU1@Q#ce4LsV@ zXw}%*q|{W>3^xm#r;bG)yZMdlH=QkpEw!z*)}rI!xbXP1Z==5*I^lhy`y}IJ%XeDe zRku;v3frOf?DmPgz@Xmo#D^7KH*><&kZ}k0<(`u)y&d8oAIZHU3e|F(q&bit1 zspqFJ#9bKcj_Q7Jan;4!Jpn!am%J}sx$J)VVy{#0xhr;8PG7aTdg>bETE}(E>+O9O zeQiHj{Lt2K+24M{>PF{H>ziEz%LmR5It*U8<$CM#ZLizc@2tEtFcdO$cQ|r*xkvZnNio#z9&IX9*nWZp8u5o(}(f= zr{t&Q6RH!9lV+2rr`)G*K3n~4{CVp0`RRh6rGKt|q5I;yUmSnwn^`q8{*wQ4;n(6< z@~@7(UiP|s)_?Z#o8&k1bA@l^-yVI(c-Q+r?ES=i<_GMDijR69yFPh;dbp6hu<#rA zg!B8%JG^WF000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQ zO+^RZ3=8O8j%WGDFRhy zP+KfIIGUFu5ztC)Ye$DlXKK}{PI0W%m#SE_qn1XFyj(7qXb_!_NEN4IwMjv(fG@#Z zjR*)y?rraFcl*a~_HqTB>5MzGv-9lpdwE{I&+~lg+J+9s8|p;g{+wjVy3hVnKq8{of$dQPwN4h7S*CFe@T?L~BK=0ZHukXDTfYQ=Z z03=xkz-`L$L;`@4l9HnTe!m|8m&*l!*W&>or6>R#ICzlBPi%Y~fXfyXvTt|{kK1i|`oEr6R#X@s z#^V4C4Gk4tsO!4%HRV8)@fCGdB-}2Z*2+ITxRFO&=QFdWihaXleA7=j4DzZ~8r!yk z-Qh4iayqS?|8hk=Qz|Ra@>$$Y8JEk2$L&6C&c8Zw0)Wqkhl|e1=5hdxjTsKeCbl}a z%jja>z`)uwU|`;iG9yf~o%u6-|Ce`LHvQ&n^}0=?xdFt!kntm*&y&yRi6;`o6A9X% z*^DF#)`kT$%klgDc)VUbUN7b4<=nIW7E+2rN>Lb&Mj4JqvB@$vS;p&>dB5)oMn^{( z9UVoMWn@_$j_lz7p zZlXp*5G8a?Ma?Q87->87(iRj&A(2RsNF+$5QlwHTWLaja&!~h8X4Nn{xPweOjU>xR zvP?sx*#|^Xr+b@tMlT-PajlQy~9*btz^mUN)$ywQ51SZAh@)^S)szY@sP%Di<9hb_uHe=`y}>&NqD-%<=a2o36}ES& zKYJPgCzDyW?D`a4&Czs8Ew8-T3xI}5V2v%=Dr?P~l^_93>F1#KOUXO>du`wQc zs*QIJ7=UbCcouDsZA8;FR^D_wpI2YOO;7G-=*uyxr&dx|Ta9FQfo|0K=O!54w{_q$8`=UlGUV2_-(JT;KTEHe6bw6`TDbvfG{QCAE6N|@*#p6VyQKHc( zL&p+UDPD8Ybe`S(2#TUuIZwo5*yk)~V|WlXt00IHu~>|0-&u~LD13H2MNWzH-C4%e z47LksISdRmm>8(=IBDU&RM*Y-}dYW;KBX_*8h{q zEGH9LW>ydyr+B z*!Vcv{e6@ld4t}LzaU8x-&%S-zk2>H&Rw(ux7&@|?MBsf@|uPy+c8LxiGiF1!DkI4 zGC8AWOFcdwZk^8q_ugfBu-@$Zf?y0NUy04q4ICcjss(jy{mDY!d#wk6*-Nf2icG0P z!Y&o}n~pXSF%SSsAs&zO`H7U3=bEZ1^xknPo{wH&-sr2;)m9q@NXErqj-@Sr_sP)& zY9@)-SH`9r7Vt_>5U10L)9ECcOp;6{nO5ea+~Y*cXHgV|j^`z0+3W*rS`CW^Cs>bJ zLZZ#d;<;y2Rq1E{CnIbOy~7vBPZptiGUd`W6;ZYmSX6roHtMH&kQ}9aJYoIFcZ+?X?g1-c=1KCiC@|+K`=YtL>g&<0X^H zkjZ37r_=1{>15%oasYP!`xth+ot75UNkLW#nIn7s-S_j_;HLvSZI%pk6Tl3Vpe>#r zxmH;&UbdWUHcL1NI3;ry+*q)-aou_zdg-7QPPaooXuw%=->V;&)l*IfcrZCLHYSh3!ClG)TAQx^`KwZ2*22{q3G}fyE^#!m33tE8cz(s zS+z!(y*`74$e-?F#f8%;ameVpj*?Y*?)4$;vn~Zd9r`=pzo3eN!=v>5bA-jqmKUAB zqrcyPTlaQ!U4^~-iw&5d&&Q4$Im>1;MFva&&}q`|jHyqXlxspiLEk6j$p-Yco18Gx z33(9$0Ye$-1~m)KtIdWH1la-2%>^Q%NdkdZBTb>8h$?Bcn&ljc2&CdVYi=^+U>ish zw62*TqXL?ylh2z50E9yl0xFHB5ifMxi0gUQ1a$Kf37bphdXq|ZZWoaq(9~ogzb6E0 y8UiMsx+5TFpwTp{s|&Kg+Es?!7ZFJ&b^Z%?mc1f#{2=rI0000EX>4Tx07%E3mUmQC*A|D*y?1({%`nm#dXp|Nfb=dP9RyJrW(F9_0K*JTY>22p zL=h1IMUbF?0i&TvtcYSED5zi$NDxqBFp8+CWJcCXe0h2A<>mLsz2Dkr?{oLrd!Mx~ z03=TzE-wX^0w9?u;0Jm*(^rK@(6Rjh26%u0rT{Qm>8ZX!?!iDLFE@L0LWj&=4?(nOT_siPRbOditRHZrp6?S8AgejFG^6va$=5K z|`EW#NwP&*~x4%_lS6VhL9s-#7D#h8C*`Lh;NHnGf9}t74chfY%+(L z4giWIwhK6{coCb3n8XhbbP@4#0C1$ZFF5847I3lz;zPNlq-OKEaq$AWE=!MYYHiJ+ zdvY?9I0Av8Ka-Wn(gPeepdb@piwLhwjRWWeSr7baCBSDM=|pK0Q5^$>Pur z|2)M1IPkCYSQ^NQ`z*pYmq4Rp8z$= z2uR(a0_5jDfT9oq5_wSE_22vEgAWDbn-``!u{igi1^xT3aEbVl&W-yV=Mor9X9@Wk zi)-R*3DAH5Bmou30~MeFbb%o-16IHmI084Y0{DSo5DwM?7KjJQfDbZ3F4znTKoQsl z_JT@K1L{E|XaOfc2RIEbfXm=IxC!on2Vew@gXdrdyaDqN1YsdEM1kZXRY(gmfXpBU zWDmJPK2RVO4n;$85DyYUxzHA<2r7jtp<1XB`W89`U4X7a1JFHa6qn9`(3jA6(BtSg7z~Dn(ZN_@JTc*z z1k5^2G3EfK6>}alfEmNgVzF3xtO3>z>xX4x1=s@Ye(W*qIqV>I9QzhW#Hr%UaPGJW z91oX=E5|kA&f*4f6S#T26kZE&gZIO;@!9wid_BGke*-^`pC?EYbO?5YU_t_6Gogae zLbybDNO(mg64i;;!~i0fxQSRnJWjkq93{RZ$&mC(E~H43khGI@gmj*CkMxR6CTo)& z$q{4$c_+D%e3AT^{8oY@VI<)t!Is!4Q6EtGo7CCWGzL)D>rQ4^>|)NiQ$)EQYB*=4e!vRSfKvS(yRXb4T4=0!`QmC#Pm zhG_4XC@*nZ!dbFoNz0PKC3A9$a*lEwxk9;CxjS<2<>~Tn@`>`hkG4N# zKjNU~z;vi{c;cwx$aZXSoN&@}N^m;n^upQ1neW`@Jm+HLvfkyqE8^^jVTFG14;RpP@{Py@g^4IZC^Zz~o6W||E74S6BG%z=?H;57x71R{; zCfGT+B=|vyZiq0XJ5(|>GPE&tF3dHoG;Cy*@v8N!u7@jxbHh6$uo0mV4H2`e-B#~i zJsxQhSr9q2MrTddnyYIS)+Vhz6D1kNj5-;Ojt+}%ivGa#W7aWeW4vOjV`f+`tbMHK zY)5t(dx~SnDdkMW+QpW}PR7~A?TMR;cZe^KpXR!7E4eQdJQHdX<`Vr9k0dT6g(bBn zMJ7e%MIVY;#n-+v{i@=tg`KfG`%5fK4(`J2;_VvR?Xdf3sdQ;h>DV6M zJ?&-mvcj_0d!zPVEnik%vyZS(xNoGwr=oMe=Kfv#KUBt7-l=k~YOPkP-cdbwfPG-_ zpyR=o8s(azn)ipehwj#T)V9}Y*Oec}9L_lWv_7=H_iM)2jSUJ7MGYU1@Q#ce4LsV@ zXw}%*q|{W>3^xm#r;bG)yZMdlH=QkpEw!z*)}rI!xbXP1Z==5*I^lhy`y}IJ%XeDe zRku;v3frOf?DmPgz@Xmo#D^7KH*><&kZ}k0<(`u)y&d8oAIZHU3e|F(q&bit1 zspqFJ#9bKcj_Q7Jan;4!Jpn!am%J}sx$J)VVy{#0xhr;8PG7aTdg>bETE}(E>+O9O zeQiHj{Lt2K+24M{>PF{H>ziEz%LmR5It*U8<$CM#ZLizc@2tEtFcdO$cQ|r*xkvZnNio#z9&IX9*nWZp8u5o(}(f= zr{t&Q6RH!9lV+2rr`)G*K3n~4{CVp0`RRh6rGKt|q5I;yUmSnwn^`q8{*wQ4;n(6< z@~@7(UiP|s)_?Z#o8&k1bA@l^-yVI(c-Q+r?ES=i<_GMDijR69yFPh;dbp6hu<#rA zg!B8%JG^WF000JJOGiWi8UXD86ln9K(f|Me32;bRa{vGf6951U69E94oEQKA00(qQ zO+^RZ3>yv;2U8srTL1tC+et)0R9M5smw#*)*j+zf!KX#ku(caG(Ogt>#F!Itr2j~yNLI$3B1zsG6VhNtz z3%@-4<^L)Q@i<6;F+2=sr+*+kY;3Ia-0SrM(BN?Jht~&qX+OMo0nWQ3b$i~v_%Q2R zApDo-SJjhFrvXq*ZhdO&AU0=NaG>u7Iq=lCVJQb^$}g`No0cQ!Iy}(&^j|@ zARmi~j&iw7xm+fb&63GxX?DA5cDreCIB0MML|&%)LafVmm?I^1qZT4h>cvI1K$h5#VhcU z+hOtD(2DT~Z{1H;72Np#H*YMWN~K7pQY4c}lF20NTVTgFcyR|qc^{tHb8VdsZi8SC$nm(X#&)mQTj#mY=i@e2 zBpUmcovAlJ$E{tY-`@lg?Ui(V&8S$GI;W}eOyha$rlQ=G=rHy(RKLjC*kzf$5Hdp_nAZF zayje{2X==8P1DdcjfogYPF--Ir)MR)cisrmwhrEJ`7O`xtsiS_sE@*3cdT6B|M^2a zeF(O6z`}*sSB&e(1Ogx@64Y+Bs^?CplP9`i>hG|4dIx^5@JyD)+hGT{3v^vaRaHLr zVM}p!PR9mlTL-fj;YUwgC6~*Q%jGB(3KR+j0@XZFEJ8F~kIp+U&iTOzeBslU@#V7N z7VEpExqhq)qCW^vzYKm4-02!#^)8TmdcZDI^W5X{aL-5KSCir>IqWNq1Kf8vXqtwi zC@V-=6~7nyyW!j{gmzlB1i(mGLa*k5&Se}}_rXJCRX8&v5{kUW0a@Q-eS4Z#j#t-h zy%T;iAspGh(YizI6^UR7vJBkrr@FrO z7Hqf$o_hEd2K#4fO4o{5u>>dnEVipy0*AvvPmfTpNJ@p+2%MjXscHD!z3}5Gymbcd z-6DwipFngS6a{2Sv}Z4_4M5Gq40^w1=KUeC*&x(gEk-4D-Jo2?;y^rRL!v^!1o7IK zos3bYH)xnfY}lO@zHU}Iqeo?w2I%S%M`Sz(l{^H^ig+vmasdJ+sAv?5K;JIWK9-Ql b4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/illuminati.png b/src/main/resources/assets/chisel/textures/blocks/warning/illuminati.png new file mode 100755 index 0000000000000000000000000000000000000000..cba0ba59b4710fadd87b31a7fefc09fc45bd7d6c GIT binary patch literal 1288 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 literal 0 HcmV?d00001 From a0acbef0d502a038cd906af492fee04802387822 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 13:21:47 +0000 Subject: [PATCH 02/30] Rework the warning sign background texture. Also prevent lightbulbs smoking (it was bad for their health) --- .../java/com/cricketcraft/chisel/Chisel.java | 39 +++++---- .../chisel/block/BlockCarvableLayered.java | 38 +++++++++ .../chisel/block/BlockCarvableTorch.java | 80 +++++++++++++++--- .../client/render/BlockLayeredRenderer.java | 49 +++++++++++ .../chisel/init/ChiselBlocks.java | 5 +- .../cricketcraft/chisel/init/Features.java | 17 ++-- .../chisel/proxy/ClientProxy.java | 2 + .../chisel/textures/blocks/warning/acid.png | Bin 4590 -> 4592 bytes .../chisel/textures/blocks/warning/base.png | Bin 3699 -> 3126 bytes .../chisel/textures/blocks/warning/bio.png | Bin 4759 -> 4791 bytes .../textures/blocks/warning/cryogenic.png | Bin 1767 -> 4764 bytes .../chisel/textures/blocks/warning/death.png | Bin 4947 -> 4972 bytes .../textures/blocks/warning/explosion.png | Bin 5468 -> 5513 bytes .../chisel/textures/blocks/warning/fall.png | Bin 4812 -> 4840 bytes .../textures/blocks/warning/falling.png | Bin 4041 -> 4048 bytes .../chisel/textures/blocks/warning/fire.png | Bin 4928 -> 4952 bytes .../textures/blocks/warning/generic.png | Bin 4489 -> 4499 bytes .../textures/blocks/warning/illuminati.png | Bin 1288 -> 3475 bytes .../textures/blocks/warning/noentry.png | Bin 4986 -> 5097 bytes .../chisel/textures/blocks/warning/rad.png | Bin 4816 -> 4844 bytes .../chisel/textures/blocks/warning/sound.png | Bin 5128 -> 5144 bytes .../blocks/warning/underconstruction.png | Bin 4852 -> 4861 bytes .../textures/blocks/warning/voltage.png | Bin 4868 -> 4921 bytes 23 files changed, 191 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java create mode 100644 src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 46f6ea07..67c4f7c0 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -1,6 +1,20 @@ package com.cricketcraft.chisel; -import com.cricketcraft.chisel.api.IChiselItem; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; @@ -30,8 +44,12 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -39,20 +57,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; @Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft") public class Chisel { @@ -70,7 +74,8 @@ public class Chisel { public static int renderCarpetId; public static int renderAutoChiselId; public static int renderGlowId; - + public static int renderLayeredId; + public static final Logger logger = LogManager.getLogger(MOD_ID); @Instance(MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java new file mode 100644 index 00000000..92f0a117 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java @@ -0,0 +1,38 @@ +package com.cricketcraft.chisel.block; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import com.cricketcraft.chisel.Chisel; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockCarvableLayered extends BlockCarvable { + @SideOnly(Side.CLIENT) + private IIcon baseTexture; + private String baseTexLocation; + + public BlockCarvableLayered(Material mat, String baseTexLocation) { + super(mat); + this.baseTexLocation = baseTexLocation; + } + @Override + public void registerBlockIcons(IIconRegister register) { + super.registerBlockIcons(register); + baseTexture = register.registerIcon(Chisel.MOD_ID + ":" + baseTexLocation); + } + public IIcon getBaseTex() { + return baseTexture; + } + @Override + public int getRenderType() { + return Chisel.renderLayeredId; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java index bae70cd8..01d32a44 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -1,33 +1,87 @@ package com.cricketcraft.chisel.block; +import java.util.Random; + import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.World; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ChiselTabs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvableTorch extends BlockTorch implements ICarvable { - public CarvableHelper carverHelper; - private String texLocation; + public CarvableHelper carverHelper; + private String texLocation; + protected boolean emitsParticles = true; - public BlockCarvableTorch() - { - super(); - - carverHelper = new CarvableHelper(); - } + public BlockCarvableTorch() + { + super(); + carverHelper = new CarvableHelper(); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + setLightLevel(0.9375F); + setBlockName("torch"); + } @Override public CarvableVariation getVariation(int metadata) { return carverHelper.getVariation(metadata); } @Override - public void registerBlockIcons(IIconRegister icon){ - this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/"+ texLocation); - } + public void registerBlockIcons(IIconRegister icon){ + this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/"+ texLocation); + } public void setInformation(String textureLocation){ - this.texLocation = textureLocation; - } + this.texLocation = textureLocation; + } + public BlockCarvableTorch disableParticles() + { + this.emitsParticles = false; + return this; + } + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World p_149734_1_, int p_149734_2_, int p_149734_3_, int p_149734_4_, Random p_149734_5_) + { + if(emitsParticles) + { + int l = p_149734_1_.getBlockMetadata(p_149734_2_, p_149734_3_, p_149734_4_); + double d0 = (double)((float)p_149734_2_ + 0.5F); + double d1 = (double)((float)p_149734_3_ + 0.7F); + double d2 = (double)((float)p_149734_4_ + 0.5F); + double d3 = 0.2199999988079071D; + double d4 = 0.27000001072883606D; + + if (l == 1) + { + p_149734_1_.spawnParticle("smoke", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); + } + else if (l == 2) + { + p_149734_1_.spawnParticle("smoke", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); + } + else if (l == 3) + { + p_149734_1_.spawnParticle("smoke", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D); + } + else if (l == 4) + { + p_149734_1_.spawnParticle("smoke", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D); + } + else + { + p_149734_1_.spawnParticle("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D); + p_149734_1_.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D); + } + } + } } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java new file mode 100644 index 00000000..1dd4a016 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java @@ -0,0 +1,49 @@ +package com.cricketcraft.chisel.client.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.block.BlockCarvableLayered; +import com.cricketcraft.chisel.utils.Drawing; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class BlockLayeredRenderer implements ISimpleBlockRenderingHandler { + + public BlockLayeredRenderer() { + Chisel.renderLayeredId = RenderingRegistry.getNextAvailableRenderId(); + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + //GL11.glDisable(GL11.GL_LIGHTING); + Drawing.drawBlock(block, ((BlockCarvableLayered)block).getBaseTex(), renderer); + //GL11.glEnable(GL11.GL_LIGHTING); + Drawing.drawBlock(block, metadata, renderer); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableLayered) block).getBaseTex()); + renderer.renderStandardBlock(block, x, y, z); + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return Chisel.renderLayeredId; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 8a9ca03f..26998a0f 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -5,6 +5,7 @@ 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.BlockCarvableLayered; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; import com.cricketcraft.chisel.block.BlockCarvablePumpkin; @@ -105,10 +106,8 @@ public final class ChiselBlocks { public static final BlockCarvable technical = null; public static final BlockCarvableGlass technical2 = null; public static final BlockCarvable futura = null; - public static final BlockCarvable bone = null; - public static final BlockCarvable scorching = null; public static final BlockCarvable brickCustom = null; - public static final BlockCarvable sign = null; + public static final BlockCarvableLayered sign = null; public static final BlockCarvable arcane = null; public static final BlockCarvable bloodRune = null; public static final BlockCarvableSand colored_sand = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index b2bb96ba..5479bd19 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -28,6 +28,7 @@ import com.cricketcraft.chisel.block.BlockBeaconBase; import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.BlockCarvableGlass; import com.cricketcraft.chisel.block.BlockCarvableGlow; +import com.cricketcraft.chisel.block.BlockCarvableLayered; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; import com.cricketcraft.chisel.block.BlockCarvablePumpkin; @@ -2343,7 +2344,7 @@ public enum Features { WARNING_SIGN { @Override void addBlocks() { - BlockCarvable sign = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockCarvableLayered sign = (BlockCarvableLayered) new BlockCarvableLayered(Material.iron, "warning/base").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.0.desc"), 0, "warning/rad"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.1.desc"), 1, "warning/bio"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.2.desc"), 2, "warning/fire"); @@ -2371,11 +2372,15 @@ public enum Features { @Override void addBlocks() { Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); - for(int metadata = 0; metadata < 10; metadata++){ - torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(0.9375F).setBlockName("torch"); - torch[metadata].setInformation("torch" + (metadata + 1)); - GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1)); - Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1)); + for(int type = 0; type < 10; type++){ + if(type == 8 || type == 9) + torch[type] = (BlockCarvableTorch) new BlockCarvableTorch().disableParticles(); + else + torch[type] = (BlockCarvableTorch) new BlockCarvableTorch(); + + torch[type].setInformation("torch" + (type + 1)); + GameRegistry.registerBlock(torch[type], "torch" + (type + 1)); + Carving.chisel.addVariation("torch", torch[type], 0, (type + 1)); } Carving.chisel.registerOre("torch", "torch"); } diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 4a119d61..f2a36042 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -13,6 +13,7 @@ import com.cricketcraft.chisel.client.render.BlockAdvancedMarbleRenderer; import com.cricketcraft.chisel.client.render.BlockCarpetRenderer; import com.cricketcraft.chisel.client.render.BlockEldritchRenderer; import com.cricketcraft.chisel.client.render.BlockGlowRenderer; +import com.cricketcraft.chisel.client.render.BlockLayeredRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; @@ -53,6 +54,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new BlockAdvancedMarbleRenderer()); RenderingRegistry.registerBlockHandler(new BlockCarpetRenderer()); RenderingRegistry.registerBlockHandler(new BlockGlowRenderer()); + RenderingRegistry.registerBlockHandler(new BlockLayeredRenderer()); RenderingRegistry.registerBlockHandler(new BlockTexturedOreRenderer()); diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/acid.png b/src/main/resources/assets/chisel/textures/blocks/warning/acid.png index 0ae7c68d9ee0f29680601d795994b6d60418cdbf..3874bf8b106552a3b85be48077c9c0262ef8ae18 100755 GIT binary patch delta 1928 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 N002ovPDHLkV1i-G3i|*6 diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/cryogenic.png b/src/main/resources/assets/chisel/textures/blocks/warning/cryogenic.png index 09a55cafe2cca692d4652fc06eee361fcaa75b9a..392e828489a280da11e1e540d1de233ad95ca738 100755 GIT binary patch delta 4756 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 T`Dl`d00000NkvXXu0mjfhNp7P delta 2272 zcmV<62p{+CCetRcj0%6=3=Q!d0 z@ZGxrls*18lDdEhP`xGZ4Cl_CWr@p0=NDh_|E|8C9_HHZ9659-@Assv;;vPY13_?C z<}4RPk-EA%)~;R4Bab{nsI3hEo7I|U>Gv(4KW|>z!bpDvfEzb%aPYtZ&YU>|z{QIf z(RCf&0N}1ne~Y>*67-5`clGt*u-SOvfd|ku4Trn4him6D1Xf#SR8pUKb zV=|kG#bU%_F^&g7uxM!x)YRM?so8Ai!i5W2d2?MIca5e3aOKLCyz^gu^;MR{KejYP zDk?w>g~-NyrsZ~<4ZF?8ojZ59efxhlPd)V%LqkK{o|wSz^RZyT0(yIUNhA^!7Z+za zFcl6{Qc}X$*cho)D*Il>6NyBEL?S_jTT62wnFPQ0-X1u6_AJjl^9-{s7BofS-FM%` zVzKc2^Ut$;_ih$1Ud(UG%1Fdwl$V!t|NZxK@#4jw=0K(wgnSU!o71)3sPTW{a2SA* zkr4nMTfLgX!ouw3*49>|Q7oV)*N?0f-rML1vDaoSX#U_ZwO; z3pz5urW)`z-y7|VFTO}15XiE>q@;wBl9Ftb$)x4*@Gv(A2azP{p6{7d0rwUi@wlNl z6T@&gOgJ27baa%_(NXS(!}Ndl^x$&2*tl^cqobn$ELyaPMT-`(aN$A<3kwkhfv&DD zo_p>&OtQ>B+S`f6Vpy$KtX6B5{h3w0CCve8V->squnwex%4}H$m@?)7>zp}k-n^N$ zYuD1%)y3G@7!HSncs!1#X=s|pz`y_#6BE4m-g}gmma=WzHrB0MM`wR$ClwNy1F`6ty+aBibNt2#wRAQS*>(; zcVn?wXl_osud}n0WHQO%;2{0|{gjuN<8U}AD=S0SG#VQldGNspQ51z(EQX>e?A|qi zEE{#8zBU(|LmzxVYZapML{mo59*Q}GF70(Lr`3=It- zN)kmyMMi^x%1RZvtrecFfU)uM?8ReEP29YBllJy@N}qpxGW|!wu*`1E4fnDL$sIAZR z5dlrpQ50AM06;JxA)r!WfH=`&BBCqQyLCf}gvp|^(HNzC$3)~=P+6Hyr`7YY-w#P(OLbaq3yDOdI{yU{107>lW_f-900000SgQ$CPSBa*Z=?u+et)0R9M4>mwQmuSC+>=_t!tVX=olz z2oqD$w52Q}IN**BKC=@uGnG z8Ye_&WGh)EF+563&Yc3lY&HY% zrw>1rv9YlLjEs!%FK@mn09x*a&j_4QE)n)^!4=tFg!fWsMASkXehI0 z%>tmlz8gsAXWo3!>_IBFa+W`m*4V5cbu4H(4IH;Gs$^TTO zreG`cpUHp1g$n`jcs%%gJ^&t%iv!?^C!PS{_U+qrcXv-m``h2j^z?K9?%lh`#~*+E zNaQ}RSHAGV3%Fb^%w{t^Jw4>S^pXIu*+AL6*@sK>p*I*vPEIB=B7%vD2_`2e0oa(4 zA)=z9g3jH(eVc-U0%0^7F&d5R-@hM#iHQl09Xo%BAE+wJ7$=AzT-s3=vD3Mc^Ex5LAS51BJ(4gg-S7fsV1iDc2DMF80C_Tak@KlnhV zrKKUIoMr{q@<+K+1ZKRZYLr#l9-qnITd|(cQ?A~0 z`L>}!zVXHzNGVZOmHPU6np<1hxqG)59~)zQY>X}0{v%eL9)GR_gocKq>ijvcX&O$a za|(#^$tR!WhaZ06z2E�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 Y2N*S2wFgkt=l}o!07*qoM6N<$f?lzd6aWAK delta 1359 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 delta 2253 zcmV;;2r~EBCcq}Jj0%6=3=8O8j%WGDFRhyP+KfIIGUFu5ztC)Ye$DlXKK}{PI0W%m#SE_qn1XFyj(7qXb_!_ zNEN4IwMjv(fG@#ZjR*)y?rraFcl*a~_HqTB>5MzGv-9lpdwG9ezR&Y~>Dq=4#vAHH z-~OCr$-QCp&aDM~dsx)l+b6AW6ZQ5#iv{_4N$=_s3UXM`!=b|Z?VW-i3Kh=pXhSE| zh8_+IMMiXQpL9u3)I-6-ruHuMP-kI%cUaK7y9(?3BBCDZD9DkBtVg;ho!24jynww7CcT?7Z3qft>tT<$2Q&1yZu}FCZDXV5@^jMhr$qODtIo4Vv&biH*ezcH5amP zcnpu*ZF%~?o>x{>7#_ys01OQc6$;m&=96?LKYJzdCUOfX{}9 zi_XdBasZ5t84k!MwmP@V=wjZ$z}holVBU-}BTTZL`7?a~mv>t>{pM@+x=o|G0mQzL z@gtwllh1$Wi6;`o6A9X%*^DF#)`kT$%klgDc)VUbUN7b4<=nIW7E+2rN>Lb&Mj4Jq zvB@$vS;p&>dB5)oMn^{(9UVoMWn@_p@Oc>oe-zeuH0%#H0~R+WdfPruE|mYV^{q|*RgaoJWRhi>+P z=F?l)wKrgumlK!!>v3@+o&}{LMen)=HM|^YFYW_D5wU-vK|{4^IP7*Db~}E*AHUykMPk#l-R%El z1VOU#RV>Y2!M!}Sb00^KpFp%3X?Se)MfA5lX?ZToGW92SgCG)*$9eO;!&FbLWXbGG z6h%Q%6naA-xHJO;EiHyczq{{l!cW|DiYJfkGzLo5lnO4W^>K0IdiMFQ;MPCA!8?Bk zqD-%<=a2o36}ES&KYJPgCzDyW?D`a4&Czs8Ew8-T3xI}5V2v%=D zr?P~l^_93>F1#KOUXO>du`wQcs*QIJ7=UbCcouDsZA8;FR^D_wpI2YOO;7G-=*uyx zr&dx|Ta9FQfo|0K=O<8e%{sY$klgTV66Io_f8)Mw23Itj~?CrpsQVyHZ6INe(4tL(R zjw45oFdmCB9*Z%><0zWzbEbcLkY$5U10L)9ECcOp;6{nO5ea z+~Y*cXHgV|j^`z0+3W*rS`CW^Cs>bJLZZ#d;<;y2Rq1E{CnIbOy~7vBPZptiGUd`W z6;ZYmSX6roHtMH&kQ{%dd^}ZmaE{U*jc{$&krpNT<{6=;>tPta1Q$|N9tryPcL6(@8;A z37I2%{oVKT+Tf=MqJ);uB8U=)hL7N!f2~0z*WJdh>^#K!9~6HXxN6aiqR1VOWs3Bd zomWZy+0#fTW4!vo(Mhua#O4OjG|1(01; zMFva&&}q`|jHyqXlxspiLEk6j$p-Yco18Gx33(9$0Ye$-1~m)KtIdWH1la-2%>^Q% zNdkdZBTb>8h$?Bcn&ljc2&CdVYi=^+U>ishw62*TqXL?ylh2z50E9yl0xFHB5ifMx zi0gUQ1aw975(%42<$9A!b#51t9njQdAipOBY8nD2p1LC-W}wkDs;djKz}i)Y+!ql^ bCUyP`cb2^(bNnFm00000NkvXXu0mjfCmvW# diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/generic.png b/src/main/resources/assets/chisel/textures/blocks/warning/generic.png index 109700b75f2b8a0a082fac57c4e308508899ef05..26dd4108dabd60c4b6bb72163f761fd21265923f 100755 GIT binary patch delta 1835 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 P3jhEBNkvXXu0mjfAcAqQ diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/illuminati.png b/src/main/resources/assets/chisel/textures/blocks/warning/illuminati.png index cba0ba59b4710fadd87b31a7fefc09fc45bd7d6c..9a5f8540f19437e68daf6d3895b5a9be2083cf4d 100755 GIT binary patch delta 3457 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 QKmY&$07*qoM6N<$f(GYL)&Kwi diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/noentry.png b/src/main/resources/assets/chisel/textures/blocks/warning/noentry.png index 51191f48acc6fac949d3e1cccada4822fa49c353..5cea89618a227be23dff385329a067ff33bbcf08 100755 GIT binary patch delta 2423 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 delta 2311 zcmV+i3HbKuC;BF^j0%6=3>yv^0@;`kUH||H%t=H+R9M4}mu*a3WfsSO_s*Re#_}Ra zwaK<%%9zShX=A}JcB6($-&|W>2iOiZG)>trYIM^|&_o)$C6P9(ZdR?efeyoP2Zk;X z*O!#I*mZHgv|1|_c4gbqO|_;4<_E>V+RsYUKyG})7y@9h&bZ*OY;8K0=hJt^DglQf_A7JogG zHqe^_EdW~YY50HZ*lz(?v0?=PCP@MyUAL8B5P&=GxMR`#?Cfj+Y&IJJnHd=Xgu-C} zE`R+sw~oNza*$Aq*<+mLm|HP`x)^0INa98 z_3PJf%U4uVaWuq`IN}*O;W!qH5sSr8fzabJg$1ZnsllxAVXQ4=^`3ho)(~{PN3u=l3H?5}~;{LUVI8 zIN|_^!6?Ws(TK3$>*a+PUchWN8yh<6>Uiw2#~2?U2VmX0b&QUV^3>kFKbhYrckiaO zw3L5%JdV|B<@&~c_xp|YGqbbI%+3-Dh1j-Z2TrFGfRd6DcJ10lWPYB={5(CK z0_p;~4%8+VpYH6Wxw#pDw6rv0u^6ws@(O?ct5*Ry+TPBtUAwq=@uC6Z_BlUTQI9q+&YKJUKs4#8lMP$)zw6he|DBuOHuD4aZb5`cf= z;$m`hb1_L0Rn-ZAq9|&3PbWC=$Rm#cFf}zrOG^uljg43=79x=dt*xzmrEhw)y`7yq zcN&~1EG%SjaBxYEljG8*OH55o0kC=V=9CV&M8vA9II200)nZ}8h7Ae*zI>VAA3e(M ziVEuL>abd^L?RJdT3Yz$gyATR;^kEz>OO>43tg#_EA$)V}NLFZAA$L0NA&GKb4i0 z28hDKLO%TPL)S_>uJ`6cEnG$?ZRh7()3^Fq^n3;c>p{BML zhr@x@YBe~asVeb!oUPlpFI%E#1_oGISiokpVYAs#Rn-upNF+jaQU{_@=ymHQq-%SI zu5P!ElG0L~PA3+Ng@uI$jvP6HpkFX`4Gqhd=wIG@&sd-IncO3J7l`%sU=|bic`{G= z`S~BAJdmGcy4wFE3wGqQk?(?A*DN!oorT zKKbMm0L-d@qXEQ$9*o?4{`u#GLLt)9(%8CnE7z`FV>S?AHW0upNtk~niGZSzm7Q&* zBT3A>ygXv6%9h6;UsR$cB_+K2>Z@3-Rsw;50j{nw!2v;*(V_vcWO)I&dE*An&CNuk zQP!_tk3%mJQ4kj0dXgmJzj6gxmWf0nSglr$965sj+iw9F8XV-@xpUai0FTC04qRI6ck0l?RFCk2C-NyoH}(1RaH?{m4KoUP!vPq0<*K+ znVr3)L|5H&58-f_UqAUIk3RZnB1%DEdU_g<$3r+ACL9ja(`7=EbRBRuq;kBwqJlSc zZQs0kGsWxI|7;7EbJtylSS2}eZ+<=iCr+G5$}O+I{yO>h-fMrX6D%6Fdq9w7ljd-! zbR0XDXhaqk09apC#1l_E0l>(}2u)2*)YjD*U2RzJdXwF-5(v=M)s-Na*~~ZJd_zG& z0RRI719a-&EEWp@zW#nawUUbLS{m8Gg9rKGgAV{GD=XvT#fxaF%0E8)Y}u2L%w|rU zIDy%0CK8Dln-6~t4e_Tp-(0>Ybm={zrwguJYhOgNWQ2LESM&7KPa7)v{rBH9Ha5nU zD_0Cr$;ru~prC-Fq9RtWUX9soCKiiv{P=PH_UWgKB9H2=S!2x*q?uAZ;nDWx0Z5X> z7Z)yY;J^W@s;X|Q=l6QOy#4murdwrruWu#nu`Tr^GN#~*)We0-ddkr75lM)+k>(Grd%?c^998cLAS z+l{8FF!sg&2LO2q_xQrxLcS6HF#(a3-5kfp}aa79+)hKG}qT zO0^E+&t5Z%7Q^Y#^i52dZ7P*|E9L1Hk*rWtlaSPY8Ps`j=#8@12Vw-Obx^&%5Ct0R h680IN$lRR9e*wnYKo$|(maG5(002ovPDHLkV1j_cXxRV& diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/rad.png b/src/main/resources/assets/chisel/textures/blocks/warning/rad.png index 13f2320865d4ee2ee1dceec46f2945d983f8ee0c..53ccbab03751b49a93e5ee5efcdc32854ba0f126 100755 GIT binary patch delta 2168 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/sound.png b/src/main/resources/assets/chisel/textures/blocks/warning/sound.png index 46185faec887cbe483a6960708841b07bdc1c214..64cb240f7d65a665a800c5353e73fe1193d66822 100755 GIT binary patch delta 2471 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 delta 2455 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 a@^5+g*U}uF1`7ZH002ovPDHLk0$_sag(&d= delta 2190 zcmV;92yyrQCG;h*WeN!z0PO%2X!E1elWqzgf8Gom4ipvd<@D4500>4&L_t(o!^M|d zP#f17$A5cvwL%~v1lT1RkAodjJDE%Zp*DUf3292~hr~0j!2)XIz9vuUOJ4hw^tI_r zGLy8m!GMGeZvD{2WZY>|j4v~`)1YvfiErazE)uZ1fV9$H`k<8rO)^Oy+V0HGneXhm zfBe61|L6aGhtL2v6yER%_Sp~Ql06>59{E%G`%pyKLql7}pBDDeA4SZm^8v7#$pA1rH^=CWtoc?FY@uk1OPRG0H^x#}2nf&MMf#C~%T;pTGV#?_;;XByudlPdzK)_O zD2l@7#s-@k8}tP&07NTxe=i?COg^7y z>hfih$t02_eXl5-I|t(ANwD2ksk7+0$K%1{@el|E2m}InJRYW|rnr6kHud%O9653X zP1AVz@FDH(?fCtEzIyP0Pd@nsEsgp=7f0Y$pIeHX;e}4KYON)!&xt`l=6YK>MiO40k`~Ci}d9JD| z6%`c>4h&%1Hir%!qNSyUg@px{mzVj&JMRz*h46ShJpJ_30DSnjzah&qLI~2S6zNo| z(UEM!?`Vq${%`FZN=>v{F)QB>zhe*)~=zn{v=N_Ott z$$^6h@%el#E-rHG=1qhUSeEteIxr|ujvccY87Z9et=e8uQGsPy2q73aa|THWUg+pR zmSukP#v3dyE+We^2M!*j@5BjGsTBU28lHOUDXw3?&fhOxV%M%+n5Ky&Nq8M4-PqUw zU_1<#Y!x`r+xzW`fA{uVZvoKQ*vOG1M|khuciH{eWBC1k48!2c)D-{v>@#Fp#xzaZ zUwDD~`g#C9o|r%gQHs{K=pyLq0x>p5$@3!HRaK=n5a8;SE6mKy;BvX>?Cj+H_&7EY zi^b414M~!yt*zzu?b|4df-K9VlS$gz+7Lppw6w(i`}e7;f2tytO0luAfv)T5x=vS7 z2XZ+G4Q)>vvMi%%8lg}K(=_>Mdpk`{O?15YB5iGLNI+d(9d5UqpS|=F4;L1;C7fNm zcG1+-gl*g0ym5m}Ci9Jvh(tj2_JT`LV!zMlqq@49_doc6SS*Im=cBW;lUO{?x~8$= z z)PZBYW!4KJxOVj_*RNeGq|KflTrL-iqF@*X(P)(Q^>yyuyGJsS;F;!T4z{&%>Cz>l z(I}TECy7R*$g)gFM+X4+@89R1lcb7KaG4UpJ`m%>f0VM6s;WGA@PKn;V`Q^g4jeeZ zj~W`#5(!+2LNbwHVPS!`Lx%|V^e{6sgOShE+}zAF&pylC+#H&w5uKi9ZEcO(x;pml z-;ZG!e0J*=YinyIneOR#IFOfN@cr_CnVg(tZgv*0*UQg4JCP)*G--Kh2~}0uv2!O? zRaI10e^rr4B+zx8YgexlkH-;CK{G!;j}U^^)>b?o56jETUn^3EPYXma2vk8Tm12H= zo^U7xz{`gZQ(aw+X_}a(iIzw(J2yw;o;~c?v4dnHLAB3EKA&f4agkUoh9pT?mW3oq zM5m`qzplBZ1%O*OZ?dwoLMD@8_>7FAI682$f3I-vBasNEY0}ctLThX5Hnc(rnx1%~ zv>3pXPd-UaO$}Ni!QQ=lX=-Ysv9XcH#zyw+*+VQA1K{z;A7}UO-B^~z%okr2K&m#! zPk<5*%LIcalarH7fBrcxmkYn&&+P0hSzRZe%ay8RpVv!5(^!qi$>};SRYliz9%*Qx zf4;5`8*n?7RW6r9*LCjPxr58)LUp^5Wto+g72@$Yy}gb^kB(u72eDOEE!FD(?N^oy z_l(G(b1xV<1MmI0gS!q%Y`}JsNRfcWg3~n3LPTV_baacqXsi97tt3exNtlK~U0of& z`|X!dA)^5Fo`SdDewj=rL)u9eS?6L=f4rcilF4n!q*%shv)Mv^-xB(*{l!*wl3gyB z!{u^;`X$}nCd&D9@QW^p#pByZ=XGv4E6dA;iMkGs1OsFofW@j=cfJ>ers#R`dvSab zNO#a7cRmZ@GyGqk@ga}^du#*@0YL}V*eIAeIDWzrj6qP`aQt|=kg#NlU|)d`c;P{T zDO>dQIrGOPHd8hyf9>f0X^>^;J6SA7B`nLvFdP5?k+6(}NtXlSFQYC}w!z7u?QA0B z@|gV6DWyiv3KTbVcNao^E(~TCf~QKS3!y`o11c1P9MIoWu+NVPHa2Yj4fxChufVQ1 QjQ{`u07*qoM6N<$g0EjmoB#j- diff --git a/src/main/resources/assets/chisel/textures/blocks/warning/voltage.png b/src/main/resources/assets/chisel/textures/blocks/warning/voltage.png index 2e7d60fa819821387fafdf170bf1fe6a803390d6..14d95896999fa45e52bd8330cbaf2b1bbc386072 100755 GIT binary patch delta 2246 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 T7V;$k000R9NkvXXu0mjfnY~4E From 749254ef0277d4afa9dee67c67b1369d7b7d7c42 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 14:17:35 +0000 Subject: [PATCH 03/30] More work at underping the warning sign lighting --- .../chisel/client/render/BlockLayeredRenderer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java index 1dd4a016..ee9b254b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java @@ -23,9 +23,9 @@ public class BlockLayeredRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - //GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); Drawing.drawBlock(block, ((BlockCarvableLayered)block).getBaseTex(), renderer); - //GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_LIGHTING); Drawing.drawBlock(block, metadata, renderer); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -33,6 +33,7 @@ public class BlockLayeredRenderer implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableLayered) block).getBaseTex()); + Tessellator.instance.setBrightness(0xFFFFFF); renderer.renderStandardBlock(block, x, y, z); return true; } From da3a73f3932b6d079bd67227bffda7ea10144528 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 18:34:08 +0000 Subject: [PATCH 04/30] Make BlockCarvableGlow emit light at the same level as a redstone torch --- .../java/com/cricketcraft/chisel/block/BlockCarvableGlow.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java index da98ead3..977d4f54 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java @@ -18,6 +18,7 @@ public class BlockCarvableGlow extends BlockCarvable { public BlockCarvableGlow(String glowTexture) { super(); + this.setLightLevel(0.5F); //Same as redstone torch this.glowTexturePath = glowTexture; } From ae830fc1f5f055b107fbe3e57f959f2c959df9aa Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 19:03:34 +0000 Subject: [PATCH 05/30] Setup basic infrastructure for Chiselable Thaumium, Tallow and Amber --- .../chisel/init/ChiselBlocks.java | 3 ++ .../cricketcraft/chisel/init/Features.java | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 628b9a77..8467f67b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -109,6 +109,9 @@ public final class ChiselBlocks { public static final BlockCarvable brickCustom = null; public static final BlockCarvable sign = null; public static final BlockCarvable arcane = null; + public static final BlockCarvable thaumium = null; + public static final BlockCarvable tallow = null; + public static final BlockCarvable bloodRune = null; public static final BlockCarvableSand colored_sand = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index d52f7e8e..abbda8df 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -130,6 +130,41 @@ public enum Features { } }, + THAUMIUM("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); + Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); + thaumium.carverHelper.register(thaumium, "thaumium"); + Carving.chisel.registerOre("thaumium", "thaumium"); + } + }, + + TALLOW("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); + Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 10, 0); + tallow.carverHelper.register(tallow, "tallow"); + Carving.chisel.registerOre("tallow", "tallow"); + } + }, + + AMBER("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 0, 0); + Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 1, 1); + amber.carverHelper.register(amber, "amber"); + Carving.chisel.registerOre("amber", "amber"); + } + }, + AUTO_CHISEL { void addBlocks() { From 01c4f193cec34523f2d0e04d5340c99eb64a4be6 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 19:07:56 +0000 Subject: [PATCH 06/30] Add the thaumcraft textures to the folders, for easy location when making textures --- .../chisel/textures/blocks/amber/amberblock.png | Bin 0 -> 869 bytes .../textures/blocks/amber/amberblock_top.png | Bin 0 -> 834 bytes .../chisel/textures/blocks/tallow/tallowblock.png | Bin 0 -> 674 bytes .../textures/blocks/tallow/tallowblock_top.png | Bin 0 -> 552 bytes .../textures/blocks/thaumium/thaumiumblock.png | Bin 0 -> 598 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 src/main/resources/assets/chisel/textures/blocks/amber/amberblock.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/amber/amberblock_top.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/tallow/tallowblock.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/tallow/tallowblock_top.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumblock.png diff --git a/src/main/resources/assets/chisel/textures/blocks/amber/amberblock.png b/src/main/resources/assets/chisel/textures/blocks/amber/amberblock.png new file mode 100755 index 0000000000000000000000000000000000000000..2754f635f3af897ba882c87349b1d4d13b4d5c9e GIT binary patch literal 869 zcmV-r1DgDaP)WdKxlWgsy*AWdO%ATls9GaxZEIxsLgFfbr1FfuSO1eo*<;=`maI8=<~@C%z2ATP@nP8W`1Z37TUWE9VleE|?;BFT#byO*)^O74;1xBw z?Xa9zY_=^`?GZd51zenmjGu+9x3Ek~o;>xLd^4f6Id=<7v`WZ#Ij4gjm!HNIXAL*6 zOKvwM!G)N|mq&08{u|2}$LWh9{QQ#6I_2!uTmH#YvSo`K`|$k}qNHGw8Sq+y>v_sg zwg)fHBs=DE*1#7pVfZT?-4JgIu5{2n9bn=Jf&gUCbW(1mD!A5#uci&-ZXdoB(8$5F z5x5e$3sTNk;1J2%PD%70Y-Z!0|vntPbVSW{6Jfui<&CF^2R5 zL;^Vp@cJITj)2$exm1ZY^bYcRI@s?WE+C)OhcPce72!nrm=a%mTf4>la&^q)2T4Bd z!rc^RYbXSW)`*Rb6eVEO16Z*i6}n1#KIvfwBPFX!5Gp*`p_PjGn8UNwD=Vem`ATzH z2^Hir!`edistMAneJlr|KqQG$^Xb3vx#mWhII$;t5D~e3HaTuxuvlfRb=25QI5P#e zlfPl_5L_h-R;gDCO+CQgk+*l0KdNkL@I8a4eRKaVVfkLD_ws556iG>{Qgy{13NVrH zsZ?|oqzU1Ei#nWm)T0%tU?TF5xul4p(3hE*|C_;w#UcH^F7=g7sf=8BP+I03iT)E` zWh@JW?>YyjO)fPXvU`E7q#~&vCD+3vmeU2V{`ecaN*|T^&c|y4g2=U`*5UrzsQJ{M zcHasm7Y{0@nk!kRl!@i`=7A_4;N6teH*;RUDVZ=T&D)Rsra~Vs2juodB$Ot!g{Ct00000NkvXXu0mjfu!@e3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/amber/amberblock_top.png b/src/main/resources/assets/chisel/textures/blocks/amber/amberblock_top.png new file mode 100755 index 0000000000000000000000000000000000000000..ca42fbd7292790fd71051f5c0592acd046620b15 GIT binary patch literal 834 zcmV-I1HJr-P)WdKxlWgs#+AWvg-ATls9GaxZDIx;mnGd3VAFfuSO><)CL00007bV*G` z2i*!C3o{GlTVd+}000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP0007+ zNkl0Vv$FeNRT1nZ2 zqoPaQompAgW#`N1Pj^KTb9@mH%`8Jx67<3KTsCDz50`+3W>=CIJ)TmCV@2+gZd**A zE;)a-z;k1!!GOs?fUyszA#4qMww?!N1Ah~|bxF@@Nb`a$jWKWDML2E3#}CIifrBK# zVhSUzUIi27*%o%ddP?;Dp3zl8Sv&ND8OGX{*?5RE7T|m&&;UtM~^ zvx`uGyA3?6-@YpQ5mcq*ch%)ZuKh?PffPRc<|wq7x~WyoJxB~i5-AqCU_`*F)<<|F zQwNHn?vCUOE468mD3_aioLJ@t0ap6l#l!LajO9w6w|-wI{-X3e+{jXpUQ? znLr|0>rl4nM3F1T3iE$Y#Cu2OO{(wZGws8gq$s-AuJ&w9yaTYlRKGW1pYfI*?7JrYN~trCck_ zNF&Q6+&>NT@L*WdKuQbRaV^AVGC!ATls9GaxZJIxsOhFgYMAFfuSOOy-iI00007bV*G` z2i*w-2Qw@q`cEMM000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP0005` zNkl1|95adU{gG7D#0l60% z1-(axyg*HW2;C!e7m(bxDyZ1GtkJ`~uZ0T&C1(_ zsH{X@MQTaPSvVK24PiWr|DbKR3zDMgAP__FGVgX822mSS4J9IYWEPWTkARdjLoHGw z=Y5ZSBynLtbfp#r2H{dFSKjV#PC$t3k&k;xYux5iWKRr@ANRB?7u%J~&(|5Wf~cAC z0rTxP147DBna0z!?QcH?y-o)xcLBbBehk=RF~Q^!rh(QirnEa(A1{;LZ*%N?04XKM z=8CH&qDG?P&H8ERzI_bI;z1mS@a6ekE;39P6QEeJ!E}r9avCigZ@$fYJd*M48JJrd z&byQfI!miHLYZ>2iWa&RK=96Tn(y&^zM9f%w(U!G;E2>B2UAv=w|F$u01mJ|zdv6e z#$kLw#9XQ;i_oP5Yqim+wU*<^PZuN9rl<83aOeY(y=Xe(%j^8>bt%<2PxrmXEM4d) z^MK^v@c*h>F^dq=G&muDeL8o+kKg-}atL6f8KZglUx8%WXkXWPSw4Mu=*9_&fF(E# zW7nF19$oMM%$wP5L*jaHTvC#9tSjN6=wllPYgtROt>4S>7bCfXt^RLxIRF3v07*qo IM6N<$f^^Luw*UYD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/tallow/tallowblock_top.png b/src/main/resources/assets/chisel/textures/blocks/tallow/tallowblock_top.png new file mode 100755 index 0000000000000000000000000000000000000000..1352971dac045ff085fc808dbec147ba6facf499 GIT binary patch literal 552 zcmV+@0@wYCP)WdKuQbRaV^AVGC!ATls9GaxZJIxsOhFgYMAFfuSOOy-iI00007bV*G` z2i*uC6fYqkB#OoW000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP0004h zNklX^Ntxllb!++l>AT zI>C2r4;(8*aC^n=1-|8qKsbLN&!yx3_1sM+a(dY2>oaT>QJGu2Da3vM3ODeJ`1@Qm zg{cSOodLOg=P?hUQM~CQt))`oR$Vs&Z(>!N&#%yf5 zLVohHli|))jya`Pavt@-5mBIOBKyj5b=_I1C{o>fIAwysL2 z9Y)Jl9x9kkWdKuQbRaV^AVGC!ATls9GaxZIIyE^uFfbr1FfuSOW@zF;00007bV*G` z2i*uC5IY?i?1{(#000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP00054 zNkl`^+ zuf5%*h-$61tu-RtBgQ=QU!s)4<~7fA9Cq)IZ|@&p-rhxI%*)-caYV#i*Ibj%<+J2+ z)X_ZLZvEl0#vI)sQI*o{=054K+7dqEnor2VYPBK4y4^vdf?ZVuhW@HXCtt8rt)yI- z6@5^vDm?CMu9GvXwtPjbQlhszprG;M#yoBL7$%AC!%V#WY_{Q zx20=Vypq8#WhD`dh@rhU%j~v+F`gTUBq8;zERwJhRy(nx4}RsmS>K4ow~|lbaFX4+ zQtCcRAj2+no{QXyjhcx`gW+WaU@^^rY2fI(4sys{(F{?NcF|vg#0VO%!~hE9%7tUY z6FYV_!qPOy@tIB{ Date: Sun, 11 Jan 2015 19:26:21 +0000 Subject: [PATCH 07/30] Some Thaumium Block concepts --- .../com/cricketcraft/chisel/init/Features.java | 4 ++++ src/main/resources/assets/chisel/lang/en_US.lang | 7 +++++++ .../chisel/textures/blocks/thaumium/bevel.png | Bin 0 -> 3214 bytes .../chisel/textures/blocks/thaumium/chunks.png | Bin 0 -> 3221 bytes .../textures/blocks/thaumium/purplerunes-v9.png | Bin 0 -> 6625 bytes .../chisel/textures/blocks/thaumium/runes-v9.png | Bin 0 -> 6690 bytes 6 files changed, 11 insertions(+) create mode 100755 src/main/resources/assets/chisel/textures/blocks/thaumium/bevel.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/thaumium/chunks.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/purplerunes-v9.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/runes-v9.png diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index abbda8df..e066870a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -137,6 +137,10 @@ public enum Features { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.0.desc"), 0, "thaumium/bevel"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.1.desc"), 1, "thaumium/chunks"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.2.desc"), 2, "thaumium/purplerunes"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.3.desc"), 3, "thaumium/runes"); thaumium.carverHelper.register(thaumium, "thaumium"); Carving.chisel.registerOre("thaumium", "thaumium"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index d02e9cb9..b4152109 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -100,6 +100,13 @@ tile.arcane.6.desc=Temporal Conduit tile.arcane.7.desc=Braaainz tile.arcane.8.desc=Spatial Conduit +#Thaumium +tile.thaumium.name=Thaumium Block +tile.thaumium.0.desc=Beveled Thaumium Block +tile.thaumium.1.desc=Small Thaumium Blocks +tile.thaumium.2.desc=Engraved Symbols +tile.thaumium.3.desc=Red Symbols + #Futura tile.futura.name=Futura Block tile.futura.0.desc=Glowing Screen with Metallic Borders diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/bevel.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/bevel.png new file mode 100755 index 0000000000000000000000000000000000000000..ee3fd20c771eae6fa26c95c7b7fce20a806a1a10 GIT binary patch literal 3214 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 Hu0mjfPOKN| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/purplerunes-v9.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/purplerunes-v9.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f137b7f7206832866f87450e1833d4a905854e GIT binary patch literal 6625 zcmV<786M_|P)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;(K){{a7>y{D4^000SaNLh0L04^c`04^c{ zs^Z;}00007bV*G`2j2k;6B80i>xUQs01qiiL_t(&-ldvJb0pVwM$emar~(Rw2GHnc zgXoED4w5C=5ngEH-=^Q?jl&V%NV4gWM4CgBJ)>EehpL?3=tUO5Mgs*>Ha3Vr;nXW+ z-hA(T_d?;DMJX3lp--D>SoH@w>wCwxwSSXGY0EBI@ge!l6QF_ zBq>2vPcQfoEt$?xS_2S*TgW3o3IoIo-uaFcBZ+i{*F`p9V|9z=;VME1oVUanv92Md zgbx;LJyI%csL1qPVhWV`5-~;I=j*1TZfXREXD_}XCePNrhd`n%OGpVH9LkwX{Gb@o zG!52w#29hD#b}Mz5+6J%MMCsfc%5ehVhT9#$aIcCA_W+o6Qif=Ix=12qXj_gj2Hu2 zX^b+w&xa5Z2#$8AoV7oqWlndhSzb2`@+GWqkx~(3yu>$MLyGXlSO10-nnEx0_~EBC z&S8up&k9KC3NMw?WV#@wh!A}VNvVk`;=Ch-h|xKj8jz`BUuHt0lp>|X`+Sj?WLd%L zV4J0UgXMga!C0ZB#s{~MS5hK`U|epYWsZ-Qub%#y-M4$h0992pot<9cC4dheDJ3xl zVhs4uA%&!_YeEd1>^1n%VMB$K8X;s~>-1mm@+2XJiHLI@0!fS>+c}!9raBTF z*KbHEvQ%tv(!Al~D<#zYR=&&6sxw09>(y5o({2yzC)DnkwJ-*e7V=UU>Sjil=3%FRd^=*0g>KBH^P$ zD}BLh=lc(4t!46Z%HG*`RPGP}DKuKFk6zZ{BcR zzv_Q4d2+o(ZI8}x8(QT^AqnsCLI|8|@gV?EyJOz`I3-g9w(dRTZm|g|lADs0!UZo= zj2N9^t!3KoG3|B%$kc$%rBAs3;YWmM3CSabB1TV)VZKL4&iVer3R-uD3oR1G+VCOk z!^a3A0f-R>WwDUYvz(M7Yr}_RY6w8%PI&g}D}oQ?c?rZzyp~de5C|#Q9DT-FJ7GEB zU~O}Zlo}G$hoEInN&zVpLP?Y|q!f`#gAgPV+Grj>_!Oyrg%1`fHFaH)rV%ML&UZbp zC5d#2k0~OQU}-pnyKu{oINCqsxPA@5*FXFxPagh`mF4jzUJD_yw!s*U8%%io;Byjz z7$Js0BCtRE0RSNsN@+q22q6g3lZgUr8`!6aQJtuZ=ONciC}F7GF)1Zd z@^rTU5byFrNMh`_(ilAmh%xrtbMo`6mI%So+2&e41jnqJ&fiCI)=rQpRtF!>A9#;K zT<}uR*RDVif+waxh@O{6e`aR)kwUX|?*T3}a}V*v6j4$WW8^wMric&{=bHXD%d9`e zr6vSVh+!e`yq%vXlD9jriOHjsVg2?hN-7{-;-wF6?mQ0XJG}2e^fm87OQr@$p|GK* zb5mmS6nTMlEipx|<713;w!*p=r6nu3#&m8u~w5bOn?h*)3qVEbc?F=UxS zDshPypFjG2%1w#UIYLTO><^)7b&BX#P=f{~4MGS`4$s)w+#t^lZCBCS8i4Eg7z0{o zIPVZilI0mjXK0mSU2`Kpt4?vDcdOxWgjW6fLWnE8czEyE$>@U26#f1@UtCH>XPds} zqyiz)G9%0S{oQ$s^DO|2_T=5?7bb5kB@+LoQSuko?t z_U%nFlM{mMAI9jf`24$k2p)uZ&*ue3Wk1WeT}9hA1R{utQTes}!aQ(tcF5WEly0gq zvcSiV$?gundh$=#`uzL+(aAmnMF<@b<^2xY+Rc{y&gq8A{1t zmIsbc4yl`(`qXjK?DX3e3Iv3h$V_p?=ilX147_>$hP~-`6lTPehrdH8)%(146vblR zIZxX*be+Yg4k09&E~%S}GA~g|Tv}hh@AJERd-&)%J~-y2-2tG`%OshQXkzq8kuA&v zeV#}ZdYOUguj;dxUz1Yc&ggTpQCyfO0G##Asu~|WTI78aw2l@vyN*FQK&ie)&pk%YHCn42C9)fRKFz&9#>naPl$bm*Dpr@b0Z)++ujP#~JlOt- zrfcxQ5n^Dn_nbuH-rbK`ibDj6)$s;Ks|&N$=RPil>5-{Y}fJh`CnNnKH%|_M+g)tNpih3uTO>6*|k0&Q=qD6AOz1|esvLy zZf&d}1S~Ht-Ixb#unfx~U;pqYq|{_;NTEl(c=atIIX-^y+pGL}9&;K&NrHPn&lYHOjo$vZS zl5>RUIIdrlNJIih^(*X2j`#lJeHQUqo)Kbyr5|iR!N(4tI___O%!BPGltp=kzmx}* zlB5*b+PcrU+(HS16q@PDjPoLQ&Mx$MAt9!~qx+vB5X9v1vE%j0f77wb%_`DDaAtEsf z?%lnQkB-Ui4k6mU#$D5w$O1mb03`CP;JDr=MB6tAgd)o_I$K}iwGWP2ee#o!r-*em zO;@8$%`jiX=#ttVV`PDl&~(#z^Ecu{yu?GohZYw)lrn7IzKax^)=n|mPd>kh@AJeN zK6c#Q{IHLy$x^pxm-4_lzc3G^1kPK$cNm>fO!&jZeP1Rp8Nl3Wk|ZvOwB z2d?(#f8OV%?4|Gj%Ktsz${x{tSQ*?|h07f;=l23`!7jA)o1-x@!2--~P4VdGr#GAAF7!x<9x=A_^|$flKp& zl=@pFrKWQo<8q6od;_ENpY89b6j4f1n3C+k=}tI4;NtAX1etj)88V_a_a&EO=i@ILf|m6ReU`%@-+ub^lc zj!H5$=xsMtm)4i(K3?Pn-ghXW$@GAbJbSaJJbnHb4t9^}Y{#scqE)ZnEXV^@J>&TF zfRG$gXsTw)vlrjuQ->BggHegr1|hEU-ggKou)gK2onS-7o5?pM;KBAMbGsd0TK{4` zkY_pLl~so00ryw`nL;mLOlA&dKk(+w3t|NC?ZW>4bT(yn9C$N%3c#qi!^zn}KU)); zjrDs7k;rt0(dOFuf>sKxHKXDVN*GErrYw3HJa2RMbG%+p zVhr3GY~SefQV4wNE)-xoJH*KucW*!B&ggSSqg6)BD>vo=9|9p-UQfQ`$K7Xy?1awM z=Rx&ih9Kp8c_60#sP3&2v=$V3(ffR;`nJYWywT@ZMq@VCKj8NI7Lk4?a5g*O;9x={ zcY5peej%So2mwzX{^LcUdAs+F$z*5#2P8sr#OP?d8|DKsML^JYGkoljLbEdXfHEK4 z=<_K>*4EZ2ijq4U+brjseWs9#oxLA;@!}~>Ti-Yz$cqdi1rP6kIpLdjM37{&(8;}>-w3NRODIF>#S10sK0;FA{Pqp9VyLw`&u(B zM}%m9@q8f>Nm0x@5;>VEF0HSdZi)|Xp^sbN5@L5_fBz=_+~=j#fTU`Ue=%=;dnpgZ f=xMvzCH{W_>d!fkLZ88600000NkvXXu0mjf4LHLO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/runes-v9.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/runes-v9.png new file mode 100644 index 0000000000000000000000000000000000000000..52e213c8f4c44ea427f785a338d3e11d91cce291 GIT binary patch literal 6690 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 literal 0 HcmV?d00001 From 4f427aa0cab0e1a65767b1accbcf046c98682da4 Mon Sep 17 00:00:00 2001 From: Mitchellbrine Date: Sun, 11 Jan 2015 11:28:24 -0800 Subject: [PATCH 08/30] Added the tool required to break road lines Set it as a wood pickaxe. Still breaks instantly, but it cannot be broken in Adventure Mode. Can be configured to any tool you desire (except shears, in which case, just make it implement IShearable). --- src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index 40f0e497..a348c54c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -19,6 +19,7 @@ public class BlockRoadLine extends Block { public BlockRoadLine() { super(Material.circuits); + this.setHarvestLevel("pickaxe",0); this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); } From e9fb9409ac2c139e5e25f2e86a7543f8d883fcb8 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 19:39:43 +0000 Subject: [PATCH 09/30] Fix #133 Also refactor BlockLightstoneCarvable to BlockCarvableGlowstone (Consistency) --- .../chisel/block/BlockCarvableGlowstone.java | 42 +++++++++++++++++++ .../chisel/block/BlockLightstoneCarvable.java | 30 ------------- .../chisel/init/ChiselBlocks.java | 4 +- .../cricketcraft/chisel/init/Features.java | 4 +- 4 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java delete mode 100644 src/main/java/com/cricketcraft/chisel/block/BlockLightstoneCarvable.java diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java new file mode 100644 index 00000000..c38c4fed --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java @@ -0,0 +1,42 @@ +package com.cricketcraft.chisel.block; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class BlockCarvableGlowstone extends BlockCarvable { + + public BlockCarvableGlowstone() { + super(Material.glass); + } + + @Override + public int quantityDropped(Random random) { + return Blocks.glowstone.quantityDropped(random); + } + + @Override + public Item getItemDropped(int i, Random random, int a) { + return Items.glowstone_dust; + } + + @Override + public int damageDropped(int i) { + return 0; + } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) + { + Block glowstone = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + return new ItemStack(Item.getItemFromBlock(glowstone), 1, meta); + } +} diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockLightstoneCarvable.java deleted file mode 100644 index 27ab5799..00000000 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLightstoneCarvable.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cricketcraft.chisel.block; - -import java.util.Random; - -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class BlockLightstoneCarvable extends BlockCarvable { - - public BlockLightstoneCarvable() { - super(Material.glass); - } - - @Override - public int quantityDropped(Random random) { - return Blocks.glowstone.quantityDropped(random); - } - - @Override - public Item getItemDropped(int i, Random random, int a) { - return Items.glowstone_dust; - } - - @Override - public int damageDropped(int i) { - return 0; - } -} diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 8467f67b..323d2035 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -16,7 +16,7 @@ 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.BlockLightstoneCarvable; +import com.cricketcraft.chisel.block.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockMarbleCarpet; import com.cricketcraft.chisel.block.BlockMarbleIce; import com.cricketcraft.chisel.block.BlockMarbleIceStairs; @@ -55,7 +55,7 @@ public final class ChiselBlocks { public static final BlockCarvable iron_block = null; public static final BlockCarvable gold_block = null; public static final BlockCarvable diamond_block = null; - public static final BlockLightstoneCarvable glowstone = null; + public static final BlockCarvableGlowstone glowstone = null; public static final BlockCarvable lapis_block = null; public static final BlockCarvable emerald_block = null; public static final BlockCarvable nether_brick = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index e066870a..145b1755 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -32,7 +32,7 @@ import com.cricketcraft.chisel.block.BlockGrimstone; import com.cricketcraft.chisel.block.BlockHolystone; import com.cricketcraft.chisel.block.BlockLavastone; import com.cricketcraft.chisel.block.BlockLeaf; -import com.cricketcraft.chisel.block.BlockLightstoneCarvable; +import com.cricketcraft.chisel.block.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockMarbleBookshelf; import com.cricketcraft.chisel.block.BlockMarbleCarpet; import com.cricketcraft.chisel.block.BlockMarbleIce; @@ -828,7 +828,7 @@ public enum Features { @Override void addBlocks() { - BlockLightstoneCarvable glowstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F) + BlockCarvableGlowstone glowstone = (BlockCarvableGlowstone) new BlockCarvableGlowstone().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F) .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); glowstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); From fac1042c02f0613132b340aee3ddc5f0a3e15137 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 19:41:41 +0000 Subject: [PATCH 10/30] I r a stupid. #Blame Derpjones --- src/main/java/com/cricketcraft/chisel/init/Features.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 145b1755..8f60ffe4 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -137,10 +137,10 @@ public enum Features { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.0.desc"), 0, "thaumium/bevel"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.1.desc"), 1, "thaumium/chunks"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.2.desc"), 2, "thaumium/purplerunes"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.3.desc"), 3, "thaumium/runes"); + thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.0.desc"), 0, "thaumium/bevel"); + thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.1.desc"), 1, "thaumium/chunks"); + thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.2.desc"), 2, "thaumium/purplerunes"); + thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.3.desc"), 3, "thaumium/runes"); thaumium.carverHelper.register(thaumium, "thaumium"); Carving.chisel.registerOre("thaumium", "thaumium"); } From 4fafbc7371c81817226cbba6a540a566e0f05fba Mon Sep 17 00:00:00 2001 From: Mitchellbrine Date: Sun, 11 Jan 2015 11:42:50 -0800 Subject: [PATCH 11/30] Added the config options for the road lines in Configurations --- .../com/cricketcraft/chisel/config/Configurations.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index c73698c2..aabaf61f 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -39,6 +39,10 @@ public class Configurations { public static int diamondChiselMaxDamage; public static boolean ironChiselCanLeftClick; + public static boolean useRoadLineTool; + public static String getRoadLineTool; + public static int roadLineToolLevel; + public static boolean refreshConfig() { String category; @@ -79,6 +83,12 @@ public class Configurations { diamondChiselMaxDamage = config.get(category, "diamondChiselMaxDamage", 5000, "The max damage of the diamond chisel. Default: 5000").getInt(); ironChiselCanLeftClick = config.get(category, "ironChiselCanLeftClick", true, "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.").getBoolean(); + /* block */ + category = "block"; + useRoadLineTool = config.get(category, "useRoadLineTool", false, "Should the road line require a tool to break (If false, road lines can be broken in Adventure)").getBoolean(); + getRoadLineTool = config.get(category, "getRoadLineTool","pickaxe","The tool that is able to break roadLines (requires useRoadLineTool to be true to take effect)").getString(); + roadLineToolLevel = config.get(category, "roadLineToolLevel",0,"The lowest harvest level of the tool able to break the road lines (requires useRoadLineTool to be true to take effect) (0 = Wood/Gold, 1 = Stone, 2 = Iron, 3 = Diamond) Default: 0").getInt(); + if (config.hasChanged()) { config.save(); } From c099172e6f1d215e7f6085bc3888e076f53ab201 Mon Sep 17 00:00:00 2001 From: Mitchellbrine Date: Sun, 11 Jan 2015 11:45:00 -0800 Subject: [PATCH 12/30] Implemented the config options into the RoadLines Using a tool is disabled by default and the tool and tool harvest level can be changed in the config --- .../java/com/cricketcraft/chisel/block/BlockRoadLine.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index a348c54c..6bb2dcc1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -9,6 +9,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; +import com.cricketcraft.chisel.config.Configurations; public class BlockRoadLine extends Block { @@ -19,7 +20,9 @@ public class BlockRoadLine extends Block { public BlockRoadLine() { super(Material.circuits); - this.setHarvestLevel("pickaxe",0); + if (Configurations.useRoadLineTool) { + this.setHarvestLevel(Configurations.getRoadLineTool,roadLineToolLevel); + } this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); } From 2e357881cf3b0ca047f59ee4838dbb8891666074 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 19:48:43 +0000 Subject: [PATCH 13/30] Fix more derping... --- src/main/java/com/cricketcraft/chisel/init/Features.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 8f60ffe4..b42005bd 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -135,8 +135,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); - Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); + Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0); thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.0.desc"), 0, "thaumium/bevel"); thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.1.desc"), 1, "thaumium/chunks"); thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.2.desc"), 2, "thaumium/purplerunes"); @@ -151,7 +150,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); - Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 10, 0); + Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 5, 0); tallow.carverHelper.register(tallow, "tallow"); Carving.chisel.registerOre("tallow", "tallow"); } From 61b0135715816298a9f294267a5e4c79ddc30f82 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 20:15:06 +0000 Subject: [PATCH 14/30] Fix the Blood Magic Blank Rune compat blocks --- src/main/java/com/cricketcraft/chisel/Chisel.java | 4 ++-- src/main/java/com/cricketcraft/chisel/init/Features.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 46f6ea07..86fb4fb2 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -54,7 +54,7 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime") public class Chisel { public static final List modsSupported = new ArrayList(); @@ -70,7 +70,7 @@ public class Chisel { public static int renderCarpetId; public static int renderAutoChiselId; public static int renderGlowId; - + public static final Logger logger = LogManager.getLogger(MOD_ID); @Instance(MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index b42005bd..71fd1a46 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -206,12 +206,12 @@ public enum Features { } }, - BLOOD_RUNE("AWWayOfTime") { + BLOOD_RUNE("AWWayofTime") { @Override void addBlocks() { BlockCarvable bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayOfTime", "bloodRune.blank"), 0, 0); + Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayofTime", "AlchemicalWizardrybloodRune"), 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"); From dc0f02c35073daa4719fdb0c66a0f34e2fac02c9 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 20:29:22 +0000 Subject: [PATCH 15/30] Lang for Blood Rune Blocks --- src/main/resources/assets/chisel/lang/en_US.lang | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index b4152109..731ad1e4 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -107,6 +107,16 @@ tile.thaumium.1.desc=Small Thaumium Blocks tile.thaumium.2.desc=Engraved Symbols tile.thaumium.3.desc=Red Symbols +#Blood Rune +tile.bloodrune.name=Blood Rune +tile.bloodrune.0.desc=Arranged Blood Rune +tile.bloodrune.1.desc=Blood Rune Bricks +tile.bloodrune.2.desc=Carved Blood Rune +tile.bloodrune.3.desc=Radial Carved Blood Rune +tile.bloodrune.4.desc=Classic Panel Blood Rune +tile.bloodrune.5.desc=Blood Rune Tiles + + #Futura tile.futura.name=Futura Block tile.futura.0.desc=Glowing Screen with Metallic Borders From 8ab7e53f28abfbbfc432b2bd538c0ed28be9eb69 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 20:56:07 +0000 Subject: [PATCH 16/30] Redo changes to 'Chisel.java' from my branch --- src/main/java/com/cricketcraft/chisel/Chisel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 86fb4fb2..02ff2730 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -70,6 +70,7 @@ public class Chisel { public static int renderCarpetId; public static int renderAutoChiselId; public static int renderGlowId; + public static int renderLayeredId; public static final Logger logger = LogManager.getLogger(MOD_ID); From 941bf49f7d3a7dd178a99bfb4ee0173998dfeeda Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 20:58:14 +0000 Subject: [PATCH 17/30] Fix what the Road Line pr broke --- src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index 6bb2dcc1..fb656454 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -21,7 +21,7 @@ public class BlockRoadLine extends Block { super(Material.circuits); if (Configurations.useRoadLineTool) { - this.setHarvestLevel(Configurations.getRoadLineTool,roadLineToolLevel); + this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel); } this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); From 9d868864f934deb2efc58da643f48b522ef54b2a Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 20:59:16 +0000 Subject: [PATCH 18/30] Import Organisation --- .../java/com/cricketcraft/chisel/Chisel.java | 36 ++++++++++--------- .../com/cricketcraft/chisel/api/IFacade.java | 1 + .../client/render/BlockGlowRenderer.java | 4 +-- .../render/RenderStandardBlockNoSunlight.java | 1 - .../chisel/config/Configurations.java | 4 +-- .../chisel/init/ChiselBlocks.java | 2 +- .../cricketcraft/chisel/init/Features.java | 2 +- .../chisel/inventory/ContainerChisel.java | 1 - .../chisel/item/chisel/ChiselController.java | 3 -- .../chisel/proxy/ClientProxy.java | 2 +- .../chisel/utils/GeneralClient.java | 4 +-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 02ff2730..c137aa4d 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -1,6 +1,20 @@ package com.cricketcraft.chisel; -import com.cricketcraft.chisel.api.IChiselItem; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; @@ -30,8 +44,12 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; @@ -39,20 +57,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; @Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime") public class Chisel { diff --git a/src/main/java/com/cricketcraft/chisel/api/IFacade.java b/src/main/java/com/cricketcraft/chisel/api/IFacade.java index 1e4f16d6..202a63a1 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IFacade.java +++ b/src/main/java/com/cricketcraft/chisel/api/IFacade.java @@ -2,6 +2,7 @@ package com.cricketcraft.chisel.api; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; /** * To be implemented on blocks that "hide" another block inside, so connected textuers can still be diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java index 84127aee..00503ee0 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java @@ -1,13 +1,13 @@ package com.cricketcraft.chisel.client.render; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemDye; import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.utils.Drawing; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderStandardBlockNoSunlight.java b/src/main/java/com/cricketcraft/chisel/client/render/RenderStandardBlockNoSunlight.java index 0ecfb374..e61e44fb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderStandardBlockNoSunlight.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RenderStandardBlockNoSunlight.java @@ -1,7 +1,6 @@ package com.cricketcraft.chisel.client.render; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index aabaf61f..f064eca4 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -2,12 +2,12 @@ package com.cricketcraft.chisel.config; import java.util.Locale; +import net.minecraftforge.common.config.Configuration; + import org.apache.commons.lang3.StringUtils; import com.cricketcraft.chisel.init.Features; -import net.minecraftforge.common.config.Configuration; - public class Configurations { public static Configuration config; diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 8b6ca58d..4b5c3e02 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -5,6 +5,7 @@ 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.BlockCarvableLayered; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; @@ -18,7 +19,6 @@ 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.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockMarbleCarpet; import com.cricketcraft.chisel.block.BlockMarbleIce; import com.cricketcraft.chisel.block.BlockMarbleIceStairs; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 0722523e..3ff6e15d 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -28,6 +28,7 @@ import com.cricketcraft.chisel.block.BlockBeaconBase; import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.BlockCarvableGlass; import com.cricketcraft.chisel.block.BlockCarvableGlow; +import com.cricketcraft.chisel.block.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockCarvableLayered; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; @@ -43,7 +44,6 @@ import com.cricketcraft.chisel.block.BlockGrimstone; import com.cricketcraft.chisel.block.BlockHolystone; import com.cricketcraft.chisel.block.BlockLavastone; import com.cricketcraft.chisel.block.BlockLeaf; -import com.cricketcraft.chisel.block.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockMarbleBookshelf; import com.cricketcraft.chisel.block.BlockMarbleCarpet; import com.cricketcraft.chisel.block.BlockMarbleIce; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java index 9476e720..88f3e92d 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.item.chisel.ItemChisel; diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java index a2820b06..96db8015 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java @@ -1,9 +1,6 @@ package com.cricketcraft.chisel.item.chisel; import io.netty.buffer.ByteBuf; - -import java.util.Arrays; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index f2a36042..d9e70654 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -17,10 +17,10 @@ import com.cricketcraft.chisel.client.render.BlockLayeredRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.chisel.client.render.RenderStandardBlockNoSunlight; import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer; import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer; +import com.cricketcraft.chisel.client.render.RenderStandardBlockNoSunlight; import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; import com.cricketcraft.chisel.client.render.item.ItemPresentRenderer; import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel; diff --git a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java b/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java index ab99288e..1243d993 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java +++ b/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java @@ -3,14 +3,14 @@ package com.cricketcraft.chisel.utils; import java.util.HashMap; import java.util.Random; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; + public class GeneralClient { public static Random rand = new Random(); From 133b3262b258d39e849df8e6f8524a70c6ac77da Mon Sep 17 00:00:00 2001 From: Drullkus Date: Sun, 11 Jan 2015 13:18:53 -0800 Subject: [PATCH 19/30] Add Poptart Rainbow, push files around --- .../cricketcraft/chisel/init/Features.java | 7 +++--- .../resources/assets/chisel/lang/en_US.lang | 1 + .../blocks/futura/Base/controller.png | Bin 0 -> 3523 bytes .../futura/{ => Base}/screenCyan-ctm.png | Bin .../{ => Base}/screenCyan-ctm.png.mcmeta | 0 .../blocks/futura/{ => Base}/screenCyan.png | Bin .../futura/{ => Base}/screenMetallic-ctm.png | Bin .../{ => Base}/screenMetallic-ctm.png.mcmeta | 0 .../futura/{ => Base}/screenMetallic.png | Bin .../textures/blocks/futura/Base/wavy.png | Bin 0 -> 3727 bytes .../blocks/futura/Base/wavy.png.mcmeta | 3 +++ .../blocks/futura/Overlay/controller-ctm3.png | Bin 0 -> 6188 bytes .../blocks/futura/Overlay/controller.png | Bin 0 -> 3523 bytes .../futura/Overlay/controllerGlow-ctm1.png | Bin 0 -> 6264 bytes .../futura/Overlay/controllerGlow-ctm2.png | Bin 0 -> 6666 bytes .../screenCyan-ctm.png} | Bin .../screenCyan-ctm.png.mcmeta} | 0 .../blocks/futura/Overlay/screenCyan.png | Bin 0 -> 2808 bytes .../futura/Overlay/screenMetallic-ctm.png | Bin 0 -> 5441 bytes .../screenMetallic-ctm.png.mcmeta} | 0 .../blocks/futura/Overlay/screenMetallic.png | Bin 0 -> 2808 bytes .../textures/blocks/futura/Overlay/wavy.png | Bin 0 -> 4287 bytes .../blocks/futura/Overlay/wavy.png.mcmeta | 3 +++ .../blocks/futura/WIP/controllerWIP-ctm1.png | Bin 0 -> 6824 bytes .../futura/WIP/controllerWIP-ctm1.png.mcmeta | 5 ++++ .../blocks/futura/WIP/controllerWIP-ctm2.png | Bin 0 -> 7106 bytes .../futura/WIP/controllerWIP-ctm2.png.mcmeta | 5 ++++ .../blocks/futura/WIP/controllerWIP-ctm3.png | Bin 0 -> 7354 bytes .../futura/WIP/controllerWIP-ctm3.png.mcmeta | 5 ++++ .../blocks/futura/{ => WIP}/controllerWIP.png | Bin .../futura/{ => WIP}/controllerWIP.png.mcmeta | 0 .../futura/{ => WIP}/screenCyanWIP-ctm.png | Bin .../futura/WIP/screenCyanWIP-ctm.png.mcmeta | 23 ++++++++++++++++++ .../blocks/futura/{ => WIP}/screenCyanWIP.png | Bin .../{ => WIP}/screenMetallicWIP-ctm.png | Bin .../WIP/screenMetallicWIP-ctm.png.mcmeta | 23 ++++++++++++++++++ .../futura/{ => WIP}/screenMetallicWIP.png | Bin .../textures/blocks/futura/WIP/wavyWIP.png | Bin 0 -> 4605 bytes .../blocks/futura/WIP/wavyWIP.png.mcmeta | 3 +++ .../blocks/futura/controllerWIP-ctm1.png | Bin 7334 -> 0 bytes .../futura/controllerWIP-ctm1.png.mcmeta | 16 ------------ .../blocks/futura/controllerWIP-ctm2.png | Bin 7662 -> 0 bytes .../futura/controllerWIP-ctm2.png.mcmeta | 16 ------------ .../blocks/futura/controllerWIP-ctm3.png | Bin 7932 -> 0 bytes .../futura/controllerWIP-ctm3.png.mcmeta | 16 ------------ .../blocks/hexPlating/hexAnim.png.mcmeta | 13 +--------- .../assets/chisel/textures/chisel2Gui.png | Bin 0 -> 4643 bytes ...iselGUIRevamp.png => chisel2GuiScroll.png} | Bin 48 files changed, 76 insertions(+), 63 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenCyan-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenCyan-ctm.png.mcmeta (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenCyan.png (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenMetallic-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenMetallic-ctm.png.mcmeta (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => Base}/screenMetallic.png (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm2.png rename src/main/resources/assets/chisel/textures/blocks/futura/{screenOverlay-ctm.png => Overlay/screenCyan-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{screenCyanWIP-ctm.png.mcmeta => Overlay/screenCyan-ctm.png.mcmeta} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png rename src/main/resources/assets/chisel/textures/blocks/futura/{screenMetallicWIP-ctm.png.mcmeta => Overlay/screenMetallic-ctm.png.mcmeta} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png.mcmeta rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/controllerWIP.png (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/controllerWIP.png.mcmeta (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/screenCyanWIP-ctm.png (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png.mcmeta rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/screenCyanWIP.png (100%) rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/screenMetallicWIP-ctm.png (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png.mcmeta rename src/main/resources/assets/chisel/textures/blocks/futura/{ => WIP}/screenMetallicWIP.png (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png.mcmeta delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png.mcmeta delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/chisel2Gui.png rename src/main/resources/assets/chisel/textures/{chiselGUIRevamp.png => chisel2GuiScroll.png} (100%) diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index d52f7e8e..591ff3da 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -668,9 +668,10 @@ public enum Features { void addBlocks() { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock/* , "futura/screenOverlay-ctm" */).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F) .setResistance(10F); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/controllerWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/WIP/screenMetallicWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/WIP/screenCyanWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/WIP/controllerWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.3.desc"), 3, "futura/WIP/wavyWIP"); futura.carverHelper.register(futura, "futura"); Carving.chisel.registerOre("futura", "futura"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index d02e9cb9..9d534ffc 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -105,6 +105,7 @@ tile.futura.name=Futura Block tile.futura.0.desc=Glowing Screen with Metallic Borders tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines +tile.futura.3.desc=Poptart Rainbow #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png new file mode 100644 index 0000000000000000000000000000000000000000..5370369013933ffad560908e74faa41f2d70d474 GIT binary patch literal 3523 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png new file mode 100644 index 0000000000000000000000000000000000000000..3e6c531c269416fbdb28098705b14dac9035c3b8 GIT binary patch literal 6188 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 NL*1)7<=PIR{{;XDM7aO} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png new file mode 100644 index 0000000000000000000000000000000000000000..5370369013933ffad560908e74faa41f2d70d474 GIT binary patch literal 3523 zcmV;!4LtIRP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0008+NklxPG5Q}H^i zc>p935)v$_Xg7rtR1icYp)^gMq_KT}JmWhvcUVN~3w$~{N1wQV|BI+aKq*B?HS_r# zYb{!9LI`;8(OTo2!x%%Sc8n)e&hrUnRgttBNAk<}Xsub?{+P0IG)+UArc_l$2!Xm@ z00J?snE$p<9VBigQWOPJB?_%Im+pN|_Qy|XYfwtDUKJ=;6Rn}E6!yg_=J6rL+iPTL zi{W6v)}1>@69x9xN95mpN&VqxG>@N<<`u0pWqf*ywH7;>V-E|8n|)e;PFZ>H3d?J& zD5Xf8^BBEEeQk&E-B)Cv-edCh4?G+V@kykr9PVU>S(l{GYT8@t$X<)uIVRI7(k>QE z&L`wjlaJn~`1VKa-FK+}Es15I8GFJ=Bc6N0iomxZFH725vo;uzSYrqwkQX^pNs?RF zi9i2Cy!{6JH7AY|;$8`BDNPcostPG3&yJ38&XIWUvDQ-8H9`ooEJIyeMed#vZ*~!f z0frjU1_89&ZG;dk^?J7qMjVn+UU}H9uU`iBuAFa38WB&5HQ97kO(2@bUFwVh({G_dyVGN z0ol77gieCjDLg$!-Mvb9u*Zp%B)t~id%E531p#GEaxf*`8j$^dLi5%tvDd;F!(4jI zsL$fjAz|kV@xO|`%owb$GM&wki(-!d`xLP~Bzbzq9JLl*~aCOc90{}{&s1(5SqD24z002ovPDHLkV1jS(gthrgBTcGGm#P$Lp%Bm+yQ4XE5C~56 zJ$I+ucN_u0dm`NgWooj$Auto95;7t1RECxhvR!?VZfjhbmR zG{CG~S>eP{QJ6@2BSFfi$K!yq8`%K#GM> zKG&8olEP3HsBzHD1$DM{%r6S71dwy10T`sx0e=643k2Z&6cjFB#F91wAn#!c2!Oqo zh81NCJA~226Q!05sAz&P>B+n%Ko%IV`CxCi02m4ZHhlie z!vH27m*NWoEEC}LpsZMc^SooYI^Zl16c1c~ssWgb0(4GS+vI>TAwX0I>7)&mRRh?5 z7)1pDp#(&Y!b2_rU|+zdi;K$}2u=a$GIxC6wk0<^%mxt892z1M65ab&@E zQ_Im>_-cwXJp1s)HXXZKa{;;qBU+Cr_0-5c@z)n4)Z#9+^L#vW_%bVaOsq631(dlc zfqY|y@~!NN53lmU%ssJRjsRe{&b|2)KZF?L95g@Rb+)a1qLsx1V4QT~JOJR9I=8TC zPo;7v1OU{t0tCubS@)Zn1hFJ+&F7|?DeyMZ!D`%XEov||at93CJ)29#folAreP!$d zHX@%?*d?(>&Y|&WYT*{M8frx}^oK1ZqnW=xfDEkK1vzgEp9lxpJvHZwf-t6p;NZ>L zVA^NgoZaDcMi;NfN@teHbG=-?@q8qJWEHhAwXi(;g7_R3(9Gjt+a3DGHvU1cJbXuBgS+|jC5E-OeD zZ~vkEVlib=2TR%YV&b}p1N(t;FEDL@29``3?4`zO%b}`mu4k@4rk&5p#w|%RK_){+ z9BkCWcQHQy>RaCTG~e5p?8L>w%(Vr%KGQ~@7lHYPBidxRX(JHge6=w|I_0lSKhl2G z{CL-xYfZ2qO;VeME53We!L@=^ENpgwAF}9I)bbhueja2jvwKv&S#-&DK`R64cq{{ULG3Z=<{U#@In8lgV z`RI1(s^@!}=|m3wq(S7z4{KVhNvp*BUX)a!^g*5BD1PQNCQ>F8vlmlovR*Fp@H6I4 zQ&AbQjpUUSXo|a;xj>b`WBS-0@qK)f=_Dz{#!@8G1cXRh=X zgu7A|g+2(7YU3^M8-M&zpf34@z3!P}VL`SWLPA#pS!ukN;G|5tknDkb;i*ry!k?G4 z=l67mZu`=gORTw)dbMJXH(d*#Cp|YW(k?P8(%NW{F4@dW&u!4Cvp5c*R_)Z~yUC}8 zitay`zG56q3dhb>^gO?rn`At$r+8eFd2I8c{7h1R(`NO5jinE zar=>Xpham;Qc1~8GD+Fbq|h$q;jX|g(mDCf2w~N#f_QD4Xqz-299ui2@Nz`+7fop7 z?T(uZ+zW0UZXGXqNqFJBSFf#K+e$UQR-1b%S6)wEud}bWFQ@Nwid34S*r@nQ+Dh7J z+HAGW4euL*Rrysljye^KH*zhus_O5C+>o<)ZEkkMs#5b!`Wv3lb#LnOX!2_H(mQ=Y_J+VdEF`}y5OIo+$8{(h5fAY(TA}LkaICT;G4R*i# zZ|~7vxqf9Pwg1JI@{{)c=W8M;^8whvn8ZTW`45-cZl{~14QrtoQMLDj_QIbJ*_gWWix-WbW3{c_Ey+bX0K%Cr3?#+`-81rh&iLB zA!UlpL{Zn-Vm||fK>+IA3YUnzNG$TrXj%1ZufikSZAPU-rF)qRN(%}yGvYHA*1a;= z>aOY!2CeQH)*-V9f37o!GoP~|AP>U>LJ>ygX#_46R9?XvB&RzFIROY+zb1X{)J+}moZtS%L@G{yT4^WB#)s$m{#!0a}~XCec6N^RhU3NLnP1c zc`u$Q@<%P~EvSnkL()UxV~Cpq9QwQ30@r-vzQ)!|J>qVccrCb88_ZV_Q?Ey*H=TAR zgCX@Hr<=Iql?Jh(xY!sEwL}RtdO`7!++HlS=#=czv$92Ha}y32c4`a^0XXBVP)6 zvN1KfX=Pw8Vln&9_D5(ss}g<0(-OK##w2?GG5#sTaAg1DRbLaT;+v);X>`QZ9)oT*Ey- zcC&h;@8+@DN&J!cgp`ZAYP9y#2>VAxQ{(8*mp8PiJ1;bzrf+)*QAtyo{qmyY3m01b z(c;<>+3XPq)s=~dk-o+Aq{9~;vZL5VT+~u`Q#I2}Qjaa|EZ-aSDh+*JpYg$KOk6mw!v>voFX~cDYHzyMZuvC4^L08}W6hB1pWbhH z^o`-{^GJrA;&j8FkNZ*k(ZMXkwBJ3xll~8N<6eAQZ|V)|t@l+nRmTz2VI#_xr&D9w zQ~oYkudKbHDXk-tkf4Fn*n?;&;#_n}^oLNY(2WdPB{{h-%J)vz@Og*ox#zB^dx1-Q%p=H3`o8Qb%3Y)O+IVjpkVHZmO5874}qva_EO$kybK`9dc;u zER(3?dHqBG(D^Db%8g^}*%RKSds8^+nMF++z z`J$V`pIsLACV19;kx*bHL-CQM`Z}RfE?+3L=EoJU&|l6}05EUj zM%XxBa(M-32M1S<*-m*e(((j<;qXUOmBhu^Z)f1x&NL|CRs4ae#Kz=#%s$ohM6^UY zfkVVOr0URc4wxdRkIFt~74-ALD>{9Ngon6i-a!1AQUklN1Zje~a)P;A|4zFlKw4PC zqA=B+>&!}YN4|Tek2;pmC5XdcRV4+Se<->SHpfwcM9DDopeT;)d3OkZJcd>Q+f9G} zaSO4H4-g90+lR1c?qkFiv($-RtQ)oRK`=By#fp@QAcn?OkfV>veB|=#dfdL0d62ZH z9TZ`J2{8!8F7D?Z@{z+itT_Q*kbZjUBAlw}Qb@Z0)BHoeG&t4SxruolS#?^Cfqal;CUw!kwPPZ?}fai8?73!-d zG4}p}0JXm=HeD#0FJOKdxxscC0thBsp47W{lp{GPsh&qQb%Ulu>6e*(4;RH`zaMx_ zK@2aT*LP)M`UbaN5=wb)wZpO|2p~hX*$I{Q+jc-m>y`epZxgSc$m1=woM6ML1!zgL8STBV)8{i6nw;Tn3>t>_RdnYi5!+R2Dr%fMqJIGT6S0Jr z+o2z+{b`^!w3B(&t&YnW+Kn*UqCVzEZ;Ck;dSp>LE_bXlZw0oSs3Kv-_iUNEm+@R)9J~k5E6pZ!9qVhm_L*`p1I`f zHH2da)jVc`mTpSVjb(CTTC8c%D2inro0{(=H0E*@7%G+rkUlU0YK|BlF_f)EF zLmqVyl0&KQ_nqB~=o9IS_X^a(!||hCgi`6gVua59+Wiu4++j^4swnmtJ2F};aTCu+ z#3@>EQ@M9JPfWQ3NdZr8r(S5Ri{XdURpa7a(TTxqzDI4HxY8Stat)eKY%#{NeS>Ll zU@fd?2MyF=KZMAMEPHsC~+eD|xWwrgtZgaUGTslJ}YuG+AH?J?PF$uGo z)H%HSFkHci^)2o)Q4hDuuQ%Sj4Z-LDlu-0Ogv?)ykhX+5kbVi%f&>RJOf1T6lcUvz zD<(}?1M$$#nMTtpA%I9GhfM+#^o|*nf0%f^leuqbglEmQjKpoVjX-}6a@iB2r|<6K zp99PJMo(lzJNN0kE=Sx>o$=WByl@x)3g);S>umOnU<5e!U&QGTX5mh&$I7R>&o6`L zpfb3n_vquaC))`Pb|sw(c5~b}FS)GAvK9sVfeZx_z9xK>JZPO*--?5@Wv$!Q0Uw3wZ(t%aC8TZ$c4?s$ zlAOV$G`GGn#VmY!9t2A^ExF*dH=KN7p(q5_YZvA*Yo(n4duoaAma5TJi)!%wVvk1( z1&`%GT&T4#y>MFXyAIKYaFc2Neg6H#^^>OI#C+)&ke=P~{==GHHbc7;L%Vl!El76| zTmBc99W-BBjvJ(GliOEDUOgk9>IR;kkf5xI*1_|0b6$kr2SQ0@eS(9VxU%$!bawzg zWaKwyC}s`BL@PSP~0ZhCTdNMMB*0iV7#JUe6A`@b11t-b@om9zi0u;BCCzb`EN#~r^fEauFE-xpR3 z>K_X$_oROHTGg+C>%gf;$Lx5G+E7glMku(6>&NEjBs>qX~I>0kB20dMtZy%1?y(EpQOFcX^e554FiRQg>no}H=xp%qM=mmqn#&3G@U!+CQ3+l%8pL#L!KRpH~OPd;& z$U(|vI3xcXH79+IUOh8bl73o%@P&?6*E%ZMLq15>4iY>y9{7ls>8{_qsCjELY+&uk zz_AmX?^5%iO*gKNZP3l!HlrM6z!4O0?bn$O9DwqKqlxGD7p27gv{Y7ZQGyB;eRrM1 z6TTtAdIppi&<78;C>hTp0EnKzD75nX?cV5bBWe(*^46MdVQyVWyU^((%S|45=ZxYv zvC|?3wL3;&sb5WR-{~@#8yp9I`OhM#4*fYN`8Riv-vHk7CqD8wov8WC{rJl#*yf9> z0cukZDes#2YeUlDv4?RDY3vsbK9LBWKE;TW8UADQ$P=~-&`QjvsMaz|W5^5Q@y5ho z?!ZNoV)p?`vgB17aixu)P$IyxBQJvoU;r111!3F~u{|F7IURp^Xx{gHp!0*JSe5lk zIl(*r+k)jtbJ73WAiNs9*(xlF+LlqS7QFDj>Zmih_pT z382z@ktQ`DEeVHM&RTo8_P*GcXPk?S`Q7{%na}^c-#a5rPaCi>9%KXnfaQdtuKC^* z2>>(zJ>A}DQdKMnpyffza%%i(v<7*q`b&uwB9x=6)0KwBU zKQ>f0Q^hjB)E3-78q`o*KQ<|c3}6)V0@&zFT|{n>MM1!(KMW>)2oL!HfP6kN(F1tn z6ubg|*e-NVJLwz<8w|qVj8i*BkL3W6=osxx0I3hcrY4G80O_=VV~g{J3BXhqaFoD& z{RCiBHI&Rs#YE7l?4<|*ti)2MQ;Fn zI~!98K+g;)n1zQN0ciaI$3{_6A0Rjh;Lu;SfvrdvuuV(ty{V)USh<+GUcgy;*=rCR z8#zJA_7mLF97mmKoRX1p)xJr*N&za+QDQ3qq{ngY{aYg0r=7K+z5QrR8S8o3xsPJ9fOd1Vx^>Oy1wY{d zL-2*cudxQCH%z-Eflr5OPh2RsmExE%J8&&VH#wT9^x{y2_JbpJhr4!N#z$m!z?vhf zK+z>lkYAi^w!Jg>`zZ-F+nf0D4FFhu?^*R(k{*n84;mwQ?=B(82I+?ZtlNnP*8spl zS4_^bxfIbr4*yAhA0<|SW z+lmCF9OXYF1yt~6?xFEsta8;>Z&~49&}}DrT$N-+00XU7BR#v5NPjr!LZq!|3_W*J z$fih@A?<-EG2y0g4zok2;#3V4%_A*^tqcWL;n!)@!_Miyi_>TXlmbbi6$XkA14_)` zpP66llxH717_6Vc)ZubdF*%kiJ*DINtAp_9qfe(ha^0c*v6?y!3iufwh;r>^1-bef z?P4_#on|B0`%|GexK$< z@pH?r16}%ESItFdWnQMJ7#iAq{l&yvlDvY%S+SB*WRo&U7VywEHxn_cBrvU*z(*NIav z@-rTNI_S>rzHzZ|=H|QoLyrVcCv@0!wagmKB+P)K^NG_*&?HYQTd6XsJDhRNjE_z}5`V-eC2#pMCo^X_hsla))nXa@ z(!t_xfxeZp#l%a7&yRDha#Bs_E%+=@FEz5ma!}cxmWb#6cH{^;yBeb!6P@Q~>BZ+K zD(Z!qoOw%qWJEkzazk$gsMd-XxAon*E%iQ;Ebu-Gp7Zjlx{mTmWtⓈzKtCWFqm} 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png new file mode 100644 index 0000000000000000000000000000000000000000..86e8064b4b49be0dd58c8889f12c5991c84271d0 GIT binary patch literal 2808 zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0000ZNklE_b00030{{sMHngbn}2@^K}0000< KMNUMnLSTZ0JTa{R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..335776ed2023eb8a04f7b12c231cd73568e06f9d GIT binary patch literal 5441 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 KMNUMnLSTZ0JTa{R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png new file mode 100644 index 0000000000000000000000000000000000000000..ae33f0f5786aa7307b47c48fa93b0a06786c131b GIT binary patch literal 4287 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png new file mode 100644 index 0000000000000000000000000000000000000000..c7625808b0479fd948171effde59f61a92b9851d GIT binary patch literal 6824 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 bjR_EO>Tq>E)3ZhYD*!l+F*B&tca8WTMWvJp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta new file mode 100644 index 00000000..68df5399 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png new file mode 100644 index 0000000000000000000000000000000000000000..5128d610bbb3e88bded587d73add8216b4f83e55 GIT binary patch literal 7106 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta new file mode 100644 index 00000000..68df5399 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c0954d3a19c617a25279cf6b19e8148a129b30 GIT binary patch literal 7354 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta deleted file mode 100644 index 0805fb46..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png deleted file mode 100644 index 00c3171b5bd82141809304af5c2244ea52a86889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7932 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 RUlM5GA;6++Wc1cI~x9*QWvDbkAw8blC7 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 Date: Sun, 11 Jan 2015 21:18:41 +0000 Subject: [PATCH 20/30] Implement more road lines - Double White, Yellow and Double Yellow --- .../chisel/block/BlockRoadLine.java | 10 ++++++---- .../chisel/init/ChiselBlocks.java | 2 +- .../cricketcraft/chisel/init/Features.java | 18 +++++++++++++++--- .../resources/assets/chisel/lang/en_US.lang | 5 ++++- .../line-marking/double-yellow-center.png | Bin 717 -> 3342 bytes 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index fb656454..e405217a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -16,9 +16,11 @@ public class BlockRoadLine extends Block { public IIcon aloneIcon; public IIcon halfLineIcon; public IIcon fullLineIcon; + private String type; - public BlockRoadLine() { + public BlockRoadLine(String type) { super(Material.circuits); + this.type = type; if (Configurations.useRoadLineTool) { this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel); @@ -67,9 +69,9 @@ public class BlockRoadLine extends Block { @Override public void registerBlockIcons(IIconRegister reg) { - blockIcon = aloneIcon = reg.registerIcon("Chisel:line-marking/white-center"); - halfLineIcon = reg.registerIcon("Chisel:line-marking/white-side"); - fullLineIcon = reg.registerIcon("Chisel:line-marking/white-long"); + blockIcon = aloneIcon = reg.registerIcon("Chisel:line-marking/" + type + "-center"); + halfLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-side"); + fullLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-long"); } } diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 4b5c3e02..1031dc18 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -53,7 +53,7 @@ public final class ChiselBlocks { public static final BlockCarvable sandstone = null; public static final BlockCarvable sandstone_scribbles = null; public static final BlockConcrete concrete = null; - public static final BlockRoadLine road_line = null; + public static BlockRoadLine road_line = null; public static final BlockCarvable iron_block = null; public static final BlockCarvable gold_block = null; public static final BlockCarvable diamond_block = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 3ff6e15d..670e6b86 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -1874,9 +1874,21 @@ public enum Features { @Override void addBlocks() { - BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) + BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine("white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) .setBlockName("roadLine"); GameRegistry.registerBlock(road_line, ItemCarvable.class, "road_line"); + BlockRoadLine road_line1 = (BlockRoadLine) new BlockRoadLine("yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) + .setBlockName("roadLine1"); + GameRegistry.registerBlock(road_line1, ItemCarvable.class, "road_line1"); + BlockRoadLine road_line2 = (BlockRoadLine) new BlockRoadLine("double-white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) + .setBlockName("roadLine2"); + GameRegistry.registerBlock(road_line2, ItemCarvable.class, "road_line2"); + BlockRoadLine road_line3 = (BlockRoadLine) new BlockRoadLine("double-yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) + .setBlockName("roadLine3"); + GameRegistry.registerBlock(road_line3, ItemCarvable.class, "road_line3"); + Carving.chisel.addVariation("roadLine", road_line1, 0, 1); + Carving.chisel.addVariation("roadLine", road_line2, 0, 2); + Carving.chisel.addVariation("roadLine", road_line3, 0, 3); Carving.chisel.registerOre("roadLine", "roadLine"); } @@ -2412,9 +2424,9 @@ public enum Features { Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); for(int type = 0; type < 10; type++){ if(type == 8 || type == 9) - torch[type] = (BlockCarvableTorch) new BlockCarvableTorch().disableParticles(); + torch[type] = new BlockCarvableTorch().disableParticles(); else - torch[type] = (BlockCarvableTorch) new BlockCarvableTorch(); + torch[type] = new BlockCarvableTorch(); torch[type].setInformation("torch" + (type + 1)); GameRegistry.registerBlock(torch[type], "torch" + (type + 1)); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 72b8751e..8e6bf07b 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -546,7 +546,10 @@ tile.concrete.9.desc=Partly Weathered Concrete Block tile.concrete.10.desc=Asphalt #Road Line -tile.roadLine.name=Road Lines +tile.roadLine.name=Road Lines (White) +tile.roadLine1.name=Road Lines (Double White) +tile.roadLine2.name=Road Lines (Yellow) +tile.roadLine3.name=Road Lines (Double Yellow) #Iron Blocks tile.iron_block.name=Iron Block diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png index f4249e53b179b7559a73923e31b0997e93854b1b..3cf03cde985af4faae15ee65df9da2cfc6ca26b0 100644 GIT binary patch delta 2969 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 P00000NkvXXu0mjfGi8lV delta 325 zcmV-L0lNN<8qEceBM$+6P)t-s|NsA=jXr{OGqY+6bOC?-S%HQC000?uQchC<%w568 z{kzA%!?n20{<+A<&Hnz${@LZaV$lzB0002yNkl$QG*xfWmDb?}Tf5~B9wf5;a0?Z`O=AiJurAnf- ziGV;dk~x2h9Q&*ycSFr0V9o<=*g3I>Q{30K5dkLQ%+g?jtZR7%$N>Zlg5Q#mLt&p% zEx`~1h6&kr%ilqqe|%R*5inL{qUn|$TwQT!va0pWfm@Zd3rE{Ww zad~y!@giV`hD6rQaPIr;gEEhRC-M2^)x&CvAA~8lC;}EfGM~-G@1I|1@sC^Tb#=ck X>f Date: Sun, 11 Jan 2015 13:21:05 -0800 Subject: [PATCH 21/30] ??? --- .../futura/Overlay/screenCyanOverlay-ctm.png | Bin 0 -> 5441 bytes .../Overlay/screenMetallicOverlay-ctm.png | Bin 0 -> 5441 bytes .../blocks/futura/Overlay/wavyOverlay.png | Bin 0 -> 4287 bytes .../futura/screenOverlay-ctm.png.mcmeta | 23 ------------------ 4 files changed, 23 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyanOverlay-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallicOverlay-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavyOverlay.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyanOverlay-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyanOverlay-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..335776ed2023eb8a04f7b12c231cd73568e06f9d GIT binary patch literal 5441 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png.mcmeta deleted file mode 100644 index c82b1666..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png.mcmeta +++ /dev/null @@ -1,23 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - ] - } -} \ No newline at end of file From 18adbe8bc6a1559a219f411115c2fe134f868dcd Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 21:22:50 +0000 Subject: [PATCH 22/30] #Warderp returns --- src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 1031dc18..4b5c3e02 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -53,7 +53,7 @@ public final class ChiselBlocks { public static final BlockCarvable sandstone = null; public static final BlockCarvable sandstone_scribbles = null; public static final BlockConcrete concrete = null; - public static BlockRoadLine road_line = null; + public static final BlockRoadLine road_line = null; public static final BlockCarvable iron_block = null; public static final BlockCarvable gold_block = null; public static final BlockCarvable diamond_block = null; From fb225ee244af5c66095948a59b069360dba81698 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 21:32:37 +0000 Subject: [PATCH 23/30] Switch Road Lines to meta --- .../java/com/cricketcraft/chisel/Chisel.java | 1 + .../chisel/block/BlockRoadLine.java | 30 +++++++++++-------- .../client/render/BlockRoadLineRenderer.java | 19 ++++++------ .../cricketcraft/chisel/init/Features.java | 18 ++++------- .../resources/assets/chisel/lang/en_US.lang | 9 +++--- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index c137aa4d..f892209c 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -75,6 +75,7 @@ public class Chisel { public static int renderAutoChiselId; public static int renderGlowId; public static int renderLayeredId; + public static int roadLineId; public static final Logger logger = LogManager.getLogger(MOD_ID); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index e405217a..9840317e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -1,26 +1,29 @@ package com.cricketcraft.chisel.block; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; import com.cricketcraft.chisel.config.Configurations; -public class BlockRoadLine extends Block { +public class BlockRoadLine extends BlockCarvable { - public IIcon aloneIcon; - public IIcon halfLineIcon; - public IIcon fullLineIcon; - private String type; + public IIcon aloneIcon[] = new IIcon[4]; + public IIcon halfLineIcon[] = new IIcon[4]; + public IIcon fullLineIcon[] = new IIcon[4]; - public BlockRoadLine(String type) { + public BlockRoadLine() { super(Material.circuits); - this.type = type; if (Configurations.useRoadLineTool) { this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel); @@ -28,7 +31,6 @@ public class BlockRoadLine extends Block { this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); } - @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { return null; @@ -46,7 +48,7 @@ public class BlockRoadLine extends Block { @Override public int getRenderType() { - return BlockRoadLineRenderer.id; + return Chisel.roadLineId; } @Override @@ -69,9 +71,13 @@ public class BlockRoadLine extends Block { @Override public void registerBlockIcons(IIconRegister reg) { - blockIcon = aloneIcon = reg.registerIcon("Chisel:line-marking/" + type + "-center"); - halfLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-side"); - fullLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-long"); + for(int i = 0; i < 4; i++) + { + String[] texNames = {"white", "yellow", "double-white", "double-yellow"}; + aloneIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-center"); + halfLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-side"); + fullLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-long"); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java index 7cd2a343..090ace59 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java @@ -7,6 +7,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.BlockRoadLine; import com.cricketcraft.chisel.utils.Drawing; @@ -15,10 +16,8 @@ import cpw.mods.fml.client.registry.RenderingRegistry; public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { - public static int id; - public BlockRoadLineRenderer() { - id = RenderingRegistry.getNextAvailableRenderId(); + Chisel.roadLineId = RenderingRegistry.getNextAvailableRenderId(); } @Override @@ -72,18 +71,18 @@ public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { if (N && S) { renderer.uvRotateTop = 0; - renderer.overrideBlockTexture = block.fullLineIcon; + renderer.overrideBlockTexture = block.fullLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } else { if (N) { renderer.uvRotateTop = 0; - renderer.overrideBlockTexture = block.halfLineIcon; + renderer.overrideBlockTexture = block.halfLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } if (S) { renderer.uvRotateTop = 3; - renderer.overrideBlockTexture = block.halfLineIcon; + renderer.overrideBlockTexture = block.halfLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } @@ -91,17 +90,17 @@ public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { if (E && W) { renderer.uvRotateTop = 1; - renderer.overrideBlockTexture = block.fullLineIcon; + renderer.overrideBlockTexture = block.fullLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } else { if (E) { renderer.uvRotateTop = 1; - renderer.overrideBlockTexture = block.halfLineIcon; + renderer.overrideBlockTexture = block.halfLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } if (W) { renderer.uvRotateTop = 2; - renderer.overrideBlockTexture = block.halfLineIcon; + renderer.overrideBlockTexture = block.halfLineIcon[meta]; renderer.renderStandardBlock(block, x, y, z); } } @@ -118,6 +117,6 @@ public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return id; + return Chisel.roadLineId; } } diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 9fab7015..e51dfb13 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -1875,21 +1875,13 @@ public enum Features { @Override void addBlocks() { - BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine("white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) + BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) .setBlockName("roadLine"); + road_line.carverHelper.addVariation(StatCollector.translateToLocal("tile.roadLine.0.desc"), 0, "line-marking/white-center"); + road_line.carverHelper.addVariation(StatCollector.translateToLocal("tile.roadLine.1.desc"), 1, "line-marking/double-white-center"); + road_line.carverHelper.addVariation(StatCollector.translateToLocal("tile.roadLine.2.desc"), 2, "line-marking/yellow-center"); + road_line.carverHelper.addVariation(StatCollector.translateToLocal("tile.roadine.3.desc"), 3, "line-marking/double-yellow-center"); GameRegistry.registerBlock(road_line, ItemCarvable.class, "road_line"); - BlockRoadLine road_line1 = (BlockRoadLine) new BlockRoadLine("yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) - .setBlockName("roadLine1"); - GameRegistry.registerBlock(road_line1, ItemCarvable.class, "road_line1"); - BlockRoadLine road_line2 = (BlockRoadLine) new BlockRoadLine("double-white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) - .setBlockName("roadLine2"); - GameRegistry.registerBlock(road_line2, ItemCarvable.class, "road_line2"); - BlockRoadLine road_line3 = (BlockRoadLine) new BlockRoadLine("double-yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F) - .setBlockName("roadLine3"); - GameRegistry.registerBlock(road_line3, ItemCarvable.class, "road_line3"); - Carving.chisel.addVariation("roadLine", road_line1, 0, 1); - Carving.chisel.addVariation("roadLine", road_line2, 0, 2); - Carving.chisel.addVariation("roadLine", road_line3, 0, 3); Carving.chisel.registerOre("roadLine", "roadLine"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 00ff557e..69ad3314 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -547,10 +547,11 @@ tile.concrete.9.desc=Partly Weathered Concrete Block tile.concrete.10.desc=Asphalt #Road Line -tile.roadLine.name=Road Lines (White) -tile.roadLine1.name=Road Lines (Double White) -tile.roadLine2.name=Road Lines (Yellow) -tile.roadLine3.name=Road Lines (Double Yellow) +tile.roadLine.name=Road Lines +tile.roadLine.0.desc=White +tile.roadLine.1.desc=Double White +tile.roadLine.2.desc=Yellow +tile.roadLine.3.desc=Double Yellow #Iron Blocks tile.iron_block.name=Iron Block From 6dde438e97516ae2ae4876b026991cc044931cfd Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 21:56:20 +0000 Subject: [PATCH 24/30] Update the Autochisel recipe --- src/main/java/com/cricketcraft/chisel/init/Features.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index e51dfb13..a67ad34c 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -186,8 +186,8 @@ public enum Features { @Override void addRecipes() { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.autoChisel, 1), new Object[] { "XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'), - ChiselItems.chisel })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.autoChisel, 1), new Object[] { "XXX", " Y ", "YYY", Character.valueOf('X'), Blocks.stone_slab, Character.valueOf('Y'), + "ingotIron" })); } }, From 64e390fc1d837577c293e00cb3d33fa891e56f85 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 17:21:53 -0500 Subject: [PATCH 25/30] Fix autochisel inventory syncing and change autochisel block bounds --- .../java/com/cricketcraft/chisel/Chisel.java | 1 + .../cricketcraft/chisel/PacketHandler.java | 15 ----- .../chisel/block/BlockAutoChisel.java | 3 +- .../tileentity/TileEntityAutoChisel.java | 22 ++++--- .../chisel/item/chisel/ChiselController.java | 57 +------------------ .../chisel/network/PacketHandler.java | 20 +++++++ 6 files changed, 41 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/PacketHandler.java create mode 100644 src/main/java/com/cricketcraft/chisel/network/PacketHandler.java diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index c137aa4d..f0a4a3e0 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -33,6 +33,7 @@ import com.cricketcraft.chisel.inventory.ContainerChisel; import com.cricketcraft.chisel.inventory.ContainerPresent; import com.cricketcraft.chisel.inventory.InventoryChiselSelection; import com.cricketcraft.chisel.item.chisel.ChiselController; +import com.cricketcraft.chisel.network.PacketHandler; import com.cricketcraft.chisel.proxy.CommonProxy; import com.cricketcraft.chisel.utils.General; import com.cricketcraft.chisel.world.GeneratorChisel; diff --git a/src/main/java/com/cricketcraft/chisel/PacketHandler.java b/src/main/java/com/cricketcraft/chisel/PacketHandler.java deleted file mode 100644 index 7c65050d..00000000 --- a/src/main/java/com/cricketcraft/chisel/PacketHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cricketcraft.chisel; - -import com.cricketcraft.chisel.item.chisel.ChiselController; - -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; - -public class PacketHandler { - - public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(Chisel.MOD_ID); - - public static void init() { - INSTANCE.registerMessage(ChiselController.PlaySoundHandler.class, ChiselController.PacketPlaySound.class, 0, Side.CLIENT); - } -} \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java index 9bf227e8..7127ed37 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java @@ -20,6 +20,7 @@ public class BlockAutoChisel extends BlockContainer { public BlockAutoChisel() { super(Material.rock); setHardness(1F); + setBlockBounds(0.125f, 0, 0.125f, 0.875f, 0.8125f, 0.875f); } @Override @@ -46,7 +47,7 @@ public class BlockAutoChisel extends BlockContainer { if (tile != null && tile instanceof TileEntityAutoChisel && !player.isSneaking()) { player.openGui(Chisel.instance, 1, world, x, y, z); } - + return true; } diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index e286ba93..63963c7d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -17,6 +17,8 @@ import net.minecraft.util.StatCollector; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.init.ChiselItems; +import com.cricketcraft.chisel.network.PacketHandler; +import com.cricketcraft.chisel.network.message.MessageSlotUpdate; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -122,22 +124,20 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory if (canMerge(chiseled)) { // if our output is empty, just use the current result if (output == null) { - inventory[OUTPUT] = chiseled; + setInventorySlotContents(OUTPUT, chiseled); } else { // otherwise just add our result to the existing stack inventory[OUTPUT].stackSize += chiseled.stackSize; + slotChanged(OUTPUT); } // remove what we made from the stack base.stackSize -= chiseled.stackSize; if (base.stackSize <= 0) { - inventory[BASE] = null; // clear out 0 size itemstacks + setInventorySlotContents(BASE, null); // clear out 0 size itemstacks } // TODO here we need to send a packet to the client so that the animation and sound can be played ((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, this, CHISEL, inventory[CHISEL], inventory[TARGET]); - - // we changed something, so we need to tell the chunk to save - markDirty(); } } } @@ -221,6 +221,14 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory if (stack != null && stack.stackSize > getInventoryStackLimit()) { stack.stackSize = getInventoryStackLimit(); } + + if (!worldObj.isRemote) { + slotChanged(slot); + } + } + + private void slotChanged(int slot) { + PacketHandler.INSTANCE.sendToDimension(new MessageSlotUpdate(this, slot, inventory[slot]), worldObj.provider.dimensionId); markDirty(); } @@ -246,7 +254,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[] { BASE, OUTPUT }; + return new int[] { BASE, TARGET, OUTPUT, CHISEL }; } @Override @@ -270,7 +278,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory @Override public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - return hasUpgrade(Upgrade.AUTOMATION) && slot == BASE; + return hasUpgrade(Upgrade.AUTOMATION) && (slot == BASE || slot == TARGET || slot == CHISEL); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java index 96db8015..41d740e0 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java @@ -1,6 +1,5 @@ package com.cricketcraft.chisel.item.chisel; -import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -12,17 +11,14 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.commons.lang3.ArrayUtils; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.PacketHandler; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.carving.CarvingVariation; -import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.network.PacketHandler; +import com.cricketcraft.chisel.network.message.MessageChiselSound; import com.cricketcraft.chisel.utils.General; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; public final class ChiselController { @@ -92,56 +88,9 @@ public final class ChiselController { * Assumes that the player is holding a chisel */ private void setVariation(EntityPlayer player, World world, int x, int y, int z, CarvingVariation v, ItemStack target) { - PacketHandler.INSTANCE.sendTo(new PacketPlaySound(x, y, z, v), (EntityPlayerMP) player); + PacketHandler.INSTANCE.sendTo(new MessageChiselSound(x, y, z, v), (EntityPlayerMP) player); world.setBlock(x, y, z, v.block); world.setBlockMetadataWithNotify(x, y, z, v.meta, 3); ((IChiselItem) player.getCurrentEquippedItem().getItem()).onChisel(world, player.inventory, player.inventory.currentItem, player.getCurrentEquippedItem(), target); } - - public static class PacketPlaySound implements IMessage { - - public PacketPlaySound() { - } - - private int x, y, z; - private int block; - private byte meta; - - public PacketPlaySound(int x, int y, int z, CarvingVariation v) { - this.x = x; - this.y = y; - this.z = z; - this.block = Block.getIdFromBlock(v.block); - this.meta = (byte) v.meta; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(block); - buf.writeByte(meta); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - block = buf.readInt(); - meta = buf.readByte(); - } - } - - public static class PlaySoundHandler implements IMessageHandler { - - @Override - public IMessage onMessage(PacketPlaySound message, MessageContext ctx) { - String sound = ItemChisel.carving.getVariationSound(Block.getBlockById(message.block), message.meta); - GeneralChiselClient.spawnChiselEffect(message.x, message.y, message.z, sound); - return null; - } - } - } diff --git a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java b/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java new file mode 100644 index 00000000..d83930da --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java @@ -0,0 +1,20 @@ +package com.cricketcraft.chisel.network; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.network.message.MessageChiselSound; +import com.cricketcraft.chisel.network.message.MessageSlotUpdate; + +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; + +public class PacketHandler { + + public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(Chisel.MOD_ID); + + public static void init() { + int id = 0; + + INSTANCE.registerMessage(MessageChiselSound.Handler.class, MessageChiselSound.class, id++, Side.CLIENT); + INSTANCE.registerMessage(MessageSlotUpdate.Handler.class, MessageSlotUpdate.class, id++, Side.CLIENT); + } +} \ No newline at end of file From 89a10a5ca6b16caeb37b3581e87cbaed9da24a07 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 17:23:04 -0500 Subject: [PATCH 26/30] Add new files --- .../network/message/MessageChiselSound.java | 58 ++++++++++++++++++ .../network/message/MessageSlotUpdate.java | 61 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java create mode 100644 src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java new file mode 100644 index 00000000..a7ec289b --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java @@ -0,0 +1,58 @@ +package com.cricketcraft.chisel.network.message; + +import io.netty.buffer.ByteBuf; +import net.minecraft.block.Block; + +import com.cricketcraft.chisel.carving.CarvingVariation; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.item.chisel.ItemChisel; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class MessageChiselSound implements IMessage { + + public MessageChiselSound() { + } + + private int x, y, z; + private int block; + private byte meta; + + public MessageChiselSound(int x, int y, int z, CarvingVariation v) { + this.x = x; + this.y = y; + this.z = z; + this.block = Block.getIdFromBlock(v.block); + this.meta = (byte) v.meta; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(block); + buf.writeByte(meta); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + block = buf.readInt(); + meta = buf.readByte(); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(MessageChiselSound message, MessageContext ctx) { + String sound = ItemChisel.carving.getVariationSound(Block.getBlockById(message.block), message.meta); + GeneralChiselClient.spawnChiselEffect(message.x, message.y, message.z, sound); + return null; + } + } +} diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java new file mode 100644 index 00000000..51de779f --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java @@ -0,0 +1,61 @@ +package com.cricketcraft.chisel.network.message; + +import com.cricketcraft.chisel.Chisel; + +import io.netty.buffer.ByteBuf; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class MessageSlotUpdate implements IMessage { + + public MessageSlotUpdate() { + } + + private int x, y, z; + private int slot; + private ItemStack stack; + + public MessageSlotUpdate(TileEntity te, int slot, ItemStack stack) { + this.x = te.xCoord; + this.y = te.yCoord; + this.z = te.zCoord; + this.slot = slot; + this.stack = stack; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(slot); + ByteBufUtils.writeItemStack(buf, stack); + } + + @Override + public void fromBytes(ByteBuf buf) { + this.x = buf.readInt(); + this.y = buf.readInt(); + this.z = buf.readInt(); + this.slot = buf.readInt(); + this.stack = ByteBufUtils.readItemStack(buf); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(MessageSlotUpdate message, MessageContext ctx) { + TileEntity te = Chisel.proxy.getClientWorld().getTileEntity(message.x, message.y, message.z); + if (te != null && te instanceof IInventory) { + ((IInventory) te).setInventorySlotContents(message.slot, message.stack); + } + return null; + } + } + +} From ea98671cea3efbc766369c8f7304f342789ea11a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 18:23:07 -0500 Subject: [PATCH 27/30] Finish autochisel animation --- .../tileentity/TileEntityAutoChisel.java | 21 +++++++++- .../client/render/tile/RenderAutoChisel.java | 38 ++++++++++++++++++- .../chisel/network/PacketHandler.java | 4 +- .../network/message/MessageChiselSound.java | 17 +++------ .../network/message/MessageSlotUpdate.java | 21 ++++------ 5 files changed, 72 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 63963c7d..e92c5678 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -18,6 +18,7 @@ import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.init.ChiselItems; import com.cricketcraft.chisel.network.PacketHandler; +import com.cricketcraft.chisel.network.message.MessageAutoChisel; import com.cricketcraft.chisel.network.message.MessageSlotUpdate; import cpw.mods.fml.relauncher.Side; @@ -44,7 +45,12 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory private ItemStack[] inventory = new ItemStack[7]; private String name = "autoChisel"; - public float xRot, yRot, zRot; // used for floating target client only + // used for floating target client only + public float xRot, yRot, zRot; + + // used for chisel item rotation client only + public float chiselRot; + public boolean chiseling = false; @Override public boolean canUpdate() { @@ -132,12 +138,13 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory } // remove what we made from the stack base.stackSize -= chiseled.stackSize; + slotChanged(BASE); if (base.stackSize <= 0) { setInventorySlotContents(BASE, null); // clear out 0 size itemstacks } // TODO here we need to send a packet to the client so that the animation and sound can be played - ((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, this, CHISEL, inventory[CHISEL], inventory[TARGET]); + chiselItem(); } } } @@ -173,6 +180,12 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory return inventory[CHISEL] != null && inventory[CHISEL].getItem() instanceof IChiselItem && inventory[CHISEL].stackSize >= 1; } + /** Calls IChiselItem#onChisel() and sends the chisel packet for sound/animation */ + private void chiselItem() { + ((IChiselItem) inventory[CHISEL].getItem()).onChisel(worldObj, this, CHISEL, inventory[CHISEL], inventory[TARGET]); + PacketHandler.INSTANCE.sendToDimension(new MessageAutoChisel(this), worldObj.provider.dimensionId); + } + @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); @@ -345,4 +358,8 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory return Upgrade.values()[slotNumber - MIN_UPGRADE].getUnlocalizedName() + ".name"; } } + + public void doChiselAnim() { + chiseling = true; + } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java index 82a91b04..7fe9c67b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java @@ -4,6 +4,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; @@ -13,6 +14,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -27,6 +29,9 @@ import org.lwjgl.opengl.GL11; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.utils.GeneralClient; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -169,21 +174,50 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp if (item != null) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.35, y + 0.934, z + 0.5); + item.getEntityItem().stackSize = autoChisel.getStackInSlot(TileEntityAutoChisel.BASE).stackSize; renderItem.doRender(item, 0, 0, 0, 0, 0); GL11.glPopMatrix(); } - + item = autoChisel.getItemForRendering(TileEntityAutoChisel.CHISEL); if (item != null) { + if (autoChisel.chiseling) { + autoChisel.chiselRot += 1; + if (autoChisel.chiselRot > 70) { + chiselItem(autoChisel); + } + } else { + autoChisel.chiselRot = Math.max(autoChisel.chiselRot - 1, 0); + } GL11.glPushMatrix(); - GL11.glTranslated(x + 0.7, y + 1, z + 0.5); + GL11.glTranslated(x + 0.7, y + 1.01, z + 0.5); + GL11.glRotatef(autoChisel.chiselRot, 0, 0, 1); GL11.glTranslated(-0.12, 0, 0); GL11.glScalef(0.9f, 0.9f, 0.9f); renderItem.doRender(item, 0, 0, 0, 0, 0); GL11.glPopMatrix(); + } else { + autoChisel.chiselRot = 0; + autoChisel.chiseling = false; } } + private void chiselItem(TileEntityAutoChisel autoChisel) { + World world = autoChisel.getWorldObj(); + ItemStack base = autoChisel.getStackInSlot(TileEntityAutoChisel.BASE); + if (base != null) { + for (int i = 0; i < 5; i++) { + EntityDiggingFX particle = new EntityDiggingFX(world, autoChisel.xCoord + 0.5, autoChisel.yCoord + 1, autoChisel.zCoord + 0.5, 0, 0, 0, Block.getBlockFromItem(base.getItem()), + base.getItemDamage()); + particle.setVelocity((world.rand.nextDouble() / 4) - 0.125, world.rand.nextDouble() / 8, (world.rand.nextDouble() / 4) - 0.125); + Minecraft.getMinecraft().effectRenderer.addEffect(particle); + } + String sound = Carving.chisel.getVariationSound(base.getItem(), base.getItemDamage()); + GeneralClient.playChiselSound(world, autoChisel.xCoord, autoChisel.yCoord, autoChisel.zCoord, sound); + } + autoChisel.chiseling = false; + } + @SideOnly(Side.CLIENT) public EntityItem getGhostItem(World world, ItemStack itemStack) { if (ghostItem == null) { diff --git a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java b/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java index d83930da..ffbb42de 100644 --- a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java +++ b/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.network; import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.network.message.MessageAutoChisel; import com.cricketcraft.chisel.network.message.MessageChiselSound; import com.cricketcraft.chisel.network.message.MessageSlotUpdate; @@ -13,8 +14,9 @@ public class PacketHandler { public static void init() { int id = 0; - + INSTANCE.registerMessage(MessageChiselSound.Handler.class, MessageChiselSound.class, id++, Side.CLIENT); INSTANCE.registerMessage(MessageSlotUpdate.Handler.class, MessageSlotUpdate.class, id++, Side.CLIENT); + INSTANCE.registerMessage(MessageAutoChisel.Handler.class, MessageAutoChisel.class, id++, Side.CLIENT); } } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java index a7ec289b..5df9a879 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java @@ -6,42 +6,37 @@ import net.minecraft.block.Block; import com.cricketcraft.chisel.carving.CarvingVariation; import com.cricketcraft.chisel.client.GeneralChiselClient; import com.cricketcraft.chisel.item.chisel.ItemChisel; +import com.cricketcraft.chisel.network.message.base.MessageCoords; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class MessageChiselSound implements IMessage { +public class MessageChiselSound extends MessageCoords { public MessageChiselSound() { + super(); } - private int x, y, z; private int block; private byte meta; public MessageChiselSound(int x, int y, int z, CarvingVariation v) { - this.x = x; - this.y = y; - this.z = z; + super(x, y, z); this.block = Block.getIdFromBlock(v.block); this.meta = (byte) v.meta; } @Override public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); + super.toBytes(buf); buf.writeInt(block); buf.writeByte(meta); } @Override public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); + super.fromBytes(buf); block = buf.readInt(); meta = buf.readByte(); } diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java index 51de779f..47a74d85 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java @@ -1,47 +1,42 @@ package com.cricketcraft.chisel.network.message; -import com.cricketcraft.chisel.Chisel; - import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.network.message.base.MessageCoords; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class MessageSlotUpdate implements IMessage { +public class MessageSlotUpdate extends MessageCoords { public MessageSlotUpdate() { } - private int x, y, z; private int slot; private ItemStack stack; public MessageSlotUpdate(TileEntity te, int slot, ItemStack stack) { - this.x = te.xCoord; - this.y = te.yCoord; - this.z = te.zCoord; + super(te); this.slot = slot; this.stack = stack; } @Override public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); + super.toBytes(buf); buf.writeInt(slot); ByteBufUtils.writeItemStack(buf, stack); } @Override public void fromBytes(ByteBuf buf) { - this.x = buf.readInt(); - this.y = buf.readInt(); - this.z = buf.readInt(); + super.fromBytes(buf); this.slot = buf.readInt(); this.stack = ByteBufUtils.readItemStack(buf); } From 92c5abe058dadfdca2246e615dca933bcf844410 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 18:23:30 -0500 Subject: [PATCH 28/30] Once again forgot the new files --- .../network/message/MessageAutoChisel.java | 33 ++++++++++ .../network/message/base/MessageCoords.java | 61 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java create mode 100644 src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java new file mode 100644 index 00000000..d667e84d --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java @@ -0,0 +1,33 @@ +package com.cricketcraft.chisel.network.message; + +import net.minecraft.tileentity.TileEntity; + +import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.chisel.network.message.base.MessageCoords; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class MessageAutoChisel extends MessageCoords { + + public MessageAutoChisel() { + } + + public MessageAutoChisel(TileEntityAutoChisel tile) { + super(tile); + } + + public static class Handler implements IMessageHandler { + + public IMessage onMessage(MessageAutoChisel message, MessageContext ctx) { + + TileEntity te = message.getTileEntity(ctx); + if (te instanceof TileEntityAutoChisel) { + ((TileEntityAutoChisel) te).doChiselAnim(); + } + return null; + } + } + +} diff --git a/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java b/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java new file mode 100644 index 00000000..0bf50c3f --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java @@ -0,0 +1,61 @@ +package com.cricketcraft.chisel.network.message.base; + +import io.netty.buffer.ByteBuf; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import com.cricketcraft.chisel.Chisel; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; + +public abstract class MessageCoords implements IMessage { + + public int x, y, z; + + protected MessageCoords() { + ; + } + + protected MessageCoords(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + protected MessageCoords(TileEntity te) { + this(te.xCoord, te.yCoord, te.zCoord); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + this.x = buf.readInt(); + this.y = buf.readInt(); + this.z = buf.readInt(); + } + + protected Block getBlock(MessageContext ctx) { + return getWorld(ctx).getBlock(x, y, z); + } + + protected TileEntity getTileEntity(MessageContext ctx) { + return getWorld(ctx).getTileEntity(x, y, z); + } + + protected World getWorld(MessageContext ctx) { + if (ctx.side == Side.CLIENT) { + return Chisel.proxy.getClientWorld(); + } else { + return ctx.getServerHandler().playerEntity.worldObj; + } + } +} From a15ce829fd35049afc3bc7c024e825662d1408d3 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 19:32:46 -0500 Subject: [PATCH 29/30] Fix road line textures. --- .../chisel/block/BlockRoadLine.java | 29 +++++++++++++------ .../client/render/BlockRoadLineRenderer.java | 8 ++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index 9840317e..5d0ffec9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -1,21 +1,20 @@ package com.cricketcraft.chisel.block; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; import com.cricketcraft.chisel.config.Configurations; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockRoadLine extends BlockCarvable { public IIcon aloneIcon[] = new IIcon[4]; @@ -26,11 +25,12 @@ public class BlockRoadLine extends BlockCarvable { super(Material.circuits); if (Configurations.useRoadLineTool) { - this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel); + this.setHarvestLevel(Configurations.getRoadLineTool, Configurations.roadLineToolLevel); } this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { return null; @@ -70,14 +70,25 @@ public class BlockRoadLine extends BlockCarvable { } @Override + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister reg) { - for(int i = 0; i < 4; i++) - { - String[] texNames = {"white", "yellow", "double-white", "double-yellow"}; + for (int i = 0; i < 4; i++) { + String[] texNames = { "white", "yellow", "double-white", "double-yellow" }; aloneIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-center"); halfLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-side"); fullLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-long"); } } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + return aloneIcon[metadata % aloneIcon.length]; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + return getIcon(side, world.getBlockMetadata(x, y, z)); + } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java index 090ace59..437d16b5 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java @@ -59,10 +59,10 @@ public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { } tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); - boolean N = world.getBlock(x, y, z - 1).equals(block); - boolean S = world.getBlock(x, y, z + 1).equals(block); - boolean W = world.getBlock(x - 1, y, z).equals(block); - boolean E = world.getBlock(x + 1, y, z).equals(block); + boolean N = world.getBlock(x, y, z - 1).equals(block) && world.getBlockMetadata(x, y, z - 1) == meta; + boolean S = world.getBlock(x, y, z + 1).equals(block) && world.getBlockMetadata(x, y, z + 1) == meta; + boolean W = world.getBlock(x - 1, y, z).equals(block) && world.getBlockMetadata(x - 1, y, z) == meta; + boolean E = world.getBlock(x + 1, y, z).equals(block) && world.getBlockMetadata(x + 1, y, z) == meta; if (!N && !S && !W && !E) { renderer.renderStandardBlock(block, x, y, z); From 7c6f07f8723868cbd5aebd2fa6a0d20c9e123ced Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 11 Jan 2015 19:32:56 -0500 Subject: [PATCH 30/30] Fix blocks without subtypes not working in auto chisel --- .../chisel/block/tileentity/TileEntityAutoChisel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index e92c5678..754de116 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -170,7 +170,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory // need to check NBT as well as item if (toMerge.isItemEqual(inventory[OUTPUT]) && ItemStack.areItemStackTagsEqual(toMerge, inventory[OUTPUT])) { // we only care about metadata if the item has subtypes - return toMerge.getHasSubtypes() && toMerge.getItemDamage() == inventory[OUTPUT].getItemDamage(); + return !toMerge.getHasSubtypes() || toMerge.getItemDamage() == inventory[OUTPUT].getItemDamage(); } return false;