diff --git a/src/main/java/gregtech/common/blocks/BlockCasings8.java b/src/main/java/gregtech/common/blocks/BlockCasings8.java index 2e8781bca12..400f1aadacd 100644 --- a/src/main/java/gregtech/common/blocks/BlockCasings8.java +++ b/src/main/java/gregtech/common/blocks/BlockCasings8.java @@ -183,6 +183,6 @@ public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, in } } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index c7738751c23..95213c2930d 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -15,7 +15,6 @@ import gregtech.api.enums.Materials; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.Utils; public class IonParticles extends BaseItemParticle { @@ -24,16 +23,17 @@ public class IonParticles extends BaseItemParticle { public static HashMap MetaToNameMap = new HashMap<>(); public IonParticles() { - super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare); + super("Ion", ions.length, EnumRarity.rare); } - public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length]; - public static IIcon baseTexture; + public static final String[] ions = new String[] { "Hydrogen", "Helium" }; + + public IIcon[] texture = new IIcon[ions.length]; static { // Generate Ions int key = 0; - for (String s : MaterialsElements.NAMES) { + for (String s : ions) { // Map names to Meta NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key); MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase())); @@ -60,7 +60,7 @@ public String getUnlocalizedName() { @Override public String getUnlocalizedName(final ItemStack itemStack) { - return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()]; + return "item.particle.ion." + ions[itemStack.getItemDamage()]; } private static boolean createNBT(ItemStack rStack) { @@ -72,7 +72,7 @@ private static boolean createNBT(ItemStack rStack) { return true; } - public static final long getChargeState(final ItemStack aStack) { + public static long getChargeState(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("Ion"); @@ -85,7 +85,7 @@ public static final long getChargeState(final ItemStack aStack) { return 0L; } - public static final boolean setChargeState(final ItemStack aStack, final long aCharge) { + public static boolean setChargeState(final ItemStack aStack, final long aCharge) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("Ion"); @@ -102,8 +102,7 @@ public double getDurabilityForDisplay(ItemStack stack) { if (stack.getTagCompound() == null) { createNBT(stack); } - double chargeState = getChargeState(stack); - return chargeState; + return (double) getChargeState(stack); } @Override @@ -131,23 +130,21 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool + " Ion with a " + aState + " charge state of " - + aCharge - + ""); + + aCharge); } super.addInformation(stack, player, list, bool); } @Override public void registerIcons(IIconRegister reg) { - for (int i = 0; i < IonParticles.overlays.length; i++) { - IonParticles.overlays[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/" + i); + for (int i = 0; i < this.texture.length; i++) { + this.texture[i] = reg.registerIcon(GTPlusPlus.ID + ":ion" + i); } - IonParticles.baseTexture = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/IonBase"); } @Override public IIcon getIconFromDamage(int meta) { - return IonParticles.overlays[meta]; + return this.texture[meta]; } @Override @@ -157,11 +154,7 @@ public boolean requiresMultipleRenderPasses() { @Override public IIcon getIconFromDamageForRenderPass(int aMeta, int aPass) { - if (aPass == 0) { - return IonParticles.baseTexture; - } else { - return IonParticles.overlays[aMeta]; - } + return this.texture[aMeta]; } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 0c3d481fd7f..7e6f57eecda 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -43,8 +43,7 @@ public StandardBaseParticles() { MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase())); for (Particle o : Particle.aMap) { int aColour = 0; - if (o.mParticleName.toLowerCase() - .equals(s.toLowerCase())) { + if (o.mParticleName.equalsIgnoreCase(s)) { if (o.mParticleType == ElementaryGroup.BARYON) { aColour = Utils.rgbtoHexValue(174, 226, 156); aColourMap.put(key++, aColour); @@ -109,7 +108,6 @@ public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { Particle aCharge = getParticle(stack); EnumChatFormatting aColour = EnumChatFormatting.GRAY; - String aState = aColour + "Unknown" + EnumChatFormatting.RESET; if (aCharge != null) { String aGroup = aCharge.mParticleType.name() .toLowerCase(); @@ -130,13 +128,11 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool } else if (aGroup.toLowerCase() .contains("meson")) { aColour = EnumChatFormatting.WHITE; - } else { - aColour = EnumChatFormatting.GRAY; } String aFirstLet = aGroup.substring(0, 1) .toUpperCase(); aGroup = aGroup.replaceFirst(aGroup.substring(0, 1), aFirstLet); - aState = aColour + aGroup + EnumChatFormatting.RESET; + String aState = aColour + aGroup + EnumChatFormatting.RESET; list.add(EnumChatFormatting.GRAY + "Type: " + aState); } super.addInformation(stack, player, list, bool); @@ -145,7 +141,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/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index f23f4c8dce6..9f0370d9936 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java @@ -30,10 +30,10 @@ public ItemDehydratorCoil() { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_0"); - this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_1"); - this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_2"); - this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_3"); } @Override 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..6d22766c877 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 @@ -58,13 +58,4 @@ public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]); } - - /* - * @Override 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,150,50); } return - * HEX_OxFFFFFF; } - */ - } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java index d1fcf3f5c54..e8cc6ee8f76 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java @@ -10,8 +10,6 @@ public final class MaterialsElements { - public static final String[] NAMES = new String[] { "Hydrogen", "Helium" }; - // First 50 Elements public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen); public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium); diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 213ee6b47e4..29c88ca5f4a 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -17,6 +17,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GTLog; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.AlgaeDefinition; import gtPlusPlus.plugin.agrichem.IAlgalItem; @@ -25,7 +26,6 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { protected IIcon base; - protected IIcon overlay; public ItemAlgaeBase() { this.setHasSubtypes(true); @@ -89,8 +89,8 @@ public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList aList.add("Lifespan in days: " + mLifespan); aList.add("Generation: " + mGeneration); } - } catch (Throwable t) { - t.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(GTLog.err); } super.addInformation(aStack, p_77624_2_, aList, p_77624_4_); } @@ -149,16 +149,12 @@ public int getColorFromItemStack(ItemStack aStack, int aMeta) { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (pass == 0) { - return this.base; - } - return this.overlay; + return this.base; } @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae"); - this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":bioscience/BasicAlgae"); } public static ItemStack initNBT(ItemStack aFreshAlgae) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java index dc0b4a5dd6e..e3f264ee84d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java @@ -147,7 +147,7 @@ public ITexture[] getBack(final byte aColor) { } public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Sterile_Casing) }; } public ITexture[] getTop(final byte aColor) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index 7c65de73bdd..96fad17286a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -31,15 +30,6 @@ public static class SpecialCasingItemBlock extends GregtechMetaCasingItems { public SpecialCasingItemBlock(Block par1) { super(par1); } - - @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - int aMeta = aStack.getItemDamage(); - if (aMeta < 10) { - // aList.add("Tier: "+GT_Values.VN[aMeta]); - } - super.addInformation(aStack, aPlayer, aList, aF3_H); - } } public GregtechMetaSpecialMachineCasings() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index dba95455c8a..d3838099727 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -30,10 +30,6 @@ public SpecialCasingItemBlock(Block par1) { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - int aMeta = aStack.getItemDamage(); - if (aMeta < 10) { - // aList.add("Tier: "+GT_Values.VN[aMeta]); - } super.addInformation(aStack, aPlayer, aList, aF3_H); } } @@ -97,9 +93,9 @@ public static IIcon getStaticIcon(final int ordinalSide, final byte aMeta) { return switch (aMeta) { case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon(); case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); - case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon(); case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon(); case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java index 50780c5809d..100b7833d6b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java @@ -71,14 +71,6 @@ public IIcon getIcon(int ordinalSide, int aMeta) { if (aMeta < 10) { return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon(); } - return switch (aMeta) { - case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); - }; + return Textures.BlockIcons.RENDERING_ERROR.getIcon(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index 1da572fb359..dd205136bf4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -59,7 +59,7 @@ public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture return Textures.BlockIcons.RENDERING_ERROR.getIcon(); } case 15 -> { - return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon(); + return TexturesGtBlock.Sterile_Casing.getIcon(); } default -> { return TexturesGtBlock.Overlay_UU_Matter.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index f4d3d22aba4..0defa80e6c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -8,56 +8,10 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; public class TexturesCentrifugeMultiblock { - private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1"); - private static CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1"); - private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2"); - private static CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2"); - private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3"); - private static CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3"); - private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4"); - private static CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4"); - private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5"); - private static CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5"); - private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6"); - private static CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6"); - private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7"); - private static CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7"); - private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8"); - private static CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8"); - private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9"); - private static CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9"); - - private static CustomIcon frontFace_0 = (GT8_1); - private static CustomIcon frontFaceActive_0 = (GT8_1_Active); - private static CustomIcon frontFace_1 = (GT8_2); - private static CustomIcon frontFaceActive_1 = (GT8_2_Active); - private static CustomIcon frontFace_2 = (GT8_3); - private static CustomIcon frontFaceActive_2 = (GT8_3_Active); - private static CustomIcon frontFace_3 = (GT8_4); - private static CustomIcon frontFaceActive_3 = (GT8_4_Active); - private static CustomIcon frontFace_4 = (GT8_5); - private static CustomIcon frontFaceActive_4 = (GT8_5_Active); - private static CustomIcon frontFace_5 = (GT8_6); - private static CustomIcon frontFaceActive_5 = (GT8_6_Active); - private static CustomIcon frontFace_6 = (GT8_7); - private static CustomIcon frontFaceActive_6 = (GT8_7_Active); - private static CustomIcon frontFace_7 = (GT8_8); - private static CustomIcon frontFaceActive_7 = (GT8_8_Active); - private static CustomIcon frontFace_8 = (GT8_9); - private static CustomIcon frontFaceActive_8 = (GT8_9_Active); - - CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, - frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; - - CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2, - frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7, - frontFaceActive_8 }; - public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) { return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, side, thisBlock); @@ -143,9 +97,9 @@ public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) { public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) { if (isUsingAnimatedTexture(aMetaTileEntity)) { if (isCentrifugeRunning(aMetaTileEntity)) { - return this.CENTRIFUGE_ACTIVE[aIndex].getIcon(); + return TexturesGtBlock.CENTRIFUGEACTIVE[aIndex].getIcon(); } } - return this.CENTRIFUGE[aIndex].getIcon(); + return TexturesGtBlock.CENTRIFUGE[aIndex].getIcon(); } } 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 a0ee2891a2a..2f87a3b6fb9 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 @@ -157,33 +157,33 @@ public ResourceLocation getTextureFile() { // spotless:off public static final CustomIcon Casing_Coil_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon( - "NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); + "qft/NeutronPulseManipulator") : new CustomIcon("qft/NeutronPulseManipulatorStatic"); public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon( - "CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic"); + "qft/CosmicFabricManipulator") : new CustomIcon("qft/CosmicFabricManipulatorStatic"); public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon( - "InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic"); + "qft/InfinityInfusedManipulator") : new CustomIcon("qft/InfinityInfusedManipulatorStatic"); public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon( - "SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic"); - public static final CustomIcon Manipulator_Top = new CustomIcon("Manipulator_Top"); + "qft/SpaceTimeContinuumRipper") : new CustomIcon("qft/SpaceTimeContinuumRipperStatic"); + public static final CustomIcon Manipulator_Top = new CustomIcon("qft/Manipulator_Top"); public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon( - "NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic"); + "qft/NeutronShieldingCore") : new CustomIcon("qft/NeutronShieldingCoreStatic"); public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon( - "CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic"); + "qft/CosmicFabricShieldingCore") : new CustomIcon("qft/CosmicFabricShieldingCoreStatic"); public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon( - "InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic"); + "qft/InfinityInfusedShieldingCore") : new CustomIcon("qft/InfinityInfusedShieldingCoreStatic"); public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon( - "SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic"); - public static final CustomIcon ForceFieldGlass = new CustomIcon("ForceFieldGlass"); - public static final CustomIcon ForceField = new CustomIcon("rendering/ForceField"); - public static final CustomIcon Blank = new CustomIcon("Blank"); + "qft/SpaceTimeBendingCore") : new CustomIcon("qft/SpaceTimeBendingCoreStatic"); + public static final CustomIcon ForceFieldGlass = new CustomIcon("qft/ForceFieldGlass"); + public static final CustomIcon ForceField = new CustomIcon("qft/ForceField"); + public static final CustomIcon Blank = new CustomIcon("qft/blank"); //spotless:on // MACHINE_CASING_FARM_MANAGER_STRUCTURAL // Farm Manager Casings public static final CustomIcon Casing_Machine_Farm_Manager = new CustomIcon( "TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); - // Acacia_Log - public static final CustomIcon Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top"); + // Sterile Casing + public static final CustomIcon Sterile_Casing = new CustomIcon("TileEntities/sterileCasing"); // Podzol Top public static final CustomIcon Casing_Machine_Podzol = new CustomIcon("TileEntities/dirt_podzol_top"); @@ -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"); @@ -562,6 +558,25 @@ public ResourceLocation getTextureFile() { public static final CustomIcon TEXTURE_TECH_B = new CustomIcon("metro/TEXTURE_TECH_B"); public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C"); + private static final CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1"); + private static final CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1"); + private static final CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2"); + private static final CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2"); + private static final CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3"); + private static final CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3"); + private static final CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4"); + private static final CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4"); + private static final CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5"); + private static final CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5"); + private static final CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6"); + private static final CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6"); + private static final CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7"); + private static final CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7"); + private static final CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8"); + private static final CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8"); + private static final CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9"); + private static final CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9"); + public static final CustomIcon TEXTURE_TECH_PANEL_D = new CustomIcon("metro/TEXTURE_TECH_PANEL_D"); public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H"); @@ -593,4 +608,10 @@ public ResourceLocation getTextureFile() { TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV, TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV, TEXTURE_CASING_TIERED_MAX }; + + public static IIconContainer[] CENTRIFUGE = new IIconContainer[] { GT8_1, GT8_2, GT8_3, GT8_4, GT8_5, GT8_6, GT8_7, + GT8_8, GT8_9 }; + + public static IIconContainer[] CENTRIFUGEACTIVE = new IIconContainer[] { GT8_1_Active, GT8_2_Active, GT8_3_Active, + GT8_4_Active, GT8_5_Active, GT8_6_Active, GT8_7_Active, GT8_8_Active, GT8_9_Active }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java index 31450cc303c..93ec17e6eaf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java @@ -14,10 +14,8 @@ import org.jetbrains.annotations.NotNull; import gregtech.api.enums.Materials; -import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; @@ -26,7 +24,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.TurbineStatCalculator; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") public class MTELargeTurbineGas extends MTELargerTurbineBase { @@ -200,14 +197,4 @@ protected String getTurbineType() { protected String getCasingName() { return "Reinforced Gas Turbine Casing"; } - - @Override - protected ITexture getTextureFrontFace() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); - } - - @Override - protected ITexture getTextureFrontFaceActive() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java index a608cbfc077..fddacc56627 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java @@ -7,16 +7,13 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Materials; -import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.render.TextureFactory; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; import gregtech.api.util.TurbineStatCalculator; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class MTELargeTurbineSCSteam extends MTELargerTurbineBase { @@ -160,14 +157,4 @@ protected String getTurbineType() { protected String getCasingName() { return "Reinforced SC Turbine Casing"; } - - @Override - protected ITexture getTextureFrontFace() { - return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced); - } - - @Override - protected ITexture getTextureFrontFaceActive() { - return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java index afa13de0be8..25650fad089 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java @@ -7,15 +7,12 @@ import gregtech.GTMod; import gregtech.api.enums.Materials; -import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTModHandler; import gregtech.api.util.TurbineStatCalculator; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") public class MTELargeTurbineSHSteam extends MTELargerTurbineBase { @@ -176,14 +173,4 @@ protected String getTurbineType() { protected String getCasingName() { return "Reinforced HP Steam Turbine Casing"; } - - @Override - protected ITexture getTextureFrontFace() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); - } - - @Override - protected ITexture getTextureFrontFaceActive() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java index 72a50cacf30..0de134950c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java @@ -8,14 +8,11 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.GTMod; -import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTModHandler; import gregtech.api.util.TurbineStatCalculator; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") public class MTELargeTurbineSteam extends MTELargerTurbineBase { @@ -187,14 +184,4 @@ protected String getTurbineType() { protected String getCasingName() { return "Reinforced Steam Turbine Casing"; } - - @Override - protected ITexture getTextureFrontFace() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); - } - - @Override - protected ITexture getTextureFrontFaceActive() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 6e471c28291..dc2f105bbb4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -57,10 +57,64 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase implements ISurvivalConstructable { + private static final String STRUCTURE_PIECE_MAIN = "main"; + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { + + @Override + @SuppressWarnings("SpellCheckingInspection") + protected IStructureDefinition computeValue(Class type) { + return StructureDefinition.builder() + // c = turbine casing + // s = turbine shaft + // t = turbine housing + // h = dynamo/maint + // m = muffler + .addShape( + STRUCTURE_PIECE_MAIN, + (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" }, + { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, + { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, + { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, + { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, + { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, + { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, + { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, + { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, })) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta()))) + .addElement( + 't', + lazy( + t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch) + .hatchClass(MTEHatchTurbine.class) + .casingIndex(t.getCasingTextureIndex()) + .dot(1) + .build())) + .addElement( + 'h', + lazy( + t -> buildHatchAdder(MTELargerTurbineBase.class) + .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance) + .casingIndex(t.getCasingTextureIndex()) + .dot(4) + .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) + .addElement( + 'm', + lazy( + t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler) + .casingIndex(t.getCasingTextureIndex()) + .dot(7) + .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) + .build(); + } + }; + protected int baseEff = 0; protected long optFlow = 0; protected long euPerTurbine = 0; @@ -71,27 +125,20 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase mTurbineRotorHatches = new ArrayList<>(); public MTELargerTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - frontFace = getTextureFrontFace(); - frontFaceActive = getTextureFrontFaceActive(); } public MTELargerTurbineBase(String aName) { super(aName); - frontFace = getTextureFrontFace(); - frontFaceActive = getTextureFrontFaceActive(); } - protected abstract ITexture getTextureFrontFace(); - - protected abstract ITexture getTextureFrontFaceActive(); - protected abstract String getTurbineType(); protected abstract String getCasingName(); @@ -135,58 +182,6 @@ protected final MultiblockTooltipBuilder createTooltip() { return tt; } - private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { - - @Override - @SuppressWarnings("SpellCheckingInspection") - protected IStructureDefinition computeValue(Class type) { - return StructureDefinition.builder() - // c = turbine casing - // s = turbine shaft - // t = turbine housing - // h = dynamo/maint - // m = muffler - .addShape( - STRUCTURE_PIECE_MAIN, - (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" }, - { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, - { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, - { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, - { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, - { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, - { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, - { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" }, - { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, })) - .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta()))) - .addElement( - 't', - lazy( - t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch) - .hatchClass(MTEHatchTurbine.class) - .casingIndex(t.getCasingTextureIndex()) - .dot(1) - .build())) - .addElement( - 'h', - lazy( - t -> buildHatchAdder(MTELargerTurbineBase.class) - .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance) - .casingIndex(t.getCasingTextureIndex()) - .dot(4) - .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .addElement( - 'm', - lazy( - t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler) - .casingIndex(t.getCasingTextureIndex()) - .dot(7) - .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .build(); - } - }; - @Override public IStructureDefinition getStructureDefinition() { return STRUCTURE_DEFINITION.get(getClass()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java index 2fa2c1aed93..3385125bb7a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java @@ -8,11 +8,9 @@ import org.jetbrains.annotations.NotNull; -import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.MetaGeneratedTool; -import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; @@ -24,7 +22,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") public class MTELargerTurbinePlasma extends MTELargerTurbineBase { @@ -295,14 +292,4 @@ protected String getTurbineType() { protected String getCasingName() { return "Reinforced Plasma Turbine Casing"; } - - @Override - protected ITexture getTextureFrontFace() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); - } - - @Override - protected ITexture getTextureFrontFaceActive() { - return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); - } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png index baa8c91218a..789bea621a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png index 2e7e8274e13..71fe8aba7fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta index 24c3794bf6f..f3da053bced 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta @@ -1,5 +1,5 @@ { "animation":{ - "frametime": 3 + "frametime": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png index a9c630ccf5c..05d3e69b96f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png index 3c0e297f26e..de0aa413d8d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png index a096022dfaa..0b03d52a019 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png index bb884669df2..a432c30f210 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png index 41176cfb6ce..2a9b1b2b79b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png index d7db3630209..1d9c34d4e6a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png index 71e7f3a9565..b7a0305073d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png index 7189ed4bd7d..17f02c2639c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png index e19d365d199..205dac6804c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png index 432fc4a0218..ca3d2686ea5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png differ 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/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png index 99a3fb2e2b6..b647c567e55 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png index 24fcb6cfb72..1c22f3cffa8 100644 Binary files a/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png and b/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png index 8c7dac8bfe2..f3dc20a0aab 100644 Binary files a/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png and b/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png index 8a865844d15..ebd56be8146 100644 Binary files a/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png and b/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png index de922500714..9231a212f9b 100644 Binary files a/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png and b/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png differ diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png index b081e83dfab..13afe32ffab 100644 Binary files a/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png and b/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/Blank.png b/src/main/resources/assets/miscutils/textures/blocks/Blank.png deleted file mode 100644 index 4d7beb80658..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/Blank.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png deleted file mode 100644 index 6514089c64a..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta deleted file mode 100644 index cba1c432712..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":2, - "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png deleted file mode 100644 index 29b3a74f342..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png deleted file mode 100644 index 14b5e673d09..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta deleted file mode 100644 index 10cf8c6afdf..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png deleted file mode 100644 index 53e0e51c068..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png b/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png deleted file mode 100644 index ad6502026ed..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png deleted file mode 100644 index c5d7fe80b29..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta deleted file mode 100644 index b0c531fa791..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png deleted file mode 100644 index 40d9b8f31be..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png deleted file mode 100644 index 4e2e761fa82..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta deleted file mode 100644 index 9720a238668..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png deleted file mode 100644 index c822112126a..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png b/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png deleted file mode 100644 index 2a5b8aec95d..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png deleted file mode 100644 index 97c32e5988d..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta deleted file mode 100644 index cba1c432712..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":2, - "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png deleted file mode 100644 index 29b3a74f342..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png deleted file mode 100644 index 9c14ae0abf8..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta deleted file mode 100644 index 163c81b6a1c..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png deleted file mode 100644 index d4cd1c1dee6..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png deleted file mode 100644 index bb8bee0ce77..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta deleted file mode 100644 index 163c81b6a1c..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png deleted file mode 100644 index ca38aad14f7..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png deleted file mode 100644 index bb21d8af985..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta deleted file mode 100644 index c8988534a9b..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0,1,2,3,4,5,6,7] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png deleted file mode 100644 index c54c56daaf6..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png index 88d5cb9c72e..de6f943c9fb 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png and b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png index 5965bfce893..7e02fcdab10 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png and b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png index 89fed025b4c..f24266c323a 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png and b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png new file mode 100644 index 00000000000..5291474da5d Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png index e52a1b11dcf..d0a66ed92bb 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png and b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png index 5307adb9f5e..7f2b0170497 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png and b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png index 4862094cbda..bfc0586c60c 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png and b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png index ce881988676..801e50441cc 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png index d70927f140f..5ca5b1e62b5 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png index 13310d6f570..cf89f9f8dbf 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png index 7ef41870d44..8027f34aa41 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png index e42acc5c012..52bdcf90d17 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png index 440c987d6e3..a22dab2acf4 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png index b1f29058ecf..1468ac61279 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png index 747adeb2e5a..be94004d80f 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png index 230e78fe969..5cbafde8219 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png and b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png index 1f538954908..11205742100 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta deleted file mode 100644 index 0285ac2f3be..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":2, - "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png index 265d18b0f74..e71a22d39fd 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta deleted file mode 100644 index d0b9e70fe51..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":4, - "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png index 8eeb0179d7d..c5c1e723133 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png index ffac706bbd9..b40e77a3544 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png index 87c60175698..096cde5777c 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png index 61d1f49a120..c77a32e02e3 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png index 548c0ec2838..5e19b6ae8cb 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png deleted file mode 100644 index 172fab46578..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png index 68ab46a03d4..5f0dc4bae5e 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png index 4443dc8024a..d0a7d7c50a4 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png index ed8ad55ba2c..df053703c5d 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta deleted file mode 100644 index ba9119c7ad7..00000000000 --- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation":{ - "frametime":1, - "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png index eb3257c7544..beac1c9e130 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png index 3a1b6838379..9a428fed61b 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.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/metro/TEXTURE_TECH_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png index 196600afdb4..0c2c0bdab8a 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png index 1bcd1ec78f6..56138d0ba83 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png index 54381fcf214..9d5147bb610 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png index 0cf3f40762b..9f8e6742cd1 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png index b4bc37fbda9..b57be980e16 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png and b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/blank.png b/src/main/resources/assets/miscutils/textures/blocks/qft/blank.png new file mode 100644 index 00000000000..d93ed2dca3c Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/qft/blank.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/blocks/rendering/ForceField.png b/src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png deleted file mode 100644 index 32254623d1f..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png b/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png index c6376014e29..467d4423527 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png and b/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png b/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png index a8f51c0b681..141c969fd71 100644 Binary files a/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png and b/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png 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..f6031f32c65 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/MU-metaitem.01/100.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta new file mode 100644 index 00000000000..a4e44a4090b --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta @@ -0,0 +1,72 @@ +{ + "animation": { "frametime": 1, "frames": [ + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 2, + 2, + 2, + 2, + 3, + 3, + 3, + 3, + 4, + 4, + 4, + 4, + 5, + 5, + 5, + 5, + 5, + 5, + 6, + 6, + 6, + 6, + 7, + 7, + 7, + 7, + 8, + 8, + 8, + 8, + 8, + 8, + 9, + 9, + 9, + 9, + 10, + 10, + 10, + 10, + 11, + 11, + 11, + 11, + 12, + 12, + 12, + 12, + 12, + 12, + 13, + 13, + 13, + 13 + ] + } +} diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png index 9b9c3144751..e8f3b0d518f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png index b3f174ebd46..3dd5c5c4a79 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png index 0939c7eb87f..5d0895e82fa 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png index 23cc1deb66e..4c1b4c1222d 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png index 23e0a10e06b..7336e19c220 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png and b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png index 8576ae1b7a7..5edd2b37217 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png and b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png index efa1a6e0ca2..7e198c1e6a4 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png and b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png deleted file mode 100644 index aaea7803b51..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png and /dev/null 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..55b4decad17 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..677ef9c6458 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..e6b0c062ebd 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..11104196f56 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..01ff0173df8 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/chargepack/1.png b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png index 9039d443c3a..8f9abc21dc5 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/1.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/2.png b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png index 7023e7ce820..eaa2c6e16d0 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/2.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/3.png b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png index 4d787e7aa82..f17fe051d92 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/3.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/4.png b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png index 9320de06118..5a2b5fd76d9 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/4.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/5.png b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png index ab8771c89cf..59f16cb9360 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/5.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/6.png b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png index a01f435e724..60b233ecd00 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/6.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/7.png b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png index fb5a5fba437..065cdfe465c 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/7.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/8.png b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png index aff1ec693f3..be3c549823f 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/8.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/9.png b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png index 0b9cf4d18e7..da1ef00af7b 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/chargepack/9.png and b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/ion/0.png b/src/main/resources/assets/miscutils/textures/items/ion/0.png deleted file mode 100644 index c56a04238fb..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/ion/0.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/ion/1.png b/src/main/resources/assets/miscutils/textures/items/ion/1.png deleted file mode 100644 index 174d2ad950f..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/ion/1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png b/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png deleted file mode 100644 index fd342f7db2d..00000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/ion0.png b/src/main/resources/assets/miscutils/textures/items/ion0.png new file mode 100644 index 00000000000..e7dcfcd7202 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/ion0.png differ diff --git a/src/main/resources/assets/miscutils/textures/items/ion1.png b/src/main/resources/assets/miscutils/textures/items/ion1.png new file mode 100644 index 00000000000..19d2c6f09be Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/ion1.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..e15e9a69e68 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..87c8b1d3d44 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..91c9a5240b8 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..34018752bb3 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..506c01930d2 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..829228e732a 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..b5fbcab100f 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/14.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta new file mode 100644 index 00000000000..eada83be812 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "interpolate": true, "frametime": 4 } } 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..80f1a1a2ba4 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..b5f23805f5b 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..8cab86da91d 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..ad69842cdac 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..8074790eaa2 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..de4f3e8fdea 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..bb622d23ee4 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..cb8a813db64 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..450c47a1f89 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..78176654b2d 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..65e7e7edcc5 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..68479b5df3e 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..4ff62e6b385 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..be10194952e 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..0f75caa5def 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..d589c1d2cd9 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..24ce21e771d 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..1190886fc1b 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..80c2c979be1 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 diff --git a/src/main/resources/assets/miscutils/textures/items/token/0.png b/src/main/resources/assets/miscutils/textures/items/token/0.png index 7947f30bb66..6bc570cbeee 100644 Binary files a/src/main/resources/assets/miscutils/textures/items/token/0.png and b/src/main/resources/assets/miscutils/textures/items/token/0.png differ