From 2f42fe0839c77f7aeca5eb0e267ff09190500f73 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Tue, 30 Jun 2015 02:14:36 -0700 Subject: [PATCH] Tweaked the Fake Controller submap manager to be a bit more friendly if other blocks use it. --- .../com/cricketcraft/chisel/Features.java | 6 ++-- .../render/SubmapManagerFakeController.java | 28 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 167b5c74..c2a225b1 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -816,10 +816,10 @@ public enum Features { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); futura.carverHelper.addVariation("tile.futura.0.desc", 0, "futura/WIP/screenMetallicWIP"); futura.carverHelper.addVariation("tile.futura.1.desc", 1, "futura/WIP/screenCyanWIP"); - futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controller", new SubmapManagerFakeController(2)); + futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controller", new SubmapManagerFakeController(2, "futura/WIP/controller")); futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP"); - futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controllerPurple", new SubmapManagerFakeController(4)); - futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/uberWavy", new SubmapManagerFakeController(5)); + futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controller", new SubmapManagerFakeController(4, "futura/WIP/controllerPurple")); + futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/controller", new SubmapManagerFakeController(5, "futura/WIP/uberWavy")); futura.carverHelper.registerAll(futura, "futura"); BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index 3d0dd540..b8438269 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java @@ -20,6 +20,13 @@ public class SubmapManagerFakeController extends SubmapManagerBase { private TextureSubmap map; private CTM ctm = CTM.getInstance(); private int meta; + private String texturePath; + + public SubmapManagerFakeController(int meta, String texture) { + ctm.disableObscuredFaceCheck = true; + this.meta = meta; + texturePath = texture; + } public SubmapManagerFakeController(int meta) { ctm.disableObscuredFaceCheck = true; @@ -51,20 +58,15 @@ public class SubmapManagerFakeController extends SubmapManagerBase { @SideOnly(Side.CLIENT) public void registerIcons(String modName, Block block, IIconRegister register) { - switch(meta) + if (texturePath != null) { - default: - Chisel.logger.info("SubmapManagerFakeController was called on block" + block.getUnlocalizedName() - + " but an entry was not provided in this class!"); - case 2: - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); - break; - case 4: - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controllerPurple"), 2, 2); - break; - case 5: - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/uberWavy"), 2, 2); - break; + map = new TextureSubmap(register.registerIcon(modName + ":" + texturePath), 2, 2); + } + else + { + Chisel.logger.info("SubmapManagerFakeController was called on block " + block.getUnlocalizedName() + + " without declaring texture, using a default texture instead."); + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); } } }