From 8b82edbc122db2381c30466995eea8f5dadbc21a Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:02:34 +0100 Subject: [PATCH 01/27] Remove fluorite from sandstone references --- .../java/gtPlusPlus/core/config/ConfigHandler.java | 8 -------- .../core/item/base/itemblock/ItemBlockOre.java | 11 ----------- src/main/java/gtPlusPlus/core/lib/CORE.java | 1 - 3 files changed, 20 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index b922bb0116..a9a21f8972 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -9,7 +9,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIntegration; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; @@ -223,13 +222,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { 0, 10000, "Drained shards have a 1 in X chance to drop."); - chanceToDropFluoriteOre = config.getInt( - "chanceToDropFluoriteOre", - "blockdrops", - 32, - 0, - 10000, - "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone.."); // Single machines enableMachine_SolarGenerators = config.getBoolean( diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index cdb2934a40..cfb76f682e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -83,17 +83,6 @@ public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, fi list.add(CORE.GT_Tooltip_Radioactive.get()); } - /** - * Tooltip Handler for Ores - */ - if (this.mThisMaterial == FLUORIDES.FLUORITE) { - list.add( - "Mined from Sandstone with a 1/" + (CORE.ConfigSwitches.chanceToDropFluoriteOre * 20) - + " chance, or Limestone with a 1/" - + (CORE.ConfigSwitches.chanceToDropFluoriteOre) - + " chance."); - } - if (this.mThisMaterial != null) { list.add("Ore contains: "); if (mThisMaterial.getComposites().isEmpty()) { diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index a00de7a4b0..5292d55967 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -138,7 +138,6 @@ public static class ConfigSwitches { // Block Drops public static int chanceToDropDrainedShard = 196; - public static int chanceToDropFluoriteOre = 32; // Machine Related public static boolean enableAlternativeBatteryAlloy = false; From db8b0f1b6fa702ff8c1b20aaa9e957026eecc93d Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:10:20 +0100 Subject: [PATCH 02/27] Remove some unused content, rogue useless configs --- .../core/common/compat/COMPAT_ExtraUtils.java | 16 ------- .../gtPlusPlus/core/config/ConfigHandler.java | 18 ------- src/main/java/gtPlusPlus/core/lib/CORE.java | 3 -- .../items/MetaGeneratedGregtechItems.java | 48 ------------------- 4 files changed, 85 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 907e6a0c42..47e09731f1 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -16,21 +16,5 @@ public static void OreDict() { private static void run() { ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); - // GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); - - if (ConfigSwitches.enableAlternativeDivisionSigilRecipe) { - // Division Sigil - RecipeUtils.addShapedRecipe( - "plateNetherStar", - "gemIridium", - "plateNetherStar", - "plateIridium", - RECIPES_Tools.craftingToolHardHammer, - "plateIridium", - "plateNetherStar", - "gemIridium", - "plateNetherStar", - RECIPES_Tools.RECIPE_DivisionSigil); - } } } diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index a9a21f8972..1a79845848 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -9,11 +9,8 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIntegration; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeBatteryAlloy; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; @@ -128,13 +125,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { * DEBUG = config.getBoolean("debugMode", "debug", false, * "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); */ - disableEnderIOIntegration = config - .getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration."); - disableEnderIOIngotTooltips = config.getBoolean( - "disableEnderIOIngotTooltips", - "debug", - false, - "Disables EnderIO Ingot Tooltips. These apparently may cause issues for a very small number of users."); MACHINE_INFO = config.getBoolean( "enableMachineInfoLogging", "debug", @@ -154,11 +144,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group."); - enableAlternativeBatteryAlloy = config.getBoolean( - "enableAlternativeBatteryAlloy", - "machines", - false, - "Adds a non-Antimony using Battery Alloy. Not Balanced at all.."); disableIC2Recipes = config.getBoolean( "disableIC2Recipes", "machines", @@ -174,9 +159,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)"); - // requireControlCores - boolean temp = config.getBoolean("requireControlCores", "machines", true, "Multiblocks Require Control Cores"); - // Circuits enableCustomCircuits = config.getBoolean( "enableCustomCircuits", diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 5292d55967..7f46cee6b5 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -127,8 +127,6 @@ public static EntityPlayerMP getFakePlayer(World world) { public static class ConfigSwitches { // Debug - public static boolean disableEnderIOIntegration = false; - public static boolean disableEnderIOIngotTooltips = false; public static boolean MACHINE_INFO = true; public static boolean showHiddenNEIItems = false; public static boolean dumpItemAndBlockData = false; @@ -140,7 +138,6 @@ public static class ConfigSwitches { public static int chanceToDropDrainedShard = 196; // Machine Related - public static boolean enableAlternativeBatteryAlloy = false; public static boolean enableThaumcraftShardUnification = false; public static boolean disableIC2Recipes = false; public static boolean enableAlternativeDivisionSigilRecipe = false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index defa3d558b..0d5d07f9c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -38,8 +38,6 @@ public MetaGeneratedGregtechItems() { public void generateMetaItems() { int tLastID = 0; - registerCustomCircuits(); - // Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft .set(this.addItem(40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); @@ -297,50 +295,4 @@ public void generateMetaItems() { .set(this.addItem(152, "Maceration Upgrade Chip", "Used to upgrade Maceration Stack to Tier 2")); } - public void registerCustomCircuits() { - if (CORE.ConfigSwitches.enableCustomCircuits) { - GregtechItemList.Circuit_IV.set( - this.addItem( - 704, - "Symbiotic Circuit (IV)", - "A Symbiotic Data Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic))); - GregtechItemList.Circuit_LuV.set( - this.addItem( - 705, - "Neutronic Circuit (LuV)", - "A Neutron Particle Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic))); - GregtechItemList.Circuit_ZPM.set( - this.addItem( - 706, - "Quantum Circuit (ZPM)", - "A Singlularity Processor", - GregtechOrePrefixes.circuit.get(GT_Materials.Quantum))); - GregtechItemList.Circuit_Board_IV - .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_LuV - .set(this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_ZPM - .set(this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board")); - GregtechItemList.Circuit_Parts_Crystal_Chip_IV - .set(this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV - .set(this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM - .set(this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_IV.set(this.addItem(716, "(IV) Energized Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_LuV - .set(this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_ZPM.set(this.addItem(718, "(ZPM) Quantum Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_Wiring_IV - .set(this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_LuV - .set(this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_ZPM - .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); - ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); - ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); - } - } } From b7317d8350b0350a579a707e0d3c254f33e2aa3a Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:13:30 +0100 Subject: [PATCH 03/27] Remove more junk --- .../gtPlusPlus/core/config/ConfigHandler.java | 57 +--- .../core/handler/COMPAT_HANDLER.java | 1 - src/main/java/gtPlusPlus/core/lib/CORE.java | 12 - .../GregtechMetaTileEntitySolarGenerator.java | 262 ------------------ .../gregtech/GregtechSolarGenerators.java | 71 ----- 5 files changed, 5 insertions(+), 398 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 1a79845848..85b8580103 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.config; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.common.config.Configuration; + +import java.io.File; + import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.MACHINE_INFO; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator; @@ -8,13 +13,11 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; @@ -24,10 +27,8 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RF_Convetor; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RocketEngines; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SimpleWasher; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SolarGenerators; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Tesseracts; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiSizeTools; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Cyclotron; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge; @@ -51,8 +52,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_PowerSubstation; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_ThermalBoiler; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableSulfuricAcidFix; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableThaumcraftShardUnification; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableWatchdogBGM; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.hideUniversalCells; @@ -107,12 +106,6 @@ import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; -import java.io.File; - -import net.minecraftforge.common.config.Configuration; - -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - public class ConfigHandler { public static void handleConfigFile(final FMLPreInitializationEvent event) { @@ -159,31 +152,7 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)"); - // Circuits - enableCustomCircuits = config.getBoolean( - "enableCustomCircuits", - GregTech.ID, - false, - "Adds custom circuits to expand past the Master Tier. Only really recommended to enable if enableOldGTcircuits is enabled."); - enableOldGTcircuits = config.getBoolean( - "enableOldGTcircuits", - GregTech.ID, - false, - "Restores circuits and their recipes from Pre-5.09.28 times."); - - // Tools - enableMultiSizeTools = config.getBoolean( - "enableMultiSizeTools", - GregTech.ID, - true, - "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available."); - // GT-Fixes - enableSulfuricAcidFix = config.getBoolean( - "enableSulfuricAcidFix", - GregTech.ID, - false, - "Adds GT6 recipes for Sulfuric Acid. Should remove all pre-existing recipes."); turbineCutoffBase = config.getInt( "turbineCutoffBase", GregTech.ID, @@ -196,22 +165,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", GregTech.ID, true, "Adds Custom GT Fluid Pipes."); enableCustom_Cables = config.getBoolean("enableCustom_Cables", GregTech.ID, true, "Adds Custom GT Cables."); - // Block Drops - chanceToDropDrainedShard = config.getInt( - "chanceToDropDrainedShard", - "blockdrops", - 196, - 0, - 10000, - "Drained shards have a 1 in X chance to drop."); - - // Single machines - enableMachine_SolarGenerators = config.getBoolean( - "enableSolarGenerators", - GregTech.ID, - false, - "These may be overpowered, Consult a local electrician."); - enableMachine_Dehydrators = config .getBoolean("enableMachineDehydrators", GregTech.ID, true, "These dehydrate stuff."); enableMachine_SteamConverter = config diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 7aa9c73236..b6e56077b7 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -87,7 +87,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 7f46cee6b5..82cb3a8c16 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -131,12 +131,6 @@ public static class ConfigSwitches { public static boolean showHiddenNEIItems = false; public static boolean dumpItemAndBlockData = false; - // Tools - public static boolean enableMultiSizeTools = true; - - // Block Drops - public static int chanceToDropDrainedShard = 196; - // Machine Related public static boolean enableThaumcraftShardUnification = false; public static boolean disableIC2Recipes = false; @@ -146,16 +140,10 @@ public static class ConfigSwitches { // Feature Related public static boolean enableCustomCapes = false; - public static boolean enableCustomCircuits = true; - public static boolean enableOldGTcircuits = false; public static int enableWatchdogBGM = CORE_Preloader.enableWatchdogBGM; public static boolean hideUniversalCells = true; - // GT Fixes - public static boolean enableSulfuricAcidFix = false; - // Single Block Machines - public static boolean enableMachine_SolarGenerators = false; public static boolean enableMachine_Dehydrators = true; public static boolean enableMachine_SteamConverter = true; public static boolean enableMachine_FluidTanks = true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java deleted file mode 100644 index 440fb72789..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ /dev/null @@ -1,262 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import static gregtech.api.enums.GT_Values.V; - -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.ProgressBar; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.SteamVariant; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.gui.modularui.GUITextureSet; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator; - -public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator { - - public GregtechMetaTileEntitySolarGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { - super(aID, aName, aNameRegional, aTier, "Feasts on the power of the Sun!", new ITexture[0]); - this.onConfigLoad(); - } - - public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.onConfigLoad(); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", - CORE.GT_Tooltip.get()); - } - - @Override - public boolean isOutputFacing(final ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile.get( - ConfigCategories.machineconfig, - "SunAbsorber.efficiency.tier." + this.mTier, - 100 - (this.mTier * 10)); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() - && (aBaseMetaTileEntity.getUniversalEnergyStored() - < (this.maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()))) { - - if (this.mSolarCharge <= 20) { - // Utils.LOG_WARNING("1."); - this.mSolarCharge = 20; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 45) { - // Utils.LOG_WARNING("2."); - this.mSolarCharge -= 1; - this.mLossTimer = 0; - } - - if ((aTick % 10L) == 0L) { - - Logger.WARNING( - "getUniversalEnergyStored: " + aBaseMetaTileEntity.getUniversalEnergyStored() - + " maxEUOutput * 20 + getMinimumStoredEU: " - + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU())); - - if ((this.mSolarCharge > 100) && (aBaseMetaTileEntity.isAllowedToWork()) - && (!aBaseMetaTileEntity.getWorld().isThundering()) - && (aBaseMetaTileEntity.getUniversalEnergyStored() - < (this.maxEUStore() - this.getMinimumStoredEU()))) { - this.getBaseMetaTileEntity().increaseStoredEnergyUnits(sEnergyPerTick * this.getEfficiency(), true); - } - } - - if ((this.mSolarCharge < 500) && (this.mProcessingEnergy != 0) && ((aTick % 32L) == 0L)) { - Logger.WARNING("Adding Solar Charge. Currently " + this.mSolarCharge); - this.mProcessingEnergy -= 1; - this.mSolarCharge += 1; - } - - if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) - && ((aTick % 64L) == 0L) - && (!aBaseMetaTileEntity.getWorld().isThundering())) { - Logger.WARNING("Adding Processing Energy. Currently " + this.mProcessingEnergy); - final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() - && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F); - this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4)) - || !aBaseMetaTileEntity.getSkyAtSide(ForgeDirection.UP) ? 0 - : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; - } - - if (aBaseMetaTileEntity.isServerSide()) { - // Utils.LOG_WARNING("6."); - aBaseMetaTileEntity.setActive( - aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored() - >= (this.maxEUOutput() + this.getMinimumStoredEU()))); - } - } - } - - @Override - public void inValidate() {} - - @Override - public int getEfficiency() { - return this.mEfficiency; - } - - @Override - public long maxEUStore() { - return Math.max(this.getEUVar(), (V[this.mTier] * 16000) + this.getMinimumStoredEU()); - } - - ITexture SolarArray[] = { new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - - @Override - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { super.getFront(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; - } - - @Override - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { super.getBack(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - } - - @Override - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { super.getSides(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) }; - } - - @Override - public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { super.getFrontActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; - } - - @Override - public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { super.getBackActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; - } - - @Override - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; - } - - @Override - public SteamVariant getSteamVariant() { - return SteamVariant.BRONZE; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) getBaseMetaTileEntity().getStoredEU()) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_WATER, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mSolarCharge / maxProgresstime()) - .setTexture( - GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()), - GT_UITextures.PROGRESSBAR_BOILER_HEAT, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000) - .setTexture(GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()), 14) - .setDirection(ProgressBar.Direction.UP).setPos(116, 45).setSize(14, 14)); - } - - @Override - public GUITextureSet getGUITextureSet() { - return new GUITextureSet().setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(getSteamVariant())) - .setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(getSteamVariant())) - .setCoverTab( - GT_UITextures.TAB_COVER_STEAM_NORMAL.get(getSteamVariant()), - GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(getSteamVariant()), - GT_UITextures.TAB_COVER_STEAM_DISABLED.get(getSteamVariant())) - .setTitleTab( - GT_UITextures.TAB_TITLE_STEAM.getAdaptable(getSteamVariant()), - GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable(getSteamVariant()), - GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(getSteamVariant())) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(getSteamVariant())); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java deleted file mode 100644 index 996462435c..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ /dev/null @@ -1,71 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; - -public class GregtechSolarGenerators { - - public static void run() { - if (ConfigSwitches.enableMachine_SolarGenerators) { - Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks."); - if (CORE.ConfigSwitches.enableMachine_SolarGenerators) { - run1(); - } - } - } - - private static void run1() { - - GregtechItemList.GT_Solar_ULV.set( - new GregtechMetaTileEntitySolarGenerator( - 800, - "sunabsorber.tier.00", - "Ultra Low Voltage Solar Generator", - 0).getStackForm(1L)); - GregtechItemList.GT_Solar_LV.set( - new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1) - .getStackForm(1L)); - GregtechItemList.GT_Solar_MV.set( - new GregtechMetaTileEntitySolarGenerator( - 802, - "sunabsorber.tier.02", - "Medium Voltage Solar Generator", - 2).getStackForm(1L)); - GregtechItemList.GT_Solar_HV.set( - new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3) - .getStackForm(1L)); - GregtechItemList.GT_Solar_EV.set( - new GregtechMetaTileEntitySolarGenerator( - 804, - "sunabsorber.tier.04", - "Extreme Voltage Solar Generator", - 4).getStackForm(1L)); - GregtechItemList.GT_Solar_IV.set( - new GregtechMetaTileEntitySolarGenerator( - 805, - "sunabsorber.tier.05", - "Insane Voltage Solar Generator", - 5).getStackForm(1L)); - GregtechItemList.GT_Solar_LuV.set( - new GregtechMetaTileEntitySolarGenerator( - 806, - "sunabsorber.tier.06", - "Ludicrous Voltage Solar Generator", - 6).getStackForm(1L)); - GregtechItemList.GT_Solar_ZPM.set( - new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7) - .getStackForm(1L)); - GregtechItemList.GT_Solar_UV.set( - new GregtechMetaTileEntitySolarGenerator( - 808, - "sunabsorber.tier.08", - "Ultimate Voltage Solar Generator", - 8).getStackForm(1L)); - GregtechItemList.GT_Solar_MAX.set( - new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9) - .getStackForm(1L)); - } -} From dd3c63a99ce9bc866b15fb3fc89b074d38117184 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:15:06 +0100 Subject: [PATCH 04/27] Remove more --- src/main/java/gtPlusPlus/core/config/ConfigHandler.java | 2 -- src/main/java/gtPlusPlus/core/lib/CORE.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 85b8580103..201c2abacb 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -142,8 +142,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); - enableAlternativeDivisionSigilRecipe = config - .getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead."); boilerSteamPerSecond = config.getInt( "boilerSteamPerSecond", "machines", diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 82cb3a8c16..d45fbce242 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -134,9 +134,7 @@ public static class ConfigSwitches { // Machine Related public static boolean enableThaumcraftShardUnification = false; public static boolean disableIC2Recipes = false; - public static boolean enableAlternativeDivisionSigilRecipe = false; public static int boilerSteamPerSecond = 750; - public static final boolean requireControlCores = false; // Feature Related public static boolean enableCustomCapes = false; From 3cd32e92d45cad10fd98c0e9dee1408a7dee6fff Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:16:58 +0100 Subject: [PATCH 05/27] Remove RF converter, I think this is disabled anyway? Or should be? --- .../gtPlusPlus/core/config/ConfigHandler.java | 7 - src/main/java/gtPlusPlus/core/lib/CORE.java | 1 - .../core/recipe/RECIPES_Machines.java | 15 - .../gregtech/api/enums/GregtechItemList.java | 2 - .../GT_MetaTileEntity_RfConvertor.java | 347 ------------------ .../gregtech/GregtechEnergyBuffer.java | 11 - 6 files changed, 383 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 201c2abacb..195274bba6 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -15,7 +15,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; @@ -24,7 +23,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Pollution; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RF_Convetor; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RocketEngines; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SimpleWasher; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter; @@ -191,11 +189,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) { "Very basic automated cauldron for dust washing."); enableMachine_Pollution = config .getBoolean("enableMachinePollution", GregTech.ID, true, "Pollution Detector & Scrubbers."); - enableMachine_RF_Convetor = config.getBoolean( - "enableMachineRFConvetor", - GregTech.ID, - true, - "Converts RF to GTEU. Requires COFH-Core to be installed."); // Multi machines enableMultiblock_AlloyBlastSmelter = config.getBoolean( diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index d45fbce242..3366699a08 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -152,7 +152,6 @@ public static class ConfigSwitches { public static boolean enableMachine_Pollution = true; public static boolean enableCustom_Pipes = true; public static boolean enableCustom_Cables = true; - public static boolean enableMachine_RF_Convetor = false; // Multiblocks public static boolean enableMultiblock_AlloyBlastSmelter = true; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 0e20941d2d..50e1e3903e 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -955,21 +955,6 @@ private static void runModRecipes() { "plateBronze", GregtechItemList.Hatch_Output_Bus_Steam.get(1)); - // RF Convertor - if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) { - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(4, 1), - CI.getTieredCircuitOreDictName(5), - CI.getPlate(4, 1), - CI.getTransmissionComponent(3, 1), - CI.getTieredGTPPMachineCasing(4, 1), - CI.getTransmissionComponent(3, 1), - CI.getPlate(4, 1), - plateEnergeticAlloy, - CI.getPlate(4, 1), - GregtechItemList.Energy_Buffer_RF_Convertor.get(1)); - } - // Flask Configurator CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 41ccecbbff..a9df5bf301 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -702,8 +702,6 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Solar_MAX, // Variable voltage RF convertor - Energy_Buffer_RF_Convertor, - // Energy Buffers Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, Energy_Buffer_1by1_MV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java deleted file mode 100644 index 7230008645..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ /dev/null @@ -1,347 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators; - -import static gregtech.api.enums.GT_Values.V; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; - -import cofh.api.energy.IEnergyProvider; -import cofh.api.energy.IEnergyReceiver; -import cofh.api.energy.IEnergyStorage; -import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.network.ICapBankNetwork; -import crazypants.enderio.power.IPowerContainer; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * - * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple - * Machine - */ -public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer implements IEnergyReceiver { - - public GT_MetaTileEntity_RfConvertor(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures, final int aSlotCount) { - super(aName, aTier, aDescription, aTextures, aSlotCount); - } - - public GT_MetaTileEntity_RfConvertor(final int aID, final String aName, final String aNameRegional, final int aTier, - final String aDescription, final int aSlotCount) { - super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount); - } - - @Override - public String[] getDescription() { - return new String[] { "Use Screwdriver to change voltage", - "Hold Shift while using Screwdriver to change amperage", - EnumChatFormatting.DARK_AQUA + "Variable Output Voltage", CORE.GT_Tooltip.get() }; - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[12][17][]; - GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide); - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[1][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[2][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; - rTextures[3][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[4][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[5][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; - rTextures[6][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[7][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[8][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] }; - rTextures[9][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - rTextures[10][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - rTextures[11][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; - } - return rTextures; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[Math.min(2, side.ordinal()) + (side == facing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex + 1]; - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RfConvertor( - this.mName, - this.mTier, - this.mDescription, - this.mTextures, - this.mInventory.length); - } - - @Override - public long getMinimumStoredEU() { - return 0; - } - - @Override - public long maxEUStore() { - return Integer.MAX_VALUE; - } - - @Override - public long maxEUInput() { - return 0; - } - - @Override - public long maxEUOutput() { - return V[this.mTier]; - } - - @Override - public long maxAmperesIn() { - return 0; - } - - @Override - public boolean isEnetInput() { - return false; - } - - @Override - public boolean isEnetOutput() { - return true; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return !isOutputFacing(side); - } - - @Override - public boolean isOutputFacing(ForgeDirection side) { - return side == getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public boolean isAccessAllowed(final EntityPlayer aPlayer) { - return true; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - if (!aBaseMetaTileEntity.isActive()) { - aBaseMetaTileEntity.setActive(true); - } - if (this.getEUVar() < this.maxEUStore()) { - for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (aBaseMetaTileEntity.getStoredEU() >= aBaseMetaTileEntity.getEUCapacity()) break; - if (isInputFacing(side)) { - receiveEnergy(side, Integer.MAX_VALUE, false); - } - } - } - return; - } - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public String[] getInfoData() { - String[] infoData = super.getInfoData(); - return new String[] { infoData[0], "Converts RF -> GTEU | Tier: " + this.mTier, infoData[1], infoData[2] }; - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setByte("mTier", this.mTier); - super.saveNBTData(aNBT); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - this.mTier = aNBT.getByte("mTier"); - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aPlayer.isSneaking()) { - byte aTest = (byte) (aCurrentOutputAmperage + 1); - if (aTest > 16 || aTest <= 0) { - aTest = 1; - } - aCurrentOutputAmperage = aTest; - PlayerUtils.messagePlayer(aPlayer, "Now handling " + maxAmperesOut() + " Amps."); - } else { - if (this.mTier < GT_Values.V.length) { - this.mTier++; - } else { - this.mTier = 0; - } - PlayerUtils.messagePlayer(aPlayer, "Now running at " + GT_Values.VOLTAGE_NAMES[this.mTier] + "."); - } - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - if (isOutputFacing(from)) { - return false; - } - return true; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - - // Cannot accept power on the output face. - if (!canConnectEnergy(from) || isOutputFacing(from)) { - return 0; - } - - TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide(from); - if (tTileEntity == null) { - return 0; - } - - Logger.WARNING("Someone is trying to inject RF from " + from + ". Type:" + tTileEntity.getClass().getName()); - - // Calculate maximum RF we need to consume - int aInputRF = MathUtils.safeInt(this.maxEUOutput() * GregTech_API.mEUtoRF / 100); - - // Make sure we only consume the correct amount of RF that is pushed into this Tile. - if (aInputRF > maxReceive) { - aInputRF = maxReceive; - } - - int aInjectedRF = 0; - boolean aVal = false; - - long aStoredEU = this.getEUVar(); - long aMaxEU = this.maxEUStore(); - Logger.WARNING("Stored: " + aStoredEU + ", Capacity: " + aMaxEU + ""); - if (aStoredEU < aMaxEU) { - Logger.WARNING("StoredEU < MaxEU"); - long aRemainingSpace = aMaxEU - aStoredEU; - if (aRemainingSpace > 0) { - long tEU = 0; - final ForgeDirection toSide = from.getOpposite(); - byte aSide = (byte) from.ordinal(); - Logger.WARNING("Free: " + aRemainingSpace + "EU"); - if (tTileEntity instanceof IEnergyProvider - && ((IEnergyProvider) tTileEntity).extractEnergy(toSide, 1, true) == 1) { - tEU = (long) ((IEnergyProvider) tTileEntity) - .extractEnergy(toSide, (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false); - Logger.WARNING("Drained from IEnergyProvider Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - tEU = tEU * GregTech_API.mRFtoEU / 100; - } else if (tTileEntity instanceof IEnergyStorage - && ((IEnergyStorage) tTileEntity).extractEnergy(1, true) == 1) { - tEU = (long) ((IEnergyStorage) tTileEntity) - .extractEnergy((int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false); - Logger.WARNING( - "Drained from IEnergyStorage Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - tEU = tEU * GregTech_API.mRFtoEU / 100; - } else - if (GregTech_API.meIOLoaded && tTileEntity instanceof IPowerContainer - && ((IPowerContainer) tTileEntity).getEnergyStored() > 0) { - int storedRF = ((IPowerContainer) tTileEntity).getEnergyStored(); - int extractRF = (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU; - tEU = 0; - if (tTileEntity instanceof TileCapBank) { - ICapBankNetwork network = ((TileCapBank) tTileEntity).getNetwork(); - if (network != null && network.getEnergyStoredL() > 0) { - tEU = Math.min( - (Math.min( - Math.min(network.getEnergyStoredL(), storedRF - extractRF), - network.getMaxOutput())) * GregTech_API.mRFtoEU / 100, - maxEUOutput()); - Logger.WARNING( - "Drained from EIO CapBank Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) - + ""); - network.addEnergy((int) -(tEU * 100 / GregTech_API.mRFtoEU)); - } - } else { - if (storedRF > extractRF) { - ((IPowerContainer) tTileEntity).setEnergyStored(storedRF - extractRF); - tEU = maxEUOutput(); - Logger.WARNING( - "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - } else { - ((IPowerContainer) tTileEntity).setEnergyStored(0); - tEU = storedRF * GregTech_API.mRFtoEU / 100; - Logger.WARNING( - "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); - } - } - } - Logger.WARNING("EU to inject: " + tEU + "EU"); - if (!simulate) { - aVal = this.getBaseMetaTileEntity().increaseStoredEnergyUnits(tEU, true); - } - if (tEU > 0) { - Logger.WARNING("Tried injecting " + tEU + " eu into self. Success? " + aVal); - } - } - } - return aInjectedRF; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - long aStoredEU = this.getEUVar(); - long aMaxEU = this.maxEUStore(); - if (aStoredEU == 0) { - return 0; - } - if (aStoredEU < aMaxEU) { - long aRemainingSpace = aMaxEU - aStoredEU; - if (aRemainingSpace > 0) { - if (aRemainingSpace > (this.maxEUOutput() / (GregTech_API.mEUtoRF / 100))) { - int aCalculatedFreeSpace = 0; - int aRfPer10Eu = GregTech_API.mEUtoRF / 10; - // Calculate how many lots of '10 - aCalculatedFreeSpace = (int) Math.floor(aRemainingSpace / 10); - // Return value equal to how many lots of '10eu' packets we can fit in. - return Integer.MAX_VALUE - - MathUtils.balance(aCalculatedFreeSpace * aRfPer10Eu, 0, Integer.MAX_VALUE); - } - } - } - return Integer.MAX_VALUE; - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return Integer.MAX_VALUE; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 08a0b6fcf5..742e9f9ece 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -1,16 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gregtech.api.enums.Mods.COFHCore; - import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_RfConvertor; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; public class GregtechEnergyBuffer { @@ -66,13 +62,6 @@ private static void run1() { new GregtechMetaEnergyBuffer(779, "energybuffer.tier.09", "MAX Voltage Energy Buffer", 9, "", 1) .getStackForm(1L)); - if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) { - // RF Convertor Buffer Has Special ID - GregtechItemList.Energy_Buffer_RF_Convertor.set( - new GT_MetaTileEntity_RfConvertor(31022, "energybuffer.rf.tier.01", "RF Energy Convertor", 3, "", 0) - .getStackForm(1L)); - } - GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE From c68519a6d68108c35421ad71dabedf94b176893b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:19:29 +0100 Subject: [PATCH 06/27] Opps missed this --- src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index b6e56077b7..3bd35d162d 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -134,7 +134,6 @@ public static void registerGregtechMachines() { GregtechIndustrialMassFabricator.run(); GregtechIndustrialBlastSmelter.run(); GregtechQuantumForceTransformer.run(); - GregtechSolarGenerators.run(); GregtechPowerSubStation.run(); GregtechDehydrator.run(); GregtechAdvancedBoilers.run(); From ee88664a73e27704b8e7bb0fd817a85e5f42e2c4 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:44:42 +0100 Subject: [PATCH 07/27] Cleaning --- .../general/antigrief/BlockWitherProof.java | 1 - .../core/creative/AddToCreativeTab.java | 1 - .../core/entity/monster/EntitySickBlaze.java | 2 +- .../projectile/EntityToxinballSmall.java | 11 ----- .../item/base/itemblock/ItemBlockOre.java | 8 ---- src/main/java/gtPlusPlus/core/lib/CORE.java | 40 +------------------ .../core/recipe/RECIPES_Machines.java | 1 - .../loaders/RecipeGen_FluidCanning.java | 40 +++---------------- 8 files changed, 7 insertions(+), 97 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index fa7372090c..c24ef46f5c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -33,7 +33,6 @@ public BlockWitherProof() { this.setResistance(5000.0F); this.setHarvestLevel("pickaxe", 3); this.setStepSound(soundTypeMetal); - // LanguageRegistry.addName(this, "Wither Cage"); GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate")); } diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index 1a01f47ef5..fa0d3844b2 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -8,7 +8,6 @@ public class AddToCreativeTab { public static CreativeTabs tabBlock; public static CreativeTabs tabMisc; - public static CreativeTabs tabCombat; public static CreativeTabs tabTools; public static CreativeTabs tabMachines; public static CreativeTabs tabOther; diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java index 741b830885..815348b1f6 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java @@ -155,7 +155,7 @@ protected void attackEntity(Entity entity, float p_70785_2_) { if (this.field_70846_g > 1) { float f1 = MathHelper.sqrt_float(p_70785_2_) * 0.5F; this.worldObj.playAuxSFXAtEntity( - (EntityPlayer) null, + null, 1009, (int) this.posX, (int) this.posY, diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java index f2f8b8a8cc..bf7e2159c7 100644 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java @@ -8,22 +8,11 @@ public class EntityToxinballSmall extends EntityToxinball { - public EntityToxinballSmall(World p_i1770_1_) { - super(p_i1770_1_); - this.setSize(0.3125F, 0.3125F); - } - public EntityToxinballSmall(World world, EntityLivingBase entity, double x, double y, double z) { super(world, entity, x, y, z); this.setSize(0.3125F, 0.3125F); } - public EntityToxinballSmall(World p_i1772_1_, double p_i1772_2_, double p_i1772_4_, double p_i1772_6_, - double p_i1772_8_, double p_i1772_10_, double p_i1772_12_) { - super(p_i1772_1_, p_i1772_2_, p_i1772_4_, p_i1772_6_, p_i1772_8_, p_i1772_10_, p_i1772_12_); - this.setSize(0.3125F, 0.3125F); - } - /** * Called when this EntityFireball hits a block or entity. */ diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index cfb76f682e..043abdc959 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -28,7 +28,6 @@ public class ItemBlockOre extends ItemBlock { private final BlockBaseOre mThisOre; private final Material mThisMaterial; private final int mThisRadiation; - private final int mThisColour; public ItemBlockOre(final Block block) { super(block); @@ -36,19 +35,13 @@ public ItemBlockOre(final Block block) { this.mThisOre = (BlockBaseOre) block; this.mThisMaterial = this.mThisOre.getMaterialEx(); this.mThisRadiation = this.mThisMaterial.vRadiationLevel; - this.mThisColour = this.mThisMaterial.getRgbAsHex(); } else { this.mThisOre = null; this.mThisMaterial = null; this.mThisRadiation = 0; - this.mThisColour = Utils.rgbtoHexValue(255, 255, 255); } } - public int getRenderColor(final int aMeta) { - return this.mThisColour; - } - private static Map> mMapOreBlockItemToDimName = new LinkedHashMap<>(); private static boolean mInitOres_Everglades = false; private AutoMap mDimsForThisOre = new AutoMap<>(); @@ -98,7 +91,6 @@ public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, fi Block b = Block.getBlockFromItem(stack.getItem()); if (b != null) { - String aTool = b.getHarvestTool(stack.getItemDamage()); int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage()); if (aMiningLevel1 != 0) { list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5)); diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 3366699a08..294c656bf1 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -42,11 +42,9 @@ public class CORE { public static volatile Random RANDOM = new XSTR(); public static boolean DEVENV = false; - // Only can be set in Dev, no config or setting elsewhere. - public static final boolean LOAD_ALL_CONTENT = false;; + ; // Mod Variables - public static final String name = "GT++"; public static final String VERSION = "GRADLETOKEN_VERSION"; @@ -67,7 +65,6 @@ public class CORE { .translateToLocal("GTPP.core.GT_Tooltip_Builder"); public static final Supplier GT_Tooltip_Radioactive = () -> StatCollector .translateToLocal("GTPP.core.GT_Tooltip_Radioactive"); - public static final String noItem = ""; public static final String SEPERATOR = "/"; @@ -92,38 +89,6 @@ public class CORE { public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; - /** - * File Paths and Resource Paths - */ - public static final String TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/", - TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/", - TEX_DIR_ASPECTS = TEX_DIR + "aspects/", TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/", - RES_PATH = GTPlusPlus.ID + ":" + TEX_DIR, RES_PATH_GUI = GTPlusPlus.ID + ":" + TEX_DIR_GUI, - RES_PATH_ITEM = GTPlusPlus.ID + ":" + TEX_DIR_ITEM, RES_PATH_BLOCK = GTPlusPlus.ID + ":" + TEX_DIR_BLOCK, - RES_PATH_ENTITY = GTPlusPlus.ID + ":" + TEX_DIR_ENTITY, - RES_PATH_ASPECTS = GTPlusPlus.ID + ":" + TEX_DIR_ASPECTS, - RES_PATH_FLUIDS = GTPlusPlus.ID + ":" + TEX_DIR_FLUIDS; - - /** - * Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}. If this instance already exists in - * the cache, we will return that instead. These instances are held via weak reference, if the world object is - * unloaded, they too will be removed. This is the suggested way to handle them, as suggested by Forge. - * - * @param world - The {@link World} object for which you want to check for in the cache. This object is used as a - * weak reference in a {@link WeakHashMap}. - * @return - An {@link EntityPlayerMP} instance, returned either from cache or created and cached prior to return. - */ - public static EntityPlayerMP getFakePlayer(World world) { - if (fakePlayerCache.get(world) == null) { - fakePlayerCache.put(world, FakePlayerFactory.get((WorldServer) world, CORE.gameProfile)); - } - return fakePlayerCache.get(world); - } - - /* - * Config Switch Class - */ - public static class ConfigSwitches { // Debug @@ -181,7 +146,6 @@ public static class ConfigSwitches { public static boolean enableMultiblock_Cyclotron = true; // Visuals - public static boolean enableTreeFarmerParticles = true; public static boolean useGregtechTextures = true; public static boolean enableAnimatedTextures = false; @@ -217,11 +181,9 @@ public static class ConfigSwitches { public static int pollutionPerSecondMultiABS = 200; public static int pollutionPerSecondMultiCyclotron = 200; public static int pollutionPerSecondMultiIndustrialFishingPond = 20; - public static int pollutionPerSecondMultiLargeRocketEngine; public static int pollutionPerSecondMultiLargeSemiFluidGenerator = 1280; public static int pollutionPerSecondMultiMassFabricator = 40; public static int pollutionPerSecondMultiRefinery = 4000; - public static int pollutionPerSecondMultiGeneratorArray; public static int pollutionPerSecondMultiTreeFarm = 100; public static int pollutionPerSecondMultiFrothFlotationCell = 0; public static int pollutionPerSecondMultiAutoCrafter = 500; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 50e1e3903e..18287cc14f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1369,7 +1369,6 @@ private static void runModRecipes() { ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) }; - // ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1); ItemStack[] aSemifluids = new ItemStack[] { GregtechItemList.Generator_SemiFluid_LV.get(1), GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1), GregtechItemList.Generator_SemiFluid_EV.get(1), GregtechItemList.Generator_SemiFluid_IV.get(1) }; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 5447f71848..ae6304a0c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -58,20 +58,6 @@ public boolean valid() { return isValid; } - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, - FluidStack aFluidOut) { - this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, - Integer aDuration, Integer aEUt) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt); - } - // Alternative Constructor public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut, Integer aDuration, Integer aEUt) { @@ -163,7 +149,6 @@ public void run() { private void generateRecipes() { if (isValid && recipe != null) { - // Logger.INFO("Processing "+(disableOptional ? "Extracting" : "Canning")+" Recipe."); if (this.disableOptional) { addFluidExtractionRecipe(recipe); } else { @@ -172,8 +157,7 @@ private void generateRecipes() { } } - private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidExtractionRecipe(GT_Recipe aRecipe) { CORE.crash(); Logger.INFO( "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount @@ -189,13 +173,7 @@ private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { int aCount2 = aCount1; RecipeMaps.fluidExtractionRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidExtractionRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Extraction recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -206,22 +184,15 @@ private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } - private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidCannerRecipe(GT_Recipe aRecipe) { + boolean result; int aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); int aCount2 = aCount1; RecipeMaps.fluidCannerRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Canning recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -232,7 +203,6 @@ private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } private void dumpStack() { From d244b7dba00a9aee42b4a0596e842956acb36c5a Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:49:16 +0100 Subject: [PATCH 08/27] Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI? --- .../core/client/model/ModelSickBlaze.java | 87 ----- .../core/client/renderer/RenderSickBlaze.java | 96 ----- .../core/client/renderer/RenderToxinball.java | 89 ----- .../core/entity/InternalEntityRegistry.java | 19 - .../core/entity/monster/EntitySickBlaze.java | 229 ------------ .../entity/projectile/EntityToxinball.java | 332 ------------------ .../projectile/EntityToxinballSmall.java | 65 ---- .../gtPlusPlus/core/proxy/ClientProxy.java | 35 +- .../everglades/biome/Biome_Everglades.java | 4 - .../miscutils/textures/entity/batKing.png | Bin 1994 -> 0 bytes .../miscutils/textures/entity/sickBlaze.png | Bin 1221 -> 0 bytes 11 files changed, 14 insertions(+), 942 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java delete mode 100644 src/main/resources/assets/miscutils/textures/entity/batKing.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/sickBlaze.png diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java deleted file mode 100644 index f5c255e420..0000000000 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ /dev/null @@ -1,87 +0,0 @@ -package gtPlusPlus.core.client.model; - -import net.minecraft.client.model.ModelBlaze; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelSickBlaze extends ModelBlaze { - - /** The sticks that fly around the Blaze. */ - private ModelRenderer[] blazeSticks = new ModelRenderer[24]; - - private ModelRenderer blazeHead; - - public ModelSickBlaze() { - for (int i = 0; i < this.blazeSticks.length; ++i) { - this.blazeSticks[i] = new ModelRenderer(this, 0, 16); - this.blazeSticks[i].addBox(0.0F, 0.0F, 0.0F, 2, 8, 2); - } - - this.blazeHead = new ModelRenderer(this, 0, 0); - this.blazeHead.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8); - } - - @Override - public int func_78104_a() { - return 8; - } - - /** - * Sets the models various rotation angles then renders the model. - */ - @Override - public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, - float p_78088_6_, float p_78088_7_) { - this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); - this.blazeHead.render(p_78088_7_); - - for (ModelRenderer blazeStick : this.blazeSticks) { - blazeStick.render(p_78088_7_); - } - } - - /** - * Sets the model's various rotation angles. For bipeds, par1 and par2 are used for animating the movement of arms - * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how - * "far" arms and legs can swing at most. - */ - @Override - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, - float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { - float f6 = p_78087_3_ * (float) Math.PI * -0.1F; - int i; - - for (i = 0; i < 4; ++i) { - this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F); - this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 9.0F; - this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 9.0F; - ++f6; - } - - f6 = ((float) Math.PI / 4F) + p_78087_3_ * (float) Math.PI * 0.03F; - - for (i = 4; i < 8; ++i) { - this.blazeSticks[i].rotationPointY = 2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F); - this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 7.0F; - this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 7.0F; - ++f6; - } - - f6 = 0.47123894F + p_78087_3_ * (float) Math.PI * -0.05F; - - for (i = 8; i < 12; ++i) { - this.blazeSticks[i].rotationPointY = 11.0F + MathHelper.cos((i * 1.5F + p_78087_3_) * 0.5F); - this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 5.0F; - this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 5.0F; - ++f6; - } - - this.blazeHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI); - this.blazeHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI); - } -} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java deleted file mode 100644 index 28e4dd4bc2..0000000000 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java +++ /dev/null @@ -1,96 +0,0 @@ -package gtPlusPlus.core.client.renderer; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ResourceLocation; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.client.model.ModelSickBlaze; -import gtPlusPlus.core.entity.monster.EntitySickBlaze; - -@SideOnly(Side.CLIENT) -public class RenderSickBlaze extends RenderLiving { - - private static final ResourceLocation blazeTextures = new ResourceLocation( - GTPlusPlus.ID + ":" + "textures/entity/sickBlaze.png"); - private int field_77068_a; - - public RenderSickBlaze() { - super(new ModelSickBlaze(), 0.5F); - this.field_77068_a = ((ModelSickBlaze) this.mainModel).func_78104_a(); - } - - /** - * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then - * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic - * (Render this.posY + this.getEyeHeight() + this.heightOffset) { - this.motionY += (0.30000001192092896D - this.motionY) * 0.30000001192092896D; - } - } - - if (!this.onGround && this.motionY < 0.0D) { - this.motionY *= 0.6D; - } - - for (int i = 0; i < 2; ++i) { - this.worldObj.spawnParticle( - "crit", - this.posX + (this.rand.nextDouble() - 0.5D) * this.width, - this.posY + this.rand.nextDouble() * this.height, - this.posZ + (this.rand.nextDouble() - 0.5D) * this.width, - 0.0D, - 0.0D, - 0.0D); - } - - super.onLivingUpdate(); - } - - /** - * Basic mob attack. Default to touch of death in EntityCreature. Overridden by each mob to define their attack. - */ - @Override - protected void attackEntity(Entity entity, float p_70785_2_) { - if (this.attackTime <= 0 && p_70785_2_ < 2.0F - && entity.boundingBox.maxY > this.boundingBox.minY - && entity.boundingBox.minY < this.boundingBox.maxY) { - this.attackTime = 20; - this.attackEntityAsMob(entity); - } else if (p_70785_2_ < 30.0F) { - double d0 = entity.posX - this.posX; - double d1 = entity.boundingBox.minY + entity.height / 2.0F - (this.posY + this.height / 2.0F); - double d2 = entity.posZ - this.posZ; - - if (this.attackTime == 0) { - ++this.field_70846_g; - - if (this.field_70846_g == 1) { - this.attackTime = 60; - } else if (this.field_70846_g <= 4) { - this.attackTime = 6; - } else { - this.attackTime = 100; - this.field_70846_g = 0; - } - - if (this.field_70846_g > 1) { - float f1 = MathHelper.sqrt_float(p_70785_2_) * 0.5F; - this.worldObj.playAuxSFXAtEntity( - null, - 1009, - (int) this.posX, - (int) this.posY, - (int) this.posZ, - 0); - - for (int i = 0; i < 1; ++i) { - EntityToxinballSmall entitysmalltoxinball = new EntityToxinballSmall( - this.worldObj, - this, - d0 + this.rand.nextGaussian() * f1, - d1, - d2 + this.rand.nextGaussian() * f1); - entitysmalltoxinball.posY = this.posY + this.height / 2.0F + 0.5D; - this.worldObj.spawnEntityInWorld(entitysmalltoxinball); - } - } - } - - this.rotationYaw = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - this.hasAttacked = true; - } - } - - /** - * Called when the mob is falling. Calculates and applies fall damage. - */ - @Override - protected void fall(float p_70069_1_) {} - - @Override - protected Item getDropItem() { - return Items.slime_ball; - } - - /** - * Returns true if the entity is on fire. Used by render to add the fire effect on rendering. - */ - @Override - public boolean isBurning() { - return false; - } - - /** - * Drop 0-2 items of this living's type. @param par1 - Whether this entity has recently been hit by a player. @param - * par2 - Level of Looting used to kill this mob. - */ - @Override - protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { - if (p_70628_1_) { - int j = this.rand.nextInt(2 + p_70628_2_); - - for (int k = 0; k < j; ++k) { - this.dropItem(getDropItem(), 1); - } - } - } - - /** - * Checks to make sure the light is not too bright where the mob is spawning - */ - @Override - protected boolean isValidLightLevel() { - return true; - } - - @Override - public int getMaxSpawnedInChunk() { - return 8; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java deleted file mode 100644 index da1a59600d..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java +++ /dev/null @@ -1,332 +0,0 @@ -package gtPlusPlus.core.entity.projectile; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityFireball; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public abstract class EntityToxinball extends EntityFireball { - - protected int entityX = -1; - protected int entityY = -1; - protected int entityZ = -1; - private Block block; - private boolean inGround; - private int ticksAlive; - private int ticksInAir; - - public EntityToxinball(World world) { - super(world); - this.setSize(1.0F, 1.0F); - } - - @Override - protected void entityInit() {} - - /** - * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge - * length * 64 * renderDistanceWeight Args: distance - */ - @Override - @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(double p_70112_1_) { - double d1 = this.boundingBox.getAverageEdgeLength() * 4.0D; - d1 *= 64.0D; - return p_70112_1_ < d1 * d1; - } - - public EntityToxinball(World world, double x, double y, double z, double f1, double f2, double f3) { - super(world); - this.setSize(1.0F, 1.0F); - this.setLocationAndAngles(x, y, z, this.rotationYaw, this.rotationPitch); - this.setPosition(x, y, z); - double d6 = MathHelper.sqrt_double(f1 * f1 + f2 * f2 + f3 * f3); - this.accelerationX = f1 / d6 * 0.1D; - this.accelerationY = f2 / d6 * 0.1D; - this.accelerationZ = f3 / d6 * 0.1D; - } - - public EntityToxinball(World world, EntityLivingBase entity, double x, double y, double z) { - super(world); - this.shootingEntity = entity; - this.setSize(1.0F, 1.0F); - this.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - this.setPosition(this.entityX, this.entityY, this.entityZ); - this.yOffset = 0.0F; - this.motionX = this.motionY = this.motionZ = 0.0D; - x += this.rand.nextGaussian() * 0.4D; - y += this.rand.nextGaussian() * 0.4D; - z += this.rand.nextGaussian() * 0.4D; - double d3 = MathHelper.sqrt_double(x * x + y * y + z * z); - this.accelerationX = x / d3 * 0.1D; - this.accelerationY = y / d3 * 0.1D; - this.accelerationZ = z / d3 * 0.1D; - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() { - if (!this.worldObj.isRemote && (this.shootingEntity != null && this.shootingEntity.isDead - || !this.worldObj.blockExists(this.entityX, this.entityY, this.entityZ))) { - this.setDead(); - } else { - super.onUpdate(); - this.setFire(1); - - if (this.inGround) { - if (this.worldObj.getBlock(this.entityX, this.entityY, this.entityZ) == this.block) { - ++this.ticksAlive; - - if (this.ticksAlive == 600) { - this.setDead(); - } - - return; - } - - this.inGround = false; - this.motionX *= this.rand.nextFloat() * 0.2F; - this.motionY *= this.rand.nextFloat() * 0.2F; - this.motionZ *= this.rand.nextFloat() * 0.2F; - this.ticksAlive = 0; - this.ticksInAir = 0; - } else { - ++this.ticksInAir; - } - - Vec3 vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ); - Vec3 vec31 = Vec3.createVectorHelper( - this.entityX + this.motionX, - this.entityY + this.motionY, - this.entityZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); - vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ); - vec31 = Vec3.createVectorHelper( - this.entityX + this.motionX, - this.entityY + this.motionY, - this.entityZ + this.motionZ); - - if (movingobjectposition != null) { - vec31 = Vec3.createVectorHelper( - movingobjectposition.hitVec.xCoord, - movingobjectposition.hitVec.yCoord, - movingobjectposition.hitVec.zCoord); - } - - Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( - this, - this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - - for (Object o : list) { - Entity entity1 = (Entity) o; - - if (entity1.canBeCollidedWith() - && (!entity1.isEntityEqual(this.shootingEntity) || this.ticksInAir >= 25)) { - float f = 0.3F; - AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f, f, f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); - - if (movingobjectposition1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); - - if (d1 < d0 || d0 == 0.0D) { - entity = entity1; - d0 = d1; - } - } - } - } - - if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); - } - - if (movingobjectposition != null) { - this.onImpact(movingobjectposition); - } - - this.entityX += this.motionX; - this.entityY += this.motionY; - this.entityZ += this.motionZ; - float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) + 90.0F; - - for (this.rotationPitch = (float) (Math.atan2(f1, this.motionY) * 180.0D / Math.PI) - - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } - - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; - } - - this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f2 = this.getMotionFactor(); - - if (this.isInWater()) { - for (int j = 0; j < 4; ++j) { - float f3 = 0.25F; - this.worldObj.spawnParticle( - "bubble", - this.entityX - this.motionX * f3, - this.entityY - this.motionY * f3, - this.entityZ - this.motionZ * f3, - this.motionX, - this.motionY, - this.motionZ); - } - - f2 = 0.8F; - } - - this.motionX += this.accelerationX; - this.motionY += this.accelerationY; - this.motionZ += this.accelerationZ; - this.motionX *= f2; - this.motionY *= f2; - this.motionZ *= f2; - this.worldObj.spawnParticle("smoke", this.entityX, this.entityY + 0.5D, this.entityZ, 0.0D, 0.0D, 0.0D); - this.setPosition(this.entityX, this.entityY, this.entityZ); - } - } - - /** - * Return the motion factor for this projectile. The factor is multiplied by the original motion. - */ - @Override - protected float getMotionFactor() { - return 0.95F; - } - - /** - * Called when this EntityFireball hits a block or entity. - */ - @Override - protected abstract void onImpact(MovingObjectPosition p_70227_1_); - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - @Override - public void writeEntityToNBT(NBTTagCompound aTag) { - aTag.setShort("xTile", (short) this.entityX); - aTag.setShort("yTile", (short) this.entityY); - aTag.setShort("zTile", (short) this.entityZ); - aTag.setByte("inTile", (byte) Block.getIdFromBlock(this.block)); - aTag.setByte("inGround", (byte) (this.inGround ? 1 : 0)); - aTag.setTag("direction", this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ })); - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - public void readEntityFromNBT(NBTTagCompound aTag) { - this.entityX = aTag.getShort("xTile"); - this.entityY = aTag.getShort("yTile"); - this.entityZ = aTag.getShort("zTile"); - this.block = Block.getBlockById(aTag.getByte("inTile") & 255); - this.inGround = aTag.getByte("inGround") == 1; - - if (aTag.hasKey("direction", 9)) { - NBTTagList nbttaglist = aTag.getTagList("direction", 6); - this.motionX = nbttaglist.func_150309_d(0); - this.motionY = nbttaglist.func_150309_d(1); - this.motionZ = nbttaglist.func_150309_d(2); - } else { - this.setDead(); - } - } - - /** - * Returns true if other Entities should be prevented from moving through this Entity. - */ - @Override - public boolean canBeCollidedWith() { - return true; - } - - @Override - public float getCollisionBorderSize() { - return 1.0F; - } - - /** - * Called when the entity is attacked. - */ - @Override - public boolean attackEntityFrom(DamageSource damage, float p_70097_2_) { - if (this.isEntityInvulnerable()) { - return false; - } else { - this.setBeenAttacked(); - - if (damage.getEntity() != null) { - Vec3 vec3 = damage.getEntity().getLookVec(); - - if (vec3 != null) { - this.motionX = vec3.xCoord; - this.motionY = vec3.yCoord; - this.motionZ = vec3.zCoord; - this.accelerationX = this.motionX * 0.1D; - this.accelerationY = this.motionY * 0.1D; - this.accelerationZ = this.motionZ * 0.1D; - } - - if (damage.getEntity() instanceof EntityLivingBase) { - this.shootingEntity = (EntityLivingBase) damage.getEntity(); - } - - return true; - } else { - return false; - } - } - } - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() { - return 0.0F; - } - - /** - * Gets how bright this entity is. - */ - @Override - public float getBrightness(float p_70013_1_) { - return 1.0F; - } - - @Override - @SideOnly(Side.CLIENT) - public int getBrightnessForRender(float p_70070_1_) { - return 15728880; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java deleted file mode 100644 index bf7e2159c7..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java +++ /dev/null @@ -1,65 +0,0 @@ -package gtPlusPlus.core.entity.projectile; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class EntityToxinballSmall extends EntityToxinball { - - public EntityToxinballSmall(World world, EntityLivingBase entity, double x, double y, double z) { - super(world, entity, x, y, z); - this.setSize(0.3125F, 0.3125F); - } - - /** - * Called when this EntityFireball hits a block or entity. - */ - @Override - protected void onImpact(MovingObjectPosition MoP) { - if (!this.worldObj.isRemote) { - if (MoP.entityHit != null) { - if (!MoP.entityHit.isImmuneToFire() && MoP.entityHit - .attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 5.0F)) { - MoP.entityHit.setFire(5); - } - } else { - int i = MoP.blockX; - int j = MoP.blockY; - int k = MoP.blockZ; - - switch (MoP.sideHit) { - case 0 -> --j; - case 1 -> ++j; - case 2 -> --k; - case 3 -> ++k; - case 4 -> --i; - case 5 -> ++i; - } - - if (this.worldObj.isAirBlock(i, j, k)) { - this.worldObj.setBlock(i, j, k, Blocks.fire); - } - } - - this.setDead(); - } - } - - /** - * Returns true if other Entities should be prevented from moving through this Entity. - */ - @Override - public boolean canBeCollidedWith() { - return false; - } - - /** - * Called when the entity is attacked. - */ - @Override - public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 9826478ec5..a8eab5b27c 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -1,20 +1,5 @@ package gtPlusPlus.core.proxy; -import java.util.ArrayList; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -34,15 +19,11 @@ import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; import gtPlusPlus.core.client.renderer.RenderDecayChest; import gtPlusPlus.core.client.renderer.RenderMiningExplosivesPrimed; -import gtPlusPlus.core.client.renderer.RenderSickBlaze; import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct; -import gtPlusPlus.core.client.renderer.RenderToxinball; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; -import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; -import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; @@ -51,6 +32,20 @@ import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer; import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock; import ic2.core.item.ItemFluidCell; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderFireball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; public class ClientProxy extends CommonProxy implements Runnable { @@ -117,10 +112,8 @@ public void registerRenderThings() { */ RenderingRegistry .registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed()); - RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze()); RenderingRegistry .registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct()); - RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F)); RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F)); /** diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index 61c8ab5c26..7305a71d26 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -11,7 +11,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -38,10 +37,8 @@ static class BiomeGenEverglades extends BiomeGenBase { @SuppressWarnings("unchecked") public BiomeGenEverglades() { super(CORE.EVERGLADESBIOME_ID); - // this.setBiomeID(); this.theBiomeDecorator = new BiomeGenerator_Custom(); this.theBiomeDecorator.treesPerChunk = 10; - // Logger.INFO("Dark World Temperature Category: "+getTempCategory()); this.setBiomeName("Toxic Everglades"); this.topBlock = Dimension_Everglades.blockTopLayer; this.fillerBlock = Dimension_Everglades.blockSecondLayer; @@ -59,7 +56,6 @@ public BiomeGenEverglades() { this.spawnableCaveCreatureList.clear(); // Enemies - this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntitySickBlaze.class, 100, 2, 6)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 75, 4, 16)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityStaballoyConstruct.class, 20, 1, 2)); diff --git a/src/main/resources/assets/miscutils/textures/entity/batKing.png b/src/main/resources/assets/miscutils/textures/entity/batKing.png deleted file mode 100644 index ced2722563c643abafbe9e9068fd4dada09ad505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1994 zcmeHH{Wp|(6#tre=Iwdr?a3H3G)Y!QEk^UY=dZ=HFWMehMgR>lQZq*==>0r7h=62 z43MKCL`g!GFl!T)9Z9o|qI1?`Jj)>(`&)?3{Ct zDRc9tI^Z7YVHm&d#ZixFX|mu-0_pnx?r!%=EQ>hV#6xD zozrl1*6j3n@v0GzSnl(cf-rc zBP&8WvphNu|63h*h{R6PaB(~zXQsSwa(H~oY#v+t?j2*nc!EVypT}0g)0ndR$$z9L zgd8hEPMa)8$aOb=H>J~zCRrCXuHY3eb!D4}Z|B09txs+Qm^k)Ie@ba_;Lfwnn7rm< z_eJta8`=a6^AGkw<^Jb?xHFR=+q>Mr$DPZK%jOM=x6^`;HE6rYme8M`7Dh&mjy%u} zpCaC2eU5gZ5p--v?=vBuB&#r%z6`e z#XBDEujoldyFWais)@RgVC$47sD5HL)@!C;;Usk_FFw`60Sym}mcE6m1D9pI7U|!H z6COUrmYQF4GO4I=Yh=qWe_yGje5C99h+hw1eUY*5n&Ecij}P`FE`oav%O!%; zkqH~KqgwN(Wn=Ep6|D#qRZ7EB)J2r0*yhP=EvXxnhP*}|G2@=2l6U_4MNVEv$JImj zJFj-K_cs>!q$C&2^!~PYzOncFZw<(3KJ!jRPm^Na?aXUn;XZ!*xLFajx7_&Z)^;~- zP26D8F~n#ZSh7dUR^7Ax&X*BcliQrOBuAqly(~-Xb?J9U)Qy)^j>k26Q8Q~9p+c{U b>56+#YATFus~W%`{`_r&0)iz5Kb7V`Sw_~F diff --git a/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png b/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png deleted file mode 100644 index d2b36d633db14931490bc6e0e7a045480cc5497a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1221 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#N0|R4EfKP}kP=QLBiDkK) zN|~`tsVoma0~bGopco^U5F>*p1A_^JcA1r+7@LF~Bd-7hI|l<753@zNt4q0`eYuyq zArl7|BPTZl8yACYsk~{qleh$@PMI}_mLNAT1E&}hn>vS9nW;pnf@YDDR+*V{p$cCK zw{(uEOsRrosf==|tW1iyc&WH@sf=o=idLDqTAs2>juOyGIwgtp1AobrK!l4a^*;p|eG;y12e`=7-il+Pt?FCZMvr5Yiq;4UH? zFQAYlAeqCd;J_*!$02CSAr{Ck=)@tI!YLTZA)U%0nZ(J-&nWJ}E@Q(l7|S7R!y;+G zA!5xU=ElaS#UgCL%%dSDYsVsED9R(isHDXxtj#Q*!XYZfDjmfkp2Nv0z{sP+A}q$i z!yqQD1XREzD$OV$!X_HTAt1phW6dJx!OEsCAg#zKD9Xqs$fT&rBxcN_puxy3#3Ufb zs;0-pr^@PB=E+?uBwwbjkk0Y{|9`Ddli7ftXDkWw3ubV5b|VeMN%D4gY5ue2{3RfV zv%n*=n1Mm41cVvyrO8(S1=&kHeO=ifGYW}taWZGCYZn^4)O?%Gjv5OK6M4+pNr}i)l|UC9w)gx<+n!e{-&NeP#SFJEP)#`_I4E$=CWC zKg~47dRpr4L%!XKhI6Ds_&gFaj+{=}Tr^#sjg9B6n;v^l#mzNSg3{R7Zm=8(RM%g6 z$JoqnM>A8gLgXForBi}<-YuAMo4x1K$8X-6{2ciogt}8EE}o|SWJb^CrqB(#r;FC~ zXdi2}E-X0SzVGetrH>YVN_^@cHYaK4lN+td`;u3_@>px~Qoff>M!A3f3ctB)R(qvx zs#_JZIcs@s*!hst>E{bi-8;!VcRxc?)v|YIuB0#bY+%u!H2qma27~8>&(n8qh?p50 zGh<)T)t%Q4lzw6}C>P$Y#JGL>yE}W`nNDl>UOjf|me;R;x0n+uzdlqh>g-`zWB+a5 z1pnD*!?KeX|6Oy{(?0+CZ58wQl7rLND*;0~fAiyIv)8NN%gNoFyK`^(->=_aUSr?% z|KsK7`WFS;tn>cAHdowNZL5E|wDtSq|CitXd)0COr~U2v?UyGqEDaT4@ml)G%ULqF zq^2Qh1*7N@wiX75wU6Bu8VnklSs50ZeN+w*zTg?gU?O1Oq{yh?*y%Qz=MnRiOSfJa z9OSaPu#i)zW|3jzC99tJMV!pJO)Lycd&9IGI~y-H_Wk$x&(O9aA>^3RnC}Q!>*kaceM6 z(2oRakObKfoS#-wo>-L1P>`6JSE84fTB2a0XP{?jZk#ti8K{WC)78&qol`;+07QX^ AasU7T From cac8c16a53c286a75cc24d06cb5d49f4416c248b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 13:50:00 +0100 Subject: [PATCH 09/27] Delete unused Australia textures --- .../miscutils/textures/entity/australia/boar.png | Bin 3022 -> 0 bytes .../textures/entity/australia/bush_spider.png | Bin 1445 -> 0 bytes .../textures/entity/australia/dingo/dingo.png | Bin 3643 -> 0 bytes .../entity/australia/dingo/dingo_angry.png | Bin 1712 -> 0 bytes .../entity/australia/dingo/dingo_collar.png | Bin 3576 -> 0 bytes .../entity/australia/dingo/dingo_tame.png | Bin 3676 -> 0 bytes .../textures/entity/australia/octopus.png | Bin 720 -> 0 bytes .../textures/entity/villager/aboriginal.png | Bin 1154 -> 0 bytes .../textures/entity/villager/banker.png | Bin 937 -> 0 bytes .../textures/entity/villager/technician.png | Bin 996 -> 0 bytes .../textures/entity/villager/trader.png | Bin 955 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/boar.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/australia/octopus.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/banker.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/technician.png delete mode 100644 src/main/resources/assets/miscutils/textures/entity/villager/trader.png diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/boar.png b/src/main/resources/assets/miscutils/textures/entity/australia/boar.png deleted file mode 100644 index 147fc906fc9fd24bfd38d917d35b962086997e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3022 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 DuuB}9 diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png deleted file mode 100644 index 3fa3b44ea74d73ea813a7c5b0fcf86a18eccd47d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3643 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 P1mNa;f_mRE_`-hxN#X1> diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png deleted file mode 100644 index 6e37c611cb9274617e2a8dfe01b56498fb204322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3576 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 diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png deleted file mode 100644 index cd539c577352f73bfa14fd4b7725ef4e081b5e6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3676 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 KKbLh*2~7aGTKg^l diff --git a/src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png b/src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png deleted file mode 100644 index cd0474869fff65f5130706ac1e45e7629b78478b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1154 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DzHC&U#<|NsBrTU*Lg zMchJ$*G*k)LY%X*va*+|sJ6H;P|DMd+g6s_S4$#LN5xB1(oeQ;cs~O zfzSHQGnSlTW$K9I-Err?cdh({@A5^K+av$8I`}ORXdG45 zecTPzD|jsrsYcNaF|Eo?Ow-^D>7Cb*Zsg{-4K20^v8p33=XN{9?uW6q+BvsaPV$GLXz@c zo*D0bvz{w_5)b`dBbIZ(K}wjRZ^509)4zPu3o!lJ|8`IBn;$hRAMN>JGRKqm$~o4T zuI@k9XmEC=U*E)5u<>MhQ=uYT`{DkFZzh}yJZnGY=|f>vt1B0eST)=U`g!m4_4p#j zbNLKQ3vQdHEA8t&=JCpM&C2OoTQa?h9Ny_yvL5*OWrmyJXOEK$C*2dUdGE@m^Il%7 z$2#eo!x6`cp9M}^S-q{VubMFJ-{zeUUugQto=WjKCU79}bRE}@Ge<0YrZ`PGan9Ar z`olY^2Raj{MKiG&s6G3ze)p!lJJPwg=S2yw5@Fu8&bl=A_M$xhyKD}p8PvA8+HzB65skar;FZSTKC98gfZpj&AIDzBMvUBzh8gAp7}-o z39SPcz8^N|d3=NavB}xB3y&x1GNjHDQaEd~PdPJ+Q=vK0gJIKRG5ypkdG02UvM(Op zuWR>f^;kYi`7HSVj@Hd%OKk<^ycna6AKqrHXK=df!@~Uj^)g^$S1oakC`m~yNwrEY zN(E93Mh1qKx(0^2h87`423Cd!RtA>Z20+rl$#(iv6b-rgDVb@NxHT9j=tlxINP=t# s&QB{TPb^AhC`ioAE78kKEm1JhGte_K{HTyQ6{v{8)78&qol`;+0Iqn!B>(^b diff --git a/src/main/resources/assets/miscutils/textures/entity/villager/banker.png b/src/main/resources/assets/miscutils/textures/entity/villager/banker.png deleted file mode 100644 index afe65842cb928e496d93b7d8a1578d4ac5344e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 937 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$E3QC&U#<|NsAgZ+Fqw z>hw}~{Rwf-%F4={tCJiY9E?>2fl>_91ow61lslQq%F2q0iV6w}iin6vOG`^iN=isb zNJ&ZY@$vEU@+vASsw*i)^mS!_%qS$n#mStZw+d(iyQhm|NW|f{lP?x6 zHsEp1Tp@0n$-SvJ()r(i>+ngbUYAp@^BK>b>-WyNb;WzfNmG{v%1*i^GyB=kn=_Wh zB<0@zmf%v(aKvBYb9YMAws6Iuzi;IjuJ32R@OG`kzWuUEOP8>+Wvr39_wC>Qcg`>W zZvXjymiHev2F@$%%r0mY>qaZwV0sY1|Dc~~&mM-WOuP7Z&0H$YQDDP3r;njh*;Fil z0b@litHEoxvZbOg*k--!y)v^DEd0{t*}L99_rJ`0RsTLblsTo}i?Jp_A(tVOe?3D` zTP^2<3-=flUe0HTY?W=8?R-VVJnfBcCzJbg&yKt&e8(zszTFWGpNB6UL~?t=iDZBb>%vWHy!Y#leX${+KLW{P~zQ7v(eC`m~yNwrEYN(E93Mh1qKx(0^2h87`423Cd! zRtA>Z20+rl$#(iv6b-rgDVb@NxHT9j=tlxINP=t#&QB{TPb^AhC`ioAE78kKEm1Jh YGte_K{HTyQ6{v{8)78&qol`;+0IQf+CIA2c diff --git a/src/main/resources/assets/miscutils/textures/entity/villager/technician.png b/src/main/resources/assets/miscutils/textures/entity/villager/technician.png deleted file mode 100644 index 3df6503f9e6c6ee030b85c561d9d518fd2e5a9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DP5C&U#<|NsAgZ+Fqw z>hw}~{Rwf-%F4={tCNgX1cBo9#thq=iuQHnlslPTydu@sDc?IuJ}Ff}$*f4;D6^qO ze)l1nbz9^XFOgNYEZDMBMncVB&MoWaGNgM%^=RYhy zEXl9Ud+YpeckWQpt*MEFr`UV`uuWpREUvhtZX;X6*Y%87 zvb7g{Kkpl(k;TYpsArU4_dovm!Y}_^f1RoB;%8XGn8faK@AwY|hO~P1PMe8_)BGR2 zo-L5S{`Q{!jTKC(f0MW0zG~#35*y_>$073nnuilBm6GSk-p$GLUC>hEa6($RQu2d^ zZuNib>;M00XE#SNE%-f$d6jen+ZSmQ<_|LS7$UlsgmNZS$2l@(T(D;};nHRh_x+RO z_%d=+rVa;_+jGZb8mmJum{kP*;BeGj9wm^r`~*WW(+1g^o0U(SxE6-*TYA`5u6*I^ zU1EQNb9)3Y%wf32ae*a6B0(_0IhsjAA<1Qbvt)n+(*eHR zSL+!p3|&nwOH?VQ91PfW($=YqF-BM*=HA1-x3vFIL*^{L%O-sS z#}AjVC#Wz8x~bf~dgzF(Pj|G1O#ksGjxn40mo_M;EM$*x0y4cBR({`MH-Z1CZbQ(` zLf<+aqr$HWwv7G<{_|91?fu7;-ye5sUdGo-U|Lcwag8WRNi0dVN-jzTQVd20hL*Yp zhPs9pAw~vPh6Yv!mf8kD(!j}f`co7Qx%nxXX_dG&7$@jQ0yRj2YzWRzD=AMbN@XZW i%*-p%%S$a$Fwry6Gcx?BkU15oh{4m<&t;ucLK6V)j&za$ diff --git a/src/main/resources/assets/miscutils/textures/entity/villager/trader.png b/src/main/resources/assets/miscutils/textures/entity/villager/trader.png deleted file mode 100644 index f21c4eea6c5b7210cf5a094bdddf9f67c1bdb771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 955 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DzHC&U#<|NsAgZ+Fqw z>hw}~{Rwf-%F4={tCNgX1cBlV(*(CS747TDDR(jz_Lmeg5fd^O6HpW8HRIti;t@0w z5%Q1}a+Vab6BBZk;8f$%ca>GOk`Qv2;ML_;G!luhGqKT94zx6IH`LluxpNlKGNzIs zzhDN2vdL#HfIP+|Z+92Q|4h2~fE>;OkH}&M2EGFz%$RkplM^V&UgGKN%Kn&9NQ8@% zIYVz1&;)i*7srr@!*8eZ=g&3}II5|4`c|qe_p!E5$0xl1ulW7ln_|ydDQX^9O`d9= z`l)oE|Ndvql*oX0OI6Ztel8A7dHE=4X-M3LcMJu#21m_T1cdD4dU$^QHij2}q8WCt zRe$hY-#11xuaQAuU^rR(hpB;Q0)qzrP9@8M1U(+UdpGk$y>I@%Kl%F?g)!gg331^3 z+a|_f-!9I;9#-nX_~aGWf~J354+3v6?8thg_+^8}wNzfk028rGw@j`$UXGZSqU&;1 z$kt&#!>jM>Uf;{Tzj)co?AsGnq}vv@*0-A-VbJhrkY#?gE8nL-UQ!`)Hj_l4L6(kG zv%c?5jhnd)Vr+;06<%Tc?VH=PEN9A@?E!)b3w|&j;QQ3X5ON_g^!pc0&DScz2QJKG zo+ekpAa}ExVb+A6em+BmdrpycyI5mlG&a6TVsQw4x_;xTbBu~nF4@_72Sethg#Vk! z^5A~zG%cMo2b5VAZmum)7MZ#7rPR#|p45!qP2CKoYD_IcG3PSN1V5BGKd+u!JehmZ z(X0bD=P%n>x4&5SldmC}L0D$uyR5`-vS(ID&*(e8xI*CCz4nj;f}u|sWfj-#<nC}Q!>*kaceM6(2oRakObKf soS#-wo>-L1P>`6JSE84fTB2a0XP{?f_)#HqDo_!Fr>mdKI;Vst07&Fz0ssI2 From 271e05776aa8929acb65f5658694192c3fbf0ba8 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 14:01:58 +0100 Subject: [PATCH 10/27] Unused texture loading --- .../blocks/textures/TexturesGtBlock.java | 238 +----------------- 1 file changed, 12 insertions(+), 226 deletions(-) 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 faeae0ba5a..4d64356203 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 @@ -21,10 +21,6 @@ public class TexturesGtBlock { private static AutoMap mCustomiconMap = new AutoMap<>(); - static {} - - // public static ITexture[] CASING_BLOCKS_GTPP = new ITexture[256]; - /* * Handles Custom Textures. */ @@ -69,50 +65,11 @@ public ResourceLocation getTextureFile() { } } - public static class VanillaIcon implements IIconContainer, Runnable { - - protected IIcon mIcon; - protected String mIconName; - - public VanillaIcon(final String aIconName) { - this.mIconName = aIconName; - mCustomiconMap.put(this); - Logger.WARNING("Constructing a Custom Texture. " + this.mIconName); - GregTech_API.sGTBlockIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return null; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sBlockIcons.registerIcon(Minecraft.ID + ":" + this.mIconName); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationBlocksTexture; - } - } - - public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) { - return new GT_RenderedTexture(aIcon, aRGB); - } - /* * Add Some Custom Textures below. I am not sure whether or not I need to declare them as such, but better to be * safe than sorry. Right? */ - // Vanilla Textures - public static final VanillaIcon VanillaIcon_OakPlanks = new VanillaIcon("planks_oak"); // PlaceHolder Texture private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); @@ -121,14 +78,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); - // Controllers - private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon( - "TileEntities/MACHINE_CASING_FUSION_FRONT"); - public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front; - private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active = new CustomIcon( - "TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE"); - public static final CustomIcon Casing_Fusion_Simple_Front_Active = Internal_Casing_Fusion_Simple_Front_Active; - // Machine Casings // Simple private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top"); @@ -145,9 +94,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon( "TileEntities/adv_machine_dimensional"); public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional; - private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = new CustomIcon( - "TileEntities/high_adv_machine_dimensional"); - public static final CustomIcon Casing_Machine_Dimensional_Adv = Internal_Casing_Machine_Dimensional_Adv; // Material Casings private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon( @@ -179,15 +125,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR private static final CustomIcon Internal_Casing_RedSteel = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_RED_STEEL"); public static final CustomIcon Casing_Material_RedSteel = Internal_Casing_RedSteel; - private static final CustomIcon Internal_Casing_Incoloy020 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_020"); - public static final CustomIcon Casing_Material_Incoloy020 = Internal_Casing_Incoloy020; - private static final CustomIcon Internal_Casing_IncoloyDS = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS"); - public static final CustomIcon Casing_Material_IncoloyDS = Internal_Casing_IncoloyDS; - private static final CustomIcon Internal_Casing_IncoloyMA956 = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956"); - public static final CustomIcon Casing_Material_IncoloyMA956 = Internal_Casing_IncoloyMA956; private static final CustomIcon Internal_Casing_ZirconiumCarbide = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE"); public static final CustomIcon Casing_Material_ZirconiumCarbide = Internal_Casing_ZirconiumCarbide; @@ -208,12 +145,8 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR // Trinium Alloys public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM"); - public static final CustomIcon Casing_Trinium_Naquadah = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH"); public static final CustomIcon Casing_Trinium_Naquadah_Vent = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT"); - public static final CustomIcon Casing_Trinium_Naquadah_Carbon = new CustomIcon( - "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON"); // Material Machine/Firebox Casings private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon( @@ -284,41 +217,17 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR // Structural Blocks private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate"); public static final CustomIcon Casing_Machine_Metal_Grate_A = Internal_Casing_Machine_Metal_Grate_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid = new CustomIcon( - "chrono/MetalGrateA_Solid"); - public static final CustomIcon Casing_Machine_Metal_Grate_A_Solid = Internal_Casing_Machine_Metal_Grate_A_Solid; - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_B = new CustomIcon("chrono/MetalGrate2"); - public static final CustomIcon Casing_Machine_Metal_Grate_B = Internal_Casing_Machine_Metal_Grate_B; + private static final CustomIcon Internal_Casing_Machine_Metal_Panel_A = new CustomIcon("chrono/MetalPanel"); public static final CustomIcon Casing_Machine_Metal_Panel_A = Internal_Casing_Machine_Metal_Panel_A; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_A = new CustomIcon("chrono/MetalSheet"); public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_B = new CustomIcon("chrono/MetalSheet2"); - public static final CustomIcon Casing_Machine_Metal_Sheet_B = Internal_Casing_Machine_Metal_Sheet_B; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_C = new CustomIcon("chrono/MetalSheet3"); - public static final CustomIcon Casing_Machine_Metal_Sheet_C = Internal_Casing_Machine_Metal_Sheet_C; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_D = new CustomIcon("chrono/MetalSheet4"); - public static final CustomIcon Casing_Machine_Metal_Sheet_D = Internal_Casing_Machine_Metal_Sheet_D; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_E = new CustomIcon("chrono/MetalSheet5"); - public static final CustomIcon Casing_Machine_Metal_Sheet_E = Internal_Casing_Machine_Metal_Sheet_E; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_F = new CustomIcon("chrono/MetalSheet6"); - public static final CustomIcon Casing_Machine_Metal_Sheet_F = Internal_Casing_Machine_Metal_Sheet_F; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_G = new CustomIcon("chrono/MetalSheet7"); - public static final CustomIcon Casing_Machine_Metal_Sheet_G = Internal_Casing_Machine_Metal_Sheet_G; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_H = new CustomIcon("chrono/MetalSheet8"); public static final CustomIcon Casing_Machine_Metal_Sheet_H = Internal_Casing_Machine_Metal_Sheet_H; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_I = new CustomIcon("chrono/MetalSheet9"); public static final CustomIcon Casing_Machine_Metal_Sheet_I = Internal_Casing_Machine_Metal_Sheet_I; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_J = new CustomIcon("chrono/MetalSheet10"); - public static final CustomIcon Casing_Machine_Metal_Sheet_J = Internal_Casing_Machine_Metal_Sheet_J; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_K = new CustomIcon("chrono/MetalSheet11"); - public static final CustomIcon Casing_Machine_Metal_Sheet_K = Internal_Casing_Machine_Metal_Sheet_K; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_L = new CustomIcon("chrono/MetalSheet12"); - public static final CustomIcon Casing_Machine_Metal_Sheet_L = Internal_Casing_Machine_Metal_Sheet_L; private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; - private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2"); - public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B; public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon( @@ -388,18 +297,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast; private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon( "TileEntities/adv_machine_vent_rotating"); - public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv; - private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon( - "TileEntities/STEAM_TURBINE_SIDE_ACTIVE"); - public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active; - // Grate Texture - public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A"); - // Speaker Texture - private static final CustomIcon Internal_Overlay_Machine_Sound = new CustomIcon("TileEntities/audio_out"); - public static final CustomIcon Overlay_Machine_Sound = Internal_Overlay_Machine_Sound; - private static final CustomIcon Internal_Overlay_Machine_Sound_Active = new CustomIcon( - "TileEntities/audio_out_active"); - public static final CustomIcon Overlay_Machine_Sound_Active = Internal_Overlay_Machine_Sound_Active; // Diesel Engines private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical = new CustomIcon( "TileEntities/machine_top_dieselmotor"); @@ -433,8 +330,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR private static final CustomIcon Internal_Overlay_Machine_Screen_Logo = new CustomIcon( "TileEntities/adv_machine_screen_logo"); public static final CustomIcon Overlay_Machine_Screen_Logo = Internal_Overlay_Machine_Screen_Logo; - private static final CustomIcon Internal_Overlay_Machine_Cyber_Interface = new CustomIcon("chrono/Overlay_Cyber"); - public static final CustomIcon Overlay_Machine_Cyber_Interface = Internal_Overlay_Machine_Cyber_Interface; // Machine Controller Overlays private static final CustomIcon Internal_Overlay_Machine_Controller_Default = new CustomIcon( @@ -452,73 +347,13 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active; // Crafting Overlays - public static final CustomIcon Overlay_Crafting_Bronze = new CustomIcon("TileEntities/bronze_top_crafting"); - public static final CustomIcon Overlay_Crafting_Steel = new CustomIcon("TileEntities/cover_crafting"); - - public static final CustomIcon Casing_Workbench_Crafting_Overlay = new CustomIcon( - "TileEntities/gt4/bronze_top_crafting"); - public static final CustomIcon Casing_Workbench_Top = new CustomIcon("TileEntities/gt4/bronze_top"); - public static final CustomIcon Casing_Workbench_Side = new CustomIcon("TileEntities/gt4/bronze_side"); - public static final CustomIcon Casing_Workbench_Bottom = new CustomIcon("TileEntities/gt4/bronze_bottom"); public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay = new CustomIcon( "TileEntities/gt4/machine_top_crafting"); - public static final CustomIcon Casing_Adv_Workbench_Top = new CustomIcon("TileEntities/gt4/machine_top"); - public static final CustomIcon Casing_Adv_Workbench_Side = new CustomIcon("TileEntities/gt4/machine_side"); - public static final CustomIcon Casing_Adv_Workbench_Bottom = new CustomIcon("TileEntities/gt4/machine_bottom"); - - public static final CustomIcon Casing_Redstone_Top_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_off"); - public static final CustomIcon Casing_Redstone_Top_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Top_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_on"); - public static final CustomIcon Casing_Redstone_Top_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_top_redstone_main_on"); - - public static final CustomIcon Casing_Redstone_Side_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_off"); - public static final CustomIcon Casing_Redstone_Side_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Side_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_on"); - public static final CustomIcon Casing_Redstone_Side_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_side_redstone_main_on"); - - public static final CustomIcon Casing_Redstone_Bottom_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_off"); - public static final CustomIcon Casing_Redstone_Bottom_Main_Off = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_main_off"); - public static final CustomIcon Casing_Redstone_Bottom_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_on"); - public static final CustomIcon Casing_Redstone_Bottom_Main_On = new CustomIcon( - "TileEntities/gt4/redstone/machine_bottom_redstone_main_on"); - - public static final CustomIcon Casing_Electric_Auto_Workbench_Side = new CustomIcon( - "TileEntities/gt4/OVERLAY_SIDE_CABINET"); + public static final CustomIcon Casing_CropHarvester_Cutter = new CustomIcon("TileEntities/gt4/OVERLAY_CROP"); public static final CustomIcon Casing_CropHarvester_Boxes = new CustomIcon("TileEntities/gt4/OVERLAY_BOXES"); - public static final CustomIcon Casing_InventoryManagaer_Cyan = new CustomIcon("TileEntities/gt4/OVERLAY_CYAN"); - public static final CustomIcon Casing_InventoryManagaer_Green = new CustomIcon("TileEntities/gt4/OVERLAY_GREEN"); - public static final CustomIcon Casing_InventoryManagaer_Purple = new CustomIcon("TileEntities/gt4/OVERLAY_PURPLE"); - public static final CustomIcon Casing_InventoryManagaer_Red = new CustomIcon("TileEntities/gt4/OVERLAY_RED"); - public static final CustomIcon Casing_InventoryManagaer_Yellow = new CustomIcon("TileEntities/gt4/OVERLAY_YELLOW"); - public static final CustomIcon Casing_InventoryManagaer_Blue = new CustomIcon("TileEntities/gt4/OVERLAY_BLUE"); - - public static final CustomIcon Casing_InventoryManagaer_Cyan_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_CYAN_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Green_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_GREEN_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Purple_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_PURPLE_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Red_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_RED_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Yellow_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_YELLOW_REDSTONE"); - public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone = new CustomIcon( - "TileEntities/gt4/OVERLAY_BLUE_REDSTONE"); - // Covers private static final CustomIcon Internal_Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE"); public static final CustomIcon Overlay_Overflow_Valve = Internal_Overlay_Overflow_Valve; @@ -533,10 +368,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR // Advanced Muffler private static final CustomIcon Internal_Overlay_Hatch_Muffler_Adv = new CustomIcon("iconsets/OVERLAY_MUFFLER_ADV"); public static final CustomIcon Overlay_Hatch_Muffler_Adv = Internal_Overlay_Hatch_Muffler_Adv; - // Control Core Bus - private static final CustomIcon Internal_Overlay_Hatch_Control_Core = new CustomIcon( - "iconsets/OVERLAY_CONTROL_CORE_BUS"); - public static final CustomIcon Overlay_Hatch_Control_Core = Internal_Overlay_Hatch_Control_Core; // Milling Ball Bus private static final CustomIcon Internal_Overlay_Bus_Milling_Balls = new CustomIcon( "iconsets/OVERLAY_MILLING_BALL_BUS"); @@ -545,28 +376,10 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR private static final CustomIcon Internal_Overlay_Bus_Catalyst = new CustomIcon("iconsets/OVERLAY_CATALYSTS"); public static final CustomIcon Overlay_Bus_Catalyst = Internal_Overlay_Bus_Catalyst; - public static final CustomIcon Overlay_Cobble = new CustomIcon("iconsets/OVERLAY_COBBLE"); - public static final CustomIcon Overlay_Connector = new CustomIcon("iconsets/OVERLAY_CONNECTOR"); - public static final CustomIcon Overlay_Fire = new CustomIcon("iconsets/OVERLAY_FIRE"); - public static final CustomIcon Overlay_Grinder = new CustomIcon("iconsets/OVERLAY_GRINDER"); - public static final CustomIcon Overlay_GT_Logo = new CustomIcon("iconsets/OVERLAY_GT"); - public static final CustomIcon Overlay_Ice = new CustomIcon("iconsets/OVERLAY_ICE"); - public static final CustomIcon Overlay_Implosion = new CustomIcon("iconsets/OVERLAY_IMPLOSION"); - // Lapo Orb Hatch - public static final CustomIcon Overlay_Hatch_Lapo_Orb = new CustomIcon("iconsets/OVERLAY_LAPO"); // Data Orb Hatch public static final CustomIcon Overlay_Hatch_Data_Orb = new CustomIcon("iconsets/OVERLAY_DATA_ORB"); - // RTG Hatch - private static final CustomIcon Internal_Overlay_Hatch_RTG_Off = new CustomIcon("iconsets/OVERLAY_ENERGY_RTG_OFF"); - public static final CustomIcon Overlay_Hatch_RTG_Off = Internal_Overlay_Hatch_RTG_Off; - private static final CustomIcon Internal_Overlay_Hatch_RTG_On = new CustomIcon("iconsets/OVERLAY_ENERGY_RTG_ON"); - public static final CustomIcon Overlay_Hatch_RTG_On = Internal_Overlay_Hatch_RTG_On; - // Dimensional - private static final CustomIcon Internal_Overlay_Machine_Dimensional_Blue = new CustomIcon( - "TileEntities/adv_machine_dimensional_cover_blue"); - public static final CustomIcon Overlay_Machine_Dimensional_Blue = Internal_Overlay_Machine_Dimensional_Blue; private static final CustomIcon Internal_Overlay_Machine_Dimensional_Orange = new CustomIcon( "TileEntities/adv_machine_dimensional_cover_orange"); public static final CustomIcon Overlay_Machine_Dimensional_Orange = Internal_Overlay_Machine_Dimensional_Orange; @@ -584,8 +397,6 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR "TileEntities/adv_machine_matterfab_active_animated"); public static final CustomIcon Overlay_MatterFab_Active_Animated = Internal_Overlay_MatterFab_Active_Animated; - private static final CustomIcon Internal_Overlay_Oil = new CustomIcon("TileEntities/adv_machine_oil"); - public static final CustomIcon Overlay_Oil = Internal_Overlay_Oil; private static final CustomIcon Internal_Overlay_Water = new CustomIcon("TileEntities/adv_machine_water"); public static final CustomIcon Overlay_Water = Internal_Overlay_Water; private static final CustomIcon Internal_Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum"); @@ -608,28 +419,16 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR public static final CustomIcon TEXTURE_METAL_PANEL_B = new CustomIcon("metro/TEXTURE_METAL_PANEL_B"); public static final CustomIcon TEXTURE_METAL_PANEL_C = new CustomIcon("metro/TEXTURE_METAL_PANEL_C"); public static final CustomIcon TEXTURE_METAL_PANEL_D = new CustomIcon("metro/TEXTURE_METAL_PANEL_D"); - public static final CustomIcon TEXTURE_METAL_PANEL_E = new CustomIcon("metro/TEXTURE_METAL_PANEL_E"); public static final CustomIcon TEXTURE_METAL_PANEL_F = new CustomIcon("metro/TEXTURE_METAL_PANEL_F"); - public static final CustomIcon TEXTURE_METAL_PANEL_G = new CustomIcon("metro/TEXTURE_METAL_PANEL_G"); - public static final CustomIcon TEXTURE_METAL_PANEL_H = new CustomIcon("metro/TEXTURE_METAL_PANEL_H"); - public static final CustomIcon TEXTURE_METAL_PANEL_I = new CustomIcon("metro/TEXTURE_METAL_PANEL_I"); public static final CustomIcon TEXTURE_MAGIC_PANEL_A = new CustomIcon("metro/TEXTURE_MAGIC_A"); public static final CustomIcon TEXTURE_MAGIC_PANEL_B = new CustomIcon("metro/TEXTURE_MAGIC_B"); - public static final CustomIcon TEXTURE_ORGANIC_PANEL_A = new CustomIcon("metro/TEXTURE_ORGANIC_PANEL_A"); public static final CustomIcon TEXTURE_ORGANIC_PANEL_A_GLOWING = new CustomIcon( "metro/TEXTURE_ORGANIC_PANEL_A_GLOWING"); - public static final CustomIcon TEXTURE_STONE_BIRD_A = new CustomIcon("metro/TEXTURE_STONE_BIRD_A"); - public static final CustomIcon TEXTURE_STONE_BIRD_A_LEFT = new CustomIcon("metro/TEXTURE_STONE_BIRD_A_LEFT"); - public static final CustomIcon TEXTURE_STONE_BIRD_A_RIGHT = new CustomIcon("metro/TEXTURE_STONE_BIRD_A_RIGHT"); public static final CustomIcon TEXTURE_STONE_RED_A = new CustomIcon("metro/TEXTURE_STONE_RED_A"); public static final CustomIcon TEXTURE_STONE_RED_B = new CustomIcon("metro/TEXTURE_STONE_RED_B"); - public static final CustomIcon TEXTURE_STONE_BLUE_A = new CustomIcon("metro/TEXTURE_STONE_BLUE_A"); - public static final CustomIcon TEXTURE_STONE_GREEN_A = new CustomIcon("metro/TEXTURE_STONE_GREEN_A"); - public static final CustomIcon TEXTURE_STONE_TABLET_A = new CustomIcon("metro/TEXTURE_STONE_TABLET_A"); - public static final CustomIcon TEXTURE_STONE_TABLET_B = new CustomIcon("metro/TEXTURE_STONE_TABLET_B"); public static final CustomIcon OVERLAY_SC_TURBINE1 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL1"); public static final CustomIcon OVERLAY_SC_TURBINE2 = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE_IDEL2"); @@ -654,34 +453,21 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR 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"); - public static final CustomIcon TEXTURE_TECH_PANEL_A = new CustomIcon("metro/TEXTURE_TECH_PANEL_A"); - public static final CustomIcon TEXTURE_TECH_PANEL_B = new CustomIcon("metro/TEXTURE_TECH_PANEL_B"); - public static final CustomIcon TEXTURE_TECH_PANEL_C = new CustomIcon("metro/TEXTURE_TECH_PANEL_C"); public static final CustomIcon TEXTURE_TECH_PANEL_D = new CustomIcon("metro/TEXTURE_TECH_PANEL_D"); - public static final CustomIcon TEXTURE_TECH_PANEL_E = new CustomIcon("metro/TEXTURE_TECH_PANEL_E"); - public static final CustomIcon TEXTURE_TECH_PANEL_F = new CustomIcon("metro/TEXTURE_TECH_PANEL_F"); - public static final CustomIcon TEXTURE_TECH_PANEL_G = new CustomIcon("metro/TEXTURE_TECH_PANEL_G"); public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H"); - public static final CustomIcon TEXTURE_TECH_PANEL_I = new CustomIcon("metro/TEXTURE_TECH_PANEL_I"); - public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE = new CustomIcon( - "TileEntities/DecayablesChest_bottom"); - public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon( - "TileEntities/DecayablesChest_top"); public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] { - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture( - (IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, - new short[] { 240, 240, 245, 0 }) }; + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) }; public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4, From 6ed131f2638ddbe9293d47952d568998d00db3c9 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 14:47:33 +0100 Subject: [PATCH 11/27] Bulk remove seemingly unused textures. --- src/main/java/gtPlusPlus/GTplusplus.java | 3 - .../block/base/BasicTileBlockWithTooltip.java | 4 +- .../java/gtPlusPlus/core/item/ModItems.java | 4 - .../core/item/tool/misc/DebugScanner.java | 108 ------------------ .../agrichem/item/algae/ItemAlgaeBase.java | 2 +- .../blocks/textures/TexturesGtTools.java | 2 - .../assets/miscutils/textures/DevCape.png | Bin 1232 -> 0 bytes .../assets/miscutils/textures/FancyCape.png | Bin 1191 -> 0 bytes .../assets/miscutils/textures/TesterCape.png | Bin 1101 -> 0 bytes .../miscutils/textures/aspects/Sagrausten.png | Bin 2997 -> 0 bytes .../miscutils/textures/aspects/Slusium.png | Bin 697 -> 0 bytes .../miscutils/textures/aspects/Xablum.png | Bin 563 -> 0 bytes .../miscutils/textures/aspects/Xenil.png | Bin 1000 -> 0 bytes .../miscutils/textures/aspects/Zetralt.png | Bin 1461 -> 0 bytes .../textures/blocks/FirePit/mossyFirepit.png | Bin 612 -> 0 bytes .../miscutils/textures/blocks/SwirlBlue.png | Bin 284 -> 0 bytes .../miscutils/textures/blocks/SwirlCyan.png | Bin 286 -> 0 bytes .../miscutils/textures/blocks/SwirlGray.png | Bin 270 -> 0 bytes .../miscutils/textures/blocks/SwirlRed.png | Bin 286 -> 0 bytes .../miscutils/textures/blocks/SwirlYellow.png | Bin 280 -> 0 bytes .../DecayablesChest_bottom_old.png | Bin 617 -> 0 bytes .../blocks/TileEntities/EggBox_full.png | Bin 1777 -> 0 bytes .../blocks/TileEntities/EggBox_side.png | Bin 504 -> 0 bytes .../blocks/TileEntities/EggBox_top.png | Bin 654 -> 0 bytes .../MACHINE_CASING_FUSION_FRONT.png | Bin 515 -> 0 bytes .../MACHINE_CASING_FUSION_FRONT_ACTIVE.png | Bin 502 -> 0 bytes .../MACHINE_CASING_QFT_COIL_STATIC.png | Bin 688 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_020.png | Bin 665 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_DS.png | Bin 660 -> 0 bytes .../MACHINE_CASING_STABLE_INCOLOY_MA956.png | Bin 654 -> 0 bytes ...MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png | Bin 459 -> 0 bytes ..._CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png | Bin 436 -> 0 bytes .../TileEntities/ModularTable_output.png | Bin 260 -> 0 bytes .../blocks/TileEntities/ModularTable_side.png | Bin 244 -> 0 bytes .../blocks/TileEntities/ModularTable_top.png | Bin 289 -> 0 bytes .../STEAM_TURBINE_SIDE_ACTIVE.png | Bin 1505 -> 0 bytes .../adv_machine_dimensional_cover_blue.png | Bin 1457 -> 0 bytes .../blocks/TileEntities/adv_machine_oil.png | Bin 238 -> 0 bytes .../blocks/TileEntities/audio_out.png | Bin 275 -> 0 bytes .../blocks/TileEntities/audio_out_active.png | Bin 433 -> 0 bytes .../blocks/TileEntities/bronze_side.png | Bin 395 -> 0 bytes .../TileEntities/bronze_side_cabinet.png | Bin 401 -> 0 bytes .../TileEntities/bronze_top_crafting.png | Bin 383 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_BLUE.png | Bin 221 -> 0 bytes .../gt4/OVERLAY_BLUE_REDSTONE.png | Bin 243 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_CYAN.png | Bin 197 -> 0 bytes .../gt4/OVERLAY_CYAN_REDSTONE.png | Bin 226 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_GREEN.png | Bin 204 -> 0 bytes .../gt4/OVERLAY_GREEN_REDSTONE.png | Bin 229 -> 0 bytes .../TileEntities/gt4/OVERLAY_PURPLE.png | Bin 190 -> 0 bytes .../gt4/OVERLAY_PURPLE_REDSTONE.png | Bin 208 -> 0 bytes .../blocks/TileEntities/gt4/OVERLAY_RED.png | Bin 209 -> 0 bytes .../TileEntities/gt4/OVERLAY_RED_REDSTONE.png | Bin 219 -> 0 bytes .../TileEntities/gt4/OVERLAY_SIDE_CABINET.png | Bin 416 -> 0 bytes .../TileEntities/gt4/OVERLAY_YELLOW.png | Bin 172 -> 0 bytes .../gt4/OVERLAY_YELLOW_REDSTONE.png | Bin 202 -> 0 bytes .../blocks/TileEntities/gt4/bronze_bottom.png | Bin 377 -> 0 bytes .../blocks/TileEntities/gt4/bronze_side.png | Bin 395 -> 0 bytes .../blocks/TileEntities/gt4/bronze_top.png | Bin 359 -> 0 bytes .../TileEntities/gt4/bronze_top_crafting.png | Bin 237 -> 0 bytes .../blocks/TileEntities/gt4/machine_side.png | Bin 822 -> 0 bytes .../TileEntities/gt4/machine_side_cabinet.png | Bin 822 -> 0 bytes .../machine_bottom_redstone_main_off.png | Bin 179 -> 0 bytes .../machine_bottom_redstone_main_on.png | Bin 178 -> 0 bytes .../redstone/machine_bottom_redstone_off.png | Bin 169 -> 0 bytes .../redstone/machine_bottom_redstone_on.png | Bin 162 -> 0 bytes .../machine_side_redstone_main_off.png | Bin 172 -> 0 bytes .../machine_side_redstone_main_on.png | Bin 172 -> 0 bytes .../redstone/machine_side_redstone_off.png | Bin 165 -> 0 bytes .../gt4/redstone/machine_side_redstone_on.png | Bin 158 -> 0 bytes .../machine_top_redstone_main_off.png | Bin 179 -> 0 bytes .../redstone/machine_top_redstone_main_on.png | Bin 178 -> 0 bytes .../gt4/redstone/machine_top_redstone_off.png | Bin 169 -> 0 bytes .../gt4/redstone/machine_top_redstone_on.png | Bin 162 -> 0 bytes .../high_adv_machine_dimensional.png | Bin 1713 -> 0 bytes .../textures/blocks/blockAntiGrief.png | Bin 1086 -> 0 bytes .../textures/blocks/blockBloodSteel.png | Bin 529 -> 0 bytes .../textures/blocks/blockDefault.png | Bin 942 -> 0 bytes .../blockNuclearFueledHeliumGenerator.png | Bin 440 -> 0 bytes .../textures/blocks/blockOre_Overlay.png | Bin 231 -> 0 bytes .../textures/blocks/chrono/CyberPanel2.png | Bin 350 -> 0 bytes .../textures/blocks/chrono/MetalGrate2.png | Bin 269 -> 0 bytes .../textures/blocks/chrono/MetalGrate3.png | Bin 292 -> 0 bytes .../blocks/chrono/MetalGrateA_Solid.png | Bin 304 -> 0 bytes .../textures/blocks/chrono/MetalSheet10.png | Bin 675 -> 0 bytes .../textures/blocks/chrono/MetalSheet11.png | Bin 574 -> 0 bytes .../textures/blocks/chrono/MetalSheet12.png | Bin 753 -> 0 bytes .../textures/blocks/chrono/MetalSheet3.png | Bin 863 -> 0 bytes .../textures/blocks/chrono/MetalSheet4.png | Bin 851 -> 0 bytes .../textures/blocks/chrono/MetalSheet5.png | Bin 877 -> 0 bytes .../textures/blocks/chrono/MetalSheet6.png | Bin 401 -> 0 bytes .../textures/blocks/chrono/MetalSheet7.png | Bin 543 -> 0 bytes .../textures/blocks/chrono/Overlay_Cyber.png | Bin 295 -> 0 bytes .../miscutils/textures/blocks/clear_flow.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/clear_still.png | Bin 942 -> 0 bytes .../blocks/crop/blockCrop.Force.1.png | Bin 209 -> 0 bytes .../blocks/crop/blockCrop.Force.2.png | Bin 547 -> 0 bytes .../blocks/crop/blockCrop.Force.3.png | Bin 782 -> 0 bytes .../blocks/crop/blockCrop.Force.4.png | Bin 701 -> 0 bytes .../blocks/crop/blockCrop.Force.5.png | Bin 925 -> 0 bytes .../textures/blocks/door_cactus_lower.png | Bin 558 -> 0 bytes .../textures/blocks/door_cactus_upper.png | Bin 563 -> 0 bytes .../textures/blocks/door_glass_lower.png | Bin 176 -> 0 bytes .../textures/blocks/door_glass_upper.png | Bin 183 -> 0 bytes .../textures/blocks/door_ice_lower.png | Bin 508 -> 0 bytes .../textures/blocks/door_ice_upper.png | Bin 542 -> 0 bytes .../fluid.fluid.autogenerated.still.png | Bin 9586 -> 0 bytes .../blocks/fluids/fluid.hydrofluoricacid.png | Bin 3998 -> 0 bytes .../blocks/fluids/fluid.hydrogenchloride.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.lithiumhydroxide.png | Bin 22548 -> 0 bytes .../fluid.molten.autogenerated.new.1.png | Bin 4175 -> 0 bytes .../fluids/fluid.molten.autogenerated.old.png | Bin 7019 -> 0 bytes .../fluids/fluid.molten.autogenerated.png | Bin 1558 -> 0 bytes .../fluids/fluid.plasma.autogenerated.png | Bin 1461 -> 0 bytes .../blocks/fluids/fluid.pyrotheum.png | Bin 3691 -> 0 bytes .../blocks/fluids/fluid.sulfurdioxide.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.sulfuricapatite.png | Bin 2844 -> 0 bytes .../blocks/fluids/fluid.sulfuriclithium.png | Bin 31006 -> 0 bytes .../blocks/fluids/fluid.sulfurousacid.png | Bin 2844 -> 0 bytes .../fluids/fluid.thoriumhexafluoride.png | Bin 3011 -> 0 bytes .../fluids/fluid.thoriumtetrafluoride.png | Bin 3167 -> 0 bytes .../fluids/fluid.uraniumhexafluoride.png | Bin 3196 -> 0 bytes .../fluids/fluid.uraniumtetrafluoride.png | Bin 3196 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_1.png | Bin 334 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_2.png | Bin 448 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_3.png | Bin 367 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_4.png | Bin 461 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_5.png | Bin 332 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_6.png | Bin 505 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_7.png | Bin 391 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_8.png | Bin 446 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_9.png | Bin 359 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png | Bin 546 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png | Bin 865 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png | Bin 608 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png | Bin 909 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png | Bin 880 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png | Bin 945 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png | Bin 656 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png | Bin 875 -> 0 bytes .../BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png | Bin 644 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_1.png | Bin 399 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_2.png | Bin 445 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_3.png | Bin 452 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_4.png | Bin 479 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_5.png | Bin 332 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_6.png | Bin 494 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_7.png | Bin 470 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_8.png | Bin 466 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_9.png | Bin 447 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png | Bin 604 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png | Bin 851 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png | Bin 646 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png | Bin 897 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png | Bin 880 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png | Bin 939 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png | Bin 633 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png | Bin 894 -> 0 bytes .../BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png | Bin 659 -> 0 bytes .../blocks/iconsets/OVERLAY_COBBLE.png | Bin 515 -> 0 bytes .../blocks/iconsets/OVERLAY_CONNECTOR.png | Bin 401 -> 0 bytes .../iconsets/OVERLAY_CONTROL_CORE_BUS.png | Bin 553 -> 0 bytes .../iconsets/OVERLAY_ENERGY_RTG_OFF.png | Bin 353 -> 0 bytes .../blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png | Bin 377 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_FIRE.png | Bin 500 -> 0 bytes .../OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png | Bin 363 -> 0 bytes ...AY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png | Bin 350 -> 0 bytes .../blocks/iconsets/OVERLAY_GRINDER.png | Bin 237 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_GT.png | Bin 243 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_ICE.png | Bin 216 -> 0 bytes .../blocks/iconsets/OVERLAY_IMPLOSION.png | Bin 431 -> 0 bytes .../textures/blocks/iconsets/OVERLAY_LAPO.png | Bin 450 -> 0 bytes .../miscutils/textures/blocks/mash_flow.png | Bin 942 -> 0 bytes .../miscutils/textures/blocks/mash_still.png | Bin 942 -> 0 bytes .../textures/blocks/metro/OVERLAY_GRATE_A.png | Bin 423 -> 0 bytes .../blocks/metro/TEXTURE_METAL_GRATE_A.png | Bin 344 -> 0 bytes .../blocks/metro/TEXTURE_METAL_PANEL_E.png | Bin 537 -> 0 bytes .../blocks/metro/TEXTURE_ORGANIC_PANEL_A.png | Bin 598 -> 0 bytes .../blocks/metro/TEXTURE_STONE_BIRD_A.png | Bin 647 -> 0 bytes .../metro/TEXTURE_STONE_BIRD_A_LEFT.png | Bin 630 -> 0 bytes .../metro/TEXTURE_STONE_BIRD_A_RIGHT.png | Bin 627 -> 0 bytes .../blocks/metro/TEXTURE_STONE_BLUE_A.png | Bin 410 -> 0 bytes .../blocks/metro/TEXTURE_STONE_GREEN_A.png | Bin 244 -> 0 bytes .../blocks/metro/TEXTURE_STONE_TABLET_A.png | Bin 572 -> 0 bytes .../blocks/metro/TEXTURE_STONE_TABLET_B.png | Bin 579 -> 0 bytes .../blocks/metro/TEXTURE_TECH_PANEL_E.png | Bin 1488 -> 0 bytes .../blocks/metro/TEXTURE_TECH_PANEL_F.png | Bin 837 -> 0 bytes .../blocks/metro/TEXTURE_TECH_PANEL_G.png | Bin 671 -> 0 bytes .../blocks/metro/TEXTURE_TECH_PANEL_I.png | Bin 749 -> 0 bytes .../textures/blocks/rum_mature_flow.png | Bin 942 -> 0 bytes .../textures/blocks/rum_mature_still.png | Bin 942 -> 0 bytes .../textures/blocks/rum_semi_mature_flow.png | Bin 942 -> 0 bytes .../textures/blocks/rum_semi_mature_still.png | Bin 942 -> 0 bytes .../textures/blocks/workbench_top.png | Bin 550 -> 0 bytes .../textures/enviroment/moon_phases.png | Bin 1029 -> 0 bytes .../miscutils/textures/enviroment/sun.png | Bin 694 -> 0 bytes .../textures/gui/ModularityTable.png | Bin 1014 -> 0 bytes .../miscutils/textures/gui/RoundRobinator.png | Bin 1648 -> 0 bytes .../textures/gui/helium_collector_gui.png | Bin 2682 -> 0 bytes .../miscutils/textures/gui/itemBackpack.png | Bin 888 -> 0 bytes .../miscutils/textures/gui/itemGrindle.png | Bin 1254 -> 0 bytes .../textures/gui/overlay_button/mode_0.png | Bin 177 -> 0 bytes .../textures/gui/overlay_button/mode_1.png | Bin 143 -> 0 bytes .../textures/gui/overlay_button/mode_2.png | Bin 140 -> 0 bytes .../textures/gui/overlay_button/mode_3.png | Bin 141 -> 0 bytes .../textures/gui/overlay_button/mode_4.png | Bin 132 -> 0 bytes .../textures/gui/overlay_button/mode_5.png | Bin 209 -> 0 bytes .../textures/gui/overlay_button/mode_6.png | Bin 180 -> 0 bytes .../textures/gui/overlay_button/mode_7.png | Bin 178 -> 0 bytes .../textures/gui/overlay_button/mode_8.png | Bin 188 -> 0 bytes .../textures/gui/overlay_button/mode_9.png | Bin 211 -> 0 bytes .../gui/overlay_button/throughput_0.png | Bin 205 -> 0 bytes .../gui/overlay_button/throughput_1.png | Bin 194 -> 0 bytes .../gui/overlay_button/throughput_2.png | Bin 188 -> 0 bytes .../gui/overlay_button/throughput_3.png | Bin 177 -> 0 bytes .../textures/items/MU-metaitem.01/162.png | Bin 455 -> 0 bytes .../textures/items/MU-metaitem.01/212.png | Bin 252 -> 0 bytes .../textures/items/MU-metaitem.01/701.png | Bin 361 -> 0 bytes .../textures/items/MU-metaitem.01/702.png | Bin 369 -> 0 bytes .../textures/items/MU-metaitem.01/703.png | Bin 366 -> 0 bytes .../textures/items/MU-metaitem.01/704.png | Bin 368 -> 0 bytes .../textures/items/MU-metaitem.01/705.png | Bin 375 -> 0 bytes .../textures/items/MU-metaitem.01/706.png | Bin 375 -> 0 bytes .../textures/items/MU-metaitem.01/707.png | Bin 386 -> 0 bytes .../textures/items/MU-metaitem.01/708.png | Bin 362 -> 0 bytes .../textures/items/MU-metaitem.01/710.png | Bin 326 -> 0 bytes .../textures/items/MU-metaitem.01/711.png | Bin 326 -> 0 bytes .../textures/items/MU-metaitem.01/712.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/713.png | Bin 352 -> 0 bytes .../textures/items/MU-metaitem.01/714.png | Bin 363 -> 0 bytes .../textures/items/MU-metaitem.01/715.png | Bin 363 -> 0 bytes .../textures/items/MU-metaitem.01/716.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/717.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/718.png | Bin 343 -> 0 bytes .../textures/items/MU-metaitem.01/719.png | Bin 464 -> 0 bytes .../textures/items/MU-metaitem.01/721.png | Bin 465 -> 0 bytes .../textures/items/MU-metaitem.01/757.png | Bin 464 -> 0 bytes .../assets/miscutils/textures/items/bomb.png | Bin 311 -> 0 bytes .../miscutils/textures/items/bomb_casing.png | Bin 280 -> 0 bytes .../miscutils/textures/items/bomb_lit.png | Bin 328 -> 0 bytes .../textures/items/bucket/OverlayIcon.png | Bin 195 -> 0 bytes .../textures/items/frameChocolate.png | Bin 339 -> 0 bytes .../miscutils/textures/items/frameHealing.png | Bin 354 -> 0 bytes .../miscutils/textures/items/frameNova.png | Bin 636 -> 0 bytes .../textures/items/frameRestraint.png | Bin 355 -> 0 bytes .../miscutils/textures/items/frameSoul.png | Bin 584 -> 0 bytes .../miscutils/textures/items/frameVoid.png | Bin 663 -> 0 bytes .../ELECTRIC_BUTCHER_KNIFE_OVERLAY.png | Bin 143 -> 0 bytes .../iconsets/ELECTRIC_LIGHTER_OVERLAY.png | Bin 257 -> 0 bytes .../textures/items/iconsets/PUMP_OVERLAY.png | Bin 143 -> 0 bytes .../iconsets/RENDERING_ERROR_OVERLAY.png | Bin 161 -> 0 bytes .../items/iconsets/SKOOKUMCHOOCHER.png | Bin 382 -> 0 bytes .../iconsets/SKOOKUMCHOOCHER_OVERLAY.png | Bin 143 -> 0 bytes .../textures/items/iconsets/VOID_OVERLAY.png | Bin 143 -> 0 bytes .../miscutils/textures/items/itemBolt.png | Bin 161 -> 0 bytes .../miscutils/textures/items/itemBottle.png | Bin 262 -> 0 bytes .../textures/items/itemCentidust.png | Bin 326 -> 0 bytes .../miscutils/textures/items/itemDecidust.png | Bin 341 -> 0 bytes .../miscutils/textures/items/itemDefault.png | Bin 376 -> 0 bytes .../miscutils/textures/items/itemDroplet.png | Bin 218 -> 0 bytes .../miscutils/textures/items/itemFiber.png | Bin 455 -> 0 bytes .../miscutils/textures/items/itemFineWire.png | Bin 514 -> 0 bytes .../miscutils/textures/items/itemGem.png | Bin 420 -> 0 bytes .../textures/items/itemHeavyPlate.png | Bin 397 -> 0 bytes .../textures/items/itemHeavyPlate_Overlay.png | Bin 471 -> 0 bytes .../miscutils/textures/items/itemHelmet.png | Bin 396 -> 0 bytes .../miscutils/textures/items/itemKey.png | Bin 258 -> 0 bytes .../textures/items/itemPlateBatteryAlloy.png | Bin 491 -> 0 bytes .../textures/items/itemPlateDouble.png | Bin 297 -> 0 bytes .../miscutils/textures/items/itemPotion.png | Bin 271 -> 0 bytes .../textures/items/itemPotionBlack.png | Bin 284 -> 0 bytes .../textures/items/itemPotionRed.png | Bin 284 -> 0 bytes .../miscutils/textures/items/itemRing.png | Bin 311 -> 0 bytes .../miscutils/textures/items/itemRod.png | Bin 250 -> 0 bytes .../miscutils/textures/items/itemRodLong.png | Bin 246 -> 0 bytes .../miscutils/textures/items/itemRotor.png | Bin 443 -> 0 bytes .../miscutils/textures/items/itemScrew.png | Bin 199 -> 0 bytes .../textures/items/itemSlowBuildersRing.png | Bin 427 -> 0 bytes .../textures/items/itemSmallSpring.png | Bin 317 -> 0 bytes .../miscutils/textures/items/itemSpring.png | Bin 276 -> 0 bytes .../textures/items/itemSulfuricAcidPotion.png | Bin 416 -> 0 bytes .../textures/items/itemSunnariumBit.png | Bin 276 -> 0 bytes .../miscutils/textures/items/itemSword.png | Bin 363 -> 0 bytes .../miscutils/textures/items/itemTablet.png | Bin 372 -> 0 bytes .../textures/items/itemWaterBottle.png | Bin 262 -> 0 bytes .../miscutils/textures/space/RocketGui.png | Bin 490 -> 0 bytes 286 files changed, 2 insertions(+), 121 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java delete mode 100644 src/main/resources/assets/miscutils/textures/DevCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/FancyCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/TesterCape.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Slusium.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Xablum.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Xenil.png delete mode 100644 src/main/resources/assets/miscutils/textures/aspects/Zetralt.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockDefault.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/clear_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/clear_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_COBBLE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONNECTOR.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FIRE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GRINDER.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ICE.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_IMPLOSION.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_LAPO.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/mash_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/mash_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_E.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_F.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_G.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_I.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/workbench_top.png delete mode 100644 src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png delete mode 100644 src/main/resources/assets/miscutils/textures/enviroment/sun.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/ModularityTable.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/itemBackpack.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/itemGrindle.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb_casing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bomb_lit.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameChocolate.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameHealing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameNova.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameRestraint.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameSoul.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/frameVoid.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBolt.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBottle.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemCentidust.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDecidust.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDefault.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDroplet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFiber.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFineWire.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemGem.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHelmet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemKey.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotion.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPotionRed.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRod.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRodLong.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRotor.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemScrew.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSpring.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSunnariumBit.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSword.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemTablet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png delete mode 100644 src/main/resources/assets/miscutils/textures/space/RocketGui.png diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 69078ee499..73b9cc9aea 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -125,9 +125,6 @@ public static void loadTextures() { // Tools Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath()); Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath()); - Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath()); - Logger.WARNING( - "Processing texture: " + TexturesGtTools.ELECTRIC_BUTCHER_KNIFE.getTextureFile().getResourcePath()); // Blocks Logger.WARNING( diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index c4e8b191d0..d6119e5608 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -260,9 +260,7 @@ private void handleTextures() { @Override @SideOnly(Side.CLIENT) - public final void registerBlockIcons(final IIconRegister aRegisterer) { - this.blockIcon = aRegisterer.registerIcon(GTPlusPlus.ID + ":" + "net"); - } + public final void registerBlockIcons(final IIconRegister aRegisterer) {} @Override public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index c411555d4d..cf887beac9 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -64,7 +64,6 @@ import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.item.tool.misc.DebugScanner; import gtPlusPlus.core.item.tool.misc.GregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; import gtPlusPlus.core.lib.CORE; @@ -212,8 +211,6 @@ public final class ModItems { public static BatteryPackBaseBauble itemChargePack_High_3; public static BatteryPackBaseBauble itemChargePack_High_4; - public static DebugScanner itemDebugScanner; - public static ItemDummyResearch itemDummyResearch; public static BaseItemMetaFood itemMetaFood; @@ -234,7 +231,6 @@ public final class ModItems { public static void init() { - itemDebugScanner = new DebugScanner(); itemMagicFeather = new ItemMagicFeather(); itemAlkalusDisk = new BaseItemDamageable( diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java deleted file mode 100644 index 889c64f2f8..0000000000 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java +++ /dev/null @@ -1,108 +0,0 @@ -package gtPlusPlus.core.item.tool.misc; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class DebugScanner extends CoreItem { - - public DebugScanner() { - super( - "gtpp.debug.scanner", - AddToCreativeTab.tabTools, - 1, - 0, - new String[] { "Used to obtain information from GT/GT++ content", "Right Click to use", }, - EnumRarity.epic); - setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); - } - - @Override - public boolean isDamageable() { - return false; - } - - @Override - public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int p_77648_4_, int p_77648_5_, - int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - // TODO Auto-generated method stub - return super.onItemUse( - aStack, - aPlayer, - aWorld, - p_77648_4_, - p_77648_5_, - p_77648_6_, - p_77648_7_, - p_77648_8_, - p_77648_9_, - p_77648_10_); - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - // TODO Auto-generated method stub - return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_); - } - - @Override - public float getDigSpeed(ItemStack itemstack, Block block, int metadata) { - return 0f; - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if (entity != null && player != null) { - PlayerUtils.messagePlayer(player, "Entity ID: " + entity.getEntityId()); - PlayerUtils.messagePlayer(player, "UUID: " + entity.getUniqueID()); - PlayerUtils.messagePlayer(player, "Invulnerable? " + entity.isEntityInvulnerable()); - PlayerUtils.messagePlayer(player, "Invisible? " + entity.isInvisible()); - PlayerUtils.messagePlayer(player, "Age: " + entity.ticksExisted); - - if (entity instanceof EntityLivingBase g) { - PlayerUtils.messagePlayer(player, "Health: " + g.getHealth() + "/" + g.getMaxHealth()); - PlayerUtils.messagePlayer(player, "On ground? " + g.onGround); - PlayerUtils.messagePlayer(player, "Child? " + g.isChild()); - } - if (entity instanceof EntityLiving g) { - PlayerUtils.messagePlayer(player, "Can Loot? " + g.canPickUpLoot()); - } - if (entity instanceof EntityPlayer y) { - PlayerUtils.messagePlayer(player, "Experience: " + y.experience); - PlayerUtils.messagePlayer(player, "Name: " + y.getCommandSenderName()); - } - } - return true; - } - - @Override - public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return false; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } - - @Override - public int getHarvestLevel(ItemStack stack, String toolClass) { - return 0; - } -} 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 7b1fb2b148..b0d926a853 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -157,7 +157,7 @@ public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { @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.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae_Overlay"); } public static ItemStack initNBT(ItemStack aFreshAlgae) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index 7400bb987c..a9f74cd75d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -14,8 +14,6 @@ public final class TexturesGtTools { public static final CustomIcon ANGLE_GRINDER = new CustomIcon("iconsets/ANGLE_GRINDER"); public static final CustomIcon ELECTRIC_SNIPS = new CustomIcon("iconsets/ELECTRIC_SNIPS"); - public static final CustomIcon ELECTRIC_LIGHTER = new CustomIcon("iconsets/ELECTRIC_LIGHTER"); - public static final CustomIcon ELECTRIC_BUTCHER_KNIFE = new CustomIcon("iconsets/ELECTRIC_BUTCHER_KNIFE"); public static final class CustomIcon implements IIconContainer, Runnable { diff --git a/src/main/resources/assets/miscutils/textures/DevCape.png b/src/main/resources/assets/miscutils/textures/DevCape.png deleted file mode 100644 index 15c2b758cef7203b4ecbcb4505a541187a0159e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 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 diff --git a/src/main/resources/assets/miscutils/textures/aspects/Slusium.png b/src/main/resources/assets/miscutils/textures/aspects/Slusium.png deleted file mode 100644 index fd2c42414d4ece9348957fb188fa141de278b593..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 697 zcmV;q0!ICbP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGyzyJUqzyT31wzmKP00(qQO+^RZ1`G}! zIyt3QfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNG!sB*!~g&S7fD1xR9Hvt zS3QdwQ51DqvnE^EOe2Ed-^i@Rf(SN#3@o_CHvR!&AWabMRs;(nEW&oOrQ2+6og!U| zB&5hc2!xP8VA*y**hy~Aom?RSHR?KVi+JE5bA9if!<+lwVO#=tJRX0MN~PXpGMVdi zI{g}K$bXK*6AT7l=5jf!P$-aTn$+oZs8*}pt1_WSB9YI-C6t zLdG}>6GE0@7`B0azfZ&A&^E!ZL&i9YRyZ8Koa{ie*`&c>K<##$xF=+cqcAj0`-mR+ z$vsf7*QwEHuo;URQ^q(74Q%^-zOS)ZjNiM(J;9BMy4xP102)M35{U$Pz1|+4bF|jWtwScf+415QlN?9!+JZ2M>O65J8vbjP& zJSeiWA10GYnwJkSx&=N1ePEaw2n3Fz(df5zsT-!rp^n6LZ>)YpCHaA_I?ljH+V4vY=I`YXg*Ax2jR(8 ze}-rEfbg~$xRa84K>SKf>_|y1AbcSPcBP~ik7>Zp2b_uzxR7q}yZP?ee0ThZ-yJLD f%33iaS6r@N3vG~jC5BTH00000NkvXXu0mjfVA3oA diff --git a/src/main/resources/assets/miscutils/textures/aspects/Xablum.png b/src/main/resources/assets/miscutils/textures/aspects/Xablum.png deleted file mode 100644 index a19d64039a40556c43b71413aecb856f0f5980dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGyzyJUqzyT31wzmKP00(qQO+^RZ1`G}? z32Oyo=Kufz7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNG!sB*!~g&Rkx4{BR9Hvt zS38b_Fci!I_82+99wR5<5;;Ih=t37kg+vQ?_n4QtpKWiTw>4jm>`a0$g&Kc&!=_(RX?GC zCN9g;SOA%yP(a7kG>x$UGCwA;ZJT>%d7eYpb=mlS8L@$sL z+i)U}Iq98WgbXS>9Jb*^9&>(nLU8~C4aWsg_2Ux1*>H;qsQ3v5nhm!aK;|bDXg1tx z0GS^Xe0IW7pt8eB!2X7HGYi^!sn@c0agxX>^Lz$Fl$c002ovPDHLkV1l$_ B-gp22 diff --git a/src/main/resources/assets/miscutils/textures/aspects/Xenil.png b/src/main/resources/assets/miscutils/textures/aspects/Xenil.png deleted file mode 100644 index e3b5ecda82a14392dce5cae1deb56cf3605d1af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1000 zcmV>P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGyzyJUqzyT31wzmKP00(qQO+^RZ1`G}k z5=PSOD*ylh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNG!sB*!~g&TMoC0LR9HvN zm(NR7Q546A5E)uVE0LD|4IvRCEkZx3_kQlV_nx^w&bv11TC3F>m1d+n(kp30+LFFV zAI6u_@`CR2A&1RBtupI3ayeuXA8UUv9)x=Z_Z<_wVF$zkyDvRW?6vejf}>|rv@M$=b%x_9`@t_Ie$=>QVuJ!WBE_$rH-_i@F$W-JQu!fuPN&Lk^G%~J z6Ym=UMqjrt8o{_F{CapBz(<72OZyb2dYtk#qb?J#695^I_GP2ORDWTk2AML?n~_N<_1OrWAR5 z$$s!jGc;@}K4A=hY{s11k5?698;F>^fb!>)Z$@5iXOJwIX@D|q+E2vg-?KgXEB zLUJI7Ka_ZA1bZVrlHlmM6m67)i`tm0krUtemCZxknsVm{wwO;@vrQq~sWn*&AK>4FIOb)%za*|1$51!n` zWcs@+0JC3a^oc}-_+kB@??uy-t9)$Pcul*?JH z#x1FQ&+C{vvl`@y{Ky<6QZ1=`Z@;>qX)rS8oJ26}Ehn6y5M{QENzX`!-EDw18vg*^ WMQhzM{Ffd80000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGyzyJUqzyT31wzmKP00(qQO+^RZ1`H1h z38@*1^Z)<=7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNG!sB*!~g&V6G=otR9Hv7 zS4m53XAm`WLS7(>hPX%;Nn9i=73Ud8oacESzyUM}&MrhZnuQ=q(12n)wT8HGrHCSm zisFc3)TcpIT)cmf7hbR{bt?Ch&h6G`ryqWBXuW-{Q>W@wedzEePH}OuQ)OkPfj^&V zkDl&;ys@$I?D+VYy1Tpo$jZukx+Fl}(9rPw=;(+xH#cc$Xozxha&}{5W1l98nwpwl z_xAQ^dU~2#TU)83qJjzw3n?NZ;uq}|IY<=m@~1IBKi|kz`cC`GzJq|t$;nh#S108B zJB5UVP+(x7QG4aCN=Ov%GC4k9aFy&&LQ_LAF)>t7P$1-hx3{+e--8_fK#Nc%B#L*L zoWjGyUvQ%KC4o|EYVOE=e0-jJdU}42?=cxLC;XvWWS%I$yCQ+?IVdI6Xv*)%akv7{ zFc~nXd5f&QYu7<3p~hN3j3p)m<}_3O=Exs&FqW7Mm=peZEjgF!dz1@6<^X!frlY*P zJj^;}XJ?C}Gcz+OBO`;-($Xk3HC3Drm0Bpub8WxS+GMGr|agd}n8eHa0e-0t*WZLLL?tM*aQ$w7R+~&zF{#gdAXU zvT5-s@}i<53+1)7wZzMWc$*1QQc`4*Ac6Y&dg|!tpuWC7>gwteax5F077xf#zMGpH z!PV83Q~>0Wk&zZE5ez|5=8}>U%FWG{8E2>@hqadFh%-Y&PIws=fT4BWqXPhqVRdk$^XcS{mjaHnA}C9vph%u&W35Grlx3ea#F}u0x%nZk^>-D$&{Cu zQ(0M=v0!HJNji zU2jZ~Lpc*m(){@+hkl>&4&&iOkbr)@B8XZtm=FNZ(QiO+OpwDbNC4oTzvR##F_6T& zjQf)SIYtMwdw6(A`}_M+((Uc-|EL5B#u5qWjR|s1xm1q({uhV-l<_g+1IBxdw;7g+ zKsn}ietuqB(c9Zg>FMb-H#aAHUau04SEf{6P~@y!e8LI*&7s{Hu8dC@A2O_00zp93 z)6*j}3`MxrK&*aODgihhfZpK381%~ot@Oy)^06AtI{f7xLHAbUR)SD?6lk(Wza_9_31mjzVGXqtyo`Cs%j$N;AH7q1d1hyZ@ zOG``Trd0O^$dz&=z{){Rj*gC<92yk}WPHUy1+2FKC}7Pp%I8AeV2Ozj7y+{44e z^$T=bt!aGy}c=ngMc5fOT>l zYlcJFt(j2&4CJckE-o&^94?Fj_kY2_zh@8c032(EL(lck&~N=Sjojqw>Wcq_d>JVD zXACT%hl$lOH=HsRN~_9iK5lS3Os3%O?oMuQZohFDI32g$<5b@r2Zw(E5zq6mCh-ML P00000NkvXXu0mjf+(4?F diff --git a/src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png b/src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png deleted file mode 100644 index 78e400a5a031685b027641b3f6f24b71057237c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^Ag1Z(U700GoVL_t(IPhF7TY8pWp#pj9Iiv-r)jfVVz zQfx3QwG^R}M#U9uF*LFew#Z^FR;jjLgrXM}1icakz4XEt*f;PIL|>u5>1U;6ILw?m z-}(N`sL8)I91gqPZV&`^-nMQn*LC-S$)r}Rah=U(?RI;gP%f9T#^Z6Ump?B71f|hv zuy;D0h!d$)D!pD$S?_g#WyB3}lOOY9iA2J9VYFH;9ZKjBsMqVt{$NMmMvPZlS}Yc} zYs+BCWD*5yDwTqaMx*(B4pGzTl#-0d1@iUp64Uv&^M1d7RzEY}nbm4_JRW0Hp6B7< zj^pI+q}goh8Lo|s?-#4p%J==)L#$LP6$%Ar<|Rsx9|X}#lmyGwGcb()sJwOh`E)QC z5TdB|+(&b{+&+Ofm>H9*OhqO$SXs+Vn~vkiN9iZ!t>tp5!Z6(Jc8eeBNB`x0+J^l8 za&^F`jLA-jeY4qMRv)jQq54@Hzy-qp7lnH_QN{73DxlR91rN{(cUcRz{Bq|KvmtIE{-7<{!{xe@-`?4ILlrZ{PEy0qs#$8nZts*nwkN6iYmN2?QRA4 z89&vXdZ^U?{BPaX2;CDN8;l)!oOL+@eY!6sNpMXQHn$e3xGTKbqB&kEF(hW=gNrjX z3%trS&Ty`{ZzNKowJ>|mBb9@T&qgWyXo`%!$hBufjK9Garim=plfxE7c4>PhI&1z< XpH=w5xQ6El&{+(gu6{1-oD!Mq|Kvlh-E{-7<{!{x8@-`@lILlsNtXxpQ!v68aK}VV6lO{1eRc~3MxWE6K z_U(Cns!tD9#=rmW(;A_9!efK7BagEtN1#vlg`^i;(}c}$i&oqf+HBDruap=Pv+=>j z8JY!N+q8Q)SKPfMTA{Ttd(I=3gNx5bDg0=Pj1J`9vmwUY;0n`37VAk-3ubm{7bQBr b{J~iB@xX`UMsaFDhcS4%`njxgN@xNAsu*Nh diff --git a/src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png deleted file mode 100644 index 337d5fd1bcff4a77a574de9036b8fd971cfde105..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJ~ol+NKnsqHa$Y z#}Etusr?6e4;%0>@BS|%cUZV&)x2uPxf)EjJ|uRiU+Rp1yf7^B+|Pf`NBW$6TJ{Pj z@wh8`%;dXh6vGucgIoVwP(iKQ(IT_`Duz;ePjckWu6dv}?X6zN6tUX;h@>`SlYY0z z;x_MD?&8r*XT`g8!{0Pk&JgnED^k(jxrf19dB#Fvp^zb|8DV)z-yv+#cECx?k KKbLh*2~7az#9QP5 diff --git a/src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png deleted file mode 100644 index e13c73be5b676c109beef486fe78ee65f7026e0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvlh-E{-7<{!{x8@-`@lILr1lJ6C*pa8Oa^aG=b^Nt2kKs<$jr+~5CA z`}WLls!tD9%ib^cZ;jAA;juy4k;hq+BhaV&LedMaX~O2WMJw(KZMJBRS4s?t+4$h% z49xCMh9~5*%0GxaD{0ii}j?a1v9&}ixM3( a|1)0n&@$*PujU3ijKR~@&t;ucLK6UnG-50O diff --git a/src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png deleted file mode 100644 index 2b920a8387e55d7674c9d2180d3b15ee3f9df55c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvnIYE{-7<{!{xeavo3+aJF8RTq@%JBHjIkMz6~vaefz$qDr;vRd=__ ztQ36}JuhGXNR^{oQ!HnaM3rMlQdEnWvqps9og9r1RcdL4YWrOdt=N%tay&bR(Ie0000ObVXQn zQ*UN;cVTj60B~VxZgehgWpp4kE-@}N6F_Lh0005hNkl63zQTowi-3Y3*(I!zJ(Wk(SGetCSy!*Cg0v`)>{Ai z_Y&2rRj+p%jjmr;al_IeG7StLbz-n{Cd{E*FcP&?^nwo(zYc ze`MkaSy4!uby86zgD3xoyp7ZnXkI{X}+%G+t!%^mVe@5iY=O2Wo z8OO(?e&1=edWqj!?xw*P9t=GH2wz-$+HSv4NaS**c6*?zB?72--4$$_ogfo}@A`Nv zp{fPy(VAim?KtyvIhFd=?eudgSQg~(=KVUeO_d?j!}GlDEtEtek|QlwILXAQOVI zh(6-^fl@40<Jv}pwc z4}v-Df!rN-lp7HWg~_20+L#9q@J&%(@;?7pF>BT>ri#mEQDat~00000NkvXXu0mjf D-J}s- diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png deleted file mode 100644 index 787572ea3b0e1237d8bbb2cb2e19e19436e02484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1777 zcma)-=Q|q;1I0rlMo}?p&nl&rnx#leB$`;YQo*GnHnnQgHbxQ+8fsizs{}D(*SbZm z($`8+w~E^BRn%;$QrG?RKF|B@{cz6to%0WzCzcksdAP*50000F8ilYvOM`#K0Xp+a z@1T!o!ScZRHXKkhDzSD}fS!ith5$f4_53l8?W}VKqU;|40KC2bie(^x?gjvWNN9wi zZG`ity=j0rMg+RIoeT|I(lP%~hMtgD*=G|fO@y~NG1;mKJp6jUSn7=E)%Fbt*M8P| zTs)!_!pEO<(V?Qre4?z>d%QJL4RkJKUad8frEU&<*fYBIDTh&UaR zyxhIdi51}6#y5iM@3!fZ zqnKr5h}3V-+x%r5M%6)xx;&0d2SSl3REo5Gr83z=WQW5_Vo)}~i~fN(Plm9{=A|im zuRUP}h~STDys#R~^6rZQ`=p!hn%tWkrph6~WwbFuR-pbviN7DUf=rx#OpXJM~v8yUlK>*LJnEKIfMp< z>k``P#CM~>JpRPlPE!#*{L;t#mc=%%~Zh*op;m6VBpXg!>b!cA*FZiUN zDh9rj%T1YsyRs@bSbxXE#~-2`65piDK7Co!v-1ab1@0VGMS%_jUx5Bo+J&JM9;^$giQOah`MGDd2>3|KL%Fi5Y=r%pCBmuI5=D zn+~!aQoiB;nJ-d+enUT5ME5v&_?2Dn^YkwK;;4LwLQ?xyPq{F&*U{0XZfv38FPu8_ z3DGC_!?+OZQfI`}!SPh2c4{^N`P5RGVIYmR2$P2S+T=t&M*U9y_Z z)f+s9%)$_S2#(_cLnc#Wa8+}1&D^{oi2<4ILSF#8ao_~^;?~m`5Lq=ApVtF_Ps(L% z04P5x?|Y%wE_QZlj%+R#gE6W)?Ue4IPqEgCLZ*0<%fgClf;;)JI?cVwbGu4UO1{jn z{xflh*gKFByL8hqZW%@fHhD}>GH?BjI|U1fR(8F8V^7ISynEj@#)sFMUQ*O=NlW#< zFRXI4x54{iR4jHI6i;)HRyl9CE}!xdKmBOvlGrde40@SAsx=8E1@sl`{8^FU)F%2q zFUEr&XYwLptM+M;ZR#4B=Ra;2*zf$-t3PpQc5{9gKurpbfk28dKf=Hpwo+qKiii2vY35pwokR_Rn=i}k{N+U6mc+xORN|mX^3(!&W5+W4f4AVTlbw6Tx_|Bsl8k;AAWQaP8QAR~aa>iJ)C^rS)Aef>u9X5-`I-Ag zn0L^vljbV9Rg2Imu*~|kJ8M>qJ<{^&a#XqQjM7PS{A|T&0-z$BCj-Romx@vI%8G|Y zI&HkL2yM1Gy3gKblb@!)FBI}VqrS8m1;*qUi7MBe$GNH@Ln|Be#{={RwWVvCPTh$E za>m@P=vcXgL=nrpDrI)xl23sOeHLpik~D4SNZGJi07$FtQ093({}6p?;v(^lz~>v7 z+(S#8^?sd!(Ou7XE$5D${>Ygb=b@$FR>aTXf$qF%N_UXI1iNWAwMoA4FP5b?X`C#* zw&_+m{)Y{c%&n<8B7-wKS6@QW%ER8mOL2caE6yxU4oMMIvZkT_2P8Qbt|xdGxoX}^ RZ#lau02*n5sDZo0{R4FANZ$Ye diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png deleted file mode 100644 index 771fef125a7360c1ef532bc9974d236460d2618d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf4*&oQ4*`<-1El}}0gXvSK~yMHZIVrn z)i4al+Pe-~?QQBd}%3c~~N`1Oa;L^u5n99GF zpG!J!*@k4+O;pT!PKS9|PZ4p0caIjd8@NVcn-XzVba^}ZJ@R25$G*D+PF!G7(XeMv z&M4W;CTR(K*#aX0bJH7mHL%27I%iR|RAaZAOBL^FzU!G~7&_?Q+j;g+?#HX8l8P96 zK`Cx1=SxP!6|23cG0?9k0ywiRMGF@|+)e&w^vx#*SYQX@6-!l8u9kDfJzyo!iNXya zq?>PhAYQRByp+X;y&^GC&=w$W#_kaai03UgEDRU(e)IZS$T=6Wmf9k6*5Wgu4*mot u%@t*-?;O2&{wkK%gLUx!M-YjmoufZ&g*EpHR}wh@0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf4*&oQ4*`<-1El}}0wYO8K~y+TT~bYG z6HySJ_ckPvEs1|5YB3F{q(RA{Ac_mpL#YWODhP@P!HbZqClTqPiw$$mdK1mD82UK*GU3G$l9wi98wGKR{7G2QMUgVZ5}<~ zer=nXb?DaRMaTz_XO+w=y$ z1F9!lu^W)NR06@^shjaLkn4GnhznsHOUBdTJjHhWWl z{S7lg$E_ZWm>W-JJ`dd(-D94cJV?9Ut!@;cp6h{8-pF8^w?do9OU&rF4Qo&etPauHM z4;nyVDA=Hmef~sqXNTaRE|pGUMBJ0n;0;s?Prq+#XAr-XY`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^PVZl7ZS00DDJL_t(IPi2x@Pr^VDh4+7(n3@<8;*+K% zq5>8Hp-_-ZfN~Wuh>1}FE28h>1^f$mwzHi=oSZhjoNs1lcf{^~aAz-|1rCCTp`(*% zER(Zu?*^0S{?nxQIPTm(q{~$!SGdR*6NOTyQWK|%bhg%jEW35p>fTJ9*RSvQ)$iMK z1vwuJAv9Lx(iG8jcJtH!=#Qs`W+zu~BI#K&Bd`V}F1D}Le@zQUOqTkjsdN(H3J5X@ zT^H-Myz4q+`9>R(W?ZFCPug98d`d1x00K!RfF*HyHp#nJgc-D3B^(7h89Fode?GQSFwO#lgcC8VHg*jIi)kIr<`{20V78^(v=|7-Q-8-=szGp2H?{x(002ovPDHLk FV1frO#I*nb diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png deleted file mode 100644 index 4f7290c5716df5241532d33e1a663c41a2a81161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^PVZl7ZS00Cx6L_t(IPkoYGPr^VDh4+7(n3@<8;*&-a zQ43N5+d_+60+g$OK}?JYh={(67w|9OS!OdfHF0v9Y`lgPyFscdRn}r=jLBa2;*vhfIh`dqFe~=EYL`J5xeZ+ s*3hu%*1>F!_Qn9cE#0=mK-5V805NRT^%|TSg8%>k07*qoM6N<$f_sw35dZ)H diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png deleted file mode 100644 index de786a5cc9857215a04f84ba574d4f6393a8d15b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 688 zcmV;h0#E&kP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;Hc3Q5RCwAv(>rclM-YYKzaHK94j-}v6HuVFIWpkDkyqq}ICX5mi*QJj98uKF zbaz!b7{V(!g;U>=KmYo>09F=~!Ogyrq5#Y}DRa6C03(Z-6Uo5b0q~W@?@vEqW~>>k zu_)kh*twifWGUJ<#2j;{B8W%|;kPf($WMR#Qvln(G1p{W2AQz$_gpR~Vhw~u-O%0v zgA%9$0ws$qC}r2QZmUZ_U?FQkt;a8z7p#~0kA+6k%rht8MM1k#9ELG)na{nBGmDlPY+ziAih0Q zu_%JpjoXLMjHM(E3T*Gl0?C0$p!$)!4+d+J;uLM*TjG-$1} zCMX;IM)8jiaC|k!_XAo`xo}Hx=m((ySuoxTCAja-@qD3u*hmF`d7LB-->+EY{p8be z5SgHjLWuK`h{16-W)#*oau)vm+J|6(l!d?^71bdgJqEFsCT?6 zetLSs4}*g!l?xEon9R59SFG>XB59OdJ*Wud>m$(&FPxZ*^UEVufeEa2#Ud)08#$A@ zQlmr>F+>!R!qp6GMj@ygRSR_k1j3*SlO!d;ltQUeD9Aa{U%z}s6udXQIiiMIC+Udq zB+xd)n_=x8mNwR!{QUWX1N`#i)Bm$QkHOwMb53Hd>jKT$rASdum%(A{0Gv-}{u=-Y WIZo^#zR1P^00008&EL#Y7+!>a@a2CEqi4C48d;*Yuk)t(9P331H|_e~G>ObKvH z^mB>zc8c+GjC8jPbF~d|whnNx@U=7ZwlVdzGIljLa4|PzNs7#m4Gwd)aWK~Pcd)QF(5lKz$O!TFu{E{O)$p=5 zG0{?u^>TE#G&0syF;G`>GS$;nQ3!Ifig35nRFu_FknylG)>4vFm6P(aF|pLsP?DA~ z)mBxI6jPRwloc0oHr4mDH`h^-ml74SHPp7&*EH8rmk<{G|Np;>fKUt2UyMoK?k>*h z7kHC^9L@rd$YKTtZXpn6ymYtj4^WW3#M9T6{V}7E2p1=FhTbZm&{j_u#}J9jp=Vx- zH3o>VKA2k+I!STXl11L9rYNO+`^SGY_Q&XG`{ai zunA4xu=m63n=;(bQZutzU!JdHvWyY__;%UUOFYtl)9bBIE}T;PEOtw~)~+~*nc*en z9o#Z!FK?GW`kedD>$m@QJnC}Q!>*kaceM6(2oRaVDNPHb6Mw< G&;$T&F diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png deleted file mode 100644 index 52e1a73063071f07cdd6504633154697b192f57f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)t(IS32}9f@v)0=w+?l& z405sva4`3?H}$bK_Odo|w={4u*K;({buiYpGt#uy*Rax8H`hrl%Zx5e4$X-T%!u?( z4t9z4HS@JI@~|>+wNN$HvJP?aPY?G@3^ew%QZv`lcQ#Wt)(p>$cZl@Vbu>{lP}8wD zlGjx+_qW%wF_6<%meo{Lx6qYVlQ(p;F!8pLP?nKUlGe60lvI%wQ;^iLH&!xK7m*cL z&{YwZ788||5R?$su+)`OlM@gVQZdm|HqubkSK|{A`2YWZm(AlHKu<9ydAqwf30$}R z0_1QOctjR6FmMZjFyp1Wb$@_@>?NMQuI!H)g+#bGnKSfO0fjbux;TbNTn;_+QmipR zg!RGQ2dh+^T^26#_By6vwEw?%VR-6~@_n1X-(onyd*6M~gmzWdxXfA%?MfhpB}=5w;lVP=Wn3v|9}iEBhjN@7W>RdP`(kYX@0FtpS) zFw`})2r)9SGBmI8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)gBJ;332sxiS@9LbhQa{ zwhDH%2y`&_w>9&zG4Zl8_AobaHPv%6(RDP|u{Y4N*4MPwRkz4WDo=?iiVMq)3d#)e zPVsY%vp4s%HukhMbkkNfb+rkN2uKg|O0qWb(or`zH*nEZF^-SO^Ky(*S29ph&~>l~ zFx0kHme)~~)zZ_jl$TbwG;+5!^^uiSmX=U5(y^13RFM)>Fwu3;P%@Mdl~q;H6BCw} z5S0@Vlr+21sKV}pX;o@Y@&|3u*+U)7#7$R{w^z2J9rvMSw2fDi! zN_)=KO3733`uyczzNmKA*Y`E)?@Rd(ltirauG*vU?WMz{gFI6wTFtwX-TR`A)BEAF z&6dd)-H{;vN+NDD_ac73xxO~5O?elD{^gT4s}yNou=ja~$t0mG-w&;yuDvEZ zKWesSi~VlNBL&_+`csX+bHCX#|88wS)3(32+JA6#ZlC+A{^=F_Ig^a19eaAafAVYI zZ+}0oSr$4^^y$Z%>b;Clwu#^3dfMI%biQhdYeY#(Vo9o1a#1RfVlXl=wA3{))HSpS vF*2|+G_W$T)HVQ;22QrqpQ32U%}>cptHiCrI6*%WsDZ)L)z4*}Q$iB}5OK}Y diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png deleted file mode 100644 index 91d3660711069332ddd9b2c25452529b4a3a1bb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmV;+0W|)JP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0W3*GK~y+Tjgf6j z!T=aW&tJ$d78X<_BdygG#a%a&1lYbr;dA z6}x+72dcMUy)$UJOC8%ZzpWPre>X9@Wt-+5ERZ|?@}lFt6Ixg5iRk5$ZJOHzuW#=9 zFsq5&qP6MLI_BQ(TIK|)Ojl|XU8&w`BDd(=8XtN0kU*L9*(Cq~002ovPDHLkV1fjs B!J+^F diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png deleted file mode 100644 index c82b335f0cf0d144c89c395cbc669e40c1955dc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmV;l0ZaagP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0ToF^K~y+Tjgj3> z!ax{A&y6I25lbxvtSy!nF*RWDHvxqAe=6r|RZ7*>WUrXBhuJClmg$CcL%wG6%Jnnx z6Y(R-it&=m1*3vt!C+1>XE4L)Y)`%?+cDdbzu7rbyp)O+(LH_!>Dp)ox*#-pC~5sz z(sEa{+|d$0#e#!-Yv)IIRnJSX;H!zzpYHFp{_Xq<3l2@3?(h~*7Zfyys?q9QxkYOw zFQWNM2d#JaMp#g%C%@C$^fbgO{*%_G-2e+jD^nAFU58um?p(m|?xVMZmRm=gwtZbF z{%&G)Y@4?GSRl8uimvuPKU+-7csA0000qM z&(PdBZ+K)2$`0EaC#5A+l34zwvOxL6?`qM z&(PdBZ+NTLqi>8!>gzQpywz=XIZkr7 zh+pR=ZRe@X(*KS1pX!Xrl;9B4?T#)*PP;A%cxg`bO?)=T!9`IgOiKDs#&PX$3m@A* ielPHGMau++2W$opyC*dLJf9AqM z&(PdBZ+C?0cI{|TyAjp%&Sk}KG9N`7#rUuc(Rwf$0R)^X2u24thKuwm)&<#c-~VYoiS?; zSK}0+qW3B+=ML?6+2xe&%f+D(^~{2QU&NZ22WQ%mvv4FO#nE4V?zJ{ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png deleted file mode 100644 index 8ae37e61d4828d73c8c6b851cee7fbec8446dec5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1505 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 J?ViBoe*wpEyQ%;H diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png deleted file mode 100644 index a8a857b5b89388efbf6e2ef25d1192abde88fe07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwqdBmh3k`MRA@kjv*HQdwZg}7!-M!tGC?yA9S^brG{l=gb3TsLSr#Oe~+1trv%I2 zPp@MR66#s|zo^T@a~_k-bQZsfz73^wxC(lTg=gA1L^^y_X9#iWJ*dXPru^D^qEYjd b?=7ZBT&6|NJ!lBDh=IY=)z4*}Q$iB}s%S`| diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png deleted file mode 100644 index 7037204d20c1748346f5992d65edc32ee22d1185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwqdBmh3k`Ma`Zrjv*HQTYFCPHW=_YTbqmP@f>GcVSIqEG0f=H@s$o8hpkn%#S2dK zzwq2d|ImlMZI&fFVlcA{57yZ7IA2BG*f2P`<|d0gObVslcvH1nPWNn{1`6_P!I zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4NyWTz$e7@|NsA0^+1&j zH($Rwas4Kc`>gcPRv@3TB*-tA!Qt7BG!Q4r+uensgH_f8$l)yTh%9Dc;5!V$jK}j= zqyPokOFVsD*&j0siEwe0Am#~F!Et6O$o2YPyYsbw^$4NJCu)gTe~DWM4fzg&Dk diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png deleted file mode 100644 index 652245a61c0b2db345c5f8f8425d6dd20d1d05c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmV;60d)R}P)9Q3c@oiJPh|iU?E2 z96&ul!~L*SfR9VRcB--{<}rF8nqkhA5y5>Wynmq{Nbqo;WOI%XYvVD#o%uUX(E9ROwnKX1CfnD) zzqilKe78+PWe6X$%)16=)^F~&8PwkPmz$>_`@CbP zyxqQJXQ3sPi-c}%UVZ&a)u!$9eq>E#2~H0GpW`KAE^Ek8$7B#Odk^pbie}*knFG^8 zxwrk<>i;tqKop2=vXY{Plu$ zsj5craW<7nj1O4XGgP`w41V$?Qh!3nmt%1=!Y*Bq+Ss@t_9#QIdXtNso6a9qbgDZO~(ew5jUWkn(HM0}MO{Pgg&ebxsLQ0Hi9K@Bjb+ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png deleted file mode 100644 index eeb0bae10fa589dff8ee8038ae449c7a8e60de0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)2cx)&)?^1ZMFs{&9#0p?5RLOwC;4U_HV|mF|G%_b zN60CQ>)7nLL!JuvzA)J~z6-m*c(#~VRcD^pf)v4wg)J7_uC%(XT|1>^&(+Hw#-E?{ zHnmslIq|GWVi9m@F>JWVqUgrVve1QL@#?E)Y#r;a$DpHY7M+CQGFpQBD>z3yc3Xxs4GTdTNm<(bf#%vm!dmF~I( zU2or~&d|Gg-9NiYU%tE(Ru?kZRmkafTF+nU#XH5_o=?yJtuyuh7XM;dUMBDEW2#@a b74zAPnI*ox&g&Tq3@QdsS3j3^P60s4hTVTyE?GWxgTe~DWM4famPU8 diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png deleted file mode 100644 index 870d09e8f2dbddd2be8a6e53a73e8a946a7fad9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!46Ls#}EtuWh$I$*v0wT!Gx==E3u-T z^F%ZEgJLZnh1HBNk4mx~VNzRASRj0HZaXhX#I?}Kva#bTgMb4+e@v0ZVTMR%qv{UE g1-m&@(%IM;LR#HVx^=v@0J@36)78&qol`;+0Es?MC;$Ke diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.png deleted file mode 100644 index ba9dfee9484950955b64b2f719e3be5bc7c12bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6;7`#}EtuWQlbT{{R0UAjXs+%*>>w(aT^V z(!?lc>88QU7{FR8{JeSRiv^nYf`<}PT&}kBy;3{FEZNeuFiC>pGPg=oqj>{cBZm=7 mbjTy2<6H%j1~QDy%nTdajqSs$jFN!1FnGH9xvXi~Qw)4GGJHss5(zGy1qJdMRE3`?1 z;ZnCGn+lWKg7go++4&h>E_GCB;yEZbb;ps7OfhUcwhSf4C+=3vId_18p>dnNxt5H< R0-zHZJYD@<);T3K0RW+?LDT>M diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.png deleted file mode 100644 index 00614a28ee083c931b8d76ca0716b6c952f24b80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!9-6N#}EtuWQku5f?ml@{~bDbBtEV<%IVOy zK)Qu(!>lOtM7c0uUsg|+7{;xW-u^dV5s&~4NQ~Us|~b_!PC{xWt~$(695i|IvoH2 diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png deleted file mode 100644 index 15e5e3807ec374710a75d4a4b9d885bf1c5bc756..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!75J|#}Etu2a) diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.png deleted file mode 100644 index 89a22fde868022161da6a2712d83322d4f2ca6a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!C+4p#}EtuWQk`B8W%pa=WyN`!6-aMP1?XI zQzXDVQ7$ZcHrJ#LtBx}SFb5duIY%xqkvQ<@H~*Q#EC!Vdyycun6B|S)JYv1YqQrAS gRhFmnzySt^gffj)KVGbS3pAd=)78&qol`;+02B5&#sB~S diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png deleted file mode 100644 index 2b577185f7617f9a3935dffc91434ec22d9c4218..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!BkHd#}EtuiC#5o=w2K@;p3uZGtS_rg|!PC{xWt~$(695eUJ_7&% diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.png deleted file mode 100644 index 78f0f3a7b76662507a29330511368b0f4416dd77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!8A`7#}EtuWQk`F>;)PPrgV!MIA!uQtP@-z zusUi@Q>pN?#I0LbDsV1uEnwIrnZ>}x*4g-^AxGo@%hH1kvzba7*0CLBC}QYh+`+^p zxnT9dRgF^|j$|tDiockv#?`>%Xr6I{k&TU^)mb%=X?p2qpp6Wku6{1-oD!M<4^Tfy diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.png deleted file mode 100644 index 120c04d0870db9fd41d9c8d0b459077e03f0636c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enu)x#BF~q_@`2hPrWPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0X0cPK~y+T#gV;I zgFqC84``9fCrn|H(wP)C78WTiQuqK?7I}uu_%a$Ll7R?9fIxsbl0oV1N(D?e(!VAkTK#Cg0?r)X@91RZ0W0 zG({Y4;JNZkj;gH#&x5~St96!TD2swp9e_M!jDeMx6%OBEE>27aM9el4e5Kv)q}Uv0C`ypTQASB ztv4)R7g#MVIQF};yRwzVTnCS+XBiGJo9<|Rl6|w;<7v%*EZ_@?dgp%pdv$jJ0000< KMNUMnLSTZ~9j@m9 diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.png deleted file mode 100644 index 0f26874430a70447357f57ef08e50b90ffe3bb0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK}Sy)#}EtuWQnu~|LYZ)k~GAb6DFrOT}okg z)97V-rFQ1#}EtuVb}%aJ6=`P_z7TxmCpS04 s%cXe=d>&R3PZ&hbEATu`V&vgr2v#$--#1P92+%49Pgg&ebxsLQ0B^22a{vGU diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.png deleted file mode 100644 index faa25b4887182efac122e48d29a353d535d93efd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)(VT&_LHs*&mGAlmYz6s8gVh76wJXQaaULbHF827b(->QQ7wR<4e?1t z9dnunVOPwj(B=c(MQp;Y2fI>bwsczOP6KkH3hGnnKAM@McV9Q3c@oiJPh|iU?E2 z96&ul!~L*SfR9VRcB--{<}rF8nqkhA5y5>WynmqNEIm}r|9 zc8_eL(za)=c0avS<@v-di_@DjpZ<2^;9j<7`^~kIXFU$Fc-k6dom%6+!y$rGd|LE- zMIDRtMY%5wgXMiE_B@l5cy4g-dflnE9FJ9-JC~o|y<09)eeujMxwR6tOuLhB2rfI} z_U~XNd)~cf&D7bQL70(Y)*K0-V3VhdV~B-+vc#_jL9gb6hZx%a2dKpf>}Ooq z&*^p8an4i;=Q(Rlns|>CY+K4PqnF2kC*j9$;f{J|%ZvuWU`yUT33?3261KGpNHpJc zcrN^$)hthgnfDKK6?e-;2B55ZcL%G0bjQJ*1rj|#-Fq3BBAldo{xKwT@CLkTRpghD ZVCZ?S6!!N}doR#644$rjF6*2UngEwVN4o$3 diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png deleted file mode 100644 index 9fd8c3be818b6c2bccf83e311c87862f8340b9b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 822 zcmb7?M@~Xf7=qDw7pi^v>9CBC^}oAMRsxV#X=;PJxL`G;ukxKcsQLp zyh`k&Ta5@qfgJ;m~O^lRyez`vi{u=`&93%h$ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png deleted file mode 100644 index 6f1e9c0664bbc1bc8d78d43ddf01e0469b6b9224..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 822 zcmb7?YcGOf7{@bTz)K&&C-4Eh_YFExn_h@549!+rJ;>pWY$O$(q?DM=nMow46e4p< zt>&zJ0RMHhX3HVZe)qNezV6?3J=e26Rn?WHtn5>XSbCE)Q;PX2yiwYjn3^yFZ9(Y3TNjYzDmc+d)& zF`Y&tu3ulBCI9C7P$q3lBre0p-aQDo&YK4kgMDOv>P2ZmnMFJ>h&%vO|OGB}&lYnouk^Ji5)QDo&YK4kgMDOv>P2ZmnMFJ>h&%vO|OGB~@o*EGS7C*=C}hRhP@84FBqCOqI>P^WN+VdF&$E(r;SuGQi^ Ub%!P<1C35XC_F_?nr9EA2>TG=jm?)z4*}Q$iB} DDXJ`X diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.png deleted file mode 100644 index 14d33b6e4b5362eb7d716ee74ca30d90ba30cb5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK}Sy)#}EtuWC_;A2^9=(8oi9GUPb?No|$mr zT10cGZkS`qS%ZeN0z8Z}(zYFwGLUDhySlw0v&4DE0+X8!PRtS#3^UXCIi4>H1-XU6 M)78&qol`;+0F|^c=>Px# diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.png deleted file mode 100644 index baa8fff68a355bba42298f21a4a9081ccd651ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK}Sy)#}EtuWC_;A2^9=(8oi9GUPb?No|$mr zT10cGZkS`qS%ZeN0z8Z}o?Sa8WgySC>UH!1lU<5F0kd)(7BceiFf0t?=g?>1;s6@P N;OXk;vd$@?2>^&)FiQXc diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.png deleted file mode 100644 index 9751d8358566dcb27717d4af727805a5dbd10557..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK`T!e#}EtuWC_;A2_g-Q%2V7JL%-_&U+5!p z;aWuV!g;J-$qd_$NojC1)m`205V@j((`z!XhDk#sBSYCib}mtmxSoL-Z8HB1^B85zzl7Wh`VY^oAaJAQDo&YK4kgMDOv>P2ZmnMFJ>h&%vO|OGB}&lYnouk^Ji5)QDo&YK4kgMDOv>P2ZmnMFJ>h&%vO|OGB~@o*EGS7C*=C}hRhP@84FBqCOqI>P^WN+VdF&$E(r;SuGQi^ Ub%!P<1C35XC_F_?nr9EA2>TG=jm?)z4*}Q$iB} DDXJ`X diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png deleted file mode 100644 index fe779e8a9e9692396b3c3e2437385eb53e70357c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1713 zcmV;i22S~jP)EK|00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-T?&@5&~w#0;>Q320lqd zK~#9!?VHPsTtyVdzf*NPVG^Ta#snjYx(TS@$_GRwCedKPsE7mN+JJw68#m4b+{CpT z!GUZfkw}P%V30f<)DQ!TE8Pf6L=qJ=zL1&js^en1o0_7|IdvmKkK7BF+dbS{w_fL0 z-}$PCUVZHlhY--~^)R)59j2zHu;Hc~v1QvIB{ktzWihXuguPZ0nqR!&aR{5(7}V4*>?eNy?r+vGvk@Z761To zcykz@G5K3eP5?Om;UjR~!2!U@bGya`qz~i;r3E~@_v7V$BO*Mt`}~Rm!mtodYLpl7 z?&*iY%*#zUb$&OH-B@~aTEKHpd zk(C;ZM&$YZm(cW@zD^kuLmN+4I3to2QLhHfC2|n zP8_v(P@2A6!viV)Lv}TJAibHBXe{!8Ga8k+z#0!?;cZ-KipYbIJ;a6YQR9IGlTs%Z zc@Tt-jD;E$dBBA?OIYuCFtI$?F*~cWVDz_(8V_n07F8dFiq%==0V`xu^+6syECiLw z16G!Hl?QAnlwk4TU+aTt)WYO}MdgkMtAYnxhCHA`j*x!8BJqF)T^QT&fGel6$b(Q= zAFK0)HWJ6w2U_Z*<_r099t5bWJm7+;$irFWK~!`?sNq2{Ql5?n6VHQwq7R^W2y1Kf zK@b9pYk8neCXol6%|sTK_$qzC!sqMK2O;YRHD9pYi(v796&_Ui2Uab()<1}bPV9Iv zu{`)j$rsXNyTyZ0SdloJNFookI7rifkq2CDQwM9c4Ke06bxzIPJK8S(^z!nc! zNiw*G2f>gzCJ#y@5CnnI@nB+ka5nQ3ODq6@$7}q=(lwpR=KewuqLVcqNIM%PXWR4> zS+NGI^99Y#YsG_n$v5+bVARCS7g&)w)&4;+Jd}9=G#*fLb6yjlTtyye?M@33 zdEkVO%$pg|?UaLgaxf45d_qjt3LVgLe`hNGt$=8HooqQ`u=ekRHfq zq{;&?%s`(NP~<`SHZqzZ^1vH4aWy=U*htA}6nT(`Z3(Pi<3S2k${xx`p~!z`LOe_!9Ccj65zykvC zcMT6plgZcQ3%(-hF#Q9G2UYok6O0I7n=iQRL28>XI3b|&Xf*YKH%6hF2T~10|3G@s zcmBa@;lcKye~@bg&P3+dwLBmt7DOIsiwf27pypJ0;0+p)#RD<|sahXs>5s|-su+#d zJn)4Ym^>gwGj=?fXddh>{5~<|!svRsmIq##+SNR`F8@Gs^L&Oi)lV$BdX$-Qrk^NT zgDMY5$x^EPL~m>lRPn$YZ1goesF64w4|t#o00000NkvXX Hu0mjfKa35+ diff --git a/src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png b/src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png deleted file mode 100644 index 4168d9d9340e0bfaba2c8b5783645bb533322fcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1086 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky5YL|!f7A`AmMO{G-G$+Qd;gjJKptm- zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-^lB*Ml1r?Elv*ammE~^Smd|bcsgr-$f9Eg_O~)qw6texXt*}_N-s5!h^W@xUTSjUL`_-lmF|i!)APmZ zHcd-e6qx`1T3q7V@Es*<3zU6@vaZ{8M>*;jKVLk*`Td925lxp)weDq6Qn|RmF<^JN zRr}=V?`+wte;O|C*?Q1#?YF3PQ>^>-y_RZga~m}D^h(doP>kGBU^(@xY*So&occMI z#U~CrJ&{Zx>ftQ(LgMINe&hYKF=etGR&} zZto~uZ{;np_iMAedf*lBLn%*VuH1@xm6K!gYcq@c_bO=~sjY=l%U%j+`%jws_sLpu zj(xXQ=su5oQ+i%#*~L2xCu{bmb4Eq)T_W_hX7g1aJB?7UnL&!>nX4_lKb)+dd8vA) zepGMV1lE(6E*+X`y6CsKOAp)9ty5PB@Elv&893>5=rjuteTmE~Sy#;_1uFi%enjPE z4o}ftZrK^LWKHE<@9NC%IdsS=IeGCc`{y!7+EcF;>h0Tf+3qy&q`G;>U(PYU)O-vW zwI+PUH>BRWWcpcs66bI$pXV|+YWcRyr&1SRoczK|ZDm2weAOKV7rKg%*xf&sA-ngp zXIsjI-PYb892biASZ#G*oTj9}wJ3{k#UobvJz}MwU%jlkT7AK{@lr%ZYVOKO*{b{d z)h`BZ+CHb$|F%}R)`i{Mub#GeVY8!j%a&=@7M8cV!iw1Qb+(jQ^)8v9-Rt#p%Belu zzFbV-y4Ek~e50x5mrMOzd)Ka2_k8NKaC-N7mTd8Ldy3QT+mGH-h^Wq1?cmVbyVu9m z{hkST%9|&_7FM^C6<^HN=~Y{NziPwPTiPt_JZ5t9k5^{D_TPWDJLgu{;%h6ezu@6m zq@wkl^TnJuUw^RopN!>L#D8!rFh8l5xJHzuB$lLFB^RXvDF!10LrYx)LtR6Q5F-OC rLjx-Vb8Q14X&}V(W(SIf-29Zxv`X9>lH)@_8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)#e2Fgt)pe2sttcJ2MEo zG6=bYkf0NTus4HXGBZO82SWxAL#7BrA_Id9gRm2WNF)Pi1Orbr14k$WcPImIFaxgx zgK)MqLzWOjI0J8vJVP=&g9n39Bm+;b3PYY2Lpm3OGlP%^gJ28;$N&HTHRA*S0_|l? z@^*Jo)=J8;0&+MDJR*x37`TN%nDNrxx<5cc_7YEDSN6w@LLyx3PcAU81q$_gx;TbN zT+Z#kDAc4N!rIS~rm(DGf@a&l|L$cMS4z(PR{33yp{r?XOu;!OXXFcRSY(0NCBzQy!qW_fG6=q1klz3{q%)s=KcnfQ#?!x;=ast>s$JKpy}vApl-| z9e{tfDgF$=s1Lv|F#uif0gyX!_UP3E03;^*AE{OpB+0s{VyGFiP87q(IVmS0QL|OI zXgdYVE)XXq*w!?nxRE6r(1|RoKp2VPR2F+kwG_pGiYY0EBsisv2JN9lCX;emBXIyMz*N( z2Hj=KnyIJ=%19IxRv{3(8bm^xN$yGAD`^7pu~Q&2mPp=EOqmfgvOy=g442CC8Hgm) zqqp&99@`-yzL68N5KAn~Y4i#ca*#D#B2uQch@K}ers&(NPl%;=v}-YNtjhfY1-_bN#>#O4ZQs3j8jAzwOiPCwKgM f=|6&JPt>12{^I`&YDcTBQ~-J_hsqZoieLK|+(7dN diff --git a/src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png b/src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png deleted file mode 100644 index f5f51c7175fd2957cf7aa365be6013c46962c47a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xiSbTKf9=TC}1>IPKHl;rL1!tlSn|IB_MkF&rd zvY3H^TL^?1FWs&C0~BO0@$_|Nf6OQ(!o~jN0`pp+&}vT?#}J9jp$8p{m=$?g9QNvl zc3yvTD1(Km<$`petYISqqfZMLfGnKjUV33$XhaL z9%ta6@2nk#L2RC77k2=ityq|KvicwT^vI!{HIRb$a}~@#3eXrSqh8W367ov9Fpp)$tfycKydGQq`3CP z2_1gd{{AlCw%@qt@mu|n2UhDZZ<%v$y8MBLwX7w*H5JlPom=;FwixNo742AZaz@yxEjrp4zBib&@i9Dj$Fx$O oeZ|xRfB)9h+IMu_E%H0fE}5~`QG}gw9?)Y9p00i_>zopr0E|w6S^xk5 diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png deleted file mode 100644 index 4f84e52ab18786a9bcbc0dadcc00fcf38b082734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvgxKE{-7<{>c+21pM&lO#ASm;79&~g$&0P?0k5{rH>uYVh}KBFt9V@ z2)@rC;HxEllp#gBBN51vVEdSuwBv?>T`99*+eFbvNzDdrj0&?t%z*sJNfKsv8k%}I zHZU$pnqc=zlHsti71x0u2Rk`6B-HxWh_$Gyi2P$_xUu=ohSNG4n}P0N@O1TaS?83{ F1OOMjQ^x=R diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png deleted file mode 100644 index ba4f079ba9310e38cffd104f7656d82e60c02860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvk1HT^vI!{MSx6$lIX6<0{)KXjAp&1V`V4iH0%3qb@d7B zg!|K{DYi`5AHZ_iL@H?xcV;Y?Me#X~FSnXEhq7~26`1^PR0OiuXU-{AfrX@T)Ojs@X5Gx(yI4r+_75`5CGeo5iF%)^xq>!&*?>+8LV i)_QPer}u|>6ZogUU%}G-@LE66c?_PeelF{r5}E+3?rTZ_ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png deleted file mode 100644 index 28b1b4dbedb51206cbb319bab33d73d6ca712965..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA`R; zi(`m|e{26i!4?A^=9hZ&s{;<0PP!L#XYI`gp9LgLnw2%Xdbb<8z5iSMpxR;H2Qhgj zGyX4SN_T|C?U(3Y-G0^llgFV=z3X;7omkRda$kG??1ipREoIKk|ITn#JOdATlc=3P@@-H9TEQg{b7qMhqkPk^G)$4 x;{w6o`)0408k607Dp#fU0Lz4$QZ@O<>^Dsg@Gcf)Sq5}BgQu&X%Q~loCIF&xco6^q diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png deleted file mode 100644 index 8d56915ff2a731e5a55a81c3851bc9605ed55480..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 zcmV;U0$lxxP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940ys%TK~z{r)t0SN z12GhZx1|DEfrvn?K&)JWSbH+|gNEuc~rda5%`vVj7l_mV(a;_q*P|K&<8WCx_KvIa zs$VQT*?wpTzCFK_ESKRMvhOJ!x#fztjeVtV#Z z(MitX7&EDb0%S^I3h51dkjt@mQkPexL+Jxuw+tSVKBbF)q))QaJk_;XJ&j;@6x z9Kvnj0fCq{JWK#1yReI6%>lf_W3ERUNs2VhWI(4`_$kMPR}7$phb-c$91;tP;^MsV zYocu7m`DI30<)RlFF&RS`p15Tz4YV$HcSQNa*W!#T;VC+r#;vv3%ll!!6qGH%+Ifg zh9v1?L38Pvbe+a(%&GnFf`pfl@$hbg?{b(55`dAm`K5vc9wM}Gmk zfOwj>S->P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940nlAQ}t=gMo8)`7c~W z!9BZ7*ur-X&J6I)%;kM}TI*9ZV)tu+sdeBbj|f3R3AmU*62nx+jI z*h59xsq6$Yz`f`M5ug(j-;xDnmy5E2sxF8uNCc+7g`XtZQhI349^et)%K#AoQ{P&x zJ{ozd^XQT+JX6212ZN} zRyzi*zht`l7JiUJr#OL5AWMGQkiQxnL~rWfqyQZ}l94l!C0Yz_>R(bYo@l-a2apn= zj-0uU%^wtwwm2}j(A6L4iMI@+ck(>%=FNt3I-PPo%ZiW3Xh@TnQPIhe@*;v)@4CoL ze5?LFuQQ*|`EXQPooUC^@Am`!exTnE^!tH+KhW<7`u)H^?+1v!0SY#tPe2zOD*ylh M07*qoM6N<$f^pXR0ssI2 diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png deleted file mode 100644 index 46c385c4ea5b2f2bf180bc7b30bbb00052c72b18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 753 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940)|OMK~z{r#h0Oy z+b|G@*FFP-0|EsC2MhxW3SS=mzl-Rw%Tm949)mjvHe-DgW=U5jjYr*^eAq1|lVU(eYFKlkNlD^3WYY1?p9 zSHZ}x8Ej>(wB0FyIoPt4lzz5ZmHpls>6{y$DmHZ~t?R^fR!rFjdkq{53sU+afK6rO zO{EQkU%r`;zNHyh87C?IJk|+*ygON0cf6mnAT{QaevTW|2|W7=#5!r%AG4`G!gfqQ z+rHR-JezmE?&SBblhO<|j9D<%2m9;UoUInEpVij(*4GKNezJ^d6XLL7st?wBo6^tT zHnvBNFj=N%>n%ZG^o5c<*e}Iv;|eLn$j9Lzg|F8WqA&b2-##o{1#qY}0ezKaH!MT0 zZ!Ee0kpWIh>=VZlXfS~5e`!E)2(%_a369HBhmH&pV~>Vq z^h=-)H3@vecdp-DKu61nmp~nz0RrEl1b{CN9j%UdF4WN(pf7L?;9i6|pwa0Xr)&gWv67kuZn8P+3rLp@wJuM?o7jYa&gP$!lF_`Y~BLFD)$qK{cH z)dvg5DMAV01Q(VEF5cgYlzxr}{3kfE@YDkE*$nvVjM-ElxTGI4fDZ!<;stPU*tbKQ zuj`mi^^uhR*%uM&MsRd`Z-##|7dTJphYT=X7(6~W;0qT0wAWnvHvnxA)4zBy;Z_aw j(Hre+j_0v)Cw-AWDq=W|FuvdI00000NkvXXu0mjfaI-{g diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png deleted file mode 100644 index 1e9356ba6cc879fde4fb28981a3e90422657c6cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 863 zcmV-l1EBngP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T&Uems&SqOW=bSZbVUqnz+B7IB97Qe2==er&!-Pq4(`F(GkV?L5YFGbNe5P50wf2JNkUN+ zxLhurtE)lh&=8m)A~lz$cgIegBFVK~zo9?tenv)9(-D&8(P@NBz2JBTZ!ChCrwqRN z8AKg!)b0$R{q|ibzZG0}PqJ((hImCe=@DlMIk&X5AlSGU z4p$LI<)2_%{Z+{3GC-b3$E`aUc=I06Qeehsb*_YGY@7n{R*9IKo13wECWf}wtKidV zu(z27TyAUtZxJyvHj3b$2FgU^bC?h~lpZ}s0iHa5M9jr<1QB-`e!cF+c!3M7d{V}y z^;O8{vY3l!jV>~@8<|i!f`H-SVGInuC1w*F*7!(z4h6xBHn4GLAue@wfisM?@d#ah z`TUuJ^gn$?&L*>oU{Mh!VlqU*3af5|Pl+0Z{)3)fK*Z%CJ*TR~%sZXPClYjKVqkU_ z(c)4RPll0M%u(iS)$d8VtVqm}H0?kju*4iXew_5>kPE$#tQHI==l^EFLB$WF(zuaBH9b`e<2gJ}X1N(%mkIAueS1O!8ev1@nzU)un8@xm3|QCvU)Ojt!b zNwWtfjr*bh8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tm{SU{u0Te;35L~PB0t`XNX70Q2^KK z5`vaoR2}o8Da@Nck(+@(mSHh?sT&WDdNI`RpS*TAZu-kJr+>>MTF^hT=O)YOFCOQ9`aA_2}_ zQ`>$zHyep8JC;`j6y-V5H`tGoG7m&3DDj;G&+~ZQ-L0~`2z!`E#8HUaEHmaaZD5Nc zVU+DJMLLzlikMWV$f84KLha~un4Fx%=-3CUtf6F&i{z{EFW?L&uyfXI-0tZCqZ)ff zo(`v{rYOnqn?VZJde-2}$-#Um41-Qjwo3@Ajc!9pu7kHZNKZ);RpzW#q+>DiX&8-0 z5wz#S9tn`GF=q>xBV-iER!C~L*X!M>>~Clw{a=K$og~NNt6K~hNcg2rTqkiXmGDawe>cs zLz6KyG(^D}W&^O91}p0j6V~8f7l{qQsDsac0VCrdw`>*6t($igi#?MPXwVzXB()j5 zoSp%z_W3_F`e$ltA*U74@4W3tQeEeLVvuz0iN+UWaEK9Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T%0sw7o`=x3!*7qqsKL*(CVa5Bk(5Jvc zIxyVC#fY#qU{sFl7aScqEu7jqF3zM7r*%~w8x9*0edCyNEdpSpK;9`pe>P?SXZdV6 zfi)_MfDf&OF`Ug3wlalP*xSGuVHyJwnope)Vx#OC973*#a%Dqq@uI=cwW7utT*Eg0 zAWW!JarOty$i5+vU^N?w`g0@niTEc`E;+-oZ zMBr5^z&XY_cs|Tv$3@Dy`cgu?s7}DHs=EfrxprwIW9>hQz9;*O%JZ&tr?`i?-G0{fq4}F2S%jUSQPa^ z1Z?gxqHy~2U_pe0q*5d3XBu^%0=r}FN_b;qB6Kya=oA_k$q0ZI0uq-Jfpeb<>qOW- zQoyY^I|CT^QLx{aoNKp!*FJ(4J%TfZ4sf=(oA(a}Ik&ZTffx!7=ue3Qt%db!ar%nF zPW^*F$0@9FLQNaPDuQqATEec;AHw_fqT9XFVP7xSkepl8#~O{PW{fu{!m&*hDDv}W zI?Xp9Kg`3|?@wWxPy54>$A8-R!;Mi}PZPhVe_}u7?P<=tqUhKBjsl)zN}HIwU)x=% z_xqUQeSG-554-36@lm>3p1+F0{!fX>fQ^d9M?`B?b3t_fJsD3hVZ*P25uzev>KAGw zf;nod6lK|s*<#Lpn5&<7ajDo#NW~OXvhV ze7ZkyI0%=*47z%R3@(ksa=GXZ*w`G|(T$;Q+7SK%VQi}Jf$Xd+00000NkvXXu0mjf D3d4>j diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png deleted file mode 100644 index e93c9c35c2aac67b25d78435d9287387f80372f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+PLCw>}F(ktM?ex98hYSQ-`P~}&x|#w~d8&>u zZD8W{b~wy6li{MVo7RE^#t6kHeCMp9Jtua*73lQ0auxTkJ72F}%^<9?!1=_1BC~(X z7@q$YPI)K1J^xHEqmP97cgMMHsSNuK6LgakwtGDIRWb9}gbxbOFAK`(nM(wP2}MOH zZS7%XiETZ0Re?EkR*;bJwJm82xc{;JN@vJsoA-3pfo;oHq%oW?49y78Z=Az<_JrhC zMw{a{pUg^^)Xxr>lp8LR8z6l{#y>10Q1ZdV-3u4*;ZOM;>iE5>)am|&gHmg5zW066 zeBbcGvRS6CS(3~Zjy5l7aPkc`7`)srPtOwf*e|3gEjQ8^|GA`;mC=3in22WQ%mvv4FO#pmwnvMVf diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png deleted file mode 100644 index 1952b3d14e2e4cd47b158815abaf9bf96174c5c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~4O={2977`9-%eXtbjU%VjenVvk&)4+O+uY6 zZc54%ZJ2u6EwvH&AcQu;n_T7`IcduUkdg(2{`}C(v&#wR5U~@Y5_>QCMKA3e+7 z)n1*UT_GYVhs`Ye#-Zy=UflnosI8dDQ*&VMuO%;zyE9a-e|^jD_M-E@%&%Q*uq=Q0 z`;R-r`WMedc=@(1*&Czd%`_vsm+{AjNcU#5Q2XUtTTPqR+&t#HeM93~Yr%{Q%U-SJ zaNgp&LCc=)b>X~=(M+z9ea;gW9=Y-Bazswf+rYi53hLqYyH|ZnVBWH}ZjHyqXu&oS z*JrD;4AZj8_KPi2;;D4Ax1Mj8zxr2p#4huW{R>WazE8`&F0$8j(b->d8otHvllE*r zuzT&+Tiv3XRjV0)ng5mK5V29W)t=BFVWQ+}zprhdz>L*1kJKoxf3;ThcdJO9o^#Sh z&0jBV5=yuSSNff6|h>52W@IF^B!95c@`Kd3*ih-%3HpEehE$;-*Jq!PC{xWt~$(698Mz@16hv diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png deleted file mode 100644 index 0d32fdeec8f1227803147f2ea4f20a949ee36d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvmN`T^vI!{FhGH&D&rg;4IlVX_BBsW1xm)>!e8^C7Rz|aNYFeH;bUg zyhWcar%m>AshilPyClipXVSykF3E&B&zAC(5oiWZN`LemKXn;((~3 zaozHCsfJTAce67a%xzg8m@w{pwojhzUMm|%pk1vJyFt{{`G;BFVdQ&MBb@03%gr5dZ)H diff --git a/src/main/resources/assets/miscutils/textures/blocks/clear_flow.png b/src/main/resources/assets/miscutils/textures/blocks/clear_flow.png deleted file mode 100644 index 84a6b68e0e766cbdc60d143673fcd4459029811b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmZ`$U1%It6u#R;Q`6M8`#b-4{_dT*^S3jzv*{Z3A+p;hXiAzasiM+JcT-W2*1EAM zBBCG)f~85U_!J|7MQlkEV`?AlQ$b%O=0`zkZJN}mh!90ZD8$=GAAC6H<9z3Q9L{&% z>OXXFcRSY(0NCBzQy!qW_fG6=q1klz3{q%)s=KcnfQ#?!x;=ast>s$JKpy}vApl-| z9e{tfDgF$=s1Lv|F#uif0gyX!_UP3E03;^*AE{OpB+0s{VyGFiP87q(IVmS0QL|OI zXgdYVE)XXq*w!?nxRE6r(1|RoKp2VPR2F+kwG_pGiYY0EBsisv2JN9lCX;emBXIyMz*N( z2Hj=KnyIJ=%19IxRv{3(8bm^xN$yGAD`^7pu~Q&2mPp=EOqmfgvOy=g442CC8Hgm) zqqp&99@`-yzL68N5KAn~Y4i#ca*#D#B2uQch@K}ers&(NPl%;=v}-YNtjhfY1-_bN#>#O4ZQs3j8jAzwOiPCwKgM f=|6&JPt>12{^I`&YDcTBQ~-J_hsqZoieLK|+(7dN diff --git a/src/main/resources/assets/miscutils/textures/blocks/clear_still.png b/src/main/resources/assets/miscutils/textures/blocks/clear_still.png deleted file mode 100644 index 84a6b68e0e766cbdc60d143673fcd4459029811b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmZ`$U1%It6u#R;Q`6M8`#b-4{_dT*^S3jzv*{Z3A+p;hXiAzasiM+JcT-W2*1EAM zBBCG)f~85U_!J|7MQlkEV`?AlQ$b%O=0`zkZJN}mh!90ZD8$=GAAC6H<9z3Q9L{&% z>OXXFcRSY(0NCBzQy!qW_fG6=q1klz3{q%)s=KcnfQ#?!x;=ast>s$JKpy}vApl-| z9e{tfDgF$=s1Lv|F#uif0gyX!_UP3E03;^*AE{OpB+0s{VyGFiP87q(IVmS0QL|OI zXgdYVE)XXq*w!?nxRE6r(1|RoKp2VPR2F+kwG_pGiYY0EBsisv2JN9lCX;emBXIyMz*N( z2Hj=KnyIJ=%19IxRv{3(8bm^xN$yGAD`^7pu~Q&2mPp=EOqmfgvOy=g442CC8Hgm) zqqp&99@`-yzL68N5KAn~Y4i#ca*#D#B2uQch@K}ers&(NPl%;=v}-YNtjhfY1-_bN#>#O4ZQs3j8jAzwOiPCwKgM f=|6&JPt>12{^I`&YDcTBQ~-J_hsqZoieLK|+(7dN diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png deleted file mode 100644 index 87b1b2b7d37c1247f09c871791df0541ad43142d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~f@z*Ejv*HQ$r7wH6z+z9v!Bw*xZ$LsW9BBt zue?9bbEGCP-gsiblW;_m>BdvGK#4il2O2Ja{PE-gn}nr-!MZy=v5IzhN`}1SS}2-nt{R7)z4*}Q$iB}IPyZ- diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png deleted file mode 100644 index 631045a9363a6a7ed8e883200109db402bbf0540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmV+;0^I$HP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940k}y-K~z{r?Ulbu z#6S?nCxYM~1Q81@QXHHjc7mM`V5KkM16Wub2bRKNFUS=ZK7dbP=^KbXfp$S`EEG|$ z5Z8R09ZWX6+1Wd=ko;gS*(LMsCnQmt8nh6#l6)JOfN|gq>%Et&Ztk76Mj8K{50VU~Tao_8cI>^U}Vy23o z^mTlaB)W))yHqCHM~^A3Z5Ix%>R%$e5bXdGTmiCIeIdLNieVS{Q}yKm zEDkpix4902^B7SRx`aZYU^oXSFot_B2ZIGjg@CI^>}PG4oCS;{gy*00D*{`^TNk4C zCM?822+eePozP+rXebSdvQ7U$1N3KoZ3QU|;}5G%y+R(*_QhnTm3SRtG2 ziRkOQxG#Uc#mq0kecjzB)$I^n3@L$-??AEPyv|Z_GMedlAav9tg~iR32;>b;!a2cn z04y)a--4~4nX62!%PJ577#0Bb8}BLJ8cFH1h+scPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940;5SpK~z{r#g@xz z6hRb*PYcGy#DTpt?$dS`QNT4kbhsPY?kahX0jHTw;4KdZn6~p`f zdS!GeC&kmfF65CCTq_=!)wP~%+ob)n^45;X@xwlnC-kr# zycnDn&(}&v2xrc4-+HgkU~u`oZz`}DG>?WfYQ}PTow{e;J1auHV(2)r9@#Xqh@P5i zGqvSuQzrkAP$!yc^Zjmg3Zgt`3ytA$G(=P0a15Vb_oH!t)i0F7D+i2lhK_pA86BO= z11TR!H!Stts0}2M1t4okZNj}%X3NrE&~`L9d#qfaX0HlY9yBz!#Pl|A*ocO z%riiaF9Nx|7|sDejqn~Lc#O>XpT9nh(~!$k3?0xhA}XH9;M=xU3Js$dvGk%`o+3Gh z7cPofIw5k*HWD8bO*>=8w|r7vK~vr^1GBJj$bV269UUcP{c)Lwn5U7~dG5z3hAOI3 z|C7ki-+oVHU0LtRpzCFwWsu@6+Ds_k-nL~bdu~5c0&0X&2->-%?2B!#H?O^{W5!;Q z%L9#i;M9^x@8vjo7Mk*sJ#hAPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940#ZptK~z{r?Up-F z+&~nCj}Z+I2>~0rptP{2q9dZCNh%%^eVRZ43pElTK*|r;G+EkoL;)%~DwGn5!cn9s zilWe=-3}qqVCHz{+TOuld)>I%BiS<^`@3`RorlM%R;wseeWol;j_>=XT8>K3K+l1m z13d>yb-;C9y%Diu%kw-_OI8v?WpTDj-w8W9z$hCh@LRute@$Te6)@lcZ(*b;fN&&?Bn+mYKr=PLwrlz{ya2e4{Zcq0iob=h3G?qL2rXwR7VcW+| zgy|xe#KzT$qa(b+^T5TC{^&M%0$NYH9G?QNuYlvv+9?{lTdxQ2&Z{-YaI2F`-nSoT zuAi5aOawzfBkY*49X*G`R0G+a8}8)2>yiuEP8>_gUa$|)$n{;+`Qp!d0Mlzm!c@j3 zMv8KA1r9KBNmbm4w29dE?zD!6ik#6G<-Q+A*=aiyijj#gHOx-v=w|2jSW?nnay@|jB0JSy#tncxy(~BH1vpuup%FDGmAj^v4hxGo#2K@hjfy)axGDir;>qR-1;qRD6Zq%%1nt0J$do2qj zlFo~8rW!fG2xL9esBB7=VYWmPSjwWDD0G0Jh(^uN2+e!-2OQLsh!;EIrQa6kM4|399T00000NkvXXu0mjfkx@il diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png deleted file mode 100644 index c587e84b789656154fd0c35d7f65431a914a55f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmV;O17iG%P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ9412RcOK~z{r?Nv=k zR8bT@cWnI0ibR7PA&m&37Ue`~MYJd*P$FHm3`$q6q)kZ?g)Jg#Q=2TXMNylqa1s6N zN(w@g$Y`g5<3s~dGN@yDd*6BQyzV^5=6NY>(Fd1%?|JV#_q=nzbDnByYNFoWURo@u zOeW(k7Y7kreiqcxqP%=tYu^G-l+rese z_*hCOj=!Y+&O6I)#aSCb{p2jqHoPTR;P6)^5gJQGspm?C`_uuH51U*8u=Vy9>Tm=} zoiU$>0g-yIRvDHy z5<$}ti$KH#huE7XrOpnp@N9X2AHa$ebyV_^sG`hmY}4jR@2T5VAT)urSz8{EvkXn_X`aw)*H6*)%d38c9Rgu_SsBQM zb+uCzEC258!Xqp%ZvbU0e^7aWFWS%u$0Pa)i6UP&SL$KG00000NkvXXu0mjf@-v^r diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png deleted file mode 100644 index 2beea822b4eec74ea67d2bb8458cf98f3ae26340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Ev!L_t(IPgPRMP69y?<)Dbn^ujX3EG%L? z81<+Jt{%LYa8XH&F@hM45)}yw2N$A=2SvZxS6z*xlgebKs^6>ksyel}t=+btn^Y0S zuND1T%}?v16Cj^^SwiIBDNt4Y7#i zqwZsrMK{Pa^e=!rh(kZU;n3;1)l6nb%kz){sNozlIr|=WK&XdU_ChPkIr4CnY#2U# zpa3GUurUN!+00#4|0frTPGn2dL5%;)^w>a~&%>ssz0LaE$jm-eS9txjzCQ2kF9Y)6VwC=V%?u@nI z7xSU_Ux4VA*cMp?;MC(i zBM7j7ftfcPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00E;(L_t(IPlc1aPs1<}#xp=EdDv-b)23+) zNDK%VVd%=hg4BhFgb<>r2m}>S5U+uk7?|L1KKz|=(zpmBSx$Uke&_pqcBa=u@_P}L z-r77WUkenzx2gO&Pr*^05HG#X@hE@j0i7Hs9M^!uh{Bf^|0r)74Dog<k*he?$T{@i-#4JHsaD0QOb^_|1b{34Z~Q z{a+6t2>LbNnk_VaV6Xei^uqFp2L=GL={TIVF|qVKn|j3Fs3vo}73~2ig;k%#S%cd+ z1*rGb#DiK2Fx{G#z@50Md>F=@38!EjhX8SLp<)Wm$EhwE!yek12Y#=XWma@PD%J1C zL=$6xieb)mq5+s7-?qzUdYSNzxV+99O0#LT=By}Z;C1rt33 zJtM=93Yk-ZiWEFu978PplNp-+J1{7D98=i4n5{?3AnU*aqlTI@ALJRde=V#oOz{Lc Ofx*+&&t;ucLK6VO6ftoC diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png deleted file mode 100644 index 9cb8b98946ec5dbadac6ecc60db6502ba328a883..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Ziqt(_978PplNp-+izK!EcVJNRIJTIrM~dOlVm6)@#sJ;~o`=SN*cp0u W&TcekdSC$5!rPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00C@CL_t(IPhFDTF9T5!#rv0f^FSnoC?VCN znp#cSYKjJJJoO{CvC;HH@FF51A$=A9i{JEIcafaj%$_@QX6EcotsK8(j&9b9*PI|% zxdp}ZA&g>S|6DfkJ&yZ4D?U0Ae`*6mUIxwho}&h^aRfA&l1# zdWx+eU+brX=xNkl+Dkx&g2lW8Ifb*{e70>J(EhgrGi(Mu^)&e~u62f->D_KBXpCSH zvoVBe!TV$6nbM{0Lt3%}dP)^oT0Q;ra>+UrPW!O=lPFiAz))_QW00Jl1Tb!g!=@7k zuznLilE1Z)v;zYO%(fBO^luN2VLeE4+zvAt(@>IRxcK~VJGc&E{53I`tbnJ1$MT*4 zun*IV5ngeu5_6U8U@ra0b7G=80R9HrQv;?h)uTIDWH8Qy0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00E9kL_t(IPjyqvPQp+S?LWFSapOuh8jPrz zN<}0HjS3P};sae38d_;eC=zw!f`y63#Fg<|#-3^CVzEwgayv73UT1DK^X`$VH{%3g zW86-X`W*C=0dWGO;geDKXshP(3BYMy5BL;_o$rJ(*&V6)Pv*QY+8K;_Kgi#t_U zAzyW9?ZA!-N`g{rNV(AQGPX&Zlf9@$i16s`A(?Ztb>f8aIvg~`?ba^%a-{@KcnJIMX2iOBZ9BiWhbN~PV07*qoM6N<$f<)-$vj6}9 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png deleted file mode 100644 index ef08c75bc866e0d2227c9167d79e58ebf287f3d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9586 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png deleted file mode 100644 index 61d77a51d332d169e90dfdcceb05ef78d9ead312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3998 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%0Av7g!Vho?04xFkvjBkL2dMi2r+omo z0APQAzvBhgj?agZ@OGDG{yS!;Z#DD70yk_d&qI}%@80qckYMb!Fg_Lba|!@Cd2;;V z0g@HY`~X`(`moqRQjnq%pVnn{-h>b}wmjY!1Y;hduaV!~&!{wtK`cVk!Xcv+UzFAa=fX2g|rA05BmIZ2d z-Dz47cZq)U69Fuk8>O8H6`3zNqd=*sj3YSx0jE@GC6eCUWSjW^o=Eysy;e1H#Kd6g zm1_hHJ1de>*S2z!R_MI>TYn_tVJT|q&CAB6!Mind2{?6ejotFta^~{Ndx~VSb3sd; z)D>urW0qd@iNtm9IYC@ztmg5ImV{V>pCaosoxvItu7m_RO{@3t3lv@Yb#)sy~|?mT~?3;CTUyEr7o87dx6U2y zzWNFoT9v-iU6rv2Fn(zMErvil=&>s$O|iL)M>9}0_61!=>*0Q%AIiy^n9cf7$d zkpcgQ!j6t2W3HlO7Svr`FfCm?S6VdnV@I=^(u#5|_k?eCj@ee}1<}px;lUHrYP9gP z-u}21Q%7Q2z)YTLba`)yQvpy#0sXQBCjIUwrShIro~b z_*HAr&%JWGwW+i3ZCa2R-1vKI$`w}R3K_kr$>AqMc@cgW8=yt>7Z+1%gz*Iz$|UWhZHE%W(K35y(8lRM zGli73*i&_Nn#E!1-S4D1wJ#|0i&n?62kP&?K4y(zb-H9}#JzZw`{}L9A=;0)I&y@Z znUzmb8#0!QZN5X2-WpI2Z#Zd7l*KzXAbkaoYZtrHpF&hz?0OP;w?UHrhS}zYLg?W$ z;i~}tqRUHkq7o@3$?*<4b~ zrVA0x(5nd6mAu`5WKAML-i}cmH~V?Mgt3y@ZfjFhUCXi#t?z9@Jq5FVN0y@z+k;U@ zJBV1$Is1t7O8`C~wP}A=zprpsau-jt30~Dk| z5N5Ys!jBQlwYjcO*bt!YCqDgqy1LMaW*{GC7`HODej~)*Dw4}R6rz=Q{$s+ZQuEmd z#l^Y07$%#GIwy}|5{KANpbk6@UKcDX<91YpV^HUjxBux?6IW}J>FS4QY6B?vS2~!U z-zAmv<6uL45@V?t3^hzMAKjvUPt{0q{ju~*D(4z}!IBJew~LX4d^+d|o2Nd8VQ<4C zM>h}A;vdRK$ur9Kk|Bgp$o%lz;9iOu_Su~@`a}T+RboAC0ZM)dSP2UhpIrGI63%`H zS~oVuW?Dz^7XkHpka4l49R`RJu?$0Gayk4%&UvFGA(fs)-LUa^LbrX+fDyLd>F@^Y4AyV=5OMJg_M}hz^#Aw85mL<bq1K<)sluUVH4v-2K{p;{ z94O6x6>A7es&PEsM7JY(4ioy8I_1%)w|nHSP$s7g6-fuGHKZDTK{u?jxZ4=P3K>qD za~7xbeCe0NjJxn%T}-qNGQ@5CFr)9o$eWcNQ1VDk6m>udTi2kLiPWK~*F!w2z?IHm z-vK(L3PI=8nK zlc#yPRjQ6Wq3=!}C(fNbcc+s{uWI;?%Y4*tBa61pHsy9sDb0n1|FrehA?sOEwvpFm z(=A!Av_!lCjn`>wRAhtoe-3xi$TvYH_idY!1!&)j?%zR+BUtnO<eWoRTF-YE!|GQbWMTFq^X#bO%JcS{h-mStakTMMe$T(P1-&G<>>7L2WXp2xNzlkP z_~y)tMEjT#$6@Z%5fGVlut860IbsBRomcQNA}ilyYkkLuxVC;v)l>Hsr5`cV@mjD{S_2*R z!ka4`LqJb=z`K&dM2pCok|u&P#ODzTYOBlf!>#2q9A?6f(iietB?~6M%m3%8lFS`Q z9_}Ph6fxA34}dOG$3P3Iqot!y&_$wjkSL`7?@0cNoVL!p_&A*-^? P7XVh~cIPWiugCoxWCvN` diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png deleted file mode 100644 index 251206d195636dbffe54f193ad887ea873cebacb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22548 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%0A;22xM=*XTkrC?sATNLGqjc=VW~?6>ap~% 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%0A74d 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png deleted file mode 100644 index 512df7ce0482a709b4d317cc8c8f93799bb64455..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7019 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 g-T$L-C)6*%|K9&!AqypF diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png deleted file mode 100644 index ee40545a46a5111fa03fd1f1a26119a9cfaac23f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 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 H2c-QAXgRGK diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png deleted file mode 100644 index 00355135dfee856fcf458e53dd26cfc5ec73bff4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3691 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 SDl2>e$lAjGVzt@L_JjFP%p%XL+ zEJXwnDT;s)IvB*zBDjIjk&@67?zZad2Db&g;QhHRRmQ-{mtx!3- zP={D>F1twS@bIuL33QIfhY;*-ug(2;%+KCy<%Rj~SX*3%C@|i?;~l`km|I~yD)i^% z1Lfw+@PbDOmRPeREI!HOB1Z{9@`gNGkL6`!T-3zs^zGJLkvm%gpY0OhY7l3IcK0(5C|nq)o(&aREW02_uBwj1IsFbJS7{^?-ri*y`=3c9e6HQ7 z89QODKl9o(0*aXzN^R&^)1($VZ~rzJ34dIUTzUJdd1W}JjwS}9EN`&do>Ak>@%_6Fw&TLB{;{4>9cM8zz9%JczbVg{V*4SUgg1H6E zxf>udQADUBp8FtVCIii`%#(&wODB|=rzGG^|BbS*l5!^-Uu)+7rp(lYbK8P^nkg1ljzF+GN)`&I_p_d6HTXEI$ZwX zw7u|#CjV7q*w4Lsw!Ni$;9Yu<2>sDBaLcJ}ILbHIy_|KFUe}%g>jY9n?n(q+N+j5~ zOc^B!djm_4zIbD{o3+;Z2%0cxijbCWJ5lX{}OM+B2|{i)~*b_dY<-+cMq0 zQVcnMA$%QVf7Rs`Dp7%un(X)hMV!qX!7}*L(h$`G1XN2R_C7CrB^{=``|OiH2-0&d3V1#N)HS)P<=&4BS*Db%f|Zz?N!6vFG4Y{?Dhav05{W4ki;N^ z-Px!Geoy#NQAfoT{#;mxIloIPDcp%$MnJt?3Lbq*=Td}+NW5wX;r z-!RC+2*a&@QfU3ia*4iG@$!eG+@5Qgi9xH984&k48g^gA zcZiJ84?^#Eiuuur9P8V9xGg^FVdAsDW^0QLsrs^E261aMn|DI&EF(FbV<8%emp>(p zE3{sGR9c#+gJ!Te$V;+l27ZL~6ym^Djtq_J zA>pj|fK_t~G0RE<_P0E*BnWlqhfWN00kiUGoNKXstAbBG;&34W>@_zQt3xE5J0I)e zkH7FZElGKmJLiuR1eE#`b;2g&alLlALxz|}r{i193mCusYp`4rLvitg ztxPZ;Vt?jwADbfVdqvo79Qodu=d$=A`2M_|xRTA7e7hNCJstc#43(t|w28eRO@^9^ zj5GBbP`pQ!_edUcX-fX93a@DxO(ZN1;oh$rQS;u4Zl@p1kUyvF-UZxMhl&S$n+8(q z!NShp;!U;D0%1>|WJbQ9$4@7rWj}No}wtH{s)vn6W zN2VUe?1h8rtj=`>jHi3AzCv=bQ}!luTGq67be+QI@>JmE;KnncqtsHSx$XBW+1 zCB^P=&SrOCF8}8^JqEU~gO1ilgt$!}rw@D_d%Ly=h@Ys7q6`UO8k$tH5ZYALMzBW> zu+|;yJ46FoZd}MW?iGRFog5UjFT+OlCW8r`aoDv%_zO|S>y|&(%2y*BZQ#Fli8fV+ zE*$K{=BrA908@e7)l9&|HkHBH~KSw(}^(kPo86HfPx!a_*+Pg`FdvY#jC z7eFJLZe1;)sffn5_4AN5;F(gTzzoVhqy`FviAPR2ql zmgpwYN*xZu7+D?X#4Rv&IUz-BwG*b)I()T2OA+I9gB^p zL1VkX+Y4)A1*aZzsv>?DbyLGkt8d|Twa!zU17f>z)rxYpFi+%7z%~q;(3ud23$kU^ z_#mhe>G)P3hlS5407UZ9CS8Tqh%wA;mJR%{?Fd#^ya`Po3A~LHJzP8~$=h zHB{6~Z;oIr4mH~a>q!n1E+J)!8}rZMUqr~Mtgpt8wpU8A83}s||ByDSnNZn%-ak*7 zVCF#Za3^>o@u8kP0O=sK^)(RM8rpg|9RyMvfkfz?LGV_@tX2Ni{}BWRdH8zW`~QMW TX{A-30Ay)qd%4==cHF-Ksp4RF diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png deleted file mode 100644 index fee5f03cd5eddff0a597abe47eb4b097657279fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31006 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png deleted file mode 100644 index 63e9189c45c017c19a180ec199585d9f58be4dd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3011 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png deleted file mode 100644 index 05d4c69e1ab04e488dba213e1ab6850001789d91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3167 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png deleted file mode 100644 index 90cbef3417308b384e8b606bf512bb74202543c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3196 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 F{{}ku7qtKY diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png deleted file mode 100644 index 90cbef3417308b384e8b606bf512bb74202543c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3196 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 F{{}ku7qtKY diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png deleted file mode 100644 index 2780ffe2dde8a986ceda5d264d2fe6d01c1db163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmV-U0kQsxP)42ENkjD4jPW*7h^zVD42hQWFkF-D_B#8wn` zuj^V>Rkf%Q&jhuakq75}1l{~#hEgg@!~n+rqx@3?y*`+b1kY-i6;FML3W`Dk=gw(Irk z_3iz5u~;y(h%hsNd;suxcbVz=vgH%LIzKCHpV{pF&h%zGBNv=f5|Qi`5qU901jWba g*EP|6+0Mf05A#T0?!h?lcK`qY07*qoM6N<$f@D3J4FCWD diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png deleted file mode 100644 index c3ca19138cdc23300acd459542df01fb89036eca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)j~Qe9$d4FPY><+&nJ8+MzrjKll8uxV7Mf(Iu#*3RQmkZ!EN5>c z%FFa-(#t*PS{!q`z4#XQo%5aVJMX*iH5H3RB2r2bQLI2jZp~8=k?;FNgox&;o!U%9 z^?Kc6DhLABRjXB=F~Trpb*)z86&ClN=OH2@x~{8~((4_^VZUwL%m{ukYvwkSs0I*G z=p>HgFgrPrf(Gs@?@WeaXxlab2=>hsGVm8>M>`v3*X{EQ5sB%1yQv61!e zd17Sv?%`4Y=UmFQ-IPd(#nKY{39*nLyLqZu9o;|s&xV8QPYf59*G6U5(8p=?RApg1!gW?Mp6eTV5} z=Dp!%(w(+#iHMnrXp$hJ9OIY}QBf2`gotq*m7|!5LI_GqUDpY(?|bP9oO8nV-pdFj z=RD655fQU2W9D(ZwN~`T7^x)kk!tKacESS?QB9o0q?qlTBO(Auq+zX%2ghuQQ%kX* zZFanIb#rlWb!uYw|FDTj0RR9jn%&9b|9VZ;tz5Tq0I)pYyPlQXY=QTFBY6AN?_X9l z0B}1$ny@7|#)wsg-!v=o!qlVYS8s?YEj2&fFRQw&>QQrdc`~wP{fHPskVKVLom!n* zecUu3gSY#|naq}7gPFC~n>(adi<9S<*Qdt^7~lu2*Xt01_dbNc%s(rOaMJQUVKo2% N002ovPDHLkV1mYBr0oCz diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png deleted file mode 100644 index d8ec997508ba14a5db40c3b760483b21ce48f0ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmV;;0W$uHP)GeE^7y?Od)c%maYO))A2#Kt%W*OtZ`!qti6C9QG3j z<^8?gKg_)EXO_Y+4eYimei$ zanoobK>#3xSYKS=$$It|*^lJ<7DBAf&Dtg8ecxkYrBo0EoVe(fsYwe3+XE3X+87fA z!NJKjyXtDurOpcP%c^+B7^RfE2iMip{avZE;x6$EJpN3TY~D5A00000NkvXXu0mjf D^NrQ@ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png deleted file mode 100644 index 3466822e049793019512cadb9d7aa6cb741e90cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJ~GmH$NGu=%lBM zV~B-+??gi`CPyCE=UtCfujSpmcFvgNno^mV*gAz`-QZKR!vq@o>6>+U~O}mZ%2WXd6vnd9d%}ntKsjk4*T< znDV#&C4)u4*(-T&3%-_Tb{?Fhk?Gm?pW)YMuZxHKtd0nrUp2c~@PH44^L7&-x7X`x Z8J{lrl>2R`aVgMK44$rjF6*2UngCxifph=> diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png deleted file mode 100644 index 853e88b189781051d9e4fd3854291a0de0a0b3d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmVAdsBIM-UI*#ES=SdK1)}D2Rw4K7pbKFY3t+ zsF#2TF+|NWFs2%ec1In!C~1T1KzmxvQikq7Xt9FdcToIY*=6*43N0sY4_w zi0Q?~PL6F;%+E&J7^AfYpys4FQtbcslj<%;Cker~kB>3ffKf9Q?2H<-0ZJs;WxU zG=v~|UhR?#i%X-XR!UiG#l>@Hm)E{3Qc5bN)Rhb8@LCuirESI3i52qA=!h&UJw5D@^v zDt^|*^^JFbEb-PIt4eO10ui~O8lv3;l z0HqWWG1$y3$0METw04G8V!3Fa=9Oe(CLtmK2;ajbqha6F)vQ%<97pVKnkLM6asT}0 zGvl3g(T84HmU*6s^Vy1VJv!XyWQ4)$Hu3fD@%4ACUHUCIi`$16Yi;yTw-*t+opW2q zVIC2kbKe2}Pv`T`JRV!)@&($fF{002ovPDHLkV1hbjt||Zk diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png deleted file mode 100644 index 503022d6564a10665b9371dbeff5ed4bdbe545e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzWP)a(K?D&Ag7_fD zToSSogV`O6!Sx0+)yz3(&zxCYpP7k@g|qvIt(E1@?w&+j8vq>Tvh~les92cHWIQOi zii(Ac{38)Tt6JUOsYIpkdfg**_4G^$+E`kQJBj^y{!wcke?K-pp@>MSCiEzml|~aK zD6z4-7hgh3D@1IWM=OPhs+m=!X?=D&p64$vk=9yiy}5r-iAn(Q@%D;S<0AktH^1ip z$KP=K{sD*z5dl$Qe^>_qT$maIfT&y**UqrdZ@7!f2p~ED=`M>=uod09bZ2==a|_T69fS>lgwVt z%%`_+%g8ABbVC;djN3rG(tpXCZck+0I=ih_F?A);Cb>50040RHuc`q zGME_=i72IHpoq@)ROA&6AqX8~ln$+VRULP`!;kmLbRcxE-^dveRaGV0)>&_-H? zWa#~`29z!bSf_K&Mu+>Cmc*<)^ExdNV_aO2&3nJmx8}~d#fSXiq^uw!05G$WdumBq zD;+{0B1B9nNn*6)%6m&)tTJ<5*HX01tOH5kb$jI({Q``BY&$wkk>CIT002ovPDHLk FV1gispdA1J diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png deleted file mode 100644 index 7b14db3bda2fbc7550401f2aaf4cdd8e1b599c50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmV+-0^R+IP)fI&K|F zSQ#@Xl}I$CY3CdOA~G^yt<{b-EoC(%9nW=IXWU%Rx*pc_tLFzqlx##_?ZJC*tzApM z>^~56_Rn3d5c7QlJuTDGaBOafMDi$fo^=lo559c;cCRQ3V~qFS7y}?y0K7hW80pSl z*KC_d_j`%>lQipmM|xVOq|Ag6y!SCzM5KcuA~1fR|9wi-+3TiuXRFaeqlfi+FxW&7 z0B);?X_+!31SH}(p1j;#v3SG(lqoX<%*^$A$g}Qo|C!LtT(5^WCnrR7)bIZ~JNy3Q zXQPJ-)ac>Pdbqr;YiTGwjE3V6@7@Bq)%!3Sj`L2jli3$f9-CS{Ov`k4zb8xOogxuE zIOn|gi^amPOurAOlZn)~)3nh;1#0wg2R)32 z*4oz(8MLUsqRGM@L6XOG{HzQ(ax%*VotE+uOs#!_Cdj z+1c6A(b3%8+|bZaO-;?l#zsX&#opdtPft%tNl9K_J}1guTU%RJRyNAZ%Gt>|GdR$} z(b2))zB(hLsi@%Op4~^bZrQqcp^dGrv$G4(ZlI*8sVUGohDL@~R@VA@dL|~OPEO7) zE-sFaPA<+a_V#vG)>c-QmR43)W~Qb_Mn=XaCI*Iv&dyHOHr8h5=ElZG`UVEZKw)F! z|NsA&?E13^=u^fdZ+92ZcGf2~Kn{C}r>`sfV@4qnE{>9XIbcXIHh8)?hFF|FJNahV zAp-%2<+&QUjsh=}cxRh>c{3b-V-(EgqwV;cb1;# zmpZ#ROnS}ZbDrisCVjE`maSV3?@GMuC3~%8@3wk2zIDvzuj|(H?~wa=<%wf5gWgr{69{-rXA9di8XAX)zK@45CVM&~WtUpy47 zb*WivK6m-b+~NsBYhDU79-DVsL|G%Uw;?F+jLC|7+pT6S%WH~A6uZN-D?r{@+{Nh{C#^ThoxQ@eRiSNPt19$@sSmbgZgq$HN4S|t~y z0x1R~14Bz)14CUyix49ND?kmkS;VX#ySReF9z?-|13tyFh{wHp(~}3mlLsF_7SFzbH$5&W ze!akYb4A5CL(+qpwW>YTBs5ufWoCBM1V!u&w5?Zprp@SZ$xUxW0Ds%4uc0pP?oq z0RRB7ksPZX{84XHq{A#7W&m*Y{PAn6-NR~*JkO^IUkm@+B;XtXxUqh!rsla)imeL# zO{-BDskqAdt2adCEwR3IqT7qRy|~J`d3m`~^YJ61)|w}x+l#%x_X5A4B;QMKw>Hjj zZEg)?jPLu?|KJ5aJ9+i~KL@15&Md;33$sMTt5Z7C%YO(qlf z#qMh%8~|_}hm2$MP_x9ZsNta|YIyjk`{B|3ds~~^3-TbJ?>q&7R=d4+;nJJ8yUO=g z;_%a#A(cG1uFG8{r7VgIW~8*cpx%Q9zI|*Oa0}!Jp2Lh;@+aK%7)AU0000 z*4o*9r0R#v8_rbb3aHa0dUCMHL=ZZR-0(ACvFxo3A%QGua>p}xMpj*gD8v9Y0{p|y>* zg@vV_o}RY0wx*`0y1KfOl9GmohN`Nnva+(gyu7TethJT3xw(aq#M9T6{V}7E2p305z8uisjQc!Y978Nlr%ukSZZZ&PIlS^p#Oh-jEGsfz z-@NsE-|zqRA?c2fvcBK;t2l9PcBG=r_0P>4E@rsB3-sRBT71Xy<+on~R}?NdYr4tq zzukRNy))?4l0%1gb||DoI?XyzX)iU^$!%7~*Q7t&E>5XjnWD5LTS{etN5|ZW;u9_` zJ5_Axa$jlTnzCq#FSCw)Vyd0xrFqOz&~KT*xpQAj%)*s&7n=V#^7U)LN*58SzdbFC zw^W3?PhL6`CLohl_*Uxq%bLLcS)EUhKF!*^Q)zpK;qkuqRc8$4rdpm>mJ0p9!Dh~D zY2T)&5AU^=FFT>r|C`+99bJA;S+~tLDy1cBpDx_? zOov~{=hvBv3jHc8J&FG7+YQW&j~%Z3e?jUO_QmvAU zQh^kMk%6J5u7RPhp+$(1ft8_wm4St}0gyC!;x#7_MMG|WN@iLmZVgk#Ro((MFnGH9 KxvXN2bZe?^J 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 MboFyt=akR{0Q=%8(f|Me diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png deleted file mode 100644 index 3712f39fdddf3974b59401c6241e57b278aafd6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmV-~0(B?#`Dzdv_@&-kj{nxq=G$6??1Qx3e=l`)<~|ck_lC9SrvOzVrr&cwVZN zvu6O{{nwt>+FEOj$+rXmr7&1IS6u`6Hv9uqgkfl=u-0m=jWJ1*AmmUzm9qKfZojPZS+Z4;3(Mk$52uV340?Kn07%zI*|&{_*n zzfaS|vA2K59P11_iXtM)vWy(H)gC#+c{aCFN}eTVH+K^z9m{rxIOs}$1dg2#V4kg% zLKobLZ0_L9G0(FZaU35m;7=Ha$NKI1Qp&@GEbt^hqO}G9Yc29R=Mr!2*ijT2W3<*u zl5hvzjx*=Y`B(doY1 zZc6k%HX3S@$e;uOgA{z9KPckBLxBJ}~sO7VinckiG$ z`um4rST2{tDWsG^5Ljz*IOva+8Y|W7b_&&pcE5jl?V?IkC(gz7frOx^FJ7)L^{~{# zzo-vlib8sL_UIux6ww0!aDDL5E20MkfG3-qg2ZaE`hWn?>vmiV4n&{9*ZC eTIyj|4}Sq(DOebj-i&kr0000 zF-ikb5PdU$&FCh782}>kikZP|_BP7^bn?87a}YCo zF*c~GYE)=5xfB3Zbz<@e!SypI6OlyhOev2~GY~Zj%v@KM58#4vZh)DINJN^Yor6Ol zBHet%PG(b$$8Z>c5Q4MHdYwc(Y%>YWTqG)l5bC2p}LZQ<_Kh_F|mSAK&@-=sZK~ z+b#3FaR8VvmfdnN9PUgWpE3ZV>fR@heV@C_bue3V^D5Ve*wE-aqwXA`*nXQg~OtW+1wD zVCKrjgY#L?j~DN2}`M$I)9eiOI7on*eBHq!c5LPtI;|3J;rZ#v0=e z^LiNiTAL$@!ttoEQ=!4uE&BK*9|`9D&pzS(dPO zXL`D-2%ArfBHKUMFmermdS_a6VF0>J6hQzBw!4gr9f5s{ezAR<38Gnj4Gn*zY3 zEFac+5i|Q?ZctU#OnB(zC;+PJ#^egY`GuQ_$Y|_N<2rB6Ky*)F<{?HOz=3&gfSHL% zMD8E$9vlJ@>HZ>jGMj1+!^;4K5ZqN#8X+#*PXaTC@Q<&bSIb2R!OY64`YUx6Q4vX5 znE+t5T)3Y{JgTZ|W_~o8OvDok17$x7Xj{FsAY|;yfMVeSDh!CP8B*8#(AZg+?CKeWA=?7NY2nyGV zjYV3K5QriwVmJavLUOw^YcX#&M-B%TX4vO9`^*kKTHnAxeA{dT=^Y>4GSsSUBK#r7B&cEz-VvHgpA~D1$al)pxiJ7_Ty>srtlh-E=s5~GL z(Z{b_SEr{70FF5U2_V2R1E^iR0CazJost3|qSpOI``Hsqsyes?B3iw77spE|zg1LI zN`n9qHRoot6nO?cj$W@9LRj8-Zm!18$Klb2?JIXF0K9tf690+a-@k@O8!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJ~GmH$NGu=%lBM zV~B-+??gi`CPyCE=UtCfujSpmcFvgNno^mV*gAz`-QZKR!vq@o>6>+U~O}mZ%2WXd6vnd9d%}ntKsjk4*T< znDV#&C4)u4*(-T&3%-_Tb{?Fhk?Gm?pW)YMuZxHKtd0nrUp2c~@PH44^L7&-x7X`x Z8J{lrl>2R`aVgMK44$rjF6*2UngCxifph=> diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png deleted file mode 100644 index f332bb77e5cfbe6a89243fa8ac0ae6a0f6613b29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmVB#=u`b1|@ZNCFCC2zZDJqNk7?b5Ozm z;KjcXB+KSw$db%VdV0FcLoH2Y#dqrNs#pE$Rngk=GXR~rc>n;8dk5P)AKTZj0+_nn z!3a2|DsJAslg{@aJ|H3hA|fIX+1=SSDeRr|&K>s-4(o~h^bEl3<;NNl5s5K`0Dv_W zz#u;X@aEHJW=>T^gcQ~qYXPu#PE*&nK3HRzSws?nh+>RN1rY!qZfxIK`m;U=C3*Y`2KC=8)y%lWj4laY;0(&;-Acy@3yVAAp|07ya!-( zUYARD=H>@gUo9e{x~{9TEY8o1vK-n9;9C2JW@oL|WpeGD_rAKgNVal!W0RRzpDyV= zF%{0arfG=CnBfxf?9BAf{om_b@2#=c+7}B?(zdR={ZbS~6N0a6iBYFP-NnWHsQ;_i kx5gN2nR&8R{b#-Z03S-@Q?J(Qwg3PC07*qoM6N<$g5B8U9smFU diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png deleted file mode 100644 index b6576c39e4b32e6c84ef7a3da7a3cc21db580e40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P){= zZf3fxx;@nF7=j1u(9mD?_f^$bO{@1G@UQrBdIF%kxP1EL`P+lfj~?82ya2HKc$bKn znMDBPoQY`v^u%Ah`|@>qJ#2agP*&BfELntz0QmX((=mYMVt)HpJU=@dHvO>ayLHP> zB_bknZ4nU>0IxnCIp^0^+pXJf-F`oB3joY)W-iRkDJ5579_5ycd3VwN{5=y9o^l$a z#%N|aXP+dcU*xvr`V zq?GEWnFwZ9H;sF!F^&Xb&OinT5M}^AM@or^LI`0PR5hxO1Z>lj@o5UP7~@sn+t$4T zfTiTFJHcIcWEcij^`G{akhX*n0ulMuO;A-eiy`DKSOEBTbd3LwKUm!Jt5U7Yu>b%7 M07*qoM6N<$g7ym3Hvj+t diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png deleted file mode 100644 index 2c11681fcde084473c713903a3c2594051bd9662..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmV;@0WJQCP)f_dL%z&w0+F<+-_{+u8lO_u|RpvBr(s$OwR)?JaZO zFS?z(Gcy@XI2YZ{*Zl)k#dWdp^3_>!S{joP{dV|EYubJ^UsX!-U-l0~q}tz{zQd}@ zJcRCSZ>5i@*0k1Mds`i%EKEe#`VnR#;$fCmbot(F)z76}RS{v4=kMO16{i4Bj($^X zdJ4e(2TS=rd57=ECm>=X0uj@#x&c5BTTK8(?@v-4tKZBMeiS_dQXPQC_$UCaCIE_F zCpX-#4^e|1CMKIJZ#Ht?7$3dzGPU^n!^C7$0WfoWeUpF)gb<$1w{p?y+Gi2*-iHuM zYX_EuIRX(NK$xGdZ$2mye#)*9oSE1kRCA<@j7|AX+pEX#|2-+Mo}H2@z%j4?MP z;e;4toO48!wKP>E+FDCQDFuKSopa9n(%SeBQ~(+CBH#v#(Ml#@ zr>EFae-1F&MoOhjfD69TS~e%!02sE^NQVfmLmbDVFkZ|Wj_ zb@q;kOm+KL#O!7qFO0Eq@%qgL5vfQxm2!6w#Yt5G)cXgAM^7FzbI!T#x-<;iKn!#< zRTYuVgyPq-z$zYS;IwN<@=hgh{kaoQxcIZvI5HbBi#~(nVD+Nc{vQa-d+tr%_92%BDLtGltd(=*Z{T$#&Ims p#u7wCRP#8Nq-y~0XBYVI`UA1M2rta?ihck9002ovPDHLkV1hte&({C| diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png deleted file mode 100644 index b0f38da9c9b3e0ecff9f2e072c9c503562ebfc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fI?AgngPhY%v^8ESpSFavFefr|{>z8ldyn6fg!J|hxQSNWvzkmDweUz7#qod>2 z#S1fo1DlEpY;A3;GcxS$>}_nU?d|RD?Cc#J9qsJwY;0_-tgI|8EzQl%O-)UYY~6Bl z&u&{gTQf7W|Ns9_ezI#e&;g7|-tI1HQ5-Y20y*p@p1!W^j~RtTxHwAk~;7g@W(rDQY1uHgkJsF3+4-sB-rC8i)JK9ZpRD)Sw+WVRA;D4y*G= z*+&t->ks5J+UP2z+1t&lmVZ9|-tpJBe;?o5?;UyV_1^wD#XH|#cR#nce^2ht+x=0m zuf1nKQCIWiSGxU|=fD20nA?9ob?x5%udl!H-V2p){q8hB6X;*n64!{5l*E!$tK_0o zAjM#0U}&jpV5n9nO2Eg!&GsVw?GXHp00i_ I>zopr03^Zir2qf` diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png deleted file mode 100644 index f614e41d52f80101153d57bc121b0b498e2970f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fICnAqEG#U{&CShBO-)QpjEszofxyJX zz`#IXU*EvcP*+!1TU%R4M+fLEYa44bb8};3BYgt{Jv}{RBV!X|4Gyjp;}7wvS-pn+m2!4}rI^l1ruQT! z)$L7kWcCy&SoKMOB|@O!ob;LR+51>~tEQS7elWhzbni~56~ogBO>GXFuQeV}U`v#c zmGjiRRX9gwt^v!`6=)SkSbh~S)ZVCWwUdd^d27SA^^~mU%SVpxYh`c5xZK!WSLvu+|I77K)LMSk zW!vK8URtOJ@_!c+zo9?Nq3dtcOWxl{1vGN@C)CM5v9z3(yg%ZD;h!Z<>o4x$pS}B| z%gQtR&+=;=w7ZxhyYVzIPE<==BT7;dOH!?pi&B9UgOP!urLKXYuAxPUk%5(=ft7)U nwgHedc;YoD5Jf|7eoAIqC2kE<#Z}${H86O(`njxgN@xNA2t+{B diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png deleted file mode 100644 index c011a999de25ef02a369800cb656dde4c4b32279..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 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 diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png deleted file mode 100644 index a5501d12d210510228fd65b6130ed33f7ae2a787..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIU1bM#e@K78W)(*5>9G=H@_mncCUe+t}FH z0fDWZy*oY4`gTU+ z($rSb=t5o%%hfDZ>u9AS;g=@3k&b{l$9-paFF{k8v)!I6F2i=wC zldHDhe)sh|KOf^CZnyfnlAJ`nQ(1WM*I`&(x662? z&>1HM_O=GO8_jZT4RSIg^W6AFSHXekL=S{YpJ_QC}|e-T#l=9Uo28 z>wdDG`JNz^J#!~0d8?MVMwFx^mZVxG7o`Fz1|tJQOI-s)T|bP0l+XkKXd_+R diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png deleted file mode 100644 index b294af5b63c6280507648bd87cc7dae6fbbc4c0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 659 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIejBO^07 z(B9tO(a|x=%PJ?zy{EU&*~R(kix7G=H+YG?%uzD^Y-nlH*Q?G zbm{zs3+K+CH#0M{w6wIgwzdNSTL*i4Cub)I2M1>$>F9WJ&+a2zx7gU&{Qv*IjoooR z(2p1!W^j~RtTxHwAk3CE64Nd&($9Jx8X$1k(V_`EN1q{sV70dtt diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_COBBLE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_COBBLE.png deleted file mode 100644 index 6b3bdee64ee44a97e7b78dbb7fff9787102dab1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmV+e0{s1nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hmcdK~y+T#gZ{= z!ax+q|A{7|sGtrih_g#4-J5P5q)XE{c5MYeKym0)I@AwPx(daPE*)GQ#X$!JaZtn$ zAR4ryv3W1K)FO24503xK-MfF@yF2_llB;-neLvVhk|dA{=$jC8mSy2!kH^X_FZg-Z zh7ygNOZV$<8Xuo-bYwuzMD_lTH6D*6nM|VB>p@Wz=(>)@Vu6cmohuN?u0ocbuvjdj zR4QS+-C{T#B9%&^TrR^jP0Z(W&aumN)W$OqJx(SQbh}+-G8u%!VK%DQ>zGcbh(@EF zbBx!5pwsEFStt}jKA%T6o5g4}!gxG}s;ao6q@zRjD)9Mytc5}Wu~-a-VIUHTaBI0- zj?IF>Am{9MJ66Io5K!660liu(5Jiay?Zi^lf<<+W{pFaK(;2Vo&ox>V|EvoPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0VYXAK~y+T#gRQr z13?gm-`k5hHzI-xeu5u=$U-5lkRK2TXkle#A!4JorJ`V={v1VxhzfRon{Ls!^6s^?zwiYVVe>}S`ay>%`r#Vn z#k&UKPe70d7I*FO*^PN`-^!|-k*Ni2HR|0a_PSn1mSvK84e09#JFY)A8Ebh(%lSxEDR5(wKlD&>WQ51z$BzOgX zi4gyP@fTM@=K&}+3JH}5pc0i%Lq*5Scp;IQHD~SE=iWOeGgB-lC+Dtj?Y->)0IS>W zW)AoMlNO7GIo!MNQ32=k8OP%hhrwB}=M8DrhyOQgzpqv+yaBG)D^yG#4u?;gy?|UUhio=0n$2dIPN!Cu#AL6z)9IkqYDs#rSQIH_ zJRTd%s{;NoS<6;)yWK{$S`}lZQt?3?$GMM2BY_CubUKOgySY>e)`=wa6*G#2SDdh8cpSsc3$Oi-hISirv9A8m){;VnlCl;+JzmAiMc%1;n&qJVB2!?aouB9`-yM6 z1s2+MU2V=*nir6(bkjesQaw}Y=O6KfzPB`#{A&a`pDz;8ZaGqAY)9&*3PLVqpl~0J|ELgCEM^8~t@nk?`)CrEKix}pxH8?0MD@Sbl z_rHG4EJud*;&RTJH4TDN2|U78yB}=ZQvN-;RBV%ZLRQ4KoEUa7hF_oUH!;1tq-0Rb z*&)xkF}YlR20xR++2V9R*3B~~I9sv4NT0F)zVgm^KCk8{37-rY_?Ras>c`u#b1VFo zPU(=Fz?LY`aI*2rAssi)BbEm)0J*=9yKfMPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0f|XOK~y+TrBf|W z!%!5xZ8sJs;Rno+Oz;Cx1O;J&gam<%sp1Tl*Vk?;L zqDaLv>f$&CTLo5XPu9h#c3-unpyO+gci{1O47M|n!yyHIANQPlnnC>KWEm_23~`QC zOqa`uqkwEdr0>q}fdwITmsVhzf(Efx0GwXmrf(mS+Kj;Wef6%0qd1>q|KRuxd$d=u z9n1`R@4`w22B+gjp_u_b#@Kh@&Huz7&58E6A q6c2|(+!;cD?Q-O+3c)B=-Solw!bdmRv0gsC<19!s}eX))x zLuZvE@Jh}?U^*I9AeJfZmW(^ssOX;<{Wd`0D0M#f2Vod>GB diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png deleted file mode 100644 index 92910c9cdfe57b5ad567087be16af91cc3375d67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p<)L71^VC4M4MkiEpy*OmPqt1P#%{@pnVu0SEl64!{5;QX|b z^2DN4hJwV*yb`^<)Di^~Jp(->!;cD?Q-O+hd%8G=Solw!^qTXq0Z)smgLsC5wS>>^ zCdGR0na6`mm-apU<)Ww2^=rc!_eG~)=1e+KIxqU1<&r6jzD)AZXz17ywYtgib3d) p531Q1Y?QC?En;nMd1mZ;FF8DA!&c$U!$5B^c)I$ztaD0e0supke+d8p diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GRINDER.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GRINDER.png deleted file mode 100644 index b62d2b59fa9b95edf3454ee8702a49c759fa5df5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6r`^#}EtuWQn!~YgfOw=WyPc&~VP3%_l&L z=gir&54jR&B_!?OaWrI*wy6B1^7z-sZgDL dgOQDmVG65j=Bqg~Yk;m{@O1TaS?83{1OO&5Ntyrv diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GT.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GT.png deleted file mode 100644 index d81efabf11db4b046c47b9f1f5bd887b4fc9a274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!46Ls#}EtuqmvBz4k&QAZhXnOmv{B*?H@H_ z_qJraNAXH6?pUm^xZq)ZhhSf_g)>LvjypohEG{~?cHc3$W*75PVP6bm%pBK_7*5`c z2_ji;r+Iq{gFSrME06rNqJ0O`cm>MuSw$4+SK>9 kOQ-zU^89`Nt;q~E?iU>MW~nsf0^P*m>FVdQ&MBb@0Lw*H!TdG54|&MMmQ zebwE@V&SQbOQ+;+@{E7Rxc7dDc&p^o8+;CH3+9ABPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YpheK~y+TrBgdj z!$1%nuc>l}$aKj?($OI3X`o3*#Q`WN00}{W4v-KCkph9DfRu}b66FkTh~s76+YHv4 z%Hc_~JD#`m@yxFL7YUY=n`fUSi8$xPr6~#Ty}*VYfDYiBHkJLItzbNVc=dh^dlp3X z=|&Hp6zFvxN$CtQ07*j?Bz87r{_OsR0UQ@Cy(u&b_saAAOPBQ^s()Vfq&u2Wpx1fB z8kVvwd8i{38qL|Vpn+3~dB0s!XMj{Y4+k6q%y}=*`7N`VbldHSKi=G>&R;+UO;HpD zcUAysx24k$B_b2&u9*pBukjzP7IotCY4m5#7@tyWpYK=UBbVIy?Ub)*Z;I{%*kaz_XK@R(MI Z$Pd{HDMv#kk0$^C002ovPDHLkV1f%st^@!8 diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_LAPO.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_LAPO.png deleted file mode 100644 index 82109b7dd28efc0631e6f04b88cf267f3ae54c5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmasU7lasggtTjKx#0ar;xK~y+TeN#P4 z#8432_#bSH#o6512?>Iwm4$+hm11Y5|KTjW*1|?D#6l6R#1GIy{AeYTfZd&qB1S=f zM7)_~pD*tc2f|LWJNw?w5~)HE1er#gBf1zWVijybrMM1R@AZQxBibCfyyOq=4NzE6 zk;msQALX6hW6)9)uZVyVqj+j!T$&AEUfxp1!;3rS-oL)3y}ATSt*7RkoL(Xr@#l{( zBg3g2UHh^;o0=SeCTDw_WHd!z8r>%L8dYqs(e}V=jg3+Wz-@@o5ZA5}1Fnf|qQ!{H s0asj$!WXkD!9R;4*&oF07*qoM6N<$f)O9VO8@`> diff --git a/src/main/resources/assets/miscutils/textures/blocks/mash_flow.png b/src/main/resources/assets/miscutils/textures/blocks/mash_flow.png deleted file mode 100644 index f155520eae4664817276b8d33a80d5b4b593ee4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmZ`$TWDNW6g^|AjcIDzdEVza_jS&_=RRicy>lmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfjlmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfj!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo}uNHYnyFIk zt(i(^eq@v~7>Hba)0y$j#iV+YS)qB;o^8zgZ9?z-VR$b7)%xUqrgJl!moTJw?692J zJj3y`9J9(|+v5z0)dxk)jGQ>Oe7|RYkz?&wO&NAk#tEgd-_Prom^Oq4`wH*)u_UHR z==HPReT-dS_c2G9UNs5Y%hC}U>>3W{eEQ5|aP4d)grmf!!LxbUEIU>OW&7!2zNWoX zUb{Y8@FU(KU6DUw&Fsx~tP(~1SL!&|&dQo~?b1A^)yrnNtzz^7%IuR_AezNc7r&dy zui(4HGm!-Iyie~7S?pO4$Db}V7J~ZhH{(0rr4DhEP)78&qol`;+013mP ALjV8( diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png deleted file mode 100644 index 50be701a0bab7b78e0bde7551623d9b9fb1a4e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f|4b!5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdPasH6*8v+6`k;OaSZYBemmhH?_mWIXKOe26B7-q&Pdp%O_4Lsi!*e((k0??ck?P6+Zjhxn*B& zxibc5wV5m|=?H!=BciZi&z)BadmN@Iuq3;NDF791RMMWH%5gAaqUZ^smV`AYxKcQs zF4VeuEpeXX<-Tm+{=G_cBWRt+3zg+?~wXQoP>$cgLS;j56 izFuki(x$$aOlF~6N9I#pUXO@geCwKs(|(Y diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png deleted file mode 100644 index 47f17928438dd912eebb5eb7fc4910584973b65d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^XO*0N*(00D_fL_t(YOWl#dO~o(}M1KjCKp7k<dN3{cB}cezCBM0Q7tyG|_dh){O^L7S-v0x>dh#0HxY5taWa(+#RM zNDUy9pc=H&7AHgM+ipyK!6BLtoM{NYZP0ze4%Hxs(8Vu+a#hgW{+R(|J;c>BNTEC? zl!beLvYPF(yg==jyDnXWB+b|(TSv6hh{+L^tCo%dneMTu0f8AAIGs`)*AeMjQJ{o2 z2}PYhGH~L?Krc{K`CS7zV<17_;E+RuLN#!{UZ73B#)33R8LKrMtAYQ4u5)!<6oazD z@E_>9o1?w>xq*<*N9BM<0cnsj67yIMx~O6a%E0kfAT|agENyXoB!I=B{pfMojla|k b_0#kP^fJ|KtD9pb00000NkvXXu0mjfnXKY5 diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png deleted file mode 100644 index 44bc5362acaeee394c1ec1d086511fe11f0ed998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAs65i;`-yqkB%8P9$fel zU{Ro;kr0ruq9I|yh8Zsy1T6ml|9|h?)pDRp#w2fd7tW72m%agVI14-?iy0XB4ude` z@%$AjKtc8rPhVH|$BaTETpT6&avd%8G=Xq?ZTWSw`|fTwMxbcb6FL-t3;HC6mB zj8VO_b~Xs6pBIR8Xzr7Z%59H$>fj*%;~#5-n9uVyh0UgHj66}Kkmy8N=azdi^Qu+Pv~_e#W~VAE0Vk5V(&z1HEgVm-0s zSd>$n)WzVfOWjWF5PW`OkJ_@InhpB)feWWx^?kT-aonSK!GWg}NcrZTs=|a-d1Oeh9<-0}ZyzO?)F zK#IZ0z|d0Hz);uFBE-nR%Fw{dz(U&qNE$rxniGhkAvZrIGp!Q0hNE qrPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^XO*0N*(00H+&L_t(YOTCl5QNutKgk1t<5E8lsLQ0?% zmqX~12q}S(Px@|FZ=O!J2|%+W-tFzrosCc5_nyzMkL&d^7VA>xa(QPM?D6wo1=^-) z=_~^~8siZARuEBxo)}mLuWx4sm2rq=QV@kOMYT%>;Q9OllVwFLC)e0epPtTpz*j>O zu{31`E(D7PgC0BfP@RsNUS$mkRNns%0K0hXNV@Y8;(h2NLT5)brXN`VTVyUru_qlB zRc%KudOIDkI|}@Wc=Q`>ic$u<84!45)2qfg-W;WW2Nsy3IWxQkrXOjXi5g@IWGxuC zTg`Q@m}+>F zY&mtanJ&z=AS8&`4hOySf|efsr~uTCI!p@o=?(3!!M>vxG*ML;F)dJlvKsZqJ_^)j zdoQ&k1=HLLT}y#Si&UFvYCDpi-6^ze1=)}d62wpoqCdh`F#eQdR=}jg-OAj+R=^ZP z*g90t;{^cOqU2wj$8Rqng{&-@4c%8B!SjL1FFDbbY0-C)j>#`Mp$)(4*a~u3*Y$Q& hAb1e!|G41o`~&7#xs_?%aS;Fj002ovPDHLkV1j4k43Yo< diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png deleted file mode 100644 index e3a652f3f993bf035260791e79d45213837d4f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 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 N!PC{xWt~$(698q;%3%Ni diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png deleted file mode 100644 index 53df62051bdf083fb782c0ac47654b24827d2a54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^XO*0N*(00FZ}L_t(YOTClLO~X(Sgk3_);K

aHIrE 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 P00000NkvXXu0mjfC$x)_ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_G.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_G.png deleted file mode 100644 index 3c19830902fefd66b080c687c1b818fe2f6b67e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmV;Q0$}}#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TSP3fy zb=}asT4gl5IOIDrV6OLX!HR64IHX)+41lnwRVy=m3Jgv7eu~WA11@0^1yK@Y4niQU z{S+aY3q2D^q|^1PcS^O@QmKvJcsQL-swfItvwLOyV>0KcWkzOl2q>~+iM=cNLNcLy ze#p0at5mhGRD1a~!-Z5tZ{t9^IwTXi`y9wJwcLIUMu_FQ)vKr5VH}j3w@#2rjR>wt zbw4of*BOl*81sAZ(uiEyX~$R+3&9u$WynB53>kuV@fwiACp<9Q-_CR#BZlPm#O`M+ zPxeNanD8!#eRjLo#sCQ#Obj+6RXH~-5H%o$cNo5G-@4WpK zkZY`S4lCe}P~H3Z*FF#e#$woQH5FL}3lsmY{3^!*v_7u&s;AgI&(lz)z(6QMo;W>K z?P#J9ARz#h`3?;U;up&s*-1lkUqZlc`7|N9FJDA>FfaOtH_g*CQwhl(Bq6&u=3*wb z3Hjvq26R1ofa}^=B66p7!YPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T;)vB6y5IZ?Y!sR*|qb5is^rPM^3`C7t`^WF6Xn*BW@%18rVRe$#}P% zlr;Z74-w)vVtw;~!wTd~7V&a24Ur>=<(km%uz}nAd+wwrr^JOE6Lze#1>R&UUT<%y zt{=H=Nty6sZV_5T_LH+nISjo9Hnsl)o(WGJxCQ_wpt`MiE@C2fLS);c1_WL0DH_4H z(bQZq6*U0&0DEnhI|s~>I+0u+t^qwk3a*a{5to_(F%umF-iv)qc;bSWyJaA?RAOR2 zn}kRgjK#zSt8p;kfAX6D1SGE3Th|0)7)yyuF0IAihRt#79yLj($7CC3=Oqn>=iJ^s zZfLz}l4AvOK<-twZVZH2Z@!#8@bmZI&-{E1(PQ{l@Cqy!i)e+*lG^du7R0c5(EqX5 zJ>?GXwSV0ni|ROzg42R%m*XK9VGNr``X6a9S`2po_RSrA8jd)qK}^RXzFb}tofho=-?R&;fFLG_(qggOtzaU%XaJsoSHIdbCC2g}Fe5isU$rOqqjLaPWlmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfjlmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfjlmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfjlmyv3^8m+C-a@7pbD+O*5$|NNSx} z6cJGn1;NrJR>Y4O2@IkV6Vqrv+OILml%NdcL2zZo__q|0RR${J%9mUTz- zN{(B!og#HZN*rCMsu$UciQLGxin*X7oZ^`A|pd4tm{+Tr;0ASC6|Lavw&$}8ji*zULnZ#iDBy+hQz~?CXl@0MUJeA zCfj8xx}|CuDOi?NUZse5I>J(#OYTYC1$Bw~#4S>VKw2k8<%wo1UeP9b-SqT)o2xl0GDJ7Z6CWF{Dyo8PNRZ8k zmRGXv(9$hMV>S}Fy}dpD$Q6k_Gja66gO%6byn63rthn=d=flqeuq$~h5=&QJy2;3$ z^{(#f&h5{mudP4-IN93V+H%`>Nh!$* z+23+1$7epyHhqT6VJB(JU)|qP4!&&T8yHU(z5Dc{^L=EV!Cd2Fg%p06pYpZo#^>dk z9Syt?Eq?Uq<*;m#x#^|W#>|J)=g8vV>eN@!?D_ZiHL5*}^wQF~FJ?-?k%{rtPh(U0 z*Dt88fcqeL_r(iiE6g8UuRc_-4b?~5hfj0@?kEP)XDIWu$Se6xK=XRRqGh`y|Zgl;vIu`NU!Q){eX9VbKwss;H4D@lj z#FcOb$b7dIrg*o5CY!C4=uxD=9`{;UkNX{b0t9c6Tvx3xrI+0yx=Ho(WoEI1vMZf5 z(`A=s0|5S9Iw}F+=L&!V<2u#Hm(UR~;4#r@qLuZD_If&sH8TjRKx=;h5SZ{QG}CRT z@wPhFAyX~23=EL5CJVPID&Q6vV1I<2^8rr*?6(>SfU=t*-iWq^I&fg4!Otf%3=m1ttOjB0dv_ij_gcCLT9`%0`Tcms`NM o)PB{N+eA?{3r?+wFRlIN-zVDKhlDB9a{vGU07*qoM6N<$f_q~6J^%m! diff --git a/src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png b/src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png deleted file mode 100644 index 9131d0f58c5134757553ecc5c7483875fe19546f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1029 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3-pya`gKGDVB6cUq=Rpjs4tz5?O(Kg=CK) zpm>!UP;CnX!!Mvv!wUw6QUeBtR|yOZRx=nF#0%!^3bX-Avu%v{AcwQSBeIx*f$tCqGm2_> zH2?+KOFVsD*&j0siEwc;XXveBU|>q~ba4#Hxc7EO?&L)VJjW~DTpc1@*RIxZO5Xea z|6jeQ52q#T@4XzElD@9;p~dIZCiSyKW=XVdJLhwGOVr{0`p-RbkC)n-TrbVZeqm%Z z{l?cnH)|Tr=Kq}cd-v%dcgk#*9Ne^xq1NX3zYh|#rI)?^CDa}$ay(GPOZ@)Uv(pPt zJN8vfU6OHXYTD2LENs0m|FOXfmAtGvrcR)~nswq4> z=6uVZV)0(=Me$CSv$Huw*yE1N7aaan(0+;cG`FO~lyZ%tZJvewHm{AJOEf*}W#}?L zZ~tVg^PIHy&s#;D+8$j0tmystACr6x*MiE=JtFz$2?whAM5i?fFkE4pRP4vS!fPwT z0@f|j8W%z|9oG0XR_L+r?|O1>quX>^Rik1ZMRj#jn#}e?iw0mb$a>ptq%V+*mod4}$2;gE+%wUXANIJ3KhSg~*(~n>- zIUT2UI!*_)LPQi5*o*8w}S(V*_=gd&z!~Wa;+k9Q7Phiyj2TX*jC9V-A zDTyViR>?)FK#IZ0z|d0Hz);uFBE-nR%Fw{dz*5@)NE$fVPJfD`AvZrIGp!Q02IB<% QNT3D=Pgg&ebxsLQ0PN?2K>z>% diff --git a/src/main/resources/assets/miscutils/textures/enviroment/sun.png b/src/main/resources/assets/miscutils/textures/enviroment/sun.png deleted file mode 100644 index 6c25e9c637df4b60aaaac982e192fcc457c62531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10qBOuK#1%+0F)%SRGP5wS zurdM>D;pCVJ0lwh6FVm}2Nw$`H!~Lx3pXz-4?ioP02{wByO0Qnuo#DkIH#B(yMPpz zgfzFL440G`ho~f{xEzm+0*{;`ue>a`v=X0!3ZJ41pOQMiiiUvdbMOEESAY9=>-Ycv z{~s4#W&>KxnB?v5q87z5V=IuuS>O>_%)r2R5QG_bOw4`@6l5>)^mS!_%qS$n#mStZ zw+g67)6>N<#NzbS$+sspD+svop13L@xM;2Bse{%bn=E9yrf#fL+pPk>BJ$5?5qtf~y$34z&Va$o_I_^{J zg9^O(nD))skRYzLf`dc(2Sb3@LH6BO*p_%ZG%V1(#pq-4qkO4vXmoVA+iGipn(iA6 zQ;atL^v$-u{(ar%+|7bbjxHGu4SNE7O?O=MpDcejz;x9K#iZ8_Y+Q_9+nYas-lOyR z&D{%Gtb!u!3{syKnOyr>I=%eb6jwf3YX!vxuZ~sLvaJ1lBUC_ z-c`4|Ms;jC_PXpFeD?me|FBZ&*W``KZu(k9S1%s_b-4IAyP8$e#D%?mwKau{R*T2q z>wo>9mFcps=y$tI3xMIMTH+c}l9E`GYL#4+3Zxi}3=A!G4GeV+EkcY8tPBmT3@o(` lfTV$w?ewQ88glbfGSez?YcNjGj|6I9@O1TaS?83{1OOq|-vs~w diff --git a/src/main/resources/assets/miscutils/textures/gui/ModularityTable.png b/src/main/resources/assets/miscutils/textures/gui/ModularityTable.png deleted file mode 100644 index 1a455d4f9567aa7bfd423f169ea250c73ecfa827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+Jfy-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5qyv0HT>t<7f9%*X zATKmD)ZE;>ySrOc)9Ao~0}Txgwk-AiKncbqZ+91l4pvzYAcwQSBeIx*L8u6X8RJr; z9|Hy1OFVsD*&j0siEwc;XXveBU|^c(>EaktaqI0}$Gk@l0;~Z#hU`C-RQJq{Y1E#; zJmtuD-V^geH>bMFSBo7x!l=e{`khqU{n=momY0=&-QIjA$L#Eid+%k0Yyag4@~jB^ z&aCBQAjY(Z=|OI-)a<-Rt&BFkmF6qCnD2O4MKLsd0(v!?+d!Ycz@FKLB_Up$!9u5q zHNk{?Wn-|Q6*GhQ?E;VAb|JSw{C6kL_euzIuS6!IpK?Mm zQ-VmtIZMXH?lDYTOdZ%6rm^qXYI=c5fLY?ZMIA>%EYrWzzC)>u!7iKB*(MxpINQ#^ z)Wfvno$mHoXQpU>@KE|SU5{~RT>X2NR>rceZcDohHpkVsykpv}GwJ$k=4b2cWZIeT z9jkUT5fBjZVikC>pM}TUC3)R}1ujdZDv~$n?)ZD>7~?kI!@16kO4$wbbK=UyXUr4i zRA^v$%-CkHd`Vn_MZkf9k)@*O0Dt+@!)pID9=tb9xUobCBnXn3$NS-M?9UCJOI=hN z7??PK8ksZ%HNhr;d0sBR_Ag}cItq~j$_H&UTFAi9D7M=3*xiOKQJx4F=6lURUxBsa zC5|%g_g{bTb=)_72ZjSO3ZCo|ObQq4?w;tCWBwtf$e`?5Qm@oCVfp+9C0niww>cH3 zFZj>(L4YBNQRIMglwm{dJ;rN!hl;he*j5-9*6ytbb+zF9u6c`=u@hw+P_b3c>Ilg8R(MsHvB ztZ-=&D{u%=bFtI8{4Rt^aAigPyB5dqtal?DR#-2#QhuH+%gzw+oF#_oAHyZv$1`q! zmA?y2ys9Ox5hW>!C8<`)MX5lF!N|bSQrEyx*U%!w$iT|bz{$21$?&!TD(=<%vb93~dIoxi=EiyRlYxpDJYD@< J);T3K0RS3~SttMi diff --git a/src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png b/src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png deleted file mode 100644 index 54c06f22ae97845ca3fc8e31cfeba47f412ce18f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1648 zcmb_be>l^59RFiWG=(adW3abZepBy6fDJzSB{q3tWbx;#4a-EWFo5$`7t{(%QWumxu@>GuIIV?JkR_2yk4(A-tX7*dA~m2`FOjb z7g;R=0H8hGY5M>`zz_ipknknNP&O~HsC{lbLFJR>!!SV|qk2&R;Abv=&(?*xVT8MX z6adBz3x)Xga+m@DJzWnPb^n|OmpBV$H#-HLuzHejdMb&$(H-KL}onCd6kcWvo+lJ@7isWBlK;rg7d4uO+zRY`5)k5k!kIKc2=zl<)7@Y z&k5%7c(Z9OHT@IanXcwyVK&et28|C%3J0F`op?q$REk;&HDcdn1xAnP3>wIdt~oq> zz_9Ax1p?H$(tfGrUtv8OvOv` zcNA~E7+2;?j~-d$xZq#dBpL2BU=_KdPp9Wvs#>mn4W1vZXWBwuQgM`-xa+vw-%xH8 zDxWcshvbCosm#r$b;9>pcFif(lv>!@oYG+yVSCw0EbKNFZi$76K3!{*;x5>&fLiQ+ zB%?4?olH}gMX)Uw4BFFBekyyWfFbI&B-217sSOL-QB`~UUj1BF;;7nRQs9^+vg*K! zU2)5$!)DES{;HPz_Fbr|!1z>E^>zoXFS5H@cG+G_cLxDmtqw`&t5FepsS~i^4Tf$Q z@wan~VRPx+6~~VvIIu}hdTtiK=9^wS+bjFgSzdmZXI+Jh4O14e}+m?4to zbMYPg^K7?n#L|Qu96JTa)<5(oBPQ7*NatT{er$TTj;bE%x}K5mTd}9Ej3aQ0ru=|o zlbss%{^yoQZhxVN{X6RPlx^~JyvbXblz$Kb^Et0eLR?bJy+$~y;BqG4h`z<_JQ-8M zS(QvrvAyzfO(S8@B$DN)o3(Dj9vZgmvX+{_U;lHDI3+HSn^tkRuCBr@t+%&#N}tJO zY8$90N0b;3Kog)sMtcZ8q9)6Vh}0ZO#~AVX6(nmk74%S*X=fyFYK!T3D-0YfYjH3Z z96Nj$b+vOt_=OaSIjqH5pC-wQ?iBXSCn%ATkBq&!?as$E39&#p&L^~G4O5zMkYMUd zX|Mq#;15MB9xo&=f`bp3&kmsRoP)&atONFObiuo~LlR!FNb@?=hEjiaR!G5n>c=@i zMS~oX(AhH^VBz&mE~1T7LwQp}>B|fpF&E?pASXgx-;!5v zO%8hgh-eDR*AmGGkr!V~%ZO8U?>h=R=VI3-`gP`R4Avw~>eN$K7w?(x8f$@GmE!UD z+Hg?R(PbFC+pl_7&Nf! diff --git a/src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png b/src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png deleted file mode 100644 index b22d0ed94798b4a7c15f1c7428bd78ef3ef5987d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2682 zcmdT`_g9l?7QSB+Ob8`GL=-83K~NYl=qySP3PX`5xCEuQ83jXe=q(>*MRX}EGN2KN zjD_A*2qFn~SVUcLEFc&q4AKPYo&DI|vuF3r**{=^c;EZo=Y5{DkW&SSB83ee5Ry>DG;f1ij7>$3S9)jlCst z0NK2SERH{+TaM9KHWubbV|vC5{}%ZRooea%>h@K`SDRQ)>AluUC;iNBtI+ms{>Gef zzpZJg&?LN`Tz4(Fvzy-fFnyQ!$FDJIRxxSm67s=o&He`}RNG#qb}Unsj|>;|yHiv| z*Tq5JL%&p4(${Turl8AT%9muiAW!IaeBMShb6hi8q9QN-dsM-H+rxb4u}P+ycnN>m zRqM_%mEi5ICnujQviq{ivRF6fmDwHXlfRipNHY}gUR=nS9MtqScQxw>Y_!R~p6>X7 zfF8cl_}!w+=JuRP)q8amS)3A{F4fQ6?2;Z!{rRf$!)*b|=iX{C%Q8(}75Q7x@nP>8 z=$My5=Vz`S2Iq$*#L(ed3EjoY%#Yf3;SI*-QJfjKt>BQzp9kt2B)<|Sh7S?A?y{xC ziNJC%rK~=MKkGNyvS#Yed?MGHV1;9=AhizX(U+c0M#7K3p33YM!6Tba&FBxh!otJ_ zD)4h{j#UKih!@KdRa90MxoDd&+2Wm+doSEGi!PUf6&zfs!q-o&#|eb4%>V~Z;s%5U zzYL7`@C+_LxnJ)JdgH}Mndk~{R1j?MQK7HmiyL@k&*6Ue?p<}}^O8K1)*kVTE%ynG zr1x8Ryp~%U^HwbWQ}$Gu2HoMk3+v`5(Vbv_e3-7>DSWMZdhy5YMZbv}g1Yq}q^O9e zQfz3T(Nyiq8l#4}Mv=m%vsTNleJE!CDQB8xNMxiuE9@#%9NKv#CC!x;q%k>0&QXbu zGh527&~y|GO|$OmCx;~MoF+U8)cq2xY4qksr#>uCC5OlZbFN~aEbrTbaBf1w_HIp+ z0os*Ne|)WE5y#A(uXfYnxkVnrEB78QhysSk`>AAwTe4cOX^NpPM4zux&X?A_R(3^aB22D=6B(Jn(e`J#!wJF{9D}JUYymqPB_-TzBjWCF z*Ijpv@*vEeLe&o03SDJ=L^LE&NuGisv^^?X_%a7ViyRnCQydL4zZ}f5#Lm^)CL7?tvL%Cm8c;^iprA*pjLtxu2Ji?CTA8}za7^`h`KCZY0ti_ z$lnhEIEpJliZkdvTSb#IFJux}j%+1FE5)#eR8Bkw4txN2Y^WKjas*>$|_GEDH$24RospXdrxOuN?n-#3} z=f}0-Gq@bQQ~cfhfLy-Avh}Qu7li#p5i-|{P5;ud$!F1_2A1ZXEheFH7W&)fM{mYw z7<}Cgsf$NzeP{DASOWQ|s!iz9JUzTV->&xtM2=!REmp<;&8dlsrmo0_hY-e;E!qQ~i)ImcX!@r0{TG!i#nFChRiW^f7^B0*cz= z+DOgNkijlC3#Yt*qB_SH1p7G zp1RqctkcryP&J>;BjzY|aL0~oHNv(ipuM}Mf~S2EvZcqD4qTTLeq-EP6d3j*Db|Q^ z+Y6bI^0!sy+6zp-rO-W@%)JI(Jo`TUSp0RwdNtJxsUBxORi?G@PRBAj42OHlJO9wU z(TO@@ZB2cZlJFE~YhzmJ2i=m@`2L{oIwC{oRUPr|nne?X6UV7GVKlu}6?oTXj)SP{r+YcW`*4nSaOB_mxIlT)MiQMjUG&nKc_^H5_EoXjorKpDdg$xbJr||7q5p`K> z4Jxz|aG0m|$9Q^E3~0zxT1B6b0uN)zJx}yG{T1wV|9uDxkEq|tzN&et}30R>4Cx3|j--3NUdyZiOu(5Qos6ObE F@^`4VB}f1O diff --git a/src/main/resources/assets/miscutils/textures/gui/itemBackpack.png b/src/main/resources/assets/miscutils/textures/gui/itemBackpack.png deleted file mode 100644 index 08ac08a2db52b4dc0b90be464cf62106986323a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K588}#g)VJz{w?K*|-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5n3BBRT^Rni_n+Ah z4nJ@ErnSMo|r~2B08&iKnkC`(s8S5iU;V482uAP1&9>NM!aiw#eCX*ZC}_y~bZMBG<<9?8 z^>Udx-`x2ZrRQrCd0DqXzI@GwV3#@J|3z-J-oC$euD1e%)wi!do+o}|ckb!V)q7t5 zbnVUEmn#`vc#Q2Wj!Eq2&V479e68-;b&JOptO^V)4GaPdOb!ej42(bo<;PaeVwZTd zW7XTIZ_;zC^Q;;Q%l4&3lvG>(J{g&;q+#5!r*lE-e8$he4F#X@APhh;?ZW|=2@LOM za=fx(5OzEVG9N`6%8^b`@?iMx!%`~O(5aBlz=GAV2HuK9rHqc(Nw&% zzO1u3s_M_?Dy`^UnIP zMor)8Y1_Pe)g6A7$*zj{FDSr30$AW(e|YifuQjKZZ3F63Epd$~Nl7e8wMs5Z1yT$~ z28Ncp28OzZ79mCkR)z*v2A0|eK+?d;cKTBk4Y~O#nQ4`{H5e!8M}pkt>FVdQ&MBb@ E0MRl8Pyhe` diff --git a/src/main/resources/assets/miscutils/textures/gui/itemGrindle.png b/src/main/resources/assets/miscutils/textures/gui/itemGrindle.png deleted file mode 100644 index 98ccb311d062a9ad34db54b906688a3e61634a0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1254 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2P60k4uK)l4KX&XG zkQW*n+R)HoZf@S)-F@J|f&c&I{r&yV$us2Sm$2h!Gfn3p^r=85o4Xn6XD`Cp%D(y~NYkmHjcJ zkO&tibB5k31_tJIPZ!6Kid%2*Iws#T;AuU17|M7PZ@*U~A{LW$5k^8He zbv4E9k8E3Vp}^ve_MwkQH*Wtpe+%QGOwoo7vn|%L3v3sC*xv8QyP&u*LiWLqxj?JX zfNw+IJ-*9KKlpVG8O%5nYVXh1aJc_n@yp*I&O!-Ns~FOjaS8m|$DfwgFS&qSz{sIW zgn7f4ZL=c{JR3~@uZ>`3WN;|rHMr=aA;REj!tcQ_sj}f@dearA{;Ufw;s*;A4Hhf2 zfURt}Hg(~v^wd@czN_8MXpR7K9WFCmJ%8$wU=k=!(LqVe3l2k29HIj&r;?T#Oz5IO zzO15^lMg6OKtO{(DNA2ZaLAGiiq?jZeOx3$x64xn^`ZbPMTS+@H%wi$1&qOGx* zwnr-AUd!EEf>B98#u%zwgSU{GutPIBGU=X7P~_VWcGWr&Stgv zU8K=}f4cM8WrsFrY4p~I@tV%&I=^b+l;3AoElgW};Oul~%io`$2JG%$P+(aiu(mO+ zb3zoaixv;e0~`!f{x{q&ox8i)n1O+V;YpzVyOYB6*i{)W&FH=@)XQGVuu9Q{^;B{F zC!Z9-nm)T7&z%^)-gQXl(y5)=%HY{#!H%Tn^E!&f~>+jU^RXKbL$7bxe z(QlDh%+A5Za8&%e<~&A2H{;U`-PsO{w>nt8KYQjKa;v7#Ua@8dw=vY8wDa11H<*Pf;}F z=BH$)RpQoQoS+{G)F276Aviy+q&%@Gm7yRpGp|H1FSSI$M9)Ca$nc{==2TD&c)I$z JtaD0e0syoLtg-+A diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_0.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_0.png deleted file mode 100644 index 482c67e6be21a42a0cb93c7d087eea6823ca1c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe3Qrfu5R21mC!gj$pupoCuN0QX zW#m=1qv2 a$i?2+t9aN}GX4(G4Gf;HelF{r5}E*N%tQtN diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_1.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_1.png deleted file mode 100644 index 2b4fc736115cbc7aca5d1b5fc903d087d52664e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@W2dPZ!4!i_>o>9OOLUz`=6;@I0L$ z?~TXLKIVAB!R~qHawBW(k>ebmA)OpAEJIHCG^pH>WvDni``j6WY1f~eY0rD0UUJjr qojAX>;>}IbWvB0*y4Eq{TDMI0-Zn?44z6^d4Gf;HelF{r5}E)CmNnl1 diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_2.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_2.png deleted file mode 100644 index 45b8ec9f6f64a4b44ff160af946e860b3dc8dcae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheU{4pv5R21qCv4Qn%$rWtm?!NJU#mzXK o--~Z3|32}r^^IO;gnkk8^Pnu(8d1F^K;s!aUHx3vIVCg!059z`C;$Ke diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_3.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_3.png deleted file mode 100644 index bad33ed910d53c8f5618ad56f99cde45bfb2a5b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe5KkA!5R21qCv4=MJ+*E#eL?d9gOpwg#;U!^*`=ioK}7M p-}*PwovUw8+pD(QTk2Z(oSLX6UG1q>)fPMG fiTz}%?Maqv=BrpU6u#vFjb-q3^>bP0l+XkKFFYxa diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_5.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_5.png deleted file mode 100644 index 355cbe27192a3b757bd711ce0b073d915ac5eff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe8J;eVAr_~%1|JkWqQDU&5xtE| zqg8INyPBnH#+Nf61Knc8B34XkiVY53@_AEoS{VbQ!?~Xe%8XRH>UWk4Dl$A!TcB5b z@wvh3^kC+a8J`3iR>ZIREU7Pff79>Hdiq^I<(2i%tT@;#@$OZM$|D^Q>Xv{ diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_6.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_6.png deleted file mode 100644 index 44d30c40dde16b869ce3ceecaf1d02cd83aa7c0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheYEKu(5R21$Cns_pP~dR0U#eZ+ zWz$t&Vy|R&Y}&MBc^1d@=_-?EDoP7FO3wBP+1kyp;M%UQTdqklGCW@VLuvEAphc?> zOf2*enot<=XwJt;DTh96deZuL3NZ5R21qC&zLfP~d3}{&;HM zA-SdHZ{(I3?Aqn|wUAL!p~m-*V(8IzGbFE`>2pbGU|6tqTGzE|bq0-x>t03V-&@%- zVYhnMUv-U@>L-@X+WzvMe(2{7C-g&&Z|L|IxS6g=+x|Ixwz^fAE~E9gO{@PO%@i

diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_8.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_8.png deleted file mode 100644 index dcfe6ac299bf81992a2a8a8d309c607231e0fcd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheW=|K#5R21mCkOH!P~dRxet2r0 zQ{N%kyT>=>1kdbvJzeeD(kWhB!`^tg9Jrq7zN)H;LE*W~rZ6u>2J;hFic6F}OYUY6 z=3rQ2uVALJ;EJW>)q{Z(Q~Dgf?DJ3fn~^K$cf(>a!x{N+EZeqi<-hUkSFc~;3KQlV n`K?dBiMKl{F@@eOD`EJ1UHvq3^sbXY=P-D>`njxgN@xNAWxPqC diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_9.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_9.png deleted file mode 100644 index a7c2aec6ecc4885b61eb303e86b4c7557a51c04d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheS)MMAAr_~XPC3ZyqR8RWcwCTG)OT`yWe`$HL* z#L{hxJZ0aB$QpmDjQFs2!|w7`ysMT?Z+s)V|7t>-z{J<*-!h*(?tJ>0@q;j+D;Ydp L{an^LB{Ts5tQ1k= diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_0.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_0.png deleted file mode 100644 index 6416b809c070984cc196ec3e1660ca9fd5998b07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheDV{ElAr`0CPKo9_s=(pG{&-q! z>t>N}C;n#Kx^u-lc6wTy9~XnjdCew=Cp)I~ z1V7tb!^l{0?Zu>XGp!r2ZkqJ!+>I8`SwAg{ zuI!n;xYOU)Ic;+(bL9k&ha9h#EckwX^^!>~tMv4@%Wv!Pd1@=XzXs?&22WQ%mvv4F FO#lPXRFwb# diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_1.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_1.png deleted file mode 100644 index 5bada8dd71031797ca73d51de577926336a4e6f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RhePEQxd5R21muXuAEP~c&?;Q8^? zyhD~=?<``c)M;c&Z(S#HDA^-qa?4Fuq15|lbjt55Fs#`6&3*C(59Wqci#C=Svd5qD zr|@u1sC&WqvN>*o&6h?7i{ta1-c2{R-D;g=c44tb=M~GXD}Jc@@~BElU!7u7lv@%I s9CRZ5koFZ1=j_AzJ0`U3_OH*=b{4jI$b2}s1L!CQPgg&ebxsLQ0B1x=F#rGn diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_2.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_2.png deleted file mode 100644 index 808c26598137ba60cdf03c57d203a102f7b1fb25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheW=|K#5R21mr#SLCD{{EVFAM)B zaxQR(a;!=2{*(PdI@-M-64YF}IsBZ3`oBL^x$~Em>BZjvc2O+OMh)A%ZaEtKj)_*& z{Cw{pBjY|f-=cM!*12}88E1rUnQ8L;qF>&r#Vk+cLK@zD*Wg_FKJesXp%ol69oZ*j mDz>Ne1hRV`y4!ERT|MTF-R-Mxg{y(iVeoYIb6Mw<&;$SqL`L@j diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_3.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_3.png deleted file mode 100644 index de9cbead42f1f08f2bf36442f4be5d41d53d5bf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe3Qrfu5R21muXytvHsEM^IA0_D zo2HHX!@d;3rJ+-&ADko)009tc_|$e1?2^e1~z zv)%-olIAB1*i&Sx9FHwvd?G95GH)SE5x?rh>=g}j7Ak$>_Ek9W{nzf4FLCWE58qur bpUeC*Meq8jy3NagZeZ|q^>bP0l+XkK24O<6 diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png deleted file mode 100644 index 65fc3f7d6e8e6e037ea8730ea766a902851d2665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmV;&0XY7NP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5C8xR5CN?ty>$Qp0bEH$K~y+Tl~b`w z13?g-4MB*_fh5(z{ecObU|}VG!8I0w*xOtqq>&)uP_RfL_yrAEr9C}6 z_`#ZM5KZYG$1(FGJ3nX{`l2DgI{Hu~Qu%rXP1s|^vbJ4+#8yD(Rf zVE{5jaUpDDb%@Se=-qE>{AbvdjRHH@Jr0$;1;@eB_)wj04^*)c2Rk9T(PsiS4xAa_ xp={i(p#v2gnQaXgNFARBgke~zzoEPW(GsUH#>s&!fSUjS002ovPDHLkV1lgFyOIC^ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png deleted file mode 100644 index 98c4b4f2b735d4278abe0cdd663c7e6b25c05a46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKCRToP(fEpTf1psOr;B5V#p$<`H}WzW^0>zP%{=U! zBIG}5661>%0z%HQqAz!?zN@gYC9}YVRlHF2QEAwx$LiXCHi4n(%4u%dx{Ob*H(&nw z%g{z&d-~&r*KeMYS#a%^{+_pWyW3lteUv7-s2F-YQ8WHrk=t_OZxdtuC;3NwY?ixL ruR4GF*8g8(%nj?}yd*bul-4m!Eh+P9vethDbQFW9tDnm{r-UW|dAeIA diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png deleted file mode 100644 index 87d68083fa43b3062fdbfc7888838d5ffffecf92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$od#h7sn8d^Ghcl>o1d7HnoQ{HoWl>+QBYRJUeB&cvE?lsD)OJ%b zXT{=&fs-Bz%-QinFY@S~>a_U*MmsmL)ct+NseSO*?1=wj9YA|jOI#yLQW8s2t&)pU zffR$0fuW_YfuXLUMTn7sl_3ae8yHv_7)bM9T7jY=H$NpatrE9}te`9rpaup{S3j3^ HP6 diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png deleted file mode 100644 index 197729ce5c774027380a2d414b39e0a8148d528e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$odpd7sn8d^Ghcl$FvVyWi QfEpM)UHx3vIVCg!0Fm`}UjP6A diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png deleted file mode 100644 index 9f75ddb6f26378349b00d68cbba4b3723b6c4518..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$ofQ27sn8d^Ghcl3UM@;K@ z&BD?ddQYkoH8UkrReyen-IVa--I-Y{Qx+}P{`2b@r)wEwU+wdw3xSrYmbgZgq$HN4 zS|t~y0x1R~14Bz)14CUyix49ND?<>{HZZU<>&pI^QAmV~YgS@C$ogbY7sn8d^K&O&sn z&!|gCkZ*kfw{+{v6RjT}w-^U?y6g|ooO{ya;o0x$l`(Zp2KP@1NU8y?Q!R0gC`m~y zNwrEYN(E93Mh1qKx(0^2h87`423Ce3q-|heWndu9e`y7ZhTQy=%(P0}8nS}2M1UF? NJYD@<);T3K0RX4fZD0TZ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png deleted file mode 100644 index 2968f9e0f92155f8979521a57f53eea6516e41af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xiSbTKf9=TC}1>IPKHR1)MD%)n4K`K$$qm*nm4 z!tlSn|IB_MkF&rdvY3H^TL^?1FWs&C0~BO0@$_|Nf6OQ(!o@W!u^!}@7*7|+5Q)pZ zy@rAZ40xDZRRxYX?#^tP;8?+_a$nN3eT!%Nw_Eb1m$(~pIT$vaInmK0!xE5sQ@tpR zal@NQDyH$hqH}n+cK$E6@!I})md^3pZ?)FK#IZ0z|d0Hz);uFBE-nR$`FLK4GgRd45axltw7O`o1c=IR*73fR#27* PPy>UftDnm{r-UW|3>t0E diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png deleted file mode 100644 index ab26c577788c1a340b0cffa1b5cafbe9d2e9651e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xiSbTKf9=TC}1>IPKHR1)MD%)n4K`K$$qm*nm4 z!tlSn|IB_MkF&rdvY3H^TL^?1FWs&C0~BO0@$_|Nf6OQ(!o@W!u^!}@7*7|+5Q)pZ zy$5+440xDrC$gW^nycdcJ7Y-Xx5hc4 z3_812JkN$Fvu<8!_MyJd{bgCq?)FK#IZ0z|d0Hz);uFBE-nR$`FLK4GgRd45axltw7O`o1c=IR*73fR#27* PPy>UftDnm{r-UW|Q7UTK diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png deleted file mode 100644 index 84cb315d59b18ae79c920097f21ee29d64c4d417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$of)G7sn8d^R*KX@-irLuxK7j z$~cy`=J2eH)OUp)4`NGdCCWCbtX3%J6k2}fy2f7J%wF?`#F7IqeA<+`3x2bT@E*zE zwpM}hOGmhS6e~xx>_)CP8B6~%THZ3awKHkii`4uF4%=!)OqJ_ux`YH1Rccr7tGyP> ze^*WM=5>oVDnJLQmbgZgq$HN4S|t~y0x1R~14Bz)14CUyix49ND?<>{HZZU1@f diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png deleted file mode 100644 index ac695c9089e8d24662c9bbacd5acb19a0f42424e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$og1M7sn8d^H(n}6m2jNV7aLK zOv^)5JyYfE5=@H_<_Z@;s+Ancuxf|1uUMvZ{~M~W>xK`n`e5~0WDH3ag8WRNi0dVN-jzT zQVd20hL*YphPs9pAw~vPh9IPEU|?lnAkBYi1&W5;{FKbJO57T<>&pI^QAmV~YgS@C$a+gp7sn8d^T|KXH^>_atW|hm zZ)EbT-<5Hbn+a?GKl@+(>mFSE@BaVej0BI3oX%G#y8RDSd^xd|n~7mzm6%Dlk;he_ zA*v;=5hW>!C8<`)MX5lF!N|bSQrEyx*U%!w$iT`FgtQF|tPBjK`7f<>&pI^QAmV~YgS@C$a+gp7sn8d^T|KXH^>_atW|hm zZ)EbT-?dRh$R+s0i~o!Nzu=PlTmMDApR-M5wn2z&<`;R*{!1%RH00)|WTsW( V){qsHB?8pI;OXk;vd$@?2>>soTeAQF diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png deleted file mode 100644 index d1ddb92013f7ee17742fb29c4ab93a5b7257fcdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xiSbTKf9=TC}1>IPKHR1)MD%)n4K`K$$qm*nm4 z!tlSn|IB_MkF&rdvY3H^TL^?1FWs&C0~BO0@$_|Nf6OQ(!o@W!u^!|Y8&4O<5Q)oM z&l(CcDDXI6T))z5)mp1nE1jnpIPkN%RV3?8XV@pn5U0yKVNVg~HKHUXu_VKa;v7#Ua@f{?a>ft7)Q iH2nC}Q!>*kacjs5$`S!;VDNPHb6Mw<&;$SqyIf2F diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png deleted file mode 100644 index db0d4d4dde0ddf43ba832c99694e2378176921b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$ogPU7sn8d^J^y>avgBsVEKEh zQGesD_L$fIPkRblo)BbiOqS|S6ft=tZLO+uQl;Bd$;^>Oi|L_%qLB3Cy#lMB><`a4 z8tv%bm&1KXvZBzxz5Ze`{HZZU diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png deleted file mode 100644 index dd3de3ecff1b4c53ea61d7c8f74027378e9f1913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$oe=>7sn8d^J^#WqJ&H1sqDLX_)gUf4)@k@P04y}tTSkeS~3Y=$r64k0QaC%bORK}U_ zsJ_scQ|d(V$-2f5yHfTiMJ000ytHHa{Q8a0nF5|za9n*YybEZPYKdz^NlIc#s#S7P zDv)9@GBC8%H89jQvFVdQ I&MBb@0KiIXW&i*H diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png deleted file mode 100644 index dd3de3ecff1b4c53ea61d7c8f74027378e9f1913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$oe=>7sn8d^J^#WqJ&H1sqDLX_)gUf4)@k@P04y}tTSkeS~3Y=$r64k0QaC%bORK}U_ zsJ_scQ|d(V$-2f5yHfTiMJ000ytHHa{Q8a0nF5|za9n*YybEZPYKdz^NlIc#s#S7P zDv)9@GBC8%H89jQvFVdQ I&MBb@0KiIXW&i*H diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png deleted file mode 100644 index 506ab6621b89c4f7bf2cecd8f654f16b74bd4691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$a*hN7sn8d^G7Fa<>&pI^QAmV~YgS@C$a*hN7sn8d^G7Fa<>&pI^QAmV~YgS@C$a*hN7sn8d^G7Fa<>&pI^QAmV~YgS@C$oj*cE{-7@=W8#VEIn)>z;e;+ zWDm>1h(}yayJggcHRU<<)Dzdq+x}(yX?J42ym@MAVOd#G$fT2Tj&`Tg5(LxK6E`Sm zeq@+Edv)XI?+Ke0nBS6h2rFkY;GEFXG&kd&Lbp)EM<#oZ@@7kQ9;Ppr3u~D;dHB>6 zxmYjVNeE){e9=2^!M=kUER*&IW_<2qx7aSf{;cY1^&2nsFFk4b#Nz%r+1%vXHL)qv z_MLTDbb&K~dn)VFPoKOxwr!IPnRe>-^!?9Q?muh4-0tmi&ZeKof!i diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png deleted file mode 100644 index 23b7878fdd5fe3ef28a7ee9cbf0e27b1089bfad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1Z2s2)~TlWVj$X?><>&pI^QAmV~YgS@C$oeCmE{-7@=W8z*u4*w5X?OmAZ#jnjWw1X{(Y#dc4AYWX zANV~|%FMVY3ru*(=GvLE@~Ynjdq$U{y)v)6*mrE3pT0tMx4MOgo#TTY2XFrAX+L=H zovVyWifEpM) MUHx3vIVCg!0KOlfy8r+H diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png deleted file mode 100644 index 511366e648b73841a5878e45a108925919159bf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0WbcEP))6SS$v7brrS~03anSl>#hV(Y1X}uWJL48m7)Efu!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QJXCmy7aRjJltEY=& zh=qUec|*R#3OuX<`8^z+f{LlnSY9exeNl+5o_ps?@9JAdH&k4HDKh?F&LU7a>-_7+ zu4-~f_;4)(UVZKhFi+hcN$h@}!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QJXCmy7aRjJlnx~6n zh=u>s^Jlpl6a-iv5p_i z$5963Bh3}}8QnN8oZtvNmdwjgzodu5w*UUR2F5DIcD1zi-Md5FW%e$f@hJL(1!Lao Vdm=2inn1o_@O1TaS?83{1ORhkVzK}L diff --git a/src/main/resources/assets/miscutils/textures/items/bomb_lit.png b/src/main/resources/assets/miscutils/textures/items/bomb_lit.png deleted file mode 100644 index e40029160b6d1eb20433e11742e3691c4c762f21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QJXCmy7aRjL5n5T z43oS(1@s=jSL%rRc8}Y@X_x+k*34N}4$e!iPn%oJ^hQxOVeQ%mE`!Pz3W^6g3HhUctY$|ci2%dBTIVwlnW)TnrOcgF|z`w1^k Ul}_Y+4)hU&r>mdKI;Vst06Oe?G5`Po diff --git a/src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png b/src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png deleted file mode 100644 index 99a6af0f183f243f28e0654a715292f658800580..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-V3?D_)&A!(&?Rt|VI3VcuY_@VmB|YfHbyUInFq k#&1nq`?u5`+;@Q0m6?0%hW?TxKpPl5UHx3vIVCg!08l$Z3jhEB diff --git a/src/main/resources/assets/miscutils/textures/items/frameChocolate.png b/src/main/resources/assets/miscutils/textures/items/frameChocolate.png deleted file mode 100644 index 624e9b674b63763be41f25cc300c9a5183dab229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hK7aSW-r_4bx6cT<4G(T_SE zT?dp_ELga}@YlcO`HL1V&DfxuHRaRNtIzpP`95*^cm7++(Q|)y#vEL5`4h`4rdJFL z^cL_jpfmh7M1TGKi2rrws&`MOrr-Ix>))>zj6h3S8NM@#Ke_&BccS@4TeE7AJ5D`r zI&*wxr2QPBmx-(L?13U+@Zh(7MBcYFze(F?e!gQH{&eZ088Gg=5xehd_A&v3S z(Q9WiXH8+=v3U1EKhYVny?N$9jSd_ael-g~%>YwdSQKP#P47LauzHv4;zIih3pf4s z>`XwZA5X8_E%2b@|mA3J8H20Q%%fit@v3# z6|0$m^8W-E{J&&eEVNwgNs6No`y=xiD&H#Q`TrQkG6Q9u8gA8dz)b=QIQTMLO0(Wn z?7j27Qe_sX>iyu-ib!>&+=~!`+poN_F4ZRY6DO$gQu&X J%Q~loCIFMyfQaA;-+B-iXRr?2LSkvF0$xh$WwpG|Py_sCz%3PTgLnI3S^b zrHyOj?oW6&bXiMptf_GMtUzYBD@Zc^T<$AzZpJ0K5=)K#3i6f4C)I$aUAK%`!Q8f>DQCW{0q+FY$tlsWp;irEqa}; zQ0Dbq)`4;1QcK3It`8pg@Bj_@v9Ye=S>v_RgS+e9IF3ACSqf4C3W*IL6x#00U#0jv zJjvq^hi;tLa-;Qen>?V>N&@?z4)=t$j@QNe8uuZo9D;h z;uXHBpKyy;B;baw$>n_uZ~k6Azac024m=(LRyE3>m&l&5LUzRyVB%o#boFyt=akR{ E0E|Qq^#A|> diff --git a/src/main/resources/assets/miscutils/textures/items/frameRestraint.png b/src/main/resources/assets/miscutils/textures/items/frameRestraint.png deleted file mode 100644 index 4fc5cd3ab4620edd78af1dcc787dbee1519bf193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVAS$-aSW-r_4bw_|3L?aqlI%- zT8=6urW!=e@Y&aL_xPsSs&2yEij(wYr35Dja%|kROImCCvbe|p@^^o$s{JlKOIk|A z#(#m{0zQUUOs^O)7%a_k&%ahKyq~+;+VW{pt;N~Ka2i-rk>+Un+f+&3u0R_~yd>QJRvEe}TCz-xQhuBibIwao~P%*O7yP!G`_AKLr*BhIz~d0!%>hx}6X2 z$hI&r95811%{n*i^KGG-X?y#7KNbmF{{6uURIo!e-#%bRo&=ET!Tuqi(IM7Bmf;HP e6)@vH)^2ZI?iq<7cyu zB|phEl>U?x)YHaO+3KOmy-=q|bK+8;jBCpE$1=hecTQ36XfiOr5;Vn&{oIx~81 z{F-<4h1ti+KkLfpSHIi&z1pt(_Rj6Ay*oa?SiJ|xE3_rVDaJacb%KBr^j&Z z_16QhXWx$S$h;C1&n#nM#hmxO$@wg1 zYU)hlqK{5rIP^(t!^spTzWw_cwwqjG{5?IaVRyR>FhoQYG!jbBan~%e`En_EQUfpB zpBIw5cC+i9InR9WraePlMHQRae+@525rK53Q>V`w!%zdu|- z;d<-S^|}QYb|rv3(&2lco}1M}d;%Yw@VmqPgM~T6C%oWxNe(cDFnGH9xvXM7a1p4Xfo~Q-(+k8@ zb(-JjklL|=qeh0~I7pUI$H6p-)EAKUV$WSj`*3Ii%x^SuD0ZQE5C>|Zs7G2GtZ!iP zz_I|Q8>%ZvX+TOdrEUe&htdh?=aK9{Vl|YPk#>tpZ-;IGHQ#aYE6h$P>!E5yatksa z;@B&kcY|5S$th$%NBRIVhM{xe%p}FIDCbb|2UUI?pGD3Jl{Ci_dl2pyKpg=?1P%+J z+yreXGRgkq15qY&j>cxlCog&H_V|2j?vXEEzmH|T(+ggfW!JpRi>#mZc|A+>>n!2w z%1$}Qe*qI8WuXu z%lQ!hsC;f~H%(pZ9eXMo77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png deleted file mode 100644 index 1c918604619b80e0ad4cd50c7aeaa788da0f8c65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>My0`@x*DCKV1q!m4c>21s-(%$Emtw2@VFy&tAW`BPQ4*Y= zR#Ki=l*&+$n3-3imzP?iV4`QJXCmy7aRjI)-qXb~#KM2+MMu5{1s>MGb5H;3KRT8z zlJ&;PXj)y2jmlybUNhrr>wfO<@&@Qw5@h+lW)zNG&@ o1;N?%!Yy+-(enfL1Yhy85}Sb4q9e05Fi_@% diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png deleted file mode 100644 index 6c7e63b92493ad4724bb39f3b4f2661895e9a9f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBierEJY5_^EKVoSIq>0$J+oZE0flD& zS&f~IP6k;A5)2w9Ha0TmTg^D|A;mEDkC}RHX zT?W(QZp+ZixrH3-!gRI^N*Sp=dB=C{I!CM1$_v)lmwfudAE#E#cI77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png deleted file mode 100644 index 6c7e63b92493ad4724bb39f3b4f2661895e9a9f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBierE<>&kwQk&jVR!!z$n6i`Ud)5S5w;&gI?1nU>(^z-xn`cHgT y{{G(I`+KXu*KaZbQqybBI$ubWSm5!QgPFnAz>3Fs_xtBSoeZ9?elF{r5}E)wEi%3U diff --git a/src/main/resources/assets/miscutils/textures/items/itemBottle.png b/src/main/resources/assets/miscutils/textures/items/itemBottle.png deleted file mode 100644 index 942a9ffb5fd63b3d494b01d70f21c6770f91af4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvkulE{-7<{#PeD@--;%u>Aa={UhuG7C@s7yEWp0=lE}4wCLn_| z^mcus_JI`MoziSNuMA#!cHExvLn)#4{qz!s%n3_(?q&-;2y_60r>mdKI;Vst0J5`J A{r~^~ diff --git a/src/main/resources/assets/miscutils/textures/items/itemCentidust.png b/src/main/resources/assets/miscutils/textures/items/itemCentidust.png deleted file mode 100644 index 13658b477f0f529440819e8c9688b4d9eaf147f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1p2s75F#7_hYvX^-Jy0SlJ6cXX$WX{lA1r)OMba4#PIG_CEe1p6Zk0I;y z|N6iG&wprtc+>ys|C2*Ey!oH15%W#HT~uK1iC-IM6v%DoWVvfl;Vi_kj1%-Dff^V*UHx3vIVCg!03+yLEdT%j diff --git a/src/main/resources/assets/miscutils/textures/items/itemDecidust.png b/src/main/resources/assets/miscutils/textures/items/itemDecidust.png deleted file mode 100644 index 1d7766cca5263dbc44888b5086f0e93ec74d43a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1p2s75F#7_hYvX^-Jy0SlJ6cXX$WX{lA1r+k|ba4#PIDdA6As2%J5A)~$ z?N6-vDlb^Bu!uMk$h36I<0!3?{yL^6$9bkQ4V=pa-NM%x^uE>N)o58^V#Dxy%L6Wn z$5TICUTuA1q1>KV(s!2u%~UOMjVMV;EJ?LWE=mPb3`PcqmbwOpx`q}ZMg~@f237`^ n+6F+EaloaenDUL!ko-94wWR z#@Cl@elGd5ezWG0z{Q?j6;Jg#GHz7A3BDnFT)xAyPkD2o; z^{9Z8O9V0;mzHxhHRWaOaLN$S5-9yr(<&gfYMN^$m$b?H%qM z&(QM9wM{8NMP8mRjv*HQZzmXXF(_~_{9UwOpxpg`oXnMZmqcVOEbb_tdc5LQ!nG)7 zL*w?DUzMx{1ivycJ>r|Peur4XoxR`LS&n=YX56S-?qM z&(QM9wM{8NQ_VeH978Ppr%p7?VoDTft!LIs3Xt~R=%K24xuRLdfm6rPLy%>2D$D5x zjwbdEzUoR5Eprq?`6eFr`Ejha`(2g^zu5o!n)iS6(+Gcb&9V_RHH1B@C$=3JP zJ^kAH+jn@~K3AIu$i6F)t&|eyn)`36?l#uy>h%%Edb=2tI`;0EeNAw3Tm0D*2j@>P zIM^fQ666qKJ6o;wnyd5{XC^_<1y;oYvs|in=;bzd2v{1&@LW+kCRN5&rMhlgBO?>f z%8ypMABzopr0G?;6bpQYW diff --git a/src/main/resources/assets/miscutils/textures/items/itemFineWire.png b/src/main/resources/assets/miscutils/textures/items/itemFineWire.png deleted file mode 100644 index 1804dc358be0ca669908e2fe0e769ce7ceb5fde5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5C8xR5CN?ty>$Qp00(qQO+^RZ3?2^% z8`w4;ivR!s7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNHvLWs=l}o#U`a$lR5(wS zku7t=KoEuj3pUtbiw-gud$EZvnj+I+@y(y0I?QDF38-c!(L__tP*)~1LA>1!AJgMb zwBnhYymQa)?WP031Ww;4Q?6kQ2^ST7b9B3%ktB@>45&LQrSfO3%|Nmdho4DH*i@vrgBrZTmX&gq|%RNe-^^ zY&N5pNapS+1^8Fx`A54j;gL+2S)N|yD2m{^E@Ljh@Qj-*yU0Os?;J(15Uya9`^v|S zMZCbAww=5s?aY$4|JeD47W{@6_c-$-#_&HF!@q;h4+Dsr%1Wj>!~g&Q07*qoM6N<$ Ef?LSeR{#J2 diff --git a/src/main/resources/assets/miscutils/textures/items/itemGem.png b/src/main/resources/assets/miscutils/textures/items/itemGem.png deleted file mode 100644 index ad5126851a9594acdb46adf2452e24b83e37650e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1(2s1Lwnj--eWH0gbb!C6dC?vwg$(*6L3Me$))5S4F<9zMK(}K+gJS~Y@ zhfF8Rt*LWT3}C+VMl9yYbY{u6aHY8>zt4Luep~YYx6!vr_xu%ZYE`mKTBh0c@!lvI6-E$sR$z z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLfc55n0T@z%2yAjF;}# z{Q(NHmw5WRvOi`N65--x&d^&06p|=$jVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn)HD0* z$N2)N=8UI{V~Bzfj|XuGF_|t@Rg7dRrB>10odT|GwS8J)iX||KR|!ABkV1`X5J# zeaQRey31Gb>zv;PIlS_1&JIcom+ZWqm~A5@+bXnWemd(JwTCis%l3ZzyCJLp{`b^` jrCBeyZk~O8!lvI6-E$sR$z z3=CDO3=9p;3=BX21L>Cx45bDP46hOx7_4S6Fo@?*ia+WGRLfc55n0T@z%2yAjF;}# z{Q(NHmw5WRvOi`N65--x&d^&06p|=$jVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn)HD0* z$N7SRfl&@-PGcSZDUMfon6;shR`dU)OSvB{I+C!IplOL-q zB?o&&)~w0*ye|}#wl?-iLfoD7&7W`VR^6|p82LIEtzlM3<<>NEcP<{!Og-wDsqQ~Uke zH?saK$S?XHfAVv%yUwxgm0Tx3Y8M{*ld`7tqXLuDm7T0djQrvow@fHKdu2b@(XtrP z^yfS8b3Xj^^4{`)rZ4pS&hq_O)q1+UsHAswQtfxflbsAtf7o(N|1Qqbk-g~0vFfBC z#s=qHw<9eQg`v-a=I$4-Hpq80kSI2od#Zn>p1kDsq@Jy2yBUwO8|F0~%5MRNB7>)^ KpUXO@geCyi3$~U3 diff --git a/src/main/resources/assets/miscutils/textures/items/itemHelmet.png b/src/main/resources/assets/miscutils/textures/items/itemHelmet.png deleted file mode 100644 index d7c34334b23d6f22ec428877d93a636a280e3d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFjf`}4 zb^H7KLqb9%B_)A^!otEp!RZm1$AQw!B|(0{K>AnNk$XUjG0EHAg`tC0)&t1lEbxdd zW?5T}$gQ@2Lb6VG$qZ*~%+5EI7{y%(4vjY+&RE zdNopjo9E=@NT89bC9V-ADTyViR>?)FK#IZ0z|d0Hz);uFBE-nR%Fw{dz*5@)NE$fV fPJfD`AvZrIGp!Q02IB;MkPQr;u6{1-oD!Mq|KvjjFE{-7<{!9A^`MSO)+A diff --git a/src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png b/src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png deleted file mode 100644 index fb293722f6b76f5e9684ec2815b7aaa5db8a6193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)dmLmgt-3y|35G=P)|qI z-rmH<#?ahc*UC!Y+S)*0S4~Y#-pIh+L^ zk;M!Q+=3v?Sf3I<5h%!B;_2(k{+Llngo~3oLvIyOsKnF7F+}2W@416Q%?dm$0g=Ah zEf<=WzWV<^qqC)OPig*dwaGUVe<+`0ED&ohY*~2FrCF-9ZO~` zW&RnW{JQ-%|B?l^>C7UUTpziaKSi&MjW=P~wnM&MZq9)-R@|2szI)szzN5|T?>zbV zd{*|Zwg2jY_N$h-MwFx^mZVxG7o`Fz1|tJQOI-s)T|N{FKbJO57TZ6Z9j28W=oX{an^LB{Ts5v>}Z` diff --git a/src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png b/src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png deleted file mode 100644 index edb79707305843ea6400dcd49a9b20fea60ccb0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}o(K+xFGXnLwd!o-U3d7N?g^J}B6#z~f@x7an~; z?8QO9pc!)md^8;RMGn}vc1r!UddI_V^oE;Tc-7WN-EO-*HBE1A()l9Az+iZcdkwqH z`x9KZw!LK%5i~GnWOymPWXh|XPc)zN2r@Dl81p`7w%xq^VQ=K_^Pk@^&pWm6;DVpd z9I==8z5lPg$5eiw;d34a4#gd9L0+fV@4vvX?Lp=&HS_xJ1a76Gh+BXCp737YweDTZ o%dff4RYtvH8E5+$ZT~Vnt|*4UHx3vIVCg!06!XUy#N3J diff --git a/src/main/resources/assets/miscutils/textures/items/itemPotion.png b/src/main/resources/assets/miscutils/textures/items/itemPotion.png deleted file mode 100644 index a1ff53ef8d5cad4d06cb30ac24250191e25a831c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsH)r3 z#WBRfe`?P`-U9|4%)5P$oy?Lnx7XTU#Cl}Q%g0j~zR9L-yAWmUdag0G@xh$nMJkC2 zk*uquC4*|X7@Fs;;yLu7nM-wI>N}2a6`^UG-|x*=J}~dWG*!oj2BrJkSd)9W|Ly#* z%kXcXE<<#aIVbC!T1yTFRj(s^^_vwKI4UOUKQrQJZf{*xk$jv}BxmmBrNS!DfX-s@ MboFyt=akR{05M)$bpQYW diff --git a/src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png b/src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png deleted file mode 100644 index 07a59511409dd053a43644d9c492795b2c4c9f41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvmtIE{-7<{!@Dn@*XhYVBYO}>|~atxxLo*BGw~YUOt|}@J%*t+l44& z*K>`jjSuDoFH%WNh-6(IEg4k9#n3!&70;mu&0MMzQ{QoXs|Zcg{C;n~@_~5|rl~qM zG$`HQ#+uy2{cq=gU50=AbQz+X%sE--)LL>dsCpgQtKY1^z)>+#|Ctd-b9?Kmisa** YA~|y}FBMjK26PsKr>mdKI;Vst01^gZf&c&j diff --git a/src/main/resources/assets/miscutils/textures/items/itemPotionRed.png b/src/main/resources/assets/miscutils/textures/items/itemPotionRed.png deleted file mode 100644 index b6b611bbbb395f40b681ff04e61a43805402a39e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvmtIE{-7<{!@Dn@*XhYVBYL|>~u!#%H${RPs64)%rL8+BXnS2S{nD> z^57>j5n>$YELFXP*rtVU*fmx0=yC>w7b{OG@Yt;g5Q==(m(U-cI_=X$mK(x%HmPt3 z1U$LD?SahWw)%JV+ztElxerWx;OoSg9?!?*&?!{-{8q0s`&tY{oaYLfKQM@4 z_S<;5SS{;8PMxOHWL>2&DW(jSRi)E4?w7q$c{1lKi@xoV+Lih9}M#n3^{|fubzBzR~(eu@BI~Rc; zzqod2#2i#-Is3d(=$hyT?Z#zA0{I+CZ$Ff7$yk#bw`$Ar!ZX#{<+>U3p7UrNimxq; z6uxNU`|z7A&tZWZ?Xet5IyYt7{bm2`KmUc>-+jF*n^My+pnn)VUHx3vIVCg!0KjN* AZ2$lO diff --git a/src/main/resources/assets/miscutils/textures/items/itemRod.png b/src/main/resources/assets/miscutils/textures/items/itemRod.png deleted file mode 100644 index 18c9ee59c1db0c395d7dbc3729652e140a41e601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQl~bHW?iy3nbf8eXr;B5V#p$J!FLE9>;Bh&xdb&d7 z{bSuHfq&l4cKIB$KWNq^l`h>2{SUs#F{ye+ti0~ip%Rr{%dPLb;ts?_@b!`4jJEfuCm-y#8f>==hWUValHG qK@mb`3&V(@hJb6Mw<&;$UU#9Uwi diff --git a/src/main/resources/assets/miscutils/textures/items/itemRodLong.png b/src/main/resources/assets/miscutils/textures/items/itemRodLong.png deleted file mode 100644 index 1580b911f0c1d863b40bbf6b10e889e2c86251d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQTTXyq@Y0V+exOjZr;B5V#p$J!ck;3*@-Upu{H?fL zZ&$;%f)`mFC(;&2zuY4KLuX>dEJ<}12b;yKX3VVFQ{d%!Ov15Y>Gde)1yhs`++tnj z)f1St_F+WTsryz6mkZwiW%1{HcPhAP`KQ$hZ2Ls_%>An|LpPo)?3DV!te@@=H07J> m6CBKpg+qBQ)30y8$H<>&pI^QAmV~YgS@C$oh4jE{-7@=cisg=;c%>aP(ni zwETj&Lwh*`A2_L$C{|`pUDT+n7vnO;>yFDsr9*S0#pmy?UjJZ!$IY{Up3SlJ>A0_b z(e4NHkFXVt$;{VReY`ijkhLaameelYiT>w*`RRnsyYpHgDP7UJ{BX>&rJ31E6CZU6 zOrK;pyCq{u!^AtSZHInacF*fHRcuSUw$Cs4j>O5+d)Kk=?3Gt7NPo3d?asCDE0#^T z`c3$J)z|g;VWlh^cj^`ywb|$aU9MW<8c~vxSdwa$T$Bo=7>o=IEp-hHbqy^-j0~&{ qK}g%cz{4<8-vF4%bBfP>qjxqqLZpa1_xj+)o!z181O oT=&^_mInx4Utg~t|Cxh@fp>wK%&z)NASW|;y85}Sb4q9e04ostxb*c=2U%V*mgDH~Hi51e9hh3GxeOaCmkj4a74;-3CStF5;6{JHY8kj z+90sHgFB+Zk)@}BsgZ}Lkx}7jlY`)fIU3B($}aUC8ZH}mPtMdl;*gxm##j@^#PB4F zZP7-VU2;GZRZCnWN>UO_QmvAUQh^kMk%6J5u7RPhp+$(1ft4W$X&V?=85l_OUs{2p zAvZrIGp!Q0hOD405ugT1kPX54X(i=}MX3x0iJ5sNdU>fO3MP66dWOa(%+a6#VDNPH Kb6Mw<&;$T79d%Ct diff --git a/src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png b/src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png deleted file mode 100644 index 54b3afb24eb4042ea081b3e9b91e31536fb90656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE7|n|@-`drxafyYPh?X| z;CD;tHek_dR8MH>IWRqT3hz33U5<<(6$?%KY3Hjf)%#T5y(m1YqLgv_+bsq`M~;V5 zjU5YCt%`j+Gke~1$uzgn=9x~Rf!DW2Uzok@B)`P*iCJvHt$TTvv6(ve6sEH=Ouxyr zpXG+o5sACk{`50wHtl;|S2daW)FziMg{4nKizL6qKKJ9C788FLiZ~st5``Fj19E5J*ut z@zm!_t^PYcZo1+ diff --git a/src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png b/src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png deleted file mode 100644 index 5e7201a558f5cf99c0b3df96035df4277596b9dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM z&(PdBZ+>|m)q;U4-wzU6_Y>f

    101FgVCP&!&>;+MoN)59_DTmUix% z`mtVsO_CwBNxH!#eTVg*|MDuFW(+RsmQjE2Z_O4DVU=UJ_U0|qwUSp?G!6b9ik9(F z-*rRCOhwm*VGZLF$u)v6m;`taKa}hHu~*>v`^F>&j(YwH4VQs-Zx&r9*fL!&mTOsO z8KaN!8G}hY44Q|QO5SAHBPp;#Jw|kN?{Fx4md1lbS{^ z- zf1wvxBnHcJM3J{pq-Gwz>q%8ZU0F@ S1y7)(89ZJ6T-G@yGywo8cV{vH diff --git a/src/main/resources/assets/miscutils/textures/items/itemSword.png b/src/main/resources/assets/miscutils/textures/items/itemSword.png deleted file mode 100644 index 56ac390aa8c82a1645b4d7b0aa54f219536813a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xiSbTKf9=TC}1>IPKHR1)MD%)n4K`K$$qm*nm4 z!tlSn|IB_MkF&rdvY3H^TNs2H8D`Cq01C2~c>21sKV}pX;o_Q=SPybcfTxRNh{WZ& z{Tq213^|x>k9tNnm~k&T%_Xw`l>fx3mt6z{+TQVOYZWRdP`(kYX@0 zFtpS)Fw`})2r)9SG6W%Q0|P4q18M$CD^N7#=BH$)RpQo=6_h0c)WG2B>gTe~DWM4f DHR)y{ diff --git a/src/main/resources/assets/miscutils/textures/items/itemTablet.png b/src/main/resources/assets/miscutils/textures/items/itemTablet.png deleted file mode 100644 index 8e10b0529a8c9be103ea9bfd436fcf16d520e256..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p<)L71^VC4M4MkiEpy*OmP)vm6hrnCNQvSfG$(iEBhjaDG}z zd16s2LqTF@UWr~_YKel0o`IgB<&|rjQhTj%;b*KGJEO! z*dlG=`|d04GjbR%6?a>HGxuTrylxYt;}sL$ueIkh*8Y6A;`X+uQZ8Rz?}#isX0#>u zw%{HeZ_5R*tyZn->M=C&6+ZjKI4fGs? Mr>mdKI;Vst08ny{{Qv*} diff --git a/src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png b/src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png deleted file mode 100644 index 942a9ffb5fd63b3d494b01d70f21c6770f91af4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvkulE{-7<{#PeD@--;%u>Aa={UhuG7C@s7yEWp0=lE}4wCLn_| z^mcus_JI`MoziSNuMA#!cHExvLn)#4{qz!s%n3_(?q&-;2y_60r>mdKI;Vst0J5`J A{r~^~ diff --git a/src/main/resources/assets/miscutils/textures/space/RocketGui.png b/src/main/resources/assets/miscutils/textures/space/RocketGui.png deleted file mode 100644 index 2aa4a893ed58d37bb1be7727c9f610e7687c4e88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^B0&6!g&9ch-}Pf5kYY)9^mSxl*x1kgCy^D%S4j2< z@?~JCQe|LhXl7ve`5#EXWMC*YU|@Kaz`$TNgMmRje^UHWH=tUT0G|+7@vvz?rjL&g zm!u4r6cEXBNy~A|$a}}cXPNLt>G1sj|KH1W@m-)I#w2fd7jF6MM-BivoCO|{#S9GG z!XV7ZFl&wkP>{XE)7O>#F{6+O7uT%BdI6x&I!_nJ5Rc=@2@VWyjv4|IcYGEueBkkE zhST9=&Q6C-+CCVxx<$$KPvciHY;`-F*fOP~>#$+E;p`m_4b05k6H0hnjbfc06T2A0hohojy zA-MCVpYP!h1{3G-eHWN8GmP)M+L6zxD;y6=wIw(;>+3c&7ORQ)960zSij|d{jTPvR zZ~sE}PZ6vA3Us+@iEBhjN@7W>RdP`(kYX@0FtpS)Fw`})2r)9SG6W%Q0|P4q18M$C eD^N7#=BH$)RpQo=6_f>vNd`|>KbLh*2~7ZHk&sjX From c39c3cf71cd7c0a9efb66003bfb33014e7448b69 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 14:57:58 +0100 Subject: [PATCH 12/27] Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed. --- .../java/gtPlusPlus/core/item/ModItems.java | 5 +--- .../core/item/chemistry/NuclearChem.java | 3 +- .../core/recipe/RECIPES_GREGTECH.java | 6 ---- .../core/util/minecraft/EnchantingUtils.java | 29 ------------------- .../core/util/minecraft/FluidUtils.java | 4 --- 5 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index cf887beac9..005ae1cdc1 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -716,10 +716,7 @@ public static void init() { // Xp Fluids - Dev if (!FluidRegistry.isFluidRegistered("mobessence")) { - FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] { 125, 175, 125, 100 }); - } - if (!FluidRegistry.isFluidRegistered("xpjuice")) { - FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[] { 50, 150, 50, 100 }); + FluidUtils.generateFluidNoPrefix("mobessence", "Mob Essence", 0, new short[] { 125, 175, 125, 100 }); } dustNeptunium238 = new DustDecayable( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 09838c6bac..774ae866ee 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -13,6 +13,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.util.minecraft.FluidUtils; +import net.minecraftforge.fluids.FluidRegistry; public class NuclearChem extends ItemPackage { @@ -94,7 +95,7 @@ private static void chemReactor_CreateMutagen() { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), GT_Utility.getIntegratedCircuit(20)) - .fluidInputs(FluidUtils.getMobEssence(5000)) + .fluidInputs(FluidRegistry.getFluidStack("mobessence", 5000)) .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)).duration(30 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 373238df3b..30c2bf3e3d 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -565,12 +565,6 @@ private static void laserEngraverRecipes() { } private static void breweryRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) - .fluidInputs(EnchantingUtils.getMobEssence(100)).fluidOutputs(EnchantingUtils.getLiquidXP(1332)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) - .fluidInputs(EnchantingUtils.getLiquidXP(1332)).fluidOutputs(EnchantingUtils.getMobEssence(100)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES).eut(3).addTo(brewingRecipes); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java deleted file mode 100644 index 9ee99fb132..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java +++ /dev/null @@ -1,29 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import gtPlusPlus.api.objects.Logger; - -public class EnchantingUtils { - - // Xp Fluids - public static FluidStack getMobEssence(final int amount) { - Logger.WARNING("Trying to get a fluid stack of Mob Essence."); - try { - return FluidRegistry.getFluidStack("mobessence", amount).copy(); - } catch (final Throwable e) { - return null; - } - } - - public static FluidStack getLiquidXP(final int amount) { - Logger.WARNING("Trying to get a fluid stack of Liquid XP."); - try { - return FluidRegistry.getFluidStack("xpjuice", amount).copy(); - } catch (final Throwable e) { - return null; - } - } - -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 6f7697de26..b29296e0e2 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -576,10 +576,6 @@ public static Fluid generateGas(final String unlocalizedName, final String local return gtFluid; } - public static FluidStack getMobEssence(final int amount) { - return EnchantingUtils.getMobEssence(amount); - } - public static boolean doesFluidExist(String aFluidName) { FluidStack aFStack1 = (FluidUtils.getFluidStack("molten" + "." + aFluidName.toLowerCase(), 1)); FluidStack aFStack2 = (FluidUtils.getFluidStack("fluid" + "." + aFluidName.toLowerCase(), 1)); From e963a8faf177b1b7a8032649377cf4e05fb80ade Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 14:58:06 +0100 Subject: [PATCH 13/27] Clean --- .../xmod/bop/blocks/rainforest/LogRainforestTree.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java index 94d936d477..4e769b7c95 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java @@ -9,13 +9,4 @@ public LogRainforestTree() { this.treeType = new String[] { "rainforest" }; } - /* - * @Override - * @SideOnly(Side.CLIENT) protected IIcon getSideIcon(int metaID){ return this.textureSide[metaID % - * this.textureSide.length]; } - * @Override - * @SideOnly(Side.CLIENT) protected IIcon getTopIcon(int metaID){ return this.textureTop[metaID % - * this.textureTop.length]; } - */ - } From 14e054a4042d9381e370197aa5c7b6c393de6d49 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 15:03:05 +0100 Subject: [PATCH 14/27] Unused tooltips --- .../core/item/base/itemblock/ItemBlockBasicTile.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java index be73e92aee..cf50da52a3 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java @@ -26,12 +26,6 @@ public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, fi list.add("Can also be placed beside upto 4 other fish traps"); list.add("Requires at least two faces touching water"); list.add("1/1000 chance to produce triple loot."); - } else if (this.mID == 1) { // Modularity - list.add("Used to construct modular armour & bauble upgrades.."); - } else if (this.mID == 2) { // Trade - list.add("Allows for SMP trade-o-mat type trading."); - } else if (this.mID == 3) { // Project - list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter.."); } else if (this.mID == 4) { // Circuit Table list.add("Easy Circuit Configuration"); list.add("Change default setting with a Screwdriver"); @@ -44,8 +38,6 @@ public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, fi list.add("Kills Forestry Butterflies, Bats and other pests"); list.add("Use either Formaldehyde or Hydrogen cyanide"); list.add("Be weary of your neighbours"); - } else if (this.mID == 7) { // Egg Box - list.add("A box for holding big eggs"); } else if (this.mID == 8) { // Volumetric Flask Setter list.add("Easy Flask Configuration"); list.add("Configure default input slot with a screwdriver"); From 85168d63047a43c115cf0b452f483909967b3520 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 15:15:34 +0100 Subject: [PATCH 15/27] Remove hydrogen blob --- src/main/java/gtPlusPlus/core/item/ModItems.java | 4 ---- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 3 +-- .../gtPlusPlus/core/recipe/RECIPES_General.java | 4 ---- .../miscutils/textures/items/itemHeliumBlob.png | Bin 350 -> 0 bytes .../miscutils/textures/items/itemHydrogenBlob.png | Bin 241 -> 0 bytes 5 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 005ae1cdc1..cbd149fbdf 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -97,8 +97,6 @@ public final class ModItems { public static Item itemIngotBatteryAlloy; - public static Item itemHydrogenBlob; - public static Item itemBedLocator_Base; public static Item itemBaseItemWithCharge; @@ -252,8 +250,6 @@ public static void init() { MetaGeneratedGregtechItems.INSTANCE.generateMetaItems(); // Register Hydrogen Blobs first, so we can replace old helium blobs. - itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc) - .setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); // Register Old Helium Blob, this will be replaced when held by a player. // Load Wearable Items diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 30c2bf3e3d..8f61883486 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -67,7 +67,6 @@ import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.EnchantingUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; @@ -1074,7 +1073,7 @@ private static void distilleryRecipes() { .fluidInputs(Materials.Air.getGas(1000L)).fluidOutputs(Materials.Helium.getGas(1L)) .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1)) + GT_Values.RA.stdBuilder() .fluidInputs(Materials.Air.getGas(20000L)).fluidOutputs(Materials.Helium.getGas(25L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(distillationTowerRecipes); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 9e3dc1d5fc..605a998687 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -46,10 +46,7 @@ public class RECIPES_General { static String RECIPE_LapisDust = "dustLazurite"; static ItemStack OUTPUT_Blueprint; static ItemStack RECIPE_CraftingTable; - static String RECIPE_BronzePlate = "plateBronze"; - static String RECIPE_StainlessPlate = "plateStainlessSteel"; static ItemStack RECIPE_BasicCasingIC2; - static ItemStack RECIPE_HydrogenDust; public static void loadRecipes() { RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper); @@ -57,7 +54,6 @@ public static void loadRecipes() { RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow); RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian); RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table); - RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob); RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1); OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); run(); diff --git a/src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png b/src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png deleted file mode 100644 index f86ce276ccbb1cb138d120b5e1309cbc7d2232a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP zfk$L90|U1(2s1Lwnj--eWH0gbb!C6dC?vwg$(*6L3Mdrl>EaloaenK?)4U7{9LxdV z?k})5Y|p;Jt@3H&0|2=->~9JauDOSeauT#WM?@4 zS~+j2pTUF3Hqo;)?dNZ0oOknI)@}ZV^FYH@OI#yLQW8s2t&)pUffR$0fuW_YfuXLU wMTn7sm7#%^fu*(qkTh_zo&FR>LvDUbW?Cg~4aN!jkw6U$p00i_>zopr04Donr2qf` diff --git a/src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png b/src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png deleted file mode 100644 index 29296faf74175fa33390675fca6979d4b70d1c94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DF6L735odA%@DkiEpy*OmP)v!IBA+QjRw9Y7(e64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLqqq^PUb*WQJyZ2Ar}70609>4Zg0!2Fm!D26*f}iaOg@qdzb52tLobS zyuEAw9sZ#r$#9wH(8P-~6P!ED7?$0 Date: Tue, 14 May 2024 15:26:21 +0100 Subject: [PATCH 16/27] Spotless apply for branch Cleaning! for #881 (#882) spotlessApply Co-authored-by: GitHub GTNH Actions <> --- .../core/common/compat/COMPAT_ExtraUtils.java | 2 -- .../gtPlusPlus/core/config/ConfigHandler.java | 11 +++---- .../item/base/itemblock/ItemBlockOre.java | 2 -- .../core/item/chemistry/NuclearChem.java | 2 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 8 +---- .../gtPlusPlus/core/proxy/ClientProxy.java | 29 ++++++++++--------- .../core/recipe/RECIPES_GREGTECH.java | 3 +- .../core/recipe/RECIPES_Machines.java | 1 - .../blocks/textures/TexturesGtBlock.java | 4 --- .../items/MetaGeneratedGregtechItems.java | 3 -- 10 files changed, 24 insertions(+), 41 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 47e09731f1..f61c70ab5b 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -2,10 +2,8 @@ import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.recipe.RECIPES_Tools; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; public class COMPAT_ExtraUtils { diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 195274bba6..c498164cf9 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,10 +1,5 @@ package gtPlusPlus.core.config; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; - import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.MACHINE_INFO; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator; @@ -104,6 +99,12 @@ import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; +import java.io.File; + +import net.minecraftforge.common.config.Configuration; + +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + public class ConfigHandler { public static void handleConfigFile(final FMLPreInitializationEvent event) { diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 043abdc959..c88a8581b6 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -17,8 +17,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 774ae866ee..1fd9416b90 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -4,6 +4,7 @@ import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -13,7 +14,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.util.minecraft.FluidUtils; -import net.minecraftforge.fluids.FluidRegistry; public class NuclearChem extends ItemPackage { diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 294c656bf1..bb04525301 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.lib; -import static gregtech.api.enums.Mods.GTPlusPlus; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -12,13 +10,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; @@ -41,8 +36,7 @@ public class CORE { public static final float PI = (float) Math.PI; public static volatile Random RANDOM = new XSTR(); - public static boolean DEVENV = false; - ; + public static boolean DEVENV = false;; // Mod Variables public static final String name = "GT++"; diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index a8eab5b27c..a8f5479952 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -1,5 +1,20 @@ package gtPlusPlus.core.proxy; +import java.util.ArrayList; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderFireball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -32,20 +47,6 @@ import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer; import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock; import ic2.core.item.ItemFluidCell; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.util.ArrayList; public class ClientProxy extends CommonProxy implements Runnable { diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 8f61883486..cb1906197a 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1073,8 +1073,7 @@ private static void distilleryRecipes() { .fluidInputs(Materials.Air.getGas(1000L)).fluidOutputs(Materials.Helium.getGas(1L)) .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(Materials.Air.getGas(20000L)).fluidOutputs(Materials.Helium.getGas(25L)) + GT_Values.RA.stdBuilder().fluidInputs(Materials.Air.getGas(20000L)).fluidOutputs(Materials.Helium.getGas(25L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(distillationTowerRecipes); // Apatite Distillation diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 18287cc14f..c8564f794a 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.COFHCore; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.GregTech; 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 4d64356203..6bc22c5e67 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 @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; @@ -70,7 +69,6 @@ public ResourceLocation getTextureFile() { * safe than sorry. Right? */ - // PlaceHolder Texture private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; @@ -350,7 +348,6 @@ public ResourceLocation getTextureFile() { public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay = new CustomIcon( "TileEntities/gt4/machine_top_crafting"); - public static final CustomIcon Casing_CropHarvester_Cutter = new CustomIcon("TileEntities/gt4/OVERLAY_CROP"); public static final CustomIcon Casing_CropHarvester_Boxes = new CustomIcon("TileEntities/gt4/OVERLAY_BOXES"); @@ -456,7 +453,6 @@ public ResourceLocation getTextureFile() { 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"); - public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] { new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 0d5d07f9c3..b7c0c4e4e3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -15,10 +15,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow; From 959cc22547a4345e008f6e7279e6524a9dbf7a35 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 14 May 2024 17:07:58 +0100 Subject: [PATCH 17/27] More cleaning --- .../gtPlusPlus/core/proxy/ClientProxy.java | 15 +---- .../core/recipe/RECIPES_Machines.java | 64 ------------------- .../gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 2 +- .../blocks/textures/TexturesGtBlock.java | 2 +- 4 files changed, 4 insertions(+), 79 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index a8eab5b27c..882abdf319 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -140,23 +140,12 @@ public int addArmor(final String armor) { public void serverStarting(final FMLServerStartingEvent e) {} public void onPreLoad() { - /* - * if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for - * (int i$ = 0; i$ < len$; i$++) { String tName = arr$[i$]; mCapeList.add(tName.toLowerCase()); } (new - * Thread(this)).start(); } - */ + } @Override public void run() { - /* - * try { if (ConfigSwitches.enableCustomCapes){ Logger.INFO("GT++ Mod: Downloading Cape List."); - * @SuppressWarnings("resource") Scanner tScanner = new Scanner(new - * URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream()); while - * (tScanner.hasNextLine()) { String tName = tScanner.nextLine(); if - * (!this.mCapeList.contains(tName.toLowerCase())) { this.mCapeList.add(tName.toLowerCase()); } } } } catch - * (Throwable e) { Logger.INFO("Failed to download GT++ cape list."); } - */ + } @Override diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 18287cc14f..9df69577e2 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.COFHCore; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.GregTech; @@ -115,67 +114,20 @@ public class RECIPES_Machines { // Nuclear Salt Processing Plant public static ItemStack RECIPE_SaltPlantController; - // Milling - public static ItemStack RECIPE_ISAMill_Controller; - public static ItemStack RECIPE_ISAMill_Gearbox; - public static ItemStack RECIPE_ISAMill_Casing; - public static ItemStack RECIPE_ISAMill_Hatch; - public static ItemStack RECIPE_Flotation_Controller; - public static ItemStack RECIPE_Flotation_Casing; - // Cyclotron public static ItemStack RECIPE_CyclotronController; public static ItemStack RECIPE_CyclotronOuterCasing; public static ItemStack RECIPE_CyclotronInnerCoil; - // Buffer Cores - public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore1", 1); - public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1); - public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1); - public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore4", 1); - public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore5", 1); - public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore6", 1); - public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1); - public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1); - public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1); - public static ItemStack RECIPE_BufferCore_MAX = ItemUtils - .getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1); - - // Wire - public static String wireTier1 = "wireGt08Lead"; - public static String wireTier2 = "wireGt08Tin"; - public static String wireTier3 = "wireGt08Copper"; - public static String wireTier4 = "wireGt08Gold"; - public static String wireTier5 = "wireGt08Aluminium"; - public static String wireTier6 = "wireGt08Tungsten"; - public static String wireTier7 = "wireGt08Naquadah"; - public static String wireTier8 = "wireGt08Osmium"; - public static String wireTier9 = "wireGt08Superconductor"; - public static String wireTier10 = "wireGt16Superconductor"; - // Wire - public static String cableTier1 = "cableGt04Lead"; - public static String cableTier2 = "cableGt04Tin"; - public static String cableTier3 = "cableGt04Copper"; public static String cableTier4 = "cableGt04Gold"; - public static String cableTier5 = "cableGt04Aluminium"; public static String cableTier6 = "cableGt04Tungsten"; - public static String cableTier7 = "cableGt04Naquadah"; - public static String cableTier8 = "cableGt04Osmium"; - public static String cableTier9 = "cableGt04NiobiumTitanium"; - public static String cableTier10 = "cableGt08NiobiumTitanium"; public static String pipeTier1 = "pipeHuge" + "Clay"; public static String pipeTier2 = "pipeHuge" + "Potin"; public static String pipeTier3 = "pipeHuge" + "Steel"; public static String pipeTier4 = "pipeHuge" + "StainlessSteel"; - public static String pipeTier5 = "pipeHuge" + "TungstenSteel"; - public static String pipeTier6 = "pipeHuge" + "MaragingSteel300"; public static String pipeTier7 = "pipeHuge" + "Tantalloy60"; - public static String pipeTier8 = "pipeHuge" + "Tantalloy61"; - public static String pipeTier9 = "pipeHuge" + "Inconel792"; - public static String pipeTier10 = "pipeHuge" + "HastelloyX"; - public static String pipeTier11 = "pipeHuge" + "Europium"; // EV/IV MACHINES public static ItemStack IV_MACHINE_Electrolyzer; @@ -192,32 +144,16 @@ public class RECIPES_Machines { public static ItemStack IV_MACHINE_AlloySmelter; public static ItemStack IV_MACHINE_Mixer; public static ItemStack EV_MACHINE_ChemicalBath; - // Cables - public static String cableGt02Electrum = "cableGt02Electrum"; // Plates - public static String plateElectricalSteel = "plateElectricalSteel"; - public static String plateEnergeticAlloy = "plateEnergeticAlloy"; - public static String plateCobalt = "plateCobalt"; public static String plateBronze = "plateBronze"; public static String plateSteel = "plateSteel"; // Pipes - public static String pipeLargeCopper = "pipeLargeCopper"; - public static String pipeHugeSteel = "pipeHugeSteel"; public static String pipeHugeStainlessSteel = "pipeHugeStainlessSteel"; - public static String pipeHugeTitanium = "pipeHugeTitanium"; // Lava Boiler public static ItemStack boiler_Coal; - public static ItemStack blockBricks = ItemUtils.getItemStackFromFQRN("minecraft:brick_block", 1); - - // Batteries - public static String batteryBasic = "batteryBasic"; - public static String batteryAdvanced = "batteryAdvanced"; - public static String batteryElite = "batteryElite"; - public static String batteryMaster = "batteryMaster"; - public static String batteryUltimate = "batteryUltimate"; public static ItemStack IC2MFE; public static ItemStack IC2MFSU; diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java index 01d35de155..4d5d89edb7 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -92,7 +92,7 @@ public List getCache() { if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) { cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized // by NEI - .sorted().map(temp -> { return createCachedRecipe(temp); }).collect(Collectors.toList()); + .sorted().map(temp -> createCachedRecipe(temp)).collect(Collectors.toList()); // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model // so we do not need any synchronization here mCachedRecipes = new SoftReference<>(cache); 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 4d64356203..bc812a81e2 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 @@ -186,7 +186,7 @@ public ResourceLocation getTextureFile() { // Quantum Force Transformer Casing // spotless:off - private static final CustomIcon Internal_Casing_QFT = mAnimated ? new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL") : new CustomIcon("TileEntites/MACHINE_CASING_QFT_COIL"); + private static final CustomIcon Internal_Casing_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); public static final CustomIcon Casing_Coil_QFT = Internal_Casing_QFT; public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon("NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon("CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic"); From eeb8bd6af319ec8eb75a02b1cdcbdbd8f05e6f6b Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Thu, 16 May 2024 13:21:51 +0100 Subject: [PATCH 18/27] Lots of unused code. --- .../core/item/bauble/BaseBauble.java | 66 +-- .../core/item/bauble/ElectricBaseBauble.java | 2 +- .../item/bauble/FireProtectionBauble.java | 6 +- .../item/tool/staballoy/MultiSpadeBase.java | 137 ------ .../item/tool/staballoy/StaballoySpade.java | 403 ------------------ .../core/slots/SlotVolumetricFlask.java | 2 - .../core/util/minecraft/LangUtils.java | 82 +--- .../core/util/minecraft/MaterialUtils.java | 8 +- .../core/util/minecraft/MiningUtils.java | 69 +-- .../util/minecraft/ModularArmourUtils.java | 35 -- .../core/util/minecraft/NBTUtils.java | 40 -- .../core/util/minecraft/OreDictUtils.java | 5 +- .../core/util/minecraft/PlayerUtils.java | 64 +-- .../core/util/minecraft/RecipeUtils.java | 23 +- .../core/util/minecraft/ShapelessUtils.java | 41 -- .../core/util/reflect/ReflectionUtils.java | 14 - 16 files changed, 20 insertions(+), 977 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 7b017fb093..68712cb07d 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -27,7 +27,6 @@ import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.NBTUtils; @Optional.InterfaceList( @@ -43,17 +42,7 @@ public class BaseBauble extends Item implements IBauble { private List damageNegations = new ArrayList<>(); Multimap attributes = HashMultimap.create(); - public BaseBauble(BaubleType type, String displayName) { - this.mThisBauble = type; - Utils.registerEvent(this); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName(Utils.sanitizeString(displayName.toLowerCase())); - GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", displayName); - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - public BaseBauble(BaubleType type, String unlocalName, int register) { + public BaseBauble(BaubleType type) { this.mThisBauble = type; Utils.registerEvent(this); this.setMaxStackSize(1); @@ -77,26 +66,15 @@ public void onPlayerAttacked(LivingAttackEvent event) { } } - public boolean addDamageNegation(DamageSource damageSource) { - return addDamageNegation(damageSource, null); - } - - public boolean addDamageNegation(DamageSource damageSource, ItemStack aStack) { - return damageNegations.add(damageSource.damageType); - } - - public void clearDamageNegation() { - damageNegations.clear(); - } @Override public boolean canEquip(ItemStack arg0, EntityLivingBase arg1) { - return EntityPlayer.class.isInstance(arg1) ? true : false; + return arg1 instanceof EntityPlayer; } @Override public boolean canUnequip(ItemStack arg0, EntityLivingBase arg1) { - return EntityPlayer.class.isInstance(arg1) ? true : false; + return arg1 instanceof EntityPlayer; } @Override @@ -104,23 +82,10 @@ public BaubleType getBaubleType(ItemStack arg0) { return mThisBauble; } - public boolean SetBaubleType(BT arg0) { - return SetBaubleType(arg0.getType()); - } - - public boolean SetBaubleType(BaubleType arg0) { - BaubleType temp = this.mThisBauble; - this.mThisBauble = arg0; - if (this.mThisBauble != temp) { - return true; - } - return false; - } - @Override public void onEquipped(ItemStack stack, EntityLivingBase entity) { - if (entity != null && EntityPlayer.class.isInstance(entity)) { - onEquippedOrLoadedIntoWorld(stack, entity); + if (entity instanceof EntityPlayer) { + onEquippedOrLoadedIntoWorld(entity); setPlayerHashcode(stack, entity.hashCode()); } } @@ -128,26 +93,22 @@ public void onEquipped(ItemStack stack, EntityLivingBase entity) { @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { if (getPlayerHashcode(stack) != player.hashCode()) { - onEquippedOrLoadedIntoWorld(stack, player); + onEquippedOrLoadedIntoWorld(player); setPlayerHashcode(stack, player.hashCode()); } } - public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { + public void onEquippedOrLoadedIntoWorld(EntityLivingBase player) { attributes.clear(); - fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { attributes.clear(); - fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } - void fillModifiers(Multimap attributes, ItemStack stack) {} - public ItemStack getCorrectBauble(EntityPlayer player) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); @@ -164,19 +125,6 @@ public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; } - public static UUID getBaubleUUID(ItemStack stack) { - long most = NBTUtils.getLong(stack, "baubleUUIDMost"); - if (most == 0) { - UUID uuid = UUID.randomUUID(); - NBTUtils.setLong(stack, "baubleUUIDMost", uuid.getMostSignificantBits()); - NBTUtils.setLong(stack, "baubleUUIDLeast", uuid.getLeastSignificantBits()); - return getBaubleUUID(stack); - } - - long least = NBTUtils.getLong(stack, "baubleUUIDLeast"); - return new UUID(most, least); - } - public static int getPlayerHashcode(ItemStack stack) { return NBTUtils.getInteger(stack, "mPlayerHashcode"); } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index 0b8ce24974..e6b3ab9941 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -39,7 +39,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric private final BaubleType mType; public ElectricBaseBauble(BaubleType aType, int aTier, double aMaxEU, String aUnlocalName) { - super(aType, aUnlocalName, 0); + super(aType); mType = aType; mTier = aTier; maxValueEU = aMaxEU; diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index 5e31b2ad89..d8191a93fc 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -41,7 +41,7 @@ public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) { } public FireProtectionBauble() { - super(BaubleType.RING, "GTPP.bauble.fireprotection.0" + ".name", 0); + super(BaubleType.RING); String aUnlocalName = "GTPP.bauble.fireprotection.0" + ".name"; this.setUnlocalizedName(aUnlocalName); this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); @@ -70,7 +70,6 @@ public boolean showDurabilityBar(final ItemStack stack) { return false; } - @SuppressWarnings("unchecked") @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { super.addInformation(stack, aPlayer, list, bool); @@ -88,9 +87,6 @@ public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { @Override public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) { - if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer bPlayer) {} - } } @Override diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java deleted file mode 100644 index ab154c2b24..0000000000 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ /dev/null @@ -1,137 +0,0 @@ -package gtPlusPlus.core.item.tool.staballoy; - -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.Minecraft; - -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; - -public class MultiSpadeBase extends StaballoySpade { - - /* - * (non-Javadoc) - * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) - */ - @Override - public double getDurabilityForDisplay(final ItemStack stack) { - if (super.getDurabilityForDisplay(stack) > 0) { - return super.getDurabilityForDisplay(stack); - } - return 0; - } - - protected final int colour; - protected final String materialName; - protected final String displayName; - public boolean isValid = true; - - public MultiSpadeBase(final String unlocalizedName, final ToolMaterial material, final int materialDurability, - final int colour) { - super(Utils.sanitizeString(unlocalizedName), material); - this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); - // this.setTextureName(GTPlusPlus.ID + ":" + "itemShovel"); - this.setTextureName(Minecraft.ID + ":" + "iron_shovel"); - this.setMaxStackSize(1); - this.setMaxDamage(materialDurability * 3); - this.colour = colour; - this.materialName = material.name(); - this.displayName = unlocalizedName; - this.setCreativeTab(AddToCreativeTab.tabTools); - try { - this.isValid = this.addRecipe(); - } catch (final Throwable e) {} - if ((colour != 0) && this.isValid) { - if (GameRegistry.findItem(GTPlusPlus.ID, Utils.sanitizeString(unlocalizedName)) == null) { - GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); - } - } - } - - private boolean addRecipe() { - final String cleanName = Utils.sanitizeString(this.materialName); - final String plateDense = "plateDense" + cleanName; - final String plateDouble = "plateDouble" + cleanName; - final String rodLong = "stickLong" + cleanName; - final String toolHammer = "craftingToolHardHammer"; - final String toolWrench = "craftingToolWrench"; - final String toolFile = "craftingToolFile"; - final String toolScrewDriver = "craftingToolScrewdriver"; - - if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)) { - return false; - } - if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)) { - if (null != ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDouble, 1)) { - RecipeUtils.recipeBuilder( - toolFile, - plateDouble, - toolHammer, - null, - rodLong, - null, - toolWrench, - rodLong, - toolScrewDriver, - ItemUtils.getSimpleStack(this)); - - return true; - } - return false; - } - - RecipeUtils.recipeBuilder( - toolFile, - plateDense, - toolHammer, - null, - rodLong, - null, - toolWrench, - rodLong, - toolScrewDriver, - ItemUtils.getSimpleStack(this)); - - return true; - } - - public final String getMaterialName() { - return this.materialName; - } - - @Override - public String getItemStackDisplayName(final ItemStack iStack) { - return this.displayName; - /* - * String name; if (getUnlocalizedName().toLowerCase().contains("wood")){ name = "Wooden"; } else { } return - * "Big "+name+" Spade"; - */ - } - - @Override - public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { - if (this.colour == 0) { - return MathUtils.generateSingularRandomHexValue(); - } - return this.colour; - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.uncommon; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java deleted file mode 100644 index 7af2c3cf56..0000000000 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ /dev/null @@ -1,403 +0,0 @@ -package gtPlusPlus.core.item.tool.staballoy; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemSpade; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.MiningUtils; - -public class StaballoySpade extends ItemSpade { - - /* - * (non-Javadoc) - * @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack) - */ - @Override - public double getDurabilityForDisplay(final ItemStack stack) { - if (super.getDurabilityForDisplay(stack) > 0) { - return super.getDurabilityForDisplay(stack); - } - return 0; - } - - /** - * Creates an NBT tag for this item if it doesn't have one. This also set some default values. - * - * @param rStack - * @return - */ - private static boolean createNBT(ItemStack rStack) { - final NBTTagCompound tagMain = new NBTTagCompound(); - final NBTTagCompound tagNBT = new NBTTagCompound(); - - tagNBT.setBoolean("FACING_HORIZONTAL", true); - tagNBT.setString("FACING", "north"); - tagNBT.setString("lookingDirection", ""); - - tagMain.setTag("PickStats", tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - /* - * Is the player facing horizontally? - */ - - public static final boolean isFacingHorizontal(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - return aNBT.getBoolean("FACING_HORIZONTAL"); - } - } else { - createNBT(aStack); - } - return true; - } - - public static final boolean setFacingHorizontal(final ItemStack aStack, final boolean aFacingHorizontal) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - aNBT.setBoolean("FACING_HORIZONTAL", aFacingHorizontal); - return true; - } - } - return false; - } - - /* - * Handles the Direction the player is facing - */ - - public static final String getFacingDirection(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - return aNBT.getString("FACING"); - } - } else { - createNBT(aStack); - } - return "north"; - } - - public static final boolean setFacingDirection(final ItemStack aStack, final String aFacingHorizontal) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - aNBT.setString("FACING", aFacingHorizontal); - return true; - } - } - return false; - } - - /* - * The Looking Direction handlers - */ - - public static final String getLookingDirection(final ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - return aNBT.getString("lookingDirection"); - } - } else { - createNBT(aStack); - } - return ""; - } - - public static final boolean setLookingDirection(final ItemStack aStack, final String aFacingHorizontal) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("PickStats"); - if (aNBT != null) { - aNBT.setString("lookingDirection", aFacingHorizontal); - return true; - } - } - return false; - } - - private int miningLevel; - - /* - * Methods - */ - - @Override - public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer aPlayer) { - return super.onItemRightClick(stack, world, aPlayer); - } - - @Override - public boolean onBlockDestroyed(final ItemStack stack, final World world, final Block block, final int X, - final int Y, final int Z, final EntityLivingBase entity) { - if (!world.isRemote) { - if (entity instanceof EntityPlayer) { - this.GetDestroyOrientation((EntityPlayer) entity, getLookingDirection(stack), world, X, Y, Z, stack); - } - } - return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); - } - - public Boolean canPickaxeBlock(final Block currentBlock, final World currentWorld, final int[] xyz) { - String correctTool = ""; - if (!currentWorld.isRemote) { - try { - correctTool = currentBlock.getHarvestTool(0); - // Utils.LOG_WARNING(correctTool); - - Logger.WARNING( - "Tool for Block: " + correctTool + " | Current block: " + currentBlock.getLocalizedName()); - if (MiningUtils.getBlockType(currentBlock, currentWorld, xyz, this.miningLevel) - || correctTool.equals("shovel")) { - return true; - } - } catch (final NullPointerException e) { - return false; - } - } - return false; - } - - private void GetDestroyOrientation(EntityPlayer player, final String FACING, final World world, final int X, - final int Y, final int Z, final ItemStack heldItem) { - float DURABILITY_LOSS = 0; - if (!world.isRemote) { - - switch (FACING) { - case "below", "above" -> { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem)); - } - } - } - case "facingEast", "facingWest" -> { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X, Y + i, Z + j, heldItem)); - } - } - } - case "facingNorth", "facingSouth" -> { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem)); - } - } - } - } - - // int heldItemDurability = heldItem.getDamage(1); - Logger.WARNING("Total Loss: " + (int) DURABILITY_LOSS); - Logger.WARNING("1x: " + (heldItem.getItemDamage())); - final int itemdmg = heldItem.getItemDamage(); - final int maxdmg = heldItem.getMaxDamage(); - final int dodmg = (int) DURABILITY_LOSS; - final int durNow = maxdmg - itemdmg; - final int durLeft = (int) ((maxdmg - itemdmg) - DURABILITY_LOSS); - - Logger.WARNING( - "Current Damage: " + itemdmg - + " Max Damage: " - + maxdmg - + " Durability to be lost: " - + dodmg - + " Current Durability: " - + durNow - + " Remaining Durability: " - + durLeft); - - // Break Tool - if (((durNow - dodmg) <= (900)) && (itemdmg != 0)) { - // TODO break tool - Logger.WARNING("Breaking Tool"); - heldItem.stackSize = 0; - } - // Do Damage - else { - // setItemDamage(heldItem, durLeft); - Logger.WARNING("" + (durNow - durLeft)); - this.damageItem(heldItem, (durNow - durLeft) - 1, player); - } - DURABILITY_LOSS = 0; - } - } - - public void damageItem(final ItemStack item, final int damage, final EntityPlayer localPlayer) { - item.damageItem(damage, localPlayer); - } - - public void setItemDamage(final ItemStack item, final int damage) { - item.setItemDamage(damage - 1); - } - - // Should clear up blocks quicker if I chain it. - public int removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z, - final ItemStack heldItem) { - Logger.WARNING("Trying to drop/remove a block."); - try { - final Block block = world.getBlock(X, Y, Z); - Logger.WARNING(block.toString()); - String removalTool = ""; - removalTool = block.getHarvestTool(0); - if (removalTool != null) { - if (removalTool.equals("shovel")) { - if (this.canPickaxeBlock(block, world, new int[] { X, Y, Z })) { - if ((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) - && (block.getBlockHardness(world, X, Y, Z) <= 100) - && (block != Blocks.water) - && (block != Blocks.lava)) { - - final int itemdmg = heldItem.getItemDamage(); - final int maxdmg = heldItem.getMaxDamage(); - final int dodmg = 100; - final int durNow = maxdmg - itemdmg; - final int durLeft = (maxdmg - itemdmg) - 100; - - if (((durNow - dodmg) <= (900)) && (itemdmg != 0)) { - // Do Nothing, Tool is useless. - return 0; - } - block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0); - world.setBlockToAir(X, Y, Z); - Logger.WARNING("Adding 100 damage to item."); - return 100; - } - Logger.WARNING( - "Incorrect Tool for mining this block. Wrong Block Water/lava/bedrock/blacklist"); - return 0; - } - Logger.WARNING("Incorrect Tool for mining this block. Cannot Shovel this block type."); - return 0; - } - Logger.WARNING("Incorrect Tool for mining this block. Blocks mining tool is now Shovel."); - return 0; - } - Logger.WARNING("Either the block was air or it declares an invalid mining tool."); - return 0; - } catch (final NullPointerException e) { - Logger.WARNING("Something Broke"); - e.printStackTrace(); - return 0; - } - } - - public boolean checkFacing(final ItemStack aStack, final EntityPlayer aPlayer, final World world) { - if (aPlayer != null) { - final int direction = MathHelper.floor_double((aPlayer.rotationYaw * 4F) / 360F + 0.5D) & 3; - - /* - * if (localPlayer.getLookVec().yCoord > 0){ localPlayer.getLookVec().yCoord; } - */ - - final MovingObjectPosition movingobjectposition = this - .getMovingObjectPositionFromPlayer(world, aPlayer, false); - if (movingobjectposition != null) { - final int sideHit = movingobjectposition.sideHit; - String playerStandingPosition = ""; - if (movingobjectposition != null) { - // System.out.println("Side Hit: "+movingobjectposition.sideHit); - } - - if (sideHit == 0) { - playerStandingPosition = "above"; - setFacingHorizontal(aStack, false); - } else if (sideHit == 1) { - playerStandingPosition = "below"; - setFacingHorizontal(aStack, false); - } else if (sideHit == 2) { - playerStandingPosition = "facingSouth"; - setFacingHorizontal(aStack, true); - } else if (sideHit == 3) { - playerStandingPosition = "facingNorth"; - setFacingHorizontal(aStack, true); - } else if (sideHit == 4) { - playerStandingPosition = "facingEast"; - setFacingHorizontal(aStack, true); - } else if (sideHit == 5) { - playerStandingPosition = "facingWest"; - setFacingHorizontal(aStack, true); - } - setLookingDirection(aStack, playerStandingPosition); - - if (direction == 0) { - setFacingDirection(aStack, "south"); - } else if (direction == 1) { - setFacingDirection(aStack, "west"); - } else if (direction == 2) { - setFacingDirection(aStack, "north"); - } else if (direction == 3) { - setFacingDirection(aStack, "east"); - } - } - - return true; - } - return false; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(EnumChatFormatting.GOLD + "Spades a 3x3 area in the direction you are facing."); - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - return EnumRarity.rare; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { - return true; - } - - @Override - public boolean onBlockStartBreak(final ItemStack itemstack, final int X, final int Y, final int Z, - final EntityPlayer aPlayer) { - this.checkFacing(itemstack, aPlayer, aPlayer.worldObj); - return super.onBlockStartBreak(itemstack, X, Y, Z, aPlayer); - } - - public StaballoySpade(final String unlocalizedName, final ToolMaterial material) { - super(material); - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); - this.setMaxStackSize(1); - this.setMaxDamage(3200); - } -} diff --git a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java index 3d365c08b7..2f45fb9630 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java @@ -9,8 +9,6 @@ public class SlotVolumetricFlask extends Slot { - public static Item mFlask; - public SlotVolumetricFlask(final IInventory inventory, final int slot, final int x, final int y) { super(inventory, slot, x, y); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index b72d3bddfe..0ed9379dde 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -5,13 +5,7 @@ import java.util.Map; import java.util.Properties; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; - import cpw.mods.fml.common.registry.LanguageRegistry; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.reflect.ReflectionUtils; public class LangUtils { @@ -21,7 +15,7 @@ public static void rewriteEntryForLanguageRegistry(String aLang, String aKey, St LanguageRegistry aInstance = LanguageRegistry.instance(); Field aModLanguageData = ReflectionUtils.getField(LanguageRegistry.class, "modLanguageData"); if (aModLanguageData != null) { - Map aProps = new HashMap<>(); + Map aProps; Object aInstanceProps; try { aInstanceProps = aModLanguageData.get(aInstance); @@ -45,78 +39,4 @@ public static void rewriteEntryForLanguageRegistry(String aLang, String aKey, St } } } - - /** - * Quick Block Name Lookup that is friendly to servers and locale. - */ - private static final Map mLocaleCache = new HashMap<>(); - - public static String getLocalizedNameOfBlock(Block aBlock, int aMeta) { - if (aBlock != null) { - return getLocalizedNameOfItemStack(ItemUtils.simpleMetaStack(aBlock, aMeta, 1)); - } - return "Bad Block Name"; - } - - public static String getLocalizedNameOfItemStack(ItemStack aStack) { - String aUnlocalized; - if (aStack != null) { - aUnlocalized = ItemUtils.getUnlocalizedItemName(aStack) + "." + aStack.getItemDamage() + ".name"; - String mCacheKey = aUnlocalized; - if (mLocaleCache.containsKey(mCacheKey)) { - // Recache the key if it's invalid. - if (mLocaleCache.get(mCacheKey).toLowerCase().contains(".name") - || mLocaleCache.get(mCacheKey).toLowerCase().contains("|")) { - mLocaleCache.remove(mCacheKey); - String mNew; - try { - mNew = (StatCollector - .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name")) - .trim(); - if (aStack.hasTagCompound()) { - if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) { - NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display"); - - if (nbttagcompound.hasKey("Name", 8)) { - mNew = nbttagcompound.getString("Name"); - } - } - } - } catch (Throwable t) { - mNew = "ERROR - Empty Stack"; - } - Logger.INFO("Re-caching " + mNew + " into locale cache. Key: " + mCacheKey); - mLocaleCache.put(mCacheKey, mNew); - } - Logger.INFO("Returning Cached Value. Key: " + mCacheKey); - return mLocaleCache.get(mCacheKey); - } else { - String unlocalizedName = aStack.getItem().getUnlocalizedName(aStack); - Logger.INFO("Cached New Value. UnlocalName: " + unlocalizedName); - String blockName = StatCollector.translateToLocal(unlocalizedName + ".name"); - Logger.INFO("Cached New Value. TranslatedName: " + unlocalizedName); - if (blockName.toLowerCase().contains(".name") || blockName.toLowerCase().contains("|")) { - try { - blockName = (StatCollector - .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name")) - .trim(); - if (aStack.hasTagCompound()) { - if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) { - NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display"); - if (nbttagcompound.hasKey("Name", 8)) { - blockName = nbttagcompound.getString("Name"); - } - } - } - } catch (Throwable t) { - blockName = "ERROR - Empty Stack"; - } - } - mLocaleCache.put(mCacheKey, blockName); - Logger.INFO("Cached New Value. Key: " + mCacheKey); - return blockName; - } - } - return "Bad ItemStack Name"; - } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 11c883e67e..793cb2e3a9 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -126,10 +126,7 @@ public static Material generateMaterialFromGtENUM(final Materials material, shor } else if (material.getGas(1) != null) { Logger.MATERIALS("[Debug] State set as gas."); materialState = MaterialState.GAS; - } /* - * else if (material.getPlasma(1) != null){ Logger.MATERIALS("[Debug] State set as plasma."); - * materialState = MaterialState.PLASMA; } - */ else { + } else { Logger.MATERIALS( "[Debug] State set as solid. This material has no alternative states, so for safety we wont generate anything."); materialState = MaterialState.SOLID; @@ -274,7 +271,6 @@ public static Materials getMaterial(String aMaterialName, String aFallbackMateri + aFallbackMaterialName + "', returning _NULL."); CORE.crash(); - // g = Materials._NULL; } return g; } @@ -309,7 +305,7 @@ public static AutoMap getCompoundMaterialsRecursively_Speiger(Material toCheck.add(toSearch); int processed = 0; - while (toCheck.size() > 0 && processed < HARD_LIMIT) { + while (!toCheck.isEmpty() && processed < HARD_LIMIT) { Material current = toCheck.remove(); if (current.getComposites().isEmpty()) { resultList.put(current); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 1e8049a8af..754fe1b4e0 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -13,69 +13,6 @@ public class MiningUtils { - public static boolean getBlockType(final Block block, final World world, final int[] xyz, final int miningLevel) { - final String LIQUID = "liquid"; - final String BLOCK = "block"; - final String ORE = "ore"; - final String AIR = "air"; - String blockClass; - - if (world.isRemote) { - return false; - } - - if (block == Blocks.end_stone) { - return true; - } - if (block == Blocks.stone) { - return true; - } - if (block == Blocks.sandstone) { - return true; - } - if (block == Blocks.netherrack) { - return true; - } - if (block == Blocks.nether_brick) { - return true; - } - if (block == Blocks.nether_brick_stairs) { - return true; - } - if (block == Blocks.nether_brick_fence) { - return true; - } - if (block == Blocks.glowstone) { - return true; - } - - try { - blockClass = block.getClass().toString().toLowerCase(); - Logger.WARNING(blockClass); - if (blockClass.toLowerCase().contains(LIQUID)) { - Logger.WARNING(block + " is a Liquid."); - return false; - } else if (blockClass.toLowerCase().contains(ORE)) { - Logger.WARNING(block + " is an Ore."); - return true; - } else if (block.getHarvestLevel(world.getBlockMetadata(xyz[0], xyz[1], xyz[2])) >= miningLevel) { - Logger.WARNING(block + " is minable."); - return true; - } else if (blockClass.toLowerCase().contains(AIR)) { - Logger.WARNING(block + " is Air."); - return false; - } else if (blockClass.toLowerCase().contains(BLOCK)) { - Logger.WARNING(block + " is a block of some kind."); - return false; - } else { - Logger.WARNING(block + " is mystery."); - return false; - } - } catch (final NullPointerException e) { - return false; - } - } - public static int mMoonID = -99; public static int mMarsID = -99; public static int mCometsID = -99; @@ -174,12 +111,8 @@ public static boolean findAndMapOreTypesFromGT() { if (x.mOverworld || x.mNether || (x.mEnd || aEndAsteroids)) { continue; } - /* - * if (x.mMoon) { Ores_Moon.put(x); continue; } if (x.mMars) { Ores_Mars.put(x); continue; } if - * (x.mAsteroid) { Ores_Comets.put(x); continue; } - */ + Ores_Misc.put(x); - continue; } else { Ores_Comets.put(x); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java deleted file mode 100644 index fd87a05953..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import baubles.api.BaubleType; - -public class ModularArmourUtils { - - public enum BT { - - TYPE_AMULET(BaubleType.AMULET, 0), - TYPE_RING(BaubleType.RING, 1), - TYPE_BELT(BaubleType.BELT, 2); - - private final BaubleType mType; - private final int mID; - - BT(final BaubleType tType, int tID) { - this.mType = tType; - this.mID = tID; - } - - public BaubleType getType() { - return this.mType; - } - - public BT getThis() { - return this; - } - - public int getID() { - return this.mID; - } - - } - -} diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 706d1a4685..61792a5dff 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -81,46 +81,6 @@ public static ItemStack writeItemsToNBT(ItemStack itemstack, ItemStack[] stored, return itemstack; } - public static ItemStack writeItemsToGtCraftingComponents(ItemStack rStack, ItemStack[] input, boolean copyTags) { - try { - ItemStack stored[] = new ItemStack[9]; - if (input.length != 9) { - for (int e = 0; e < input.length; e++) { - if (input[e] != null) stored[e] = input[e]; - } - } - - if (copyTags) { - for (ItemStack itemStack : stored) { - if (itemStack != null && itemStack.hasTagCompound()) { - rStack.setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); - break; - } - } - } - - NBTTagCompound rNBT = rStack.getTagCompound(), tNBT = new NBTTagCompound(); - if (rNBT == null) rNBT = new NBTTagCompound(); - for (int i = 0; i < 9; i++) { - ItemStack tStack = stored[i]; - if (tStack != null && GT_Utility.getContainerItem(tStack, true) == null - && !(tStack.getItem() instanceof GT_MetaGenerated_Tool)) { - tStack = GT_Utility.copyAmount(1, tStack); - if (GT_Utility.isStackValid(tStack)) { - GT_ModHandler - .dischargeElectricItem(tStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true); - tNBT.setTag("Ingredient." + i, tStack.writeToNBT(new NBTTagCompound())); - } - } - } - rNBT.setTag("GT.CraftingComponents", tNBT); - rStack.setTagCompound(rNBT); - } catch (Throwable t) { - t.printStackTrace(); - } - return rStack; - } - public static void setBoolean(ItemStack aStack, String aTag, boolean aBoolean) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setBoolean(aTag, aBoolean); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java index 59f231b486..0c8e971443 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java @@ -14,10 +14,7 @@ public static boolean containsValidEntries(String aOreName) { if (!a) { return false; } else { - if (b == null || b.isEmpty()) { - return false; - } + return b != null && !b.isEmpty(); } - return true; } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index c84f14d593..1e1b96308a 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -52,11 +52,11 @@ public static void messagePlayer(final EntityPlayer P, final IChatComponent S) { public static EntityPlayer getPlayer(final String name) { try { for (final EntityPlayer temp : getOnlinePlayers()) { - if (temp.getDisplayName().toLowerCase().equals(name.toLowerCase())) { + if (temp.getDisplayName().equalsIgnoreCase(name)) { return temp; } } - } catch (final Throwable e) {} + } catch (final Throwable ignored) {} return null; } @@ -72,20 +72,6 @@ public static EntityPlayer getPlayerOnServerFromUUID(final UUID parUUID) { return null; } - // Not Clientside - public static EntityPlayer getPlayerInWorld(final World world, final String Name) { - final List i = world.playerEntities; - final Minecraft mc = Minecraft.getMinecraft(); - try { - for (final EntityPlayer temp : i) { - if (temp.getDisplayName().toLowerCase().equals(Name.toLowerCase())) { - return temp; - } - } - } catch (final NullPointerException e) {} - return null; - } - public static boolean isPlayerOP(final EntityPlayer player) { if (player.canCommandSenderUseCommand(2, "")) { return true; @@ -111,7 +97,7 @@ public static ItemStack getItemStackInPlayersHand(final World world, final Strin @SideOnly(Side.CLIENT) public static ItemStack getItemStackInPlayersHand() { final Minecraft mc = Minecraft.getMinecraft(); - ItemStack heldItem = null; + ItemStack heldItem; try { heldItem = mc.thePlayer.getHeldItem(); } catch (final NullPointerException e) { @@ -124,7 +110,7 @@ public static ItemStack getItemStackInPlayersHand() { } public static ItemStack getItemStackInPlayersHand(final EntityPlayer player) { - ItemStack heldItem = null; + ItemStack heldItem; try { heldItem = player.getHeldItem(); } catch (final NullPointerException e) { @@ -142,47 +128,7 @@ public static ItemStack getItemStackInPlayersHand(final EntityPlayer player) { } return heldItem; } - - @SideOnly(Side.CLIENT) - public static Item getItemInPlayersHandClient() { - final Minecraft mc = Minecraft.getMinecraft(); - Item heldItem = null; - - try { - heldItem = mc.thePlayer.getHeldItem().getItem(); - } catch (final NullPointerException e) { - return null; - } - - if (heldItem != null) { - return heldItem; - } - - return null; - } - - public static Item getItemInPlayersHand(final EntityPlayer player) { - Item heldItem = null; - try { - heldItem = player.getHeldItem().getItem(); - } catch (final NullPointerException e) { - return null; - } - - if (heldItem != null) { - return heldItem; - } - return null; - } - - public static final EntityPlayer getPlayerEntityByName(final String aPlayerName) { - final EntityPlayer player = PlayerUtils.getPlayer(aPlayerName); - if (player != null) { - return player; - } - return null; - } - + public static final UUID getPlayersUUIDByName(final String aPlayerName) { final EntityPlayer player = PlayerUtils.getPlayer(aPlayerName); if (player != null) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index 94901dd4da..d8f4d1528c 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -216,27 +216,6 @@ public static boolean generateMortarRecipe(ItemStack aStack, ItemStack aOutput) aOutput); } - public static String[] getRecipeInfo(GT_Recipe m) { - if (m == null) { - return new String[] {}; - } - AutoMap result = new AutoMap<>(); - result.put(m.toString()); - result.put("Input " + ItemUtils.getArrayStackNames(m.mInputs)); - result.put("Output " + ItemUtils.getArrayStackNames(m.mOutputs)); - result.put("Input " + ItemUtils.getArrayStackNames(m.mFluidInputs)); - result.put("Output " + ItemUtils.getArrayStackNames(m.mFluidOutputs)); - result.put("Can be buffered? " + m.mCanBeBuffered); - result.put("Duration: " + m.mDuration); - result.put("EU/t: " + m.mEUt); - result.put("Is Hidden? " + m.mHidden); - result.put("Is Enabled? " + m.mEnabled); - result.put("Special Value: " + m.mSpecialValue); - result.put("====================================="); - String s[] = result.toArray(); - return s; - } - public static class InternalRecipeObject implements RunnableWithInfo { final ItemStack mOutput; @@ -305,7 +284,7 @@ public void run() { @Override public String getInfoData() { if (mOutput != null && mOutput instanceof ItemStack) { - return ((ItemStack) mOutput).getDisplayName(); + return mOutput.getDisplayName(); } return ""; } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java deleted file mode 100644 index 600bf9f4d6..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.util.minecraft; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.ShapelessRecipes; - -import gtPlusPlus.api.objects.Logger; - -public class ShapelessUtils { - - public static boolean addShapelessRecipe(final ItemStack output, final Object... params) { - final ArrayList arraylist = new ArrayList<>(); - final Object[] aobject = params; - final int i = params.length; - - for (int j = 0; j < i; ++j) { - final Object object1 = aobject[j]; - - if (object1 instanceof ItemStack) { - arraylist.add(((ItemStack) object1).copy()); - } else if (object1 instanceof Item) { - arraylist.add(new ItemStack((Item) object1)); - } else { - if ((object1 == null)) { - Logger.INFO(("Invalid shapeless input, ignoring!")); - } else if (!(object1 instanceof Block) && (object1 != null)) { - Logger.INFO(("Invalid shapeless recipe!")); - return false; - } else { - arraylist.add(new ItemStack((Block) object1)); - } - } - } - CraftingManager.getInstance().getRecipeList().add(new ShapelessRecipes(output, arraylist)); - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 39976652a7..514062b2f4 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -48,40 +48,30 @@ public Constructor get() { private static class CachedMethod { - private final boolean STATIC; private final Method METHOD; public CachedMethod(Method aMethod, boolean isStatic) { METHOD = aMethod; - STATIC = isStatic; } public Method get() { return METHOD; } - public boolean type() { - return STATIC; - } } private static class CachedField { - private final boolean STATIC; private final Field FIELD; public CachedField(Field aField, boolean isStatic) { FIELD = aField; - STATIC = isStatic; } public Field get() { return FIELD; } - public boolean type() { - return STATIC; - } } private static Fields.ClassFields.Field cacheAccessor(Field f) { @@ -238,10 +228,6 @@ public static Method getMethod(Class aClass, String aMethodName, Class... } } - public static boolean isStaticMethod(Class aClass, String aMethodName, Class... aTypes) { - return isStaticMethod(ReflectionUtils.getMethod(aClass, aMethodName, aTypes)); - } - public static boolean isStaticMethod(Method aMethod) { if (aMethod != null && Modifier.isStatic(aMethod.getModifiers())) { return true; From c3dd25c603a379f8517afde67b35794953f22b3c Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Thu, 16 May 2024 13:39:55 +0100 Subject: [PATCH 19/27] Some reflection cleanup --- .../core/util/reflect/ReflectionUtils.java | 100 ++---------------- 1 file changed, 6 insertions(+), 94 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 514062b2f4..93149620f7 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -122,19 +122,13 @@ private static boolean cacheField(Class aClass, Field aField) { return false; } - private static boolean cacheConstructor(Class aClass, Constructor aConstructor) { + private static void cacheConstructor(Class aClass, Constructor aConstructor) { if (aConstructor == null) { - return false; - } - CachedConstructor y = mCachedConstructors - .get(aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes())); - if (y == null) { - mCachedConstructors.put( - aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes()), - new CachedConstructor(aConstructor)); - return true; + return; } - return false; + mCachedConstructors.computeIfAbsent( + aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes()), + k -> new CachedConstructor(aConstructor)); } /** @@ -264,21 +258,6 @@ public static Field getField(final Class aClass, final String aFieldName) { } } - public static Field[] getAllFields(final Class aClass) { - if (aClass == null) { - return null; - } - Field[] aFields = aClass.getDeclaredFields(); - for (Field f : aFields) { - CachedField y = mCachedFields.get(aClass.getName() + "." + f.getName()); - if (y == null) { - makeFieldAccessible(f); - cacheField(aClass, f); - } - } - return aFields; - } - /** * Returns a cached {@link Field} object. * @@ -302,20 +281,6 @@ public static boolean doesClassExist(final String classname) { return isClassPresent(classname); } - /** - * Returns the class of the objects type parameter - * - * @param o - Object to examine paramters on - * @return - a Class or null - */ - public static Class getTypeOfGenericObject(Object o) { - Class aTypeParam = findSuperClassParameterType(o, o.getClass(), 0); - if (aTypeParam == null) { - aTypeParam = findSubClassParameterType(o, o.getClass(), 0); - } - return aTypeParam; - } - public static void makeFieldAccessible(final Field field) { if (!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())) { field.setAccessible(true); @@ -439,18 +404,7 @@ public static void setFinalFieldValue(Class clazz, String fieldName, Object n } } - /** - * Allows to change the state of an immutable instance. Huh?!? - */ - public static void setFinalFieldValue(Class clazz, Field field, Object newValue) { - try { - setFieldValue_Internal(clazz, field, newValue); - } catch (Throwable t) { - t.printStackTrace(); - } - } - - public static void setByte(Object clazz, String fieldName, byte newValue) throws Exception { + public static void setByte(Object clazz, String fieldName, byte newValue) { Field nameField = getField(clazz.getClass(), fieldName); cacheAccessor(nameField).setValue(null, newValue); } @@ -610,48 +564,6 @@ public static Object invokeNonBool(Object objectInstance, String methodName, Cla * Below Code block is used for determining generic types associated with type */ - // https://xebia.com/blog/acessing-generic-types-at-runtime-in-java/ - // https://www.javacodegeeks.com/2013/12/advanced-java-generics-retreiving-generic-type-arguments.html - public static Class findSuperClassParameterType(Object instance, Class classOfInterest, int parameterIndex) { - Class subClass = instance.getClass(); - while (classOfInterest != subClass.getSuperclass()) { - // instance.getClass() is no subclass of classOfInterest or instance is a direct instance of classOfInterest - subClass = subClass.getSuperclass(); - if (subClass == null) { - return null; - } - } - ParameterizedType parameterizedType = (ParameterizedType) subClass.getGenericSuperclass(); - Class aReturn; - aReturn = (Class) parameterizedType.getActualTypeArguments()[parameterIndex]; - return aReturn; - } - - public static Class findSubClassParameterType(Object instance, Class classOfInterest, int parameterIndex) { - Map typeMap = new HashMap<>(); - Class instanceClass = instance.getClass(); - while (classOfInterest != instanceClass.getSuperclass()) { - extractTypeArguments(typeMap, instanceClass); - instanceClass = instanceClass.getSuperclass(); - if (instanceClass == null) { - return null; - } - } - - ParameterizedType parameterizedType = (ParameterizedType) instanceClass.getGenericSuperclass(); - Type actualType = parameterizedType.getActualTypeArguments()[parameterIndex]; - if (typeMap.containsKey(actualType)) { - actualType = typeMap.get(actualType); - } - if (actualType instanceof Class) { - return (Class) actualType; - } else if (actualType instanceof TypeVariable) { - return browseNestedTypes(instance, (TypeVariable) actualType); - } else { - return null; - } - } - private static void extractTypeArguments(Map typeMap, Class clazz) { Type genericSuperclass = clazz.getGenericSuperclass(); if (!(genericSuperclass instanceof ParameterizedType parameterizedType)) { From cf8bcd6467089128106b638f94147e3ece15c8b1 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 19 May 2024 12:10:19 +0100 Subject: [PATCH 20/27] Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?" This reverts commit d244b7dba00a9aee42b4a0596e842956acb36c5a. --- .../core/client/model/ModelSickBlaze.java | 87 +++++ .../core/client/renderer/RenderSickBlaze.java | 96 +++++ .../core/client/renderer/RenderToxinball.java | 89 +++++ .../core/entity/InternalEntityRegistry.java | 19 + .../core/entity/monster/EntitySickBlaze.java | 229 ++++++++++++ .../entity/projectile/EntityToxinball.java | 332 ++++++++++++++++++ .../projectile/EntityToxinballSmall.java | 65 ++++ .../gtPlusPlus/core/proxy/ClientProxy.java | 6 + .../everglades/biome/Biome_Everglades.java | 4 + .../miscutils/textures/entity/batKing.png | Bin 0 -> 1994 bytes .../miscutils/textures/entity/sickBlaze.png | Bin 0 -> 1221 bytes 11 files changed, 927 insertions(+) create mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java create mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java create mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java create mode 100644 src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java create mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java create mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java create mode 100644 src/main/resources/assets/miscutils/textures/entity/batKing.png create mode 100644 src/main/resources/assets/miscutils/textures/entity/sickBlaze.png diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java new file mode 100644 index 0000000000..f5c255e420 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -0,0 +1,87 @@ +package gtPlusPlus.core.client.model; + +import net.minecraft.client.model.ModelBlaze; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelSickBlaze extends ModelBlaze { + + /** The sticks that fly around the Blaze. */ + private ModelRenderer[] blazeSticks = new ModelRenderer[24]; + + private ModelRenderer blazeHead; + + public ModelSickBlaze() { + for (int i = 0; i < this.blazeSticks.length; ++i) { + this.blazeSticks[i] = new ModelRenderer(this, 0, 16); + this.blazeSticks[i].addBox(0.0F, 0.0F, 0.0F, 2, 8, 2); + } + + this.blazeHead = new ModelRenderer(this, 0, 0); + this.blazeHead.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8); + } + + @Override + public int func_78104_a() { + return 8; + } + + /** + * Sets the models various rotation angles then renders the model. + */ + @Override + public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, + float p_78088_6_, float p_78088_7_) { + this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); + this.blazeHead.render(p_78088_7_); + + for (ModelRenderer blazeStick : this.blazeSticks) { + blazeStick.render(p_78088_7_); + } + } + + /** + * Sets the model's various rotation angles. For bipeds, par1 and par2 are used for animating the movement of arms + * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how + * "far" arms and legs can swing at most. + */ + @Override + public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, + float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { + float f6 = p_78087_3_ * (float) Math.PI * -0.1F; + int i; + + for (i = 0; i < 4; ++i) { + this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F); + this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 9.0F; + this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 9.0F; + ++f6; + } + + f6 = ((float) Math.PI / 4F) + p_78087_3_ * (float) Math.PI * 0.03F; + + for (i = 4; i < 8; ++i) { + this.blazeSticks[i].rotationPointY = 2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F); + this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 7.0F; + this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 7.0F; + ++f6; + } + + f6 = 0.47123894F + p_78087_3_ * (float) Math.PI * -0.05F; + + for (i = 8; i < 12; ++i) { + this.blazeSticks[i].rotationPointY = 11.0F + MathHelper.cos((i * 1.5F + p_78087_3_) * 0.5F); + this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 5.0F; + this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 5.0F; + ++f6; + } + + this.blazeHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI); + this.blazeHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI); + } +} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java new file mode 100644 index 0000000000..28e4dd4bc2 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java @@ -0,0 +1,96 @@ +package gtPlusPlus.core.client.renderer; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ResourceLocation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.client.model.ModelSickBlaze; +import gtPlusPlus.core.entity.monster.EntitySickBlaze; + +@SideOnly(Side.CLIENT) +public class RenderSickBlaze extends RenderLiving { + + private static final ResourceLocation blazeTextures = new ResourceLocation( + GTPlusPlus.ID + ":" + "textures/entity/sickBlaze.png"); + private int field_77068_a; + + public RenderSickBlaze() { + super(new ModelSickBlaze(), 0.5F); + this.field_77068_a = ((ModelSickBlaze) this.mainModel).func_78104_a(); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render this.posY + this.getEyeHeight() + this.heightOffset) { + this.motionY += (0.30000001192092896D - this.motionY) * 0.30000001192092896D; + } + } + + if (!this.onGround && this.motionY < 0.0D) { + this.motionY *= 0.6D; + } + + for (int i = 0; i < 2; ++i) { + this.worldObj.spawnParticle( + "crit", + this.posX + (this.rand.nextDouble() - 0.5D) * this.width, + this.posY + this.rand.nextDouble() * this.height, + this.posZ + (this.rand.nextDouble() - 0.5D) * this.width, + 0.0D, + 0.0D, + 0.0D); + } + + super.onLivingUpdate(); + } + + /** + * Basic mob attack. Default to touch of death in EntityCreature. Overridden by each mob to define their attack. + */ + @Override + protected void attackEntity(Entity entity, float p_70785_2_) { + if (this.attackTime <= 0 && p_70785_2_ < 2.0F + && entity.boundingBox.maxY > this.boundingBox.minY + && entity.boundingBox.minY < this.boundingBox.maxY) { + this.attackTime = 20; + this.attackEntityAsMob(entity); + } else if (p_70785_2_ < 30.0F) { + double d0 = entity.posX - this.posX; + double d1 = entity.boundingBox.minY + entity.height / 2.0F - (this.posY + this.height / 2.0F); + double d2 = entity.posZ - this.posZ; + + if (this.attackTime == 0) { + ++this.field_70846_g; + + if (this.field_70846_g == 1) { + this.attackTime = 60; + } else if (this.field_70846_g <= 4) { + this.attackTime = 6; + } else { + this.attackTime = 100; + this.field_70846_g = 0; + } + + if (this.field_70846_g > 1) { + float f1 = MathHelper.sqrt_float(p_70785_2_) * 0.5F; + this.worldObj.playAuxSFXAtEntity( + null, + 1009, + (int) this.posX, + (int) this.posY, + (int) this.posZ, + 0); + + for (int i = 0; i < 1; ++i) { + EntityToxinballSmall entitysmalltoxinball = new EntityToxinballSmall( + this.worldObj, + this, + d0 + this.rand.nextGaussian() * f1, + d1, + d2 + this.rand.nextGaussian() * f1); + entitysmalltoxinball.posY = this.posY + this.height / 2.0F + 0.5D; + this.worldObj.spawnEntityInWorld(entitysmalltoxinball); + } + } + } + + this.rotationYaw = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; + this.hasAttacked = true; + } + } + + /** + * Called when the mob is falling. Calculates and applies fall damage. + */ + @Override + protected void fall(float p_70069_1_) {} + + @Override + protected Item getDropItem() { + return Items.slime_ball; + } + + /** + * Returns true if the entity is on fire. Used by render to add the fire effect on rendering. + */ + @Override + public boolean isBurning() { + return false; + } + + /** + * Drop 0-2 items of this living's type. @param par1 - Whether this entity has recently been hit by a player. @param + * par2 - Level of Looting used to kill this mob. + */ + @Override + protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { + if (p_70628_1_) { + int j = this.rand.nextInt(2 + p_70628_2_); + + for (int k = 0; k < j; ++k) { + this.dropItem(getDropItem(), 1); + } + } + } + + /** + * Checks to make sure the light is not too bright where the mob is spawning + */ + @Override + protected boolean isValidLightLevel() { + return true; + } + + @Override + public int getMaxSpawnedInChunk() { + return 8; + } +} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java new file mode 100644 index 0000000000..da1a59600d --- /dev/null +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java @@ -0,0 +1,332 @@ +package gtPlusPlus.core.entity.projectile; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityFireball; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class EntityToxinball extends EntityFireball { + + protected int entityX = -1; + protected int entityY = -1; + protected int entityZ = -1; + private Block block; + private boolean inGround; + private int ticksAlive; + private int ticksInAir; + + public EntityToxinball(World world) { + super(world); + this.setSize(1.0F, 1.0F); + } + + @Override + protected void entityInit() {} + + /** + * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge + * length * 64 * renderDistanceWeight Args: distance + */ + @Override + @SideOnly(Side.CLIENT) + public boolean isInRangeToRenderDist(double p_70112_1_) { + double d1 = this.boundingBox.getAverageEdgeLength() * 4.0D; + d1 *= 64.0D; + return p_70112_1_ < d1 * d1; + } + + public EntityToxinball(World world, double x, double y, double z, double f1, double f2, double f3) { + super(world); + this.setSize(1.0F, 1.0F); + this.setLocationAndAngles(x, y, z, this.rotationYaw, this.rotationPitch); + this.setPosition(x, y, z); + double d6 = MathHelper.sqrt_double(f1 * f1 + f2 * f2 + f3 * f3); + this.accelerationX = f1 / d6 * 0.1D; + this.accelerationY = f2 / d6 * 0.1D; + this.accelerationZ = f3 / d6 * 0.1D; + } + + public EntityToxinball(World world, EntityLivingBase entity, double x, double y, double z) { + super(world); + this.shootingEntity = entity; + this.setSize(1.0F, 1.0F); + this.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + this.setPosition(this.entityX, this.entityY, this.entityZ); + this.yOffset = 0.0F; + this.motionX = this.motionY = this.motionZ = 0.0D; + x += this.rand.nextGaussian() * 0.4D; + y += this.rand.nextGaussian() * 0.4D; + z += this.rand.nextGaussian() * 0.4D; + double d3 = MathHelper.sqrt_double(x * x + y * y + z * z); + this.accelerationX = x / d3 * 0.1D; + this.accelerationY = y / d3 * 0.1D; + this.accelerationZ = z / d3 * 0.1D; + } + + /** + * Called to update the entity's position/logic. + */ + @Override + public void onUpdate() { + if (!this.worldObj.isRemote && (this.shootingEntity != null && this.shootingEntity.isDead + || !this.worldObj.blockExists(this.entityX, this.entityY, this.entityZ))) { + this.setDead(); + } else { + super.onUpdate(); + this.setFire(1); + + if (this.inGround) { + if (this.worldObj.getBlock(this.entityX, this.entityY, this.entityZ) == this.block) { + ++this.ticksAlive; + + if (this.ticksAlive == 600) { + this.setDead(); + } + + return; + } + + this.inGround = false; + this.motionX *= this.rand.nextFloat() * 0.2F; + this.motionY *= this.rand.nextFloat() * 0.2F; + this.motionZ *= this.rand.nextFloat() * 0.2F; + this.ticksAlive = 0; + this.ticksInAir = 0; + } else { + ++this.ticksInAir; + } + + Vec3 vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ); + Vec3 vec31 = Vec3.createVectorHelper( + this.entityX + this.motionX, + this.entityY + this.motionY, + this.entityZ + this.motionZ); + MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); + vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ); + vec31 = Vec3.createVectorHelper( + this.entityX + this.motionX, + this.entityY + this.motionY, + this.entityZ + this.motionZ); + + if (movingobjectposition != null) { + vec31 = Vec3.createVectorHelper( + movingobjectposition.hitVec.xCoord, + movingobjectposition.hitVec.yCoord, + movingobjectposition.hitVec.zCoord); + } + + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( + this, + this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + double d0 = 0.0D; + + for (Object o : list) { + Entity entity1 = (Entity) o; + + if (entity1.canBeCollidedWith() + && (!entity1.isEntityEqual(this.shootingEntity) || this.ticksInAir >= 25)) { + float f = 0.3F; + AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f, f, f); + MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + + if (movingobjectposition1 != null) { + double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + + if (d1 < d0 || d0 == 0.0D) { + entity = entity1; + d0 = d1; + } + } + } + } + + if (entity != null) { + movingobjectposition = new MovingObjectPosition(entity); + } + + if (movingobjectposition != null) { + this.onImpact(movingobjectposition); + } + + this.entityX += this.motionX; + this.entityY += this.motionY; + this.entityZ += this.motionZ; + float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) + 90.0F; + + for (this.rotationPitch = (float) (Math.atan2(f1, this.motionY) * 180.0D / Math.PI) + - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { + ; + } + + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { + this.prevRotationPitch += 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { + this.prevRotationYaw -= 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { + this.prevRotationYaw += 360.0F; + } + + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + float f2 = this.getMotionFactor(); + + if (this.isInWater()) { + for (int j = 0; j < 4; ++j) { + float f3 = 0.25F; + this.worldObj.spawnParticle( + "bubble", + this.entityX - this.motionX * f3, + this.entityY - this.motionY * f3, + this.entityZ - this.motionZ * f3, + this.motionX, + this.motionY, + this.motionZ); + } + + f2 = 0.8F; + } + + this.motionX += this.accelerationX; + this.motionY += this.accelerationY; + this.motionZ += this.accelerationZ; + this.motionX *= f2; + this.motionY *= f2; + this.motionZ *= f2; + this.worldObj.spawnParticle("smoke", this.entityX, this.entityY + 0.5D, this.entityZ, 0.0D, 0.0D, 0.0D); + this.setPosition(this.entityX, this.entityY, this.entityZ); + } + } + + /** + * Return the motion factor for this projectile. The factor is multiplied by the original motion. + */ + @Override + protected float getMotionFactor() { + return 0.95F; + } + + /** + * Called when this EntityFireball hits a block or entity. + */ + @Override + protected abstract void onImpact(MovingObjectPosition p_70227_1_); + + /** + * (abstract) Protected helper method to write subclass entity data to NBT. + */ + @Override + public void writeEntityToNBT(NBTTagCompound aTag) { + aTag.setShort("xTile", (short) this.entityX); + aTag.setShort("yTile", (short) this.entityY); + aTag.setShort("zTile", (short) this.entityZ); + aTag.setByte("inTile", (byte) Block.getIdFromBlock(this.block)); + aTag.setByte("inGround", (byte) (this.inGround ? 1 : 0)); + aTag.setTag("direction", this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ })); + } + + /** + * (abstract) Protected helper method to read subclass entity data from NBT. + */ + @Override + public void readEntityFromNBT(NBTTagCompound aTag) { + this.entityX = aTag.getShort("xTile"); + this.entityY = aTag.getShort("yTile"); + this.entityZ = aTag.getShort("zTile"); + this.block = Block.getBlockById(aTag.getByte("inTile") & 255); + this.inGround = aTag.getByte("inGround") == 1; + + if (aTag.hasKey("direction", 9)) { + NBTTagList nbttaglist = aTag.getTagList("direction", 6); + this.motionX = nbttaglist.func_150309_d(0); + this.motionY = nbttaglist.func_150309_d(1); + this.motionZ = nbttaglist.func_150309_d(2); + } else { + this.setDead(); + } + } + + /** + * Returns true if other Entities should be prevented from moving through this Entity. + */ + @Override + public boolean canBeCollidedWith() { + return true; + } + + @Override + public float getCollisionBorderSize() { + return 1.0F; + } + + /** + * Called when the entity is attacked. + */ + @Override + public boolean attackEntityFrom(DamageSource damage, float p_70097_2_) { + if (this.isEntityInvulnerable()) { + return false; + } else { + this.setBeenAttacked(); + + if (damage.getEntity() != null) { + Vec3 vec3 = damage.getEntity().getLookVec(); + + if (vec3 != null) { + this.motionX = vec3.xCoord; + this.motionY = vec3.yCoord; + this.motionZ = vec3.zCoord; + this.accelerationX = this.motionX * 0.1D; + this.accelerationY = this.motionY * 0.1D; + this.accelerationZ = this.motionZ * 0.1D; + } + + if (damage.getEntity() instanceof EntityLivingBase) { + this.shootingEntity = (EntityLivingBase) damage.getEntity(); + } + + return true; + } else { + return false; + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public float getShadowSize() { + return 0.0F; + } + + /** + * Gets how bright this entity is. + */ + @Override + public float getBrightness(float p_70013_1_) { + return 1.0F; + } + + @Override + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_) { + return 15728880; + } +} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java new file mode 100644 index 0000000000..bf7e2159c7 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java @@ -0,0 +1,65 @@ +package gtPlusPlus.core.entity.projectile; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.Blocks; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityToxinballSmall extends EntityToxinball { + + public EntityToxinballSmall(World world, EntityLivingBase entity, double x, double y, double z) { + super(world, entity, x, y, z); + this.setSize(0.3125F, 0.3125F); + } + + /** + * Called when this EntityFireball hits a block or entity. + */ + @Override + protected void onImpact(MovingObjectPosition MoP) { + if (!this.worldObj.isRemote) { + if (MoP.entityHit != null) { + if (!MoP.entityHit.isImmuneToFire() && MoP.entityHit + .attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 5.0F)) { + MoP.entityHit.setFire(5); + } + } else { + int i = MoP.blockX; + int j = MoP.blockY; + int k = MoP.blockZ; + + switch (MoP.sideHit) { + case 0 -> --j; + case 1 -> ++j; + case 2 -> --k; + case 3 -> ++k; + case 4 -> --i; + case 5 -> ++i; + } + + if (this.worldObj.isAirBlock(i, j, k)) { + this.worldObj.setBlock(i, j, k, Blocks.fire); + } + } + + this.setDead(); + } + } + + /** + * Returns true if other Entities should be prevented from moving through this Entity. + */ + @Override + public boolean canBeCollidedWith() { + return false; + } + + /** + * Called when the entity is attacked. + */ + @Override + public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { + return false; + } +} diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index f138b6f596..bc746e3de8 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -34,11 +34,15 @@ import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; import gtPlusPlus.core.client.renderer.RenderDecayChest; import gtPlusPlus.core.client.renderer.RenderMiningExplosivesPrimed; +import gtPlusPlus.core.client.renderer.RenderSickBlaze; import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct; +import gtPlusPlus.core.client.renderer.RenderToxinball; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; +import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; +import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; @@ -113,8 +117,10 @@ public void registerRenderThings() { */ RenderingRegistry .registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed()); + RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze()); RenderingRegistry .registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct()); + RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F)); RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F)); /** diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index 7305a71d26..61c8ab5c26 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -11,6 +11,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -37,8 +38,10 @@ static class BiomeGenEverglades extends BiomeGenBase { @SuppressWarnings("unchecked") public BiomeGenEverglades() { super(CORE.EVERGLADESBIOME_ID); + // this.setBiomeID(); this.theBiomeDecorator = new BiomeGenerator_Custom(); this.theBiomeDecorator.treesPerChunk = 10; + // Logger.INFO("Dark World Temperature Category: "+getTempCategory()); this.setBiomeName("Toxic Everglades"); this.topBlock = Dimension_Everglades.blockTopLayer; this.fillerBlock = Dimension_Everglades.blockSecondLayer; @@ -56,6 +59,7 @@ public BiomeGenEverglades() { this.spawnableCaveCreatureList.clear(); // Enemies + this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntitySickBlaze.class, 100, 2, 6)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityPigZombie.class, 75, 4, 16)); this.spawnableMonsterList.add(new BiomeGenBase.SpawnListEntry(EntityStaballoyConstruct.class, 20, 1, 2)); diff --git a/src/main/resources/assets/miscutils/textures/entity/batKing.png b/src/main/resources/assets/miscutils/textures/entity/batKing.png new file mode 100644 index 0000000000000000000000000000000000000000..ced2722563c643abafbe9e9068fd4dada09ad505 GIT binary patch literal 1994 zcmeHH{Wp|(6#tre=Iwdr?a3H3G)Y!QEk^UY=dZ=HFWMehMgR>lQZq*==>0r7h=62 z43MKCL`g!GFl!T)9Z9o|qI1?`Jj)>(`&)?3{Ct zDRc9tI^Z7YVHm&d#ZixFX|mu-0_pnx?r!%=EQ>hV#6xD zozrl1*6j3n@v0GzSnl(cf-rc zBP&8WvphNu|63h*h{R6PaB(~zXQsSwa(H~oY#v+t?j2*nc!EVypT}0g)0ndR$$z9L zgd8hEPMa)8$aOb=H>J~zCRrCXuHY3eb!D4}Z|B09txs+Qm^k)Ie@ba_;Lfwnn7rm< z_eJta8`=a6^AGkw<^Jb?xHFR=+q>Mr$DPZK%jOM=x6^`;HE6rYme8M`7Dh&mjy%u} zpCaC2eU5gZ5p--v?=vBuB&#r%z6`e z#XBDEujoldyFWais)@RgVC$47sD5HL)@!C;;Usk_FFw`60Sym}mcE6m1D9pI7U|!H z6COUrmYQF4GO4I=Yh=qWe_yGje5C99h+hw1eUY*5n&Ecij}P`FE`oav%O!%; zkqH~KqgwN(Wn=Ep6|D#qRZ7EB)J2r0*yhP=EvXxnhP*}|G2@=2l6U_4MNVEv$JImj zJFj-K_cs>!q$C&2^!~PYzOncFZw<(3KJ!jRPm^Na?aXUn;XZ!*xLFajx7_&Z)^;~- zP26D8F~n#ZSh7dUR^7Ax&X*BcliQrOBuAqly(~-Xb?J9U)Qy)^j>k26Q8Q~9p+c{U b>56+#YATFus~W%`{`_r&0)iz5Kb7V`Sw_~F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png b/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b36d633db14931490bc6e0e7a045480cc5497a GIT binary patch literal 1221 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QY`6?zK#qG8~eHcB(j1elRbib z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#N0|R4EfKP}kP=QLBiDkK) zN|~`tsVoma0~bGopco^U5F>*p1A_^JcA1r+7@LF~Bd-7hI|l<753@zNt4q0`eYuyq zArl7|BPTZl8yACYsk~{qleh$@PMI}_mLNAT1E&}hn>vS9nW;pnf@YDDR+*V{p$cCK zw{(uEOsRrosf==|tW1iyc&WH@sf=o=idLDqTAs2>juOyGIwgtp1AobrK!l4a^*;p|eG;y12e`=7-il+Pt?FCZMvr5Yiq;4UH? zFQAYlAeqCd;J_*!$02CSAr{Ck=)@tI!YLTZA)U%0nZ(J-&nWJ}E@Q(l7|S7R!y;+G zA!5xU=ElaS#UgCL%%dSDYsVsED9R(isHDXxtj#Q*!XYZfDjmfkp2Nv0z{sP+A}q$i z!yqQD1XREzD$OV$!X_HTAt1phW6dJx!OEsCAg#zKD9Xqs$fT&rBxcN_puxy3#3Ufb zs;0-pr^@PB=E+?uBwwbjkk0Y{|9`Ddli7ftXDkWw3ubV5b|VeMN%D4gY5ue2{3RfV zv%n*=n1Mm41cVvyrO8(S1=&kHeO=ifGYW}taWZGCYZn^4)O?%Gjv5OK6M4+pNr}i)l|UC9w)gx<+n!e{-&NeP#SFJEP)#`_I4E$=CWC zKg~47dRpr4L%!XKhI6Ds_&gFaj+{=}Tr^#sjg9B6n;v^l#mzNSg3{R7Zm=8(RM%g6 z$JoqnM>A8gLgXForBi}<-YuAMo4x1K$8X-6{2ciogt}8EE}o|SWJb^CrqB(#r;FC~ zXdi2}E-X0SzVGetrH>YVN_^@cHYaK4lN+td`;u3_@>px~Qoff>M!A3f3ctB)R(qvx zs#_JZIcs@s*!hst>E{bi-8;!VcRxc?)v|YIuB0#bY+%u!H2qma27~8>&(n8qh?p50 zGh<)T)t%Q4lzw6}C>P$Y#JGL>yE}W`nNDl>UOjf|me;R;x0n+uzdlqh>g-`zWB+a5 z1pnD*!?KeX|6Oy{(?0+CZ58wQl7rLND*;0~fAiyIv)8NN%gNoFyK`^(->=_aUSr?% z|KsK7`WFS;tn>cAHdowNZL5E|wDtSq|CitXd)0COr~U2v?UyGqEDaT4@ml)G%ULqF zq^2Qh1*7N@wiX75wU6Bu8VnklSs50ZeN+w*zTg?gU?O1Oq{yh?*y%Qz=MnRiOSfJa z9OSaPu#i)zW|3jzC99tJMV!pJO)Lycd&9IGI~y-H_Wk$x&(O9aA>^3RnC}Q!>*kaceM6 z(2oRakObKfoS#-wo>-L1P>`6JSE84fTB2a0XP{?jZk#ti8K{WC)78&qol`;+07QX^ AasU7T literal 0 HcmV?d00001 From b61b3fd1be571b8ca9fc3c1ee370a0ffdbd8fa89 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 19 May 2024 12:37:41 +0100 Subject: [PATCH 21/27] Restore random conversion recipes --- .../java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index cb1906197a..d464485495 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -40,6 +40,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; @@ -564,6 +565,13 @@ private static void laserEngraverRecipes() { } private static void breweryRecipes() { + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)).fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)).fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) + .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)).fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)) + .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES).eut(3).addTo(brewingRecipes); From 874595579c8ea5c9c3ec148c971f16d3108deeab Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 19 May 2024 12:37:48 +0100 Subject: [PATCH 22/27] Unused texture --- .../assets/miscutils/textures/entity/batKing.png | Bin 1994 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/miscutils/textures/entity/batKing.png diff --git a/src/main/resources/assets/miscutils/textures/entity/batKing.png b/src/main/resources/assets/miscutils/textures/entity/batKing.png deleted file mode 100644 index ced2722563c643abafbe9e9068fd4dada09ad505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1994 zcmeHH{Wp|(6#tre=Iwdr?a3H3G)Y!QEk^UY=dZ=HFWMehMgR>lQZq*==>0r7h=62 z43MKCL`g!GFl!T)9Z9o|qI1?`Jj)>(`&)?3{Ct zDRc9tI^Z7YVHm&d#ZixFX|mu-0_pnx?r!%=EQ>hV#6xD zozrl1*6j3n@v0GzSnl(cf-rc zBP&8WvphNu|63h*h{R6PaB(~zXQsSwa(H~oY#v+t?j2*nc!EVypT}0g)0ndR$$z9L zgd8hEPMa)8$aOb=H>J~zCRrCXuHY3eb!D4}Z|B09txs+Qm^k)Ie@ba_;Lfwnn7rm< z_eJta8`=a6^AGkw<^Jb?xHFR=+q>Mr$DPZK%jOM=x6^`;HE6rYme8M`7Dh&mjy%u} zpCaC2eU5gZ5p--v?=vBuB&#r%z6`e z#XBDEujoldyFWais)@RgVC$47sD5HL)@!C;;Usk_FFw`60Sym}mcE6m1D9pI7U|!H z6COUrmYQF4GO4I=Yh=qWe_yGje5C99h+hw1eUY*5n&Ecij}P`FE`oav%O!%; zkqH~KqgwN(Wn=Ep6|D#qRZ7EB)J2r0*yhP=EvXxnhP*}|G2@=2l6U_4MNVEv$JImj zJFj-K_cs>!q$C&2^!~PYzOncFZw<(3KJ!jRPm^Na?aXUn;XZ!*xLFajx7_&Z)^;~- zP26D8F~n#ZSh7dUR^7Ax&X*BcliQrOBuAqly(~-Xb?J9U)Qy)^j>k26Q8Q~9p+c{U b>56+#YATFus~W%`{`_r&0)iz5Kb7V`Sw_~F From 15fd005a28c4d6cb6c484467af6c3936cd0fea43 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 19 May 2024 12:47:32 +0100 Subject: [PATCH 23/27] Unused stuff --- .../core/util/reflect/ReflectionUtils.java | 212 +----------------- .../everglades/GTplusplus_Everglades.java | 14 -- .../world/WorldChunkManagerCustom.java | 4 - .../everglades/world/WorldProviderMod.java | 10 - .../nei/handlers/NeiTextureHandler.java | 1 - .../block/TF_Block_Fluid_Cryotheum.java | 9 - .../block/TF_Block_Fluid_Ender.java | 4 - .../block/TF_Block_Fluid_Pyrotheum.java | 2 - .../xmod/tinkers/util/TinkersUtils.java | 33 --- 9 files changed, 4 insertions(+), 285 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 93149620f7..2d067e4d5e 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -3,17 +3,10 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.GenericDeclaration; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; -import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; @@ -222,13 +215,6 @@ public static Method getMethod(Class aClass, String aMethodName, Class... } } - public static boolean isStaticMethod(Method aMethod) { - if (aMethod != null && Modifier.isStatic(aMethod.getModifiers())) { - return true; - } - return false; - } - /** * Returns a cached {@link Field} object. * @@ -356,10 +342,10 @@ public static boolean setField(final Object object, final String fieldName, fina return true; } } catch (final NoSuchFieldException e) { - Logger.REFLECTION("setField(" + object.toString() + ", " + fieldName + ") failed."); + Logger.REFLECTION("setField(" + object + ", " + fieldName + ") failed."); clazz = clazz.getSuperclass(); } catch (final Exception e) { - Logger.REFLECTION("setField(" + object.toString() + ", " + fieldName + ") failed."); + Logger.REFLECTION("setField(" + object + ", " + fieldName + ") failed."); throw new IllegalStateException(e); } } @@ -382,10 +368,10 @@ public static boolean setField(final Object object, final Field field, final Obj return true; } } catch (final NoSuchFieldException e) { - Logger.REFLECTION("setField(" + object.toString() + ", " + field.getName() + ") failed."); + Logger.REFLECTION("setField(" + object + ", " + field.getName() + ") failed."); clazz = clazz.getSuperclass(); } catch (final Exception e) { - Logger.REFLECTION("setField(" + object.toString() + ", " + field.getName() + ") failed."); + Logger.REFLECTION("setField(" + object + ", " + field.getName() + ") failed."); throw new IllegalStateException(e); } } @@ -409,81 +395,6 @@ public static void setByte(Object clazz, String fieldName, byte newValue) { cacheAccessor(nameField).setValue(null, newValue); } - public static boolean invoke(Object objectInstance, String methodName, Class[] parameters, Object[] values) { - if (objectInstance == null || methodName == null || parameters == null || values == null) { - return false; - } - Class mLocalClass = (objectInstance instanceof Class ? (Class) objectInstance - : objectInstance.getClass()); - Logger.REFLECTION( - "Trying to invoke " + methodName + " on an instance of " + mLocalClass.getCanonicalName() + "."); - try { - Method mInvokingMethod = mLocalClass.getDeclaredMethod(methodName, parameters); - if (mInvokingMethod != null) { - return invoke(objectInstance, mInvokingMethod, values); - } - } catch (NoSuchMethodException | SecurityException | IllegalArgumentException e) { - Logger.REFLECTION( - "Failed to Dynamically invoke " + methodName + " on an object of type: " + mLocalClass.getName()); - } - - Logger.REFLECTION("Invoke failed or did something wrong."); - return false; - } - - public static boolean invoke(Object objectInstance, Method method, Object[] values) { - if (method == null || values == null || (!ReflectionUtils.isStaticMethod(method) && objectInstance == null)) { - // Logger.REFLECTION("Null value when trying to Dynamically invoke "+methodName+" on an object of type: - // "+objectInstance.getClass().getName()); - return false; - } - String methodName = method.getName(); - String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName() - : method.getDeclaringClass().getCanonicalName(); - Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + "."); - try { - Method mInvokingMethod = method; - if (mInvokingMethod != null) { - Logger.REFLECTION(methodName + " was not null."); - if ((boolean) mInvokingMethod.invoke(objectInstance, values)) { - Logger.REFLECTION("Successfully invoked " + methodName + "."); - return true; - } else { - Logger.REFLECTION("Invocation failed for " + methodName + "."); - } - } - } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - Logger.REFLECTION("Failed to Dynamically invoke " + methodName + " on an object of type: " + classname); - } - Logger.REFLECTION("Invoke failed or did something wrong."); - return false; - } - - public static boolean invokeVoid(Object objectInstance, Method method, Object[] values) { - if (method == null || values == null || (!ReflectionUtils.isStaticMethod(method) && objectInstance == null)) { - // Logger.REFLECTION("Null value when trying to Dynamically invoke "+methodName+" on an object of type: - // "+objectInstance.getClass().getName()); - return false; - } - String methodName = method.getName(); - String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName() - : method.getDeclaringClass().getCanonicalName(); - Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + "."); - try { - Method mInvokingMethod = method; - if (mInvokingMethod != null) { - Logger.REFLECTION(methodName + " was not null."); - mInvokingMethod.invoke(objectInstance, values); - Logger.REFLECTION("Successfully invoked " + methodName + "."); - return true; - } - } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - Logger.REFLECTION("Failed to Dynamically invoke " + methodName + " on an object of type: " + classname); - } - Logger.REFLECTION("Invoke failed or did something wrong."); - return false; - } - public static boolean invokeVoid(Object objectInstance, String methodName, Class[] parameters, Object[] values) { if (objectInstance == null || methodName == null || parameters == null || values == null) { return false; @@ -512,117 +423,11 @@ public static boolean invokeVoid(Object objectInstance, String methodName, Class return false; } - public static Object invokeNonBool(Object objectInstance, Method method, Object[] values) { - if ((!ReflectionUtils.isStaticMethod(method) && objectInstance == null) || method == null || values == null) { - return false; - } - String methodName = method.getName(); - String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName() - : method.getDeclaringClass().getCanonicalName(); - Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + "."); - try { - return method.invoke(objectInstance, values); - } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - Logger.REFLECTION("Failed to Dynamically invoke " + methodName + " on an object of type: " + classname); - } - - Logger.REFLECTION("Invoke failed or did something wrong."); - return null; - } - - public static Object invokeNonBool(Object objectInstance, String methodName, Class[] parameters, Object[] values) { - if (objectInstance == null || methodName == null || parameters == null || values == null) { - return false; - } - Class mLocalClass = (objectInstance instanceof Class ? (Class) objectInstance - : objectInstance.getClass()); - Logger.REFLECTION( - "Trying to invoke " + methodName + " on an instance of " + mLocalClass.getCanonicalName() + "."); - try { - Method mInvokingMethod = mLocalClass.getDeclaredMethod(methodName, parameters); - if (mInvokingMethod != null) { - Logger.REFLECTION(methodName + " was not null."); - return mInvokingMethod.invoke(objectInstance, values); - } else { - Logger.REFLECTION(methodName + " is null."); - } - } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException e) { - Logger.REFLECTION( - "Failed to Dynamically invoke " + methodName + " on an object of type: " + mLocalClass.getName()); - } - - Logger.REFLECTION("Invoke failed or did something wrong."); - return null; - } - - /* - * Internal Magic that probably should not get exposed. - */ /* * Below Code block is used for determining generic types associated with type */ - private static void extractTypeArguments(Map typeMap, Class clazz) { - Type genericSuperclass = clazz.getGenericSuperclass(); - if (!(genericSuperclass instanceof ParameterizedType parameterizedType)) { - return; - } - - Type[] typeParameter = ((Class) parameterizedType.getRawType()).getTypeParameters(); - Type[] actualTypeArgument = parameterizedType.getActualTypeArguments(); - for (int i = 0; i < typeParameter.length; i++) { - if (typeMap.containsKey(actualTypeArgument[i])) { - actualTypeArgument[i] = typeMap.get(actualTypeArgument[i]); - } - typeMap.put(typeParameter[i], actualTypeArgument[i]); - } - } - - private static Class browseNestedTypes(Object instance, TypeVariable actualType) { - Class instanceClass = instance.getClass(); - List> nestedOuterTypes = new LinkedList<>(); - for (Class enclosingClass = instanceClass.getEnclosingClass(); enclosingClass - != null; enclosingClass = enclosingClass.getEnclosingClass()) { - try { - Field this$0 = instanceClass.getDeclaredField("this$0"); - Object outerInstance = this$0.get(instance); - Class outerClass = outerInstance.getClass(); - nestedOuterTypes.add(outerClass); - Map outerTypeMap = new HashMap<>(); - extractTypeArguments(outerTypeMap, outerClass); - for (Map.Entry entry : outerTypeMap.entrySet()) { - if (!(entry.getKey() instanceof TypeVariablefoundType)) { - continue; - } - if (foundType.getName().equals(actualType.getName()) - && isInnerClass(foundType.getGenericDeclaration(), actualType.getGenericDeclaration())) { - if (entry.getValue() instanceof Class) { - return (Class) entry.getValue(); - } - actualType = (TypeVariable) entry.getValue(); - } - } - } catch (NoSuchFieldException | IllegalAccessException e) { - - } - } - return null; - } - - private static boolean isInnerClass(GenericDeclaration outerDeclaration, GenericDeclaration innerDeclaration) { - if (!(outerDeclaration instanceof ClassouterClass) || !(innerDeclaration instanceof ClassinnerClass)) { - return false; - } - while ((innerClass = innerClass.getEnclosingClass()) != null) { - if (innerClass == outerClass) { - return true; - } - } - return false; - } - /* * End of Generics Block */ @@ -632,20 +437,15 @@ private static Field getField_Internal(final Class clazz, final String fieldN Logger.REFLECTION("Field: Internal Lookup: " + fieldName); Field k = clazz.getDeclaredField(fieldName); makeFieldAccessible(k); - // Logger.REFLECTION("Got Field from Class. "+fieldName+" did exist within "+clazz.getCanonicalName()+"."); return k; } catch (final NoSuchFieldException e) { Logger.REFLECTION("Field: Internal Lookup Failed: " + fieldName); final Class superClass = clazz.getSuperclass(); if (superClass == null) { Logger.REFLECTION("Unable to find field '" + fieldName + "'"); - // Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within - // "+clazz.getCanonicalName()+"."); throw e; } Logger.REFLECTION("Method: Recursion Lookup: " + fieldName + " - Checking in " + superClass.getName()); - // Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within - // "+clazz.getCanonicalName()+". Trying super class."); return getField_Internal(superClass, fieldName); } } @@ -873,10 +673,6 @@ private static void setFieldValue_Internal(Object owner, Field field, Object val cacheAccessor(field).setValue(owner, value); } - public static boolean doesFieldExist(String clazz, String string) { - return doesFieldExist(ReflectionUtils.getClass(clazz), string); - } - public static boolean doesFieldExist(Class clazz, String string) { if (clazz != null) { if (ReflectionUtils.getField(clazz, string) != null) { diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index a5ffe1c7fc..858d3aba21 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -49,7 +49,6 @@ public class GTplusplus_Everglades implements ActionListener { // Dark World Handler protected static volatile Biome_Everglades Everglades_Biome; protected static volatile Dimension_Everglades Everglades_Dimension; - public static int globalEvergladesPortalSpawnTimer = 0; // Pre-Init @Mod.EventHandler @@ -174,19 +173,6 @@ public void serverLoad(FMLServerStartingEvent event) { getEvergladesBiome().serverLoad(event); } - /* - * @Override public int getBurnTime(ItemStack fuel) { if (DarkWorld_Biome.addFuel(fuel) != 0) return - * DarkWorld_Biome.addFuel(fuel); if (DarkWorld_Dimension.addFuel(fuel) != 0) return - * DarkWorld_Dimension.addFuel(fuel); return 0; } - */ - - /* - * @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, - * IChunkProvider chunkProvider) { chunkX = chunkX * 16; chunkZ = chunkZ * 16; if (world.provider.dimensionId == - * Dimension_DarkWorld.DIMID) { DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ); } //What does this - * even do? if (world.provider.dimensionId == -1) { DarkWorld_Biome.generateNether(world, random, chunkX, chunkZ); } - * if (world.provider.dimensionId == 0) { DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ); } } - */ @EventHandler public static void postInit(final FMLPostInitializationEvent e) { diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java index 6a4ef65f17..5e02448cec 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java @@ -47,10 +47,6 @@ public WorldChunkManagerCustom(long seed, WorldType worldType) { this.biomeIndexLayer = agenlayer[1]; } - public WorldChunkManagerCustom(World world) { - this(world.getSeed(), world.getWorldInfo().getTerrainType()); - } - /** * Gets the list of valid biomes for the player to spawn in. */ diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java index 9b25025263..c8a69a3b0e 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java @@ -31,21 +31,11 @@ public IChunkProvider createChunkGenerator() { return new ChunkProviderModded(this.worldObj, this.worldObj.getSeed() - 1278); } - @Override - public boolean isSurfaceWorld() { - return true; - } - @Override public boolean canCoordinateBeSpawn(int par1, int par2) { return false; } - @Override - public boolean canRespawnHere() { - return true; - } - @Override public float getSunBrightness(float par1) { return (par1 * 2F); diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index 1cec4d33e1..2c299e5071 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -38,7 +38,6 @@ */ public final class NeiTextureHandler { - public static final NeiTextureHandler RECIPE = new NeiTextureHandler(16, 132, 16, 16); public static final NeiTextureHandler RECIPE_BUTTON = new NeiTextureHandler(128, 116, 24, 24); public final double minU; diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index d567d7bbc2..3b28aa67a8 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java @@ -30,8 +30,6 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { - Random random = new Random(); - public static final int LEVELS = 5; public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor); private static boolean enableSourceFall = true; private static boolean effect = true; @@ -62,13 +60,8 @@ public boolean preInit() { this.addInteraction(Blocks.leaves, Blocks.air); this.addInteraction(Blocks.tallgrass, Blocks.air); this.addInteraction(Blocks.fire, Blocks.air); - // addInteraction(TFBlocks.blockFluidGlowstone, 0, Blocks.glowstone); - final String str1 = "Fluid.Cryotheum"; - String str2 = "Enable this for Fluid Cryotheum to be worse than lava, except cold."; effect = true; - - str2 = "Enable this for Fluid Cryotheum Source blocks to gradually fall downwards."; enableSourceFall = true; return true; @@ -182,6 +175,4 @@ protected void interactWithBlock(final World paramWorld, final int paramInt1, fi } } - protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2, - final int paramInt3) {} } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java index 5bbf0ea3ab..f43142a06e 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java @@ -16,7 +16,6 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { - public static final int LEVELS = 4; public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor); private static boolean effect = true; @@ -34,9 +33,6 @@ public TF_Block_Fluid_Ender() { public boolean preInit() { GameRegistry.registerBlock(this, "FluidEnder"); - String str1 = "Fluid.Ender"; - String str2 = "Enable this for Fluid Ender to randomly teleport entities on contact."; - return true; } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index af6b74c216..b9a27f77f6 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -25,8 +25,6 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { Random random = new Random(); - public static final int LEVELS = 5; - public static final Material materialFluidPyrotheum = new MaterialLiquid(MapColor.tntColor); private static boolean effect = true; private static boolean enableSourceFall = true; diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index fb89680e6c..cf9b6c0767 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -261,39 +261,6 @@ public static List getDryingRecipes() { return aData; } - public static Object generateToolMaterial(String name, String localizationString, int level, int durability, - int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) { - try { - Constructor constructor = mClass_ToolMaterial.getConstructor( - String.class, - String.class, - int.class, - int.class, - int.class, - int.class, - float.class, - int.class, - float.class, - String.class, - int.class); - return constructor.newInstance( - name, - localizationString, - level, - durability, - speed, - damage, - handle, - reinforced, - stonebound, - style, - primaryColor); - } catch (Throwable t) { - t.printStackTrace(); - return null; - } - } - public static List getTableCastingRecipes() { Object aCastingTableHandlerInstance = getCastingInstance(0); List aTemp; From ca0485c6490ac7eea65bab9eb67c3642b1d9909c Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 20 May 2024 20:53:46 +0100 Subject: [PATCH 24/27] Restore some missing textures --- .../common/items/MetaGeneratedGregtechItems.java | 2 +- .../blocks/fluids/fluid.molten.autogenerated.png | Bin 0 -> 1558 bytes .../blocks/fluids/fluid.plasma.autogenerated.png | Bin 0 -> 1461 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index b7c0c4e4e3..204e05394d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -153,7 +153,7 @@ public void generateMetaItems() { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 8L), getTcAspectStack(TC_Aspects.POTENTIA, 8L))); - this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true); + this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, false); GregtechItemList.Cover_Overflow_LV.set( this.addItem( diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png new file mode 100644 index 0000000000000000000000000000000000000000..ee40545a46a5111fa03fd1f1a26119a9cfaac23f GIT binary patch literal 1558 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 H2c-QAXgRGK literal 0 HcmV?d00001 From e969b864fd36f60036efc705a3d50ba31280ddd9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 22:16:53 +0200 Subject: [PATCH 25/27] Spotless apply for branch Cleaning! for #881 (#883) spotlessApply Co-authored-by: GitHub GTNH Actions <> --- .../core/entity/monster/EntitySickBlaze.java | 9 +-------- .../java/gtPlusPlus/core/item/bauble/BaseBauble.java | 4 ---- .../core/item/bauble/FireProtectionBauble.java | 3 +-- .../java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 11 +++++++---- .../gtPlusPlus/core/slots/SlotVolumetricFlask.java | 1 - .../gtPlusPlus/core/util/minecraft/LangUtils.java | 1 - .../gtPlusPlus/core/util/minecraft/MiningUtils.java | 4 ---- .../java/gtPlusPlus/core/util/minecraft/NBTUtils.java | 2 -- .../gtPlusPlus/core/util/minecraft/PlayerUtils.java | 3 +-- .../gtPlusPlus/core/util/minecraft/RecipeUtils.java | 2 -- .../gtPlusPlus/core/util/reflect/ReflectionUtils.java | 1 - .../gtPlusPlus/everglades/GTplusplus_Everglades.java | 1 - .../everglades/world/WorldChunkManagerCustom.java | 1 - .../block/TF_Block_Fluid_Pyrotheum.java | 2 -- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 1 - 15 files changed, 10 insertions(+), 36 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java index 815348b1f6..c5301958ad 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java @@ -3,7 +3,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.DamageSource; @@ -154,13 +153,7 @@ protected void attackEntity(Entity entity, float p_70785_2_) { if (this.field_70846_g > 1) { float f1 = MathHelper.sqrt_float(p_70785_2_) * 0.5F; - this.worldObj.playAuxSFXAtEntity( - null, - 1009, - (int) this.posX, - (int) this.posY, - (int) this.posZ, - 0); + this.worldObj.playAuxSFXAtEntity(null, 1009, (int) this.posX, (int) this.posY, (int) this.posZ, 0); for (int i = 0; i < 1; ++i) { EntityToxinballSmall entitysmalltoxinball = new EntityToxinballSmall( diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 68712cb07d..74e810f9bd 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -2,14 +2,12 @@ import java.util.ArrayList; import java.util.List; -import java.util.UUID; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -22,7 +20,6 @@ import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Mods; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -66,7 +63,6 @@ public void onPlayerAttacked(LivingAttackEvent event) { } } - @Override public boolean canEquip(ItemStack arg0, EntityLivingBase arg1) { return arg1 instanceof EntityPlayer; diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index d8191a93fc..95c2462e23 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -86,8 +86,7 @@ public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { } @Override - public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) { - } + public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) {} @Override public void onUnequipped(final ItemStack arg0, final EntityLivingBase aPlayer) { diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index d464485495..9979af4d97 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -566,11 +566,14 @@ private static void laserEngraverRecipes() { private static void breweryRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)).fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)).fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) - .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)).fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(brewingRecipes); + .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)) + .fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(brewingRecipes); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) + .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)) + .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(brewingRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) diff --git a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java index 2f45fb9630..c84c88a0b5 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java @@ -2,7 +2,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index 0ed9379dde..28d017d749 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.util.minecraft; import java.lang.reflect.Field; -import java.util.HashMap; import java.util.Map; import java.util.Properties; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 754fe1b4e0..0dd05a41ca 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -2,10 +2,6 @@ import java.util.HashMap; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; - import gregtech.common.GT_Worldgen_GT_Ore_Layer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 61792a5dff..4b0f15b81e 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -6,8 +6,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; public class NBTUtils { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 1e1b96308a..1a46e3c80a 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -9,7 +9,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChunkCoordinates; @@ -128,7 +127,7 @@ public static ItemStack getItemStackInPlayersHand(final EntityPlayer player) { } return heldItem; } - + public static final UUID getPlayersUUIDByName(final String aPlayerName) { final EntityPlayer player = PlayerUtils.getPlayer(aPlayerName); if (player != null) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index d8f4d1528c..03a4ef8e31 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -18,12 +18,10 @@ import gregtech.api.objects.ItemData; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ShapedRecipe; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 2d067e4d5e..8a472f5b84 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -423,7 +423,6 @@ public static boolean invokeVoid(Object objectInstance, String methodName, Class return false; } - /* * Below Code block is used for determining generic types associated with type */ diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 858d3aba21..11d0894075 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -173,7 +173,6 @@ public void serverLoad(FMLServerStartingEvent event) { getEvergladesBiome().serverLoad(event); } - @EventHandler public static void postInit(final FMLPostInitializationEvent e) { Logger.INFO("Finished loading Everglades plugin for GT++."); diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java index 5e02448cec..e01ae2ff1e 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java @@ -8,7 +8,6 @@ import net.minecraft.crash.CrashReportCategory; import net.minecraft.util.ReportedException; import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeCache; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index b9a27f77f6..03bf3022f2 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -5,9 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index cf9b6c0767..b3e9482a92 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -2,7 +2,6 @@ import static gregtech.api.enums.Mods.TinkerConstruct; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; From 5e78c9e8a8e169ee56b58784789b1663e0bc2260 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 20 May 2024 21:42:44 +0100 Subject: [PATCH 26/27] Conditionally enable xpjuice recipe on OpenBlocks loaded --- .../core/recipe/RECIPES_GREGTECH.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 9979af4d97..25ebc5fb63 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -37,6 +37,7 @@ import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.thermalBoilerRecipes; +import cpw.mods.fml.common.Loader; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -566,14 +567,17 @@ private static void laserEngraverRecipes() { private static void breweryRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) - .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)) - .fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(brewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) - .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)) - .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(brewingRecipes); + if (Loader.isModLoaded("OpenBlocks")) { + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) + .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)) + .fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(brewingRecipes); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) + .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)) + .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(brewingRecipes); + } + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) From 865dbc018eded1c85d5b15df2839141423a03c77 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 22:59:54 +0200 Subject: [PATCH 27/27] Spotless apply for branch Cleaning! for #881 (#884) spotlessApply Co-authored-by: GitHub GTNH Actions <> --- src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 25ebc5fb63..a9b6e860e4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -37,13 +37,13 @@ import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.thermalBoilerRecipes; -import cpw.mods.fml.common.Loader; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -570,15 +570,14 @@ private static void breweryRecipes() { if (Loader.isModLoaded("OpenBlocks")) { GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)) - .fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(brewingRecipes); + .fluidOutputs(FluidRegistry.getFluidStack("liquidxp", 1332)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(brewingRecipes); GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) .fluidInputs(FluidRegistry.getFluidStack("liquidxp", 1332)) .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)).duration(5 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(brewingRecipes); } - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES).eut(3).addTo(brewingRecipes);