From 97c948828adbab65bf41a27ff6edf7914abe2c21 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 3 Dec 2015 22:53:05 +0100 Subject: [PATCH] Fix Lamp textures --- .../actuallyadditions/blocks/BlockColoredLamp.java | 2 +- ...htBlueOn.png => blockColoredLampLightOnBlue.png} | Bin ...dLampBlackOn.png => blockColoredLampOnBlack.png} | Bin ...redLampBlueOn.png => blockColoredLampOnBlue.png} | Bin ...dLampBrownOn.png => blockColoredLampOnBrown.png} | Bin ...redLampCyanOn.png => blockColoredLampOnCyan.png} | Bin ...redLampGrayOn.png => blockColoredLampOnGray.png} | Bin ...dLampGreenOn.png => blockColoredLampOnGreen.png} | Bin ...htGrayOn.png => blockColoredLampOnLightGray.png} | Bin ...redLampLimeOn.png => blockColoredLampOnLime.png} | Bin ...pMagentaOn.png => blockColoredLampOnMagenta.png} | Bin ...ampOrangeOn.png => blockColoredLampOnOrange.png} | Bin ...redLampPinkOn.png => blockColoredLampOnPink.png} | Bin ...ampPurpleOn.png => blockColoredLampOnPurple.png} | Bin ...loredLampRedOn.png => blockColoredLampOnRed.png} | Bin ...dLampWhiteOn.png => blockColoredLampOnWhite.png} | Bin ...ampYellowOn.png => blockColoredLampOnYellow.png} | Bin 17 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampLightBlueOn.png => blockColoredLampLightOnBlue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampBlackOn.png => blockColoredLampOnBlack.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampBlueOn.png => blockColoredLampOnBlue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampBrownOn.png => blockColoredLampOnBrown.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampCyanOn.png => blockColoredLampOnCyan.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampGrayOn.png => blockColoredLampOnGray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampGreenOn.png => blockColoredLampOnGreen.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampLightGrayOn.png => blockColoredLampOnLightGray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampLimeOn.png => blockColoredLampOnLime.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampMagentaOn.png => blockColoredLampOnMagenta.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampOrangeOn.png => blockColoredLampOnOrange.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampPinkOn.png => blockColoredLampOnPink.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampPurpleOn.png => blockColoredLampOnPurple.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampRedOn.png => blockColoredLampOnRed.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampWhiteOn.png => blockColoredLampOnWhite.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{blockColoredLampYellowOn.png => blockColoredLampOnYellow.png} (100%) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index a8ef4e3df..9ed1396cb 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -126,7 +126,7 @@ public class BlockColoredLamp extends BlockBase{ public void registerBlockIcons(IIconRegister iconReg){ this.textures = new IIcon[allLampTypes.length]; for(int i = 0; i < allLampTypes.length; i++){ - this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()+allLampTypes[i].name+(isOn ? "On" : "")); + this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()+allLampTypes[i].name); } } diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightOnBlue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightOnBlue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBlack.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBlack.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBlue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBlue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBrown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnBrown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnCyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnCyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnGray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnGray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnGreen.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnGreen.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnLightGray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnLightGray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnLime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnLime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnMagenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnMagenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnOrange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnOrange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnPink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnPink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnPurple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnPurple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnRed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnRed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnWhite.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnWhite.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnYellow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOnYellow.png