From 7dc56ea093b46d204b1a0f85cdd467892deea7a6 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Mon, 6 Apr 2015 19:21:11 +0100 Subject: [PATCH] Implement some more of the unused textures as factory variants Only two textures I can't find a home for --- .../java/com/cricketcraft/chisel/Features.java | 9 +++++++++ src/main/resources/assets/chisel/lang/en_US.lang | 6 ++++++ .../{unused/chrono => factory}/frameblue-ctm.png | Bin .../{unused/chrono => factory}/frameblue.png | Bin .../{unused/chrono => factory}/iceiceice-ctm.png | Bin .../{unused/chrono => factory}/iceiceice.png | Bin .../{unused/chrono => factory}/tilemosaic-ctm.png | Bin .../{unused/chrono => factory}/tilemosaic.png | Bin .../{unused/chrono => factory}/vent-ctmv.png | Bin .../{unused/chrono => factory}/vent-top.png | Bin .../chrono => factory}/wireframeblue-ctm.png | Bin .../{unused/chrono => factory}/wireframeblue.png | Bin .../textures/blocks/unused/chrono/tilered-ctm.png | Bin 197 -> 0 bytes .../textures/blocks/unused/chrono/tilered.png | Bin 168 -> 0 bytes .../blocks/unused/lamp/symbolgold-ctm.png | Bin 473 -> 0 bytes .../textures/blocks/unused/lamp/symbolgold.png | Bin 195 -> 0 bytes 16 files changed, 15 insertions(+) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/frameblue-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/frameblue.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/iceiceice-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/iceiceice.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/tilemosaic-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/tilemosaic.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/vent-ctmv.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/vent-top.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/wireframeblue-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/chrono => factory}/wireframeblue.png (100%) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 0cf215e9..3e453156 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -687,6 +687,15 @@ public enum Features { factoryblock.carverHelper.addVariation("tile.factory.15.desc", 15, "factory/column"); factoryblock.carverHelper.registerAll(factoryblock, "factoryblock"); Carving.chisel.registerOre("factoryblock", "factoryblock"); + + BlockCarvable factoryblock2 = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) + .setStepSound(Chisel.soundMetalFootstep); + factoryblock2.carverHelper.addVariation("tile.factory2.0.desc", 0, "factory/iceiceice"); + factoryblock2.carverHelper.addVariation("tile.factory2.1.desc", 1, "factory/vent"); + factoryblock2.carverHelper.addVariation("tile.factory2.2.desc", 2, "factory/tilemosaic"); + factoryblock2.carverHelper.addVariation("tile.factory2.3.desc", 3, "factory/wireframeblue"); + factoryblock2.carverHelper.registerAll(factoryblock2, "factoryblock2"); + factoryblock2.carverHelper.registerVariations("factoryblock", factoryblock2); } @Override diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index a0abc2f6..5b39ddef 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -581,6 +581,12 @@ tile.factory.13.desc=Worn Metal Wall with Ventilation Openings tile.factory.14.desc=Rusty Metal Plates tile.factory.15.desc=Worn Metal Column +tile.chisel.factoryblock2.name=Factory Block +tile.factory2.0.desc=Neon Blue Plating +tile.factory2.1.desc=Vertical Venting +tile.factory2.2.desc=Metallic Blue Circuit Plating +tile.factory2.3.desc=Blue Wireframing + #Diamond blocks tile.chisel.diamond_block.name=Diamond Block tile.diamond.1.desc=Embossed Diamond Block diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/frameblue-ctm.png b/src/main/resources/assets/chisel/textures/blocks/factory/frameblue-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/frameblue-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/factory/frameblue-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/frameblue.png b/src/main/resources/assets/chisel/textures/blocks/factory/frameblue.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/frameblue.png rename to src/main/resources/assets/chisel/textures/blocks/factory/frameblue.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/iceiceice-ctm.png b/src/main/resources/assets/chisel/textures/blocks/factory/iceiceice-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/iceiceice-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/factory/iceiceice-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/iceiceice.png b/src/main/resources/assets/chisel/textures/blocks/factory/iceiceice.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/iceiceice.png rename to src/main/resources/assets/chisel/textures/blocks/factory/iceiceice.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilemosaic-ctm.png b/src/main/resources/assets/chisel/textures/blocks/factory/tilemosaic-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilemosaic-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/factory/tilemosaic-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilemosaic.png b/src/main/resources/assets/chisel/textures/blocks/factory/tilemosaic.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilemosaic.png rename to src/main/resources/assets/chisel/textures/blocks/factory/tilemosaic.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/vent-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/factory/vent-ctmv.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/vent-ctmv.png rename to src/main/resources/assets/chisel/textures/blocks/factory/vent-ctmv.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/vent-top.png b/src/main/resources/assets/chisel/textures/blocks/factory/vent-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/vent-top.png rename to src/main/resources/assets/chisel/textures/blocks/factory/vent-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/wireframeblue-ctm.png b/src/main/resources/assets/chisel/textures/blocks/factory/wireframeblue-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/wireframeblue-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/factory/wireframeblue-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/wireframeblue.png b/src/main/resources/assets/chisel/textures/blocks/factory/wireframeblue.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/chrono/wireframeblue.png rename to src/main/resources/assets/chisel/textures/blocks/factory/wireframeblue.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered-ctm.png b/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered-ctm.png deleted file mode 100644 index 01951da8be96a50b819e12bc7b756a67abe11957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S4BY~Ygu^%ArWs~{X}P1 zlRr<*fKr8?E{-7;aYy}ca~@C-ur_YI$oj^z(ZcEb{gn@d*Lm2_=2up<6q@;A?mE>L zzn^b3ZgE&oT9crB_<(B9{9AJ8Tv)C#R-4ROz5KA)zE+``+R3rm6FJm0%7S~$#3s~# tjO@A7%A;uum9mwN6XZ-W7k^Tqo<4xa2DS2&w?F?fBS&)LZ&UQ@+>+Q@kGu0GE& z<0I_L89kKqE?DkZoWuRkX+!HLr@FabI$zQQrrf!EKw5I6_r;HQcQAzKaCE$RU)BmV OpTX1B&t;ucLK6U0gE*`J diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold-ctm.png b/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold-ctm.png deleted file mode 100644 index 068944e85be553148886319d5c56d86f1a4ec908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmV;~0Ve*5P)W5oKG9gbhzkqnO-jx(jzpdIN;kpB!B(>_@STVuYZ3uKmLB+_TlqCdo>7*!xK%V P00000NkvXXu0mjflsCjn diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold.png b/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold.png deleted file mode 100644 index 1ecefc41bf817dd65da3ed7212de9fcbc6161ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZRgjRdP*9lQA(3DqaH2xu z!6KD=XDS4jF7pK{$nF$jq?vt;JjDQy)C~478NN)78&qol`;+0CI;*1ONa4