diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java index 303c692e8..dedb26980 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java @@ -38,9 +38,11 @@ public enum TheColoredLampColors implements INameableItem{ } public static TheColoredLampColors getColorFromDyeName(String color){ - String actualName = color.substring(3); - for(int i = 0; i < values().length; i++){ - if(values()[i].getName().equals(actualName)) return values()[i]; + if(color.substring(0, 3).equals("dye")){ + String actualName = color.substring(3); + for(int i = 0; i < values().length; i++){ + if(values()[i].getName().equals(actualName)) return values()[i]; + } } return null; } diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png index 878f0c77b..08a1e55b6 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png index 9af1d0479..e7855bae6 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png index fcb0d50f1..c405604af 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png index 635dd1a0d..187ced228 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png index d125fe3ac..aa0420108 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png index 6134821a6..7e823abf8 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png index ea7500250..00d90cd81 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png index 34d5e65a6..28e1cba11 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png differ