From bf5e6b788facb599a95d30616b776a1815f8a76a Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Thu, 26 Mar 2015 17:23:41 -0400 Subject: [PATCH] A few fixes for the last commit --- .../mekanism/client/render/MekanismRenderer.java | 12 ++++++++++++ .../client/render/block/MachineRenderingHandler.java | 2 +- .../client/render/item/ItemRenderingHandler.java | 1 + .../java/mekanism/common/block/BlockMachine.java | 12 ++++++------ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index e670bf0f4..e9b752ff6 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -222,6 +222,18 @@ public class MekanismRenderer { return new DefIcon(icon, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); } + + public static DefIcon getActivePair(IIcon icon, int... is) + { + DefIcon ret = new DefIcon(icon, is); + + for(int i : is) + { + ret.icons.add(i+6); + } + + return ret; + } } public static class Model3D diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 9e9d7764a..a41b6c2c6 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -227,7 +227,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler solarNeutronActivator.renderAll(); } else { - GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderItem(renderer, metadata, block); } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 20146ee49..e6f1abbc7 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -523,6 +523,7 @@ public class ItemRenderingHandler implements IItemRenderer if(machine == MachineType.BASIC_FACTORY || machine == MachineType.ADVANCED_FACTORY || machine == MachineType.ELITE_FACTORY) { + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderCustomItem(((RenderBlocks)data[0]), item); } else { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d223e9ab5..fb88abbad 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -191,12 +191,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], new DefIcon(register.registerIcon("mekanism:BasicFactoryFront"), 2), - new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:BasicFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], new DefIcon(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), - new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], new DefIcon(register.registerIcon("mekanism:EliteFactoryFront"), 2), - new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:EliteFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:AdvancedFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:EliteFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); } MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, icons[9], def);