From 791b6cdaaaf16340cb4112ffdb23b8b3205d7d78 Mon Sep 17 00:00:00 2001 From: tcooc Date: Mon, 30 Sep 2013 18:07:41 -0400 Subject: [PATCH] Pipe icon handling. --- additionalpipes/textures/APPipeIconProvider.java | 2 +- .../textures/blocks/{pipes => }/0.png | Bin .../textures/blocks/{pipes => }/1.png | Bin .../textures/blocks/{pipes => }/10.png | Bin .../textures/blocks/{pipes => }/11.png | Bin .../textures/blocks/{pipes => }/12.png | Bin .../textures/blocks/{pipes => }/13.png | Bin .../textures/blocks/{pipes => }/14.png | Bin .../textures/blocks/{pipes => }/15.png | Bin .../textures/blocks/{pipes => }/16.png | Bin .../textures/blocks/{pipes => }/17.png | Bin .../textures/blocks/{pipes => }/18.png | Bin .../textures/blocks/{pipes => }/19.png | Bin .../textures/blocks/{pipes => }/2.png | Bin .../textures/blocks/{pipes => }/20.png | Bin .../textures/blocks/{pipes => }/21.png | Bin .../textures/blocks/{pipes => }/22.png | Bin .../textures/blocks/{pipes => }/23.png | Bin .../textures/blocks/{pipes => }/24.png | Bin .../textures/blocks/{pipes => }/3.png | Bin .../textures/blocks/{pipes => }/4.png | Bin .../textures/blocks/{pipes => }/5.png | Bin .../textures/blocks/{pipes => }/6.png | Bin .../textures/blocks/{pipes => }/7.png | Bin .../textures/blocks/{pipes => }/8.png | Bin .../textures/blocks/{pipes => }/9.png | Bin 26 files changed, 1 insertion(+), 1 deletion(-) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/0.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/1.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/10.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/11.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/12.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/13.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/14.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/15.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/16.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/17.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/18.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/19.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/2.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/20.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/21.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/22.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/23.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/24.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/3.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/4.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/5.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/6.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/7.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/8.png (100%) rename resources/assets/additionalpipes/textures/blocks/{pipes => }/9.png (100%) diff --git a/additionalpipes/textures/APPipeIconProvider.java b/additionalpipes/textures/APPipeIconProvider.java index b921aa3..7cd4efb 100644 --- a/additionalpipes/textures/APPipeIconProvider.java +++ b/additionalpipes/textures/APPipeIconProvider.java @@ -27,7 +27,7 @@ public Icon getIcon(int iconIndex) { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { for(int i = 0; i < iconCount; i++) { - icons[i] = iconRegister.registerIcon("additionalpipes:pipes/" + i); + icons[i] = iconRegister.registerIcon("additionalpipes:" + i); } } diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/0.png b/resources/assets/additionalpipes/textures/blocks/0.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/0.png rename to resources/assets/additionalpipes/textures/blocks/0.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/1.png b/resources/assets/additionalpipes/textures/blocks/1.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/1.png rename to resources/assets/additionalpipes/textures/blocks/1.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/10.png b/resources/assets/additionalpipes/textures/blocks/10.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/10.png rename to resources/assets/additionalpipes/textures/blocks/10.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/11.png b/resources/assets/additionalpipes/textures/blocks/11.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/11.png rename to resources/assets/additionalpipes/textures/blocks/11.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/12.png b/resources/assets/additionalpipes/textures/blocks/12.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/12.png rename to resources/assets/additionalpipes/textures/blocks/12.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/13.png b/resources/assets/additionalpipes/textures/blocks/13.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/13.png rename to resources/assets/additionalpipes/textures/blocks/13.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/14.png b/resources/assets/additionalpipes/textures/blocks/14.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/14.png rename to resources/assets/additionalpipes/textures/blocks/14.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/15.png b/resources/assets/additionalpipes/textures/blocks/15.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/15.png rename to resources/assets/additionalpipes/textures/blocks/15.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/16.png b/resources/assets/additionalpipes/textures/blocks/16.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/16.png rename to resources/assets/additionalpipes/textures/blocks/16.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/17.png b/resources/assets/additionalpipes/textures/blocks/17.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/17.png rename to resources/assets/additionalpipes/textures/blocks/17.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/18.png b/resources/assets/additionalpipes/textures/blocks/18.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/18.png rename to resources/assets/additionalpipes/textures/blocks/18.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/19.png b/resources/assets/additionalpipes/textures/blocks/19.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/19.png rename to resources/assets/additionalpipes/textures/blocks/19.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/2.png b/resources/assets/additionalpipes/textures/blocks/2.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/2.png rename to resources/assets/additionalpipes/textures/blocks/2.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/20.png b/resources/assets/additionalpipes/textures/blocks/20.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/20.png rename to resources/assets/additionalpipes/textures/blocks/20.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/21.png b/resources/assets/additionalpipes/textures/blocks/21.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/21.png rename to resources/assets/additionalpipes/textures/blocks/21.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/22.png b/resources/assets/additionalpipes/textures/blocks/22.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/22.png rename to resources/assets/additionalpipes/textures/blocks/22.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/23.png b/resources/assets/additionalpipes/textures/blocks/23.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/23.png rename to resources/assets/additionalpipes/textures/blocks/23.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/24.png b/resources/assets/additionalpipes/textures/blocks/24.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/24.png rename to resources/assets/additionalpipes/textures/blocks/24.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/3.png b/resources/assets/additionalpipes/textures/blocks/3.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/3.png rename to resources/assets/additionalpipes/textures/blocks/3.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/4.png b/resources/assets/additionalpipes/textures/blocks/4.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/4.png rename to resources/assets/additionalpipes/textures/blocks/4.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/5.png b/resources/assets/additionalpipes/textures/blocks/5.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/5.png rename to resources/assets/additionalpipes/textures/blocks/5.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/6.png b/resources/assets/additionalpipes/textures/blocks/6.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/6.png rename to resources/assets/additionalpipes/textures/blocks/6.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/7.png b/resources/assets/additionalpipes/textures/blocks/7.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/7.png rename to resources/assets/additionalpipes/textures/blocks/7.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/8.png b/resources/assets/additionalpipes/textures/blocks/8.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/8.png rename to resources/assets/additionalpipes/textures/blocks/8.png diff --git a/resources/assets/additionalpipes/textures/blocks/pipes/9.png b/resources/assets/additionalpipes/textures/blocks/9.png similarity index 100% rename from resources/assets/additionalpipes/textures/blocks/pipes/9.png rename to resources/assets/additionalpipes/textures/blocks/9.png