From 722b634f5fa1f151472b5704e4d5fdd78bbf6546 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 1 Dec 2015 19:16:29 +0100 Subject: [PATCH] Tweaked Drill naming Also: THIS IS NOT YELLOW. --- .../actuallyadditions/items/ItemDrill.java | 3 ++- .../textures/items/itemDrill5.png | Bin 669 -> 0 bytes .../items/{itemDrill16.png => itemDrillBlack.png} | Bin .../items/{itemDrill12.png => itemDrillBlue.png} | Bin .../items/{itemDrill13.png => itemDrillBrown.png} | Bin .../items/{itemDrill10.png => itemDrillCyan.png} | Bin .../items/{itemDrill8.png => itemDrillGray.png} | Bin .../items/{itemDrill14.png => itemDrillGreen.png} | Bin .../{itemDrill4.png => itemDrillLightBlue.png} | Bin .../{itemDrill9.png => itemDrillLightGray.png} | Bin .../items/{itemDrill6.png => itemDrillLime.png} | Bin .../{itemDrill3.png => itemDrillMagenta.png} | Bin .../items/{itemDrill2.png => itemDrillOrange.png} | Bin .../items/{itemDrill7.png => itemDrillPink.png} | Bin .../{itemDrill11.png => itemDrillPurple.png} | Bin .../items/{itemDrill15.png => itemDrillRed.png} | Bin .../items/{itemDrill1.png => itemDrillWhite.png} | Bin .../textures/items/itemDrillYellow.png | Bin 0 -> 511 bytes 18 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill16.png => itemDrillBlack.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill12.png => itemDrillBlue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill13.png => itemDrillBrown.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill10.png => itemDrillCyan.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill8.png => itemDrillGray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill14.png => itemDrillGreen.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill4.png => itemDrillLightBlue.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill9.png => itemDrillLightGray.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill6.png => itemDrillLime.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill3.png => itemDrillMagenta.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill2.png => itemDrillOrange.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill7.png => itemDrillPink.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill11.png => itemDrillPurple.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill15.png => itemDrillRed.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrill1.png => itemDrillWhite.png} (100%) create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index 3a7b23306..a1a42f789 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -15,6 +15,7 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; import ellpeck.actuallyadditions.config.ConfigValues; import ellpeck.actuallyadditions.inventory.GuiHandler; import ellpeck.actuallyadditions.util.ItemUtil; @@ -232,7 +233,7 @@ public class ItemDrill extends ItemEnergy{ public void registerIcons(IIconRegister iconReg){ this.allDemDamnIconsMaan = new IIcon[16]; for(int i = 0; i < this.allDemDamnIconsMaan.length; i++){ - this.allDemDamnIconsMaan[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+(i+1)); + this.allDemDamnIconsMaan[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+TheColoredLampColors.values()[i].name); } } diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png deleted file mode 100644 index b349c9008a063c21825b31ac5e75f257b3b6179b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)WFU8GbZ8()Nlj2>E@cM*00IF?L_t(I%e|9PNK;`H z$A90wcW(2hMuJJ;s#$7gh~&d48%i;P%|IhiLIR1XRuKw4NR03)D2S++e8_x>AWEVh zmJg9BBtAKYNF+$gltztoc)NFV`+6x!W}!WFp3cMh|2XIT&k_7%G!4|q<(P%CS>cff z)v~^~Ty{2Hz*&-q*oeq;t3rN{r`TGl({Zem&*nTsqhW^6P73XB!usBFX?{)9*3ynm z*qJwHu`3RCI9x1F8vv{esJrf#YM$W4sb=EV0ybeMU)8ZI4g?C1-t;kXb4CEUJLvK4 zm0dGB&h2&zZAI)WsAb-qMN>5PY^h=@86lm_tk$mqobl|IPo^_OV@b}vQyKmeCSTRj zgbh`wSQ!g5Yp}As4xrmxCP(9f=0Ok7W)-5bB(3)hUdNwPS+JkUr3sRmMMhq}XT0a5 z$N{8NX->MbylNRE@EgQ`H^I|bKW5h8TPlIf$TcIYzmnqGh8tZquuZXee1DF>pobTI zF^Uz7#wmrjOCZ{cuHlrw@hy8Sx$GfORu*<^1tE-8W)O9#00000NkvXXu0mjf DlIb7w diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill16.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlack.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill16.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlack.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill12.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill12.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill13.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBrown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill13.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBrown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill10.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillCyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill10.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillCyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill8.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillGray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill8.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillGray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill14.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillGreen.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill14.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillGreen.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill4.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightBlue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill4.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightBlue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill9.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightGray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill9.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightGray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill6.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill6.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill3.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillMagenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill3.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillMagenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill2.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillOrange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill2.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillOrange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill7.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill7.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillPink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill11.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill11.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill15.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillRed.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill15.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillRed.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill1.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillWhite.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill1.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillWhite.png diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png new file mode 100644 index 0000000000000000000000000000000000000000..30a6cac8a5a747f86f1b79acf3ace76e39fb3b24 GIT binary patch literal 511 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra3;_`s zCLaP?-2eap7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ssT}ebiR5(v# zAQx=i#`%BhH1_{cF7aUXTF(EICbR#4|GxJBy7e5y88CM)`~T(^Hn4`b?~4DwdKE&P zW{^!ab!`9Nyh;B5`c2ONXD{5rHotpU`M<3lkMp~F*uc(w`6}@Li@;jy8l6bMYs6_P&0_Va4`hdfkz?!fb0&)q+W>6SRo`S>w zUfv%6FBO{n@9|c_YRH9)T>p!US+HyN25O#`XeYZfUhDtyETjK@KB`y^$<1TMZa`RA zFkIqduHpYHMJE5J2dMp5Q$`p9iXEsD>>wvQ8?N9~hVK8%1;${TL9ybdA%R~r4Aj-t z!4*2&S^WnEEGTxMLd1dS*vS8Ob~dDGA|Eg?002H<3?=8yXD|Q&002ovPDHLkV1lK} B;phMW literal 0 HcmV?d00001