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 01951da8..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered-ctm.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered.png b/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered.png deleted file mode 100644 index 80d311d8..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/unused/chrono/tilered.png and /dev/null differ 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 068944e8..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold-ctm.png and /dev/null differ 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 1ecefc41..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/unused/lamp/symbolgold.png and /dev/null differ