upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 00:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked the Fake Controller submap manager to be a bit more friendly if other blocks use it.

Browse Source
This commit is contained in:
Drullkus committed 2015-06-30 02:14:36 -07:00
1 parent 7397c87ea7
commit 2f42fe0839
2 files changed
+18 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/Features.java
+3 -3
View File
@@ -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);
src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java
+15 -13
View File
@@ -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);
}
}
}