From fc11db09cc8f1b8381944c30f496eb43a6aa42b0 Mon Sep 17 00:00:00 2001 From: Gig Date: Fri, 15 May 2015 17:05:18 +0100 Subject: [PATCH] Added bucket textures to items --- .../techreborn/items/tools/ItemFluidbucket.java | 2 +- .../bucket/{berylium.png => bucketberylium.png} | Bin ...erylium.png.mcmeta => bucketberylium.png.mcmeta} | 0 .../items/bucket/{calcium.png => bucketcalcium.png} | Bin ...{calcium.png.mcmeta => bucketcalcium.png.mcmeta} | 0 ...ciumcarbonate.png => bucketcalciumcarbonate.png} | Bin ...png.mcmeta => bucketcalciumcarbonate.png.mcmeta} | 0 .../bucket/{chlorite.png => bucketchlorite.png} | Bin ...hlorite.png.mcmeta => bucketchlorite.png.mcmeta} | 0 .../bucket/{deuterium.png => bucketdeuterium.png} | Bin .../bucket/{glyceryl.png => bucketglyceryl.png} | Bin ...lyceryl.png.mcmeta => bucketglyceryl.png.mcmeta} | 0 .../items/bucket/{helium.png => buckethelium.png} | Bin .../bucket/{helium-3.png => buckethelium3.png} | Bin .../{heliumplasma.png => bucketheliumplasma.png} | Bin ...sma.png.mcmeta => bucketheliumplasma.png.mcmeta} | 0 .../bucket/{hydrogen.png => buckethydrogen.png} | Bin .../items/bucket/{lithium.png => bucketlithium.png} | Bin ...{lithium.png.mcmeta => bucketlithium.png.mcmeta} | 0 .../items/bucket/{mercury.png => bucketmercury.png} | Bin ...{mercury.png.mcmeta => bucketmercury.png.mcmeta} | 0 .../items/bucket/{methane.png => bucketmethane.png} | Bin .../{nitrocoalfuel.png => bucketnitrocoalfuel.png} | Bin ...el.png.mcmeta => bucketnitrocoalfuel.png.mcmeta} | 0 .../bucket/{nitrofuel.png => bucketnitrofuel.png} | Bin ...rofuel.png.mcmeta => bucketnitrofuel.png.mcmeta} | 0 .../bucket/{nitrogen.png => bucketnitrogen.png} | Bin ...itrogendioxide.png => bucketnitrogendioxide.png} | Bin .../bucket/{potassium.png => bucketpotassium.png} | Bin ...assium.png.mcmeta => bucketpotassium.png.mcmeta} | 0 .../items/bucket/{silicon.png => bucketsilicon.png} | Bin ...{silicon.png.mcmeta => bucketsilicon.png.mcmeta} | 0 .../items/bucket/{sodium.png => bucketsodium.png} | Bin .../{sodium.png.mcmeta => bucketsodium.png.mcmeta} | 0 ...iumpersulfate.png => bucketsodiumpersulfate.png} | Bin ...png.mcmeta => bucketsodiumpersulfate.png.mcmeta} | 0 .../items/bucket/{tritium.png => buckettritium.png} | Bin .../bucket/{wolframium.png => bucketwolframium.png} | Bin ...amium.png.mcmeta => bucketwolframium.png.mcmeta} | 0 39 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/assets/techreborn/textures/items/bucket/{berylium.png => bucketberylium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{berylium.png.mcmeta => bucketberylium.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{calcium.png => bucketcalcium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{calcium.png.mcmeta => bucketcalcium.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{calciumcarbonate.png => bucketcalciumcarbonate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{calciumcarbonate.png.mcmeta => bucketcalciumcarbonate.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{chlorite.png => bucketchlorite.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{chlorite.png.mcmeta => bucketchlorite.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{deuterium.png => bucketdeuterium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{glyceryl.png => bucketglyceryl.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{glyceryl.png.mcmeta => bucketglyceryl.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{helium.png => buckethelium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{helium-3.png => buckethelium3.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{heliumplasma.png => bucketheliumplasma.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{heliumplasma.png.mcmeta => bucketheliumplasma.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{hydrogen.png => buckethydrogen.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{lithium.png => bucketlithium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{lithium.png.mcmeta => bucketlithium.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{mercury.png => bucketmercury.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{mercury.png.mcmeta => bucketmercury.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{methane.png => bucketmethane.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrocoalfuel.png => bucketnitrocoalfuel.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrocoalfuel.png.mcmeta => bucketnitrocoalfuel.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrofuel.png => bucketnitrofuel.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrofuel.png.mcmeta => bucketnitrofuel.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrogen.png => bucketnitrogen.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{nitrogendioxide.png => bucketnitrogendioxide.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{potassium.png => bucketpotassium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{potassium.png.mcmeta => bucketpotassium.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{silicon.png => bucketsilicon.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{silicon.png.mcmeta => bucketsilicon.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{sodium.png => bucketsodium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{sodium.png.mcmeta => bucketsodium.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{sodiumpersulfate.png => bucketsodiumpersulfate.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{sodiumpersulfate.png.mcmeta => bucketsodiumpersulfate.png.mcmeta} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{tritium.png => buckettritium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{wolframium.png => bucketwolframium.png} (100%) rename src/main/resources/assets/techreborn/textures/items/bucket/{wolframium.png.mcmeta => bucketwolframium.png.mcmeta} (100%) diff --git a/src/main/java/techreborn/items/tools/ItemFluidbucket.java b/src/main/java/techreborn/items/tools/ItemFluidbucket.java index 5120bf6f1..39a4253ee 100644 --- a/src/main/java/techreborn/items/tools/ItemFluidbucket.java +++ b/src/main/java/techreborn/items/tools/ItemFluidbucket.java @@ -32,7 +32,7 @@ public class ItemFluidbucket extends ItemBucket{ @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("techreborn:" + iconName); + this.itemIcon = par1IconRegister.registerIcon("techreborn:bucket/" + iconName); } } diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/berylium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketberylium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/berylium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketberylium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/berylium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketberylium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/berylium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketberylium.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/calcium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketcalcium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/calcium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketcalcium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/calcium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketcalcium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/calcium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketcalcium.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/calciumcarbonate.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketcalciumcarbonate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/calciumcarbonate.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketcalciumcarbonate.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/calciumcarbonate.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketcalciumcarbonate.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/calciumcarbonate.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketcalciumcarbonate.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/chlorite.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketchlorite.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/chlorite.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketchlorite.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/chlorite.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketchlorite.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/chlorite.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketchlorite.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/deuterium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketdeuterium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/deuterium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketdeuterium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/glyceryl.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketglyceryl.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/glyceryl.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketglyceryl.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/glyceryl.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketglyceryl.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/glyceryl.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketglyceryl.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/helium.png b/src/main/resources/assets/techreborn/textures/items/bucket/buckethelium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/helium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/buckethelium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/helium-3.png b/src/main/resources/assets/techreborn/textures/items/bucket/buckethelium3.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/helium-3.png rename to src/main/resources/assets/techreborn/textures/items/bucket/buckethelium3.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/heliumplasma.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketheliumplasma.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/heliumplasma.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketheliumplasma.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/heliumplasma.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketheliumplasma.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/heliumplasma.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketheliumplasma.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/hydrogen.png b/src/main/resources/assets/techreborn/textures/items/bucket/buckethydrogen.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/hydrogen.png rename to src/main/resources/assets/techreborn/textures/items/bucket/buckethydrogen.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/lithium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketlithium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/lithium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketlithium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/lithium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketlithium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/lithium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketlithium.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/mercury.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketmercury.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/mercury.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketmercury.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/mercury.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketmercury.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/mercury.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketmercury.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/methane.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketmethane.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/methane.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketmethane.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrocoalfuel.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrocoalfuel.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrocoalfuel.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrocoalfuel.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrocoalfuel.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrocoalfuel.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrocoalfuel.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrocoalfuel.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrofuel.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrofuel.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrofuel.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrofuel.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrofuel.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrofuel.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrofuel.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrofuel.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrogen.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrogen.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrogen.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrogen.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/nitrogendioxide.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrogendioxide.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/nitrogendioxide.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketnitrogendioxide.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/potassium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketpotassium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/potassium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketpotassium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/potassium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketpotassium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/potassium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketpotassium.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/silicon.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsilicon.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/silicon.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsilicon.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/silicon.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsilicon.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/silicon.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsilicon.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/sodium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsodium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/sodium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsodium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/sodium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsodium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/sodium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsodium.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/sodiumpersulfate.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsodiumpersulfate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/sodiumpersulfate.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsodiumpersulfate.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/sodiumpersulfate.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketsodiumpersulfate.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/sodiumpersulfate.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketsodiumpersulfate.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/tritium.png b/src/main/resources/assets/techreborn/textures/items/bucket/buckettritium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/tritium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/buckettritium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/wolframium.png b/src/main/resources/assets/techreborn/textures/items/bucket/bucketwolframium.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/wolframium.png rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketwolframium.png diff --git a/src/main/resources/assets/techreborn/textures/items/bucket/wolframium.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/bucket/bucketwolframium.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/bucket/wolframium.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/bucket/bucketwolframium.png.mcmeta