diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 0c3d481fd7f..1190fbb18c1 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -145,7 +145,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < this.icons.length; i++) { - this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "particle/new/" + i); + this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":particle/" + i); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java index e82e6f1b44e..84cb087e1c3 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -15,11 +15,10 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.Utils; public class ItemAirFilter extends Item { - public IIcon[] icons = new IIcon[1]; + public IIcon[] icons = new IIcon[2]; public ItemAirFilter() { super(); @@ -33,12 +32,13 @@ public ItemAirFilter() { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemAirFilter"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter1"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter2"); } @Override public IIcon getIconFromDamage(int meta) { - return this.icons[0]; + return this.icons[meta]; } @Override @@ -60,7 +60,7 @@ public String getItemStackDisplayName(final ItemStack tItem) { return "Air Filter"; } - String itemName = tItem == null ? "Air Filter" : super.getItemStackDisplayName(tItem); + String itemName = "Air Filter"; String suffixName = ""; if (tItem.getItemDamage() == 0) { suffixName = " [Tier 1]"; @@ -70,15 +70,6 @@ public String getItemStackDisplayName(final ItemStack tItem) { return (itemName + suffixName); } - @Override - public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - int meta = stack.getItemDamage(); - if (meta == 1) { - HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35); - } - return HEX_OxFFFFFF; - } - private static boolean createNBT(ItemStack rStack) { final NBTTagCompound tagMain = new NBTTagCompound(); final NBTTagCompound tagNBT = new NBTTagCompound(); @@ -88,11 +79,11 @@ private static boolean createNBT(ItemStack rStack) { return true; } - public static final long getFilterMaxDamage(final ItemStack aStack) { + public static long getFilterMaxDamage(final ItemStack aStack) { return aStack.getItemDamage() == 0 ? 50 : 2500; } - public static final long getFilterDamage(final ItemStack aStack) { + public static long getFilterDamage(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("AirFilter"); @@ -105,7 +96,7 @@ public static final long getFilterDamage(final ItemStack aStack) { return 0L; } - public static final boolean setFilterDamage(final ItemStack aStack, final long aDamage) { + public static boolean setFilterDamage(final ItemStack aStack, final long aDamage) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("AirFilter"); @@ -124,8 +115,7 @@ public double getDurabilityForDisplay(ItemStack stack) { } double currentDamage = getFilterDamage(stack); double meta = getFilterMaxDamage(stack); - double durabilitypercent = currentDamage / meta; - return durabilitypercent; + return currentDamage / meta; } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java index 8efcfe6912c..abba629e278 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java @@ -13,11 +13,10 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.Utils; public class ItemBoilerChassis extends Item { - public IIcon[] icons = new IIcon[1]; + public IIcon[] icons = new IIcon[3]; public ItemBoilerChassis() { super(); @@ -30,12 +29,14 @@ public ItemBoilerChassis() { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBoilerChassis"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis1"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis2"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis3"); } @Override public IIcon getIconFromDamage(int meta) { - return this.icons[0]; + return this.icons[meta]; } @Override @@ -54,19 +55,4 @@ public String getUnlocalizedName(ItemStack stack) { public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector.translateToLocalFormatted("item.itemBoilerChassis.name", tItem.getItemDamage()); } - - @Override // TODO - public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - int meta = stack.getItemDamage(); - if (meta == 0) { - HEX_OxFFFFFF = Utils.rgbtoHexValue(10, 110, 30); - } else if (meta == 1) { - HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35); - } else if (meta == 2) { - HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 85, 40); - } else if (meta == 3) { - HEX_OxFFFFFF = Utils.rgbtoHexValue(255, 100, 50); - } - return HEX_OxFFFFFF; - } } diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index 820486b742f..c1776ca1f74 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java @@ -30,10 +30,10 @@ public ItemDehydratorCoilWire() { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_0"); - this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_1"); - this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_2"); - this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":/itemDehydratorCoilWire_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":/itemDehydratorCoilWire_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":/itemDehydratorCoilWire_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":/itemDehydratorCoilWire_3"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 9b04cf04cc4..526f0698dc7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -310,10 +310,6 @@ public ResourceLocation getTextureFile() { public static final CustomIcon Overlay_Machine_Screen_Logo = new CustomIcon("TileEntities/adv_machine_screen_logo"); // Machine Controller Overlays - // public static final CustomIcon Overlay_Machine_Controller_Default = new CustomIcon( - // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED"); - // public static final CustomIcon Overlay_Machine_Controller_Default_Active = new CustomIcon( - // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE"); // oMCD = Overlay_Machine_Controller_Default public static final CustomIcon oMCDSolarTower = new CustomIcon("iconsets/controllerFaces/solarTower"); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png index f24a6a173b6..da288cc60d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png index ed91d3d5911..db498f9f454 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png index 13b37c999de..5494291826e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png index 3fd53829263..3c84610fe07 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png index ffd9d4893b4..11488d4f048 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png index a08018f5617..01ccda10a66 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png index 5bc352238fb..0e25ad293b7 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png index 32b6735a0d9..734f727c60c 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png b/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png deleted file mode 100644 index 97dbb4049ee..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png index cedee004e4b..6e43322faf8 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png index 57d77be16a5..fec9988e54f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png index 51bb4587d90..abfcad95609 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png index 2cdf37adad1..0de908aa4c2 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png index c98e2d6319e..4031af48638 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png index af0bcc7064c..c53a03cfb85 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png deleted file mode 100644 index da4b975517b..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png new file mode 100644 index 00000000000..e1923660b5e Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png new file mode 100644 index 00000000000..9d75ce6aa35 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png index 62de905fb92..20bd1f90eb7 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png and b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png index 593ba0ac174..c8453c46b99 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png and b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png deleted file mode 100644 index 1ac3bff8188..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png new file mode 100644 index 00000000000..cf44b0e5af9 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png new file mode 100644 index 00000000000..33f9f442de2 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png new file mode 100644 index 00000000000..cf29977a8c3 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png deleted file mode 100644 index c7a849556f2..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png deleted file mode 100644 index 8687d1c8caa..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_0.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_0.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_1.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_1.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_2.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_2.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_3.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_3.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_0.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_0.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_1.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_1.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_2.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_2.png diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_3.png similarity index 100% rename from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png rename to src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_3.png diff --git a/src/main/resources/assets/miscutils/textures/items/particle/0.png b/src/main/resources/assets/miscutils/textures/items/particle/0.png index a0a32d45086..3fe49c3a57e 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/0.png and b/src/main/resources/assets/miscutils/textures/items/particle/0.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/1.png b/src/main/resources/assets/miscutils/textures/items/particle/1.png index 4eddfa17275..39ffa85711b 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/1.png and b/src/main/resources/assets/miscutils/textures/items/particle/1.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/10.png b/src/main/resources/assets/miscutils/textures/items/particle/10.png index 09eee049a99..18ded814cf4 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/10.png and b/src/main/resources/assets/miscutils/textures/items/particle/10.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/11.png b/src/main/resources/assets/miscutils/textures/items/particle/11.png index 7f636919b68..b7e191c79f1 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/11.png and b/src/main/resources/assets/miscutils/textures/items/particle/11.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/12.png b/src/main/resources/assets/miscutils/textures/items/particle/12.png index 4e9504b03f9..49feb199e0e 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/12.png and b/src/main/resources/assets/miscutils/textures/items/particle/12.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/13.png b/src/main/resources/assets/miscutils/textures/items/particle/13.png index d929480c16e..b70178d3151 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/13.png and b/src/main/resources/assets/miscutils/textures/items/particle/13.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/14.png b/src/main/resources/assets/miscutils/textures/items/particle/14.png index 7338066c1a1..77741644ed0 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/14.png and b/src/main/resources/assets/miscutils/textures/items/particle/14.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/15.png b/src/main/resources/assets/miscutils/textures/items/particle/15.png index 189a3127d9b..d48096c85c6 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/15.png and b/src/main/resources/assets/miscutils/textures/items/particle/15.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/16.png b/src/main/resources/assets/miscutils/textures/items/particle/16.png index 8824201ff39..cef33d17fde 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/16.png and b/src/main/resources/assets/miscutils/textures/items/particle/16.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/17.png b/src/main/resources/assets/miscutils/textures/items/particle/17.png index edea5115c03..4b752e7a9a8 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/17.png and b/src/main/resources/assets/miscutils/textures/items/particle/17.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/18.png b/src/main/resources/assets/miscutils/textures/items/particle/18.png index d3e63562d70..23fdb190c7c 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/18.png and b/src/main/resources/assets/miscutils/textures/items/particle/18.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/19.png b/src/main/resources/assets/miscutils/textures/items/particle/19.png index 43f9278b2c1..94e2a856c9d 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/19.png and b/src/main/resources/assets/miscutils/textures/items/particle/19.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/2.png b/src/main/resources/assets/miscutils/textures/items/particle/2.png index 292207ae7e1..d86b5b357d5 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/2.png and b/src/main/resources/assets/miscutils/textures/items/particle/2.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/20.png b/src/main/resources/assets/miscutils/textures/items/particle/20.png index 0e2ce235652..d7cbdb8f455 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/20.png and b/src/main/resources/assets/miscutils/textures/items/particle/20.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/21.png b/src/main/resources/assets/miscutils/textures/items/particle/21.png index 758fa469414..2531eaff524 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/21.png and b/src/main/resources/assets/miscutils/textures/items/particle/21.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/22.png b/src/main/resources/assets/miscutils/textures/items/particle/22.png index 08bda97b665..d594dc4be8c 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/22.png and b/src/main/resources/assets/miscutils/textures/items/particle/22.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/23.png b/src/main/resources/assets/miscutils/textures/items/particle/23.png index 9ba21b22ebb..d96dd2b000e 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/23.png and b/src/main/resources/assets/miscutils/textures/items/particle/23.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/24.png b/src/main/resources/assets/miscutils/textures/items/particle/24.png index bc6aec88549..56067466ad1 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/24.png and b/src/main/resources/assets/miscutils/textures/items/particle/24.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/3.png b/src/main/resources/assets/miscutils/textures/items/particle/3.png index d085b86507e..43438c4ce5f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/3.png and b/src/main/resources/assets/miscutils/textures/items/particle/3.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/4.png b/src/main/resources/assets/miscutils/textures/items/particle/4.png index faf8db05763..8f0db073cd2 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/4.png and b/src/main/resources/assets/miscutils/textures/items/particle/4.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/5.png b/src/main/resources/assets/miscutils/textures/items/particle/5.png index 3a30274238a..40ec84db705 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/5.png and b/src/main/resources/assets/miscutils/textures/items/particle/5.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/6.png b/src/main/resources/assets/miscutils/textures/items/particle/6.png index 8930ce52ef2..c63ad0ba19f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/6.png and b/src/main/resources/assets/miscutils/textures/items/particle/6.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/7.png b/src/main/resources/assets/miscutils/textures/items/particle/7.png index 0581d47446f..aad8c7ca62f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/7.png and b/src/main/resources/assets/miscutils/textures/items/particle/7.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/8.png b/src/main/resources/assets/miscutils/textures/items/particle/8.png index 6bd3c2c682c..c9b908ec613 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/8.png and b/src/main/resources/assets/miscutils/textures/items/particle/8.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/9.png b/src/main/resources/assets/miscutils/textures/items/particle/9.png index 430f1aed3d9..b8e02c82ea2 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/9.png and b/src/main/resources/assets/miscutils/textures/items/particle/9.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/0.png b/src/main/resources/assets/miscutils/textures/items/particle/new/0.png deleted file mode 100644 index 3fe49c3a57e..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/0.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/1.png b/src/main/resources/assets/miscutils/textures/items/particle/new/1.png deleted file mode 100644 index 39ffa85711b..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/10.png b/src/main/resources/assets/miscutils/textures/items/particle/new/10.png deleted file mode 100644 index 18ded814cf4..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/10.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/11.png b/src/main/resources/assets/miscutils/textures/items/particle/new/11.png deleted file mode 100644 index b7e191c79f1..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/11.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/12.png b/src/main/resources/assets/miscutils/textures/items/particle/new/12.png deleted file mode 100644 index 49feb199e0e..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/12.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/13.png b/src/main/resources/assets/miscutils/textures/items/particle/new/13.png deleted file mode 100644 index b70178d3151..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/13.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/14.png b/src/main/resources/assets/miscutils/textures/items/particle/new/14.png deleted file mode 100644 index 77741644ed0..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/14.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/15.png b/src/main/resources/assets/miscutils/textures/items/particle/new/15.png deleted file mode 100644 index d48096c85c6..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/15.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/16.png b/src/main/resources/assets/miscutils/textures/items/particle/new/16.png deleted file mode 100644 index cef33d17fde..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/16.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/17.png b/src/main/resources/assets/miscutils/textures/items/particle/new/17.png deleted file mode 100644 index 4b752e7a9a8..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/17.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/18.png b/src/main/resources/assets/miscutils/textures/items/particle/new/18.png deleted file mode 100644 index 23fdb190c7c..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/18.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/19.png b/src/main/resources/assets/miscutils/textures/items/particle/new/19.png deleted file mode 100644 index 94e2a856c9d..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/19.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/2.png b/src/main/resources/assets/miscutils/textures/items/particle/new/2.png deleted file mode 100644 index d86b5b357d5..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/20.png b/src/main/resources/assets/miscutils/textures/items/particle/new/20.png deleted file mode 100644 index d7cbdb8f455..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/20.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/21.png b/src/main/resources/assets/miscutils/textures/items/particle/new/21.png deleted file mode 100644 index 2531eaff524..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/21.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/22.png b/src/main/resources/assets/miscutils/textures/items/particle/new/22.png deleted file mode 100644 index d594dc4be8c..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/22.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/23.png b/src/main/resources/assets/miscutils/textures/items/particle/new/23.png deleted file mode 100644 index d96dd2b000e..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/23.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/24.png b/src/main/resources/assets/miscutils/textures/items/particle/new/24.png deleted file mode 100644 index 56067466ad1..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/24.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/3.png b/src/main/resources/assets/miscutils/textures/items/particle/new/3.png deleted file mode 100644 index 43438c4ce5f..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/4.png b/src/main/resources/assets/miscutils/textures/items/particle/new/4.png deleted file mode 100644 index 8f0db073cd2..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/5.png b/src/main/resources/assets/miscutils/textures/items/particle/new/5.png deleted file mode 100644 index 40ec84db705..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/5.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/6.png b/src/main/resources/assets/miscutils/textures/items/particle/new/6.png deleted file mode 100644 index c63ad0ba19f..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/7.png b/src/main/resources/assets/miscutils/textures/items/particle/new/7.png deleted file mode 100644 index aad8c7ca62f..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/7.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/8.png b/src/main/resources/assets/miscutils/textures/items/particle/new/8.png deleted file mode 100644 index c9b908ec613..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/8.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/9.png b/src/main/resources/assets/miscutils/textures/items/particle/new/9.png deleted file mode 100644 index b8e02c82ea2..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/particle/new/9.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png index 2d196cb9ed3..f4900c36d7f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png and b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png differ