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/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/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 907e6a0c42..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 { @@ -16,21 +14,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 b922bb0116..c498164cf9 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -8,30 +8,20 @@ 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.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; 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; -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; 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_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; @@ -55,8 +45,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; @@ -129,13 +117,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", @@ -155,18 +136,11 @@ 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", 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", @@ -175,34 +149,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)"); - // requireControlCores - boolean temp = config.getBoolean("requireControlCores", "machines", true, "Multiblocks Require Control Cores"); - - // 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, @@ -215,29 +162,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."); - 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( - "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 @@ -266,11 +190,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/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..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( - (EntityPlayer) 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/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/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 7aa9c73236..3bd35d162d 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; @@ -135,7 +134,6 @@ public static void registerGregtechMachines() { GregtechIndustrialMassFabricator.run(); GregtechIndustrialBlastSmelter.run(); GregtechQuantumForceTransformer.run(); - GregtechSolarGenerators.run(); GregtechPowerSubStation.run(); GregtechDehydrator.run(); GregtechAdvancedBoilers.run(); diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index c411555d4d..cbd149fbdf 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; @@ -98,8 +97,6 @@ public final class ModItems { public static Item itemIngotBatteryAlloy; - public static Item itemHydrogenBlob; - public static Item itemBedLocator_Base; public static Item itemBaseItemWithCharge; @@ -212,8 +209,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 +229,6 @@ public final class ModItems { public static void init() { - itemDebugScanner = new DebugScanner(); itemMagicFeather = new ItemMagicFeather(); itemAlkalusDisk = new BaseItemDamageable( @@ -256,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 @@ -720,10 +712,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/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"); 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..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; @@ -28,7 +26,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 +33,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<>(); @@ -83,17 +74,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()) { @@ -109,7 +89,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/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 7b017fb093..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,12 +20,10 @@ 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; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.NBTUtils; @Optional.InterfaceList( @@ -43,17 +39,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 +63,14 @@ 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 +78,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 +89,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 +121,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..95c2462e23 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); @@ -87,11 +86,7 @@ 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) {} - } - } + 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/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 09838c6bac..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; @@ -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/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/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/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index a00de7a4b0..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,12 +36,9 @@ public class CORE { public static final float PI = (float) Math.PI; 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;; + public static boolean DEVENV = false;; // Mod Variables - public static final String name = "GT++"; public static final String VERSION = "GRADLETOKEN_VERSION"; @@ -67,7 +59,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,74 +83,24 @@ 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 - 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; - // Tools - public static boolean enableMultiSizeTools = true; - - // Block Drops - public static int chanceToDropDrainedShard = 196; - public static int chanceToDropFluoriteOre = 32; - // Machine Related - public static boolean enableAlternativeBatteryAlloy = false; 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; - 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; @@ -170,7 +111,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; @@ -200,7 +140,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; @@ -236,11 +175,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/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 9826478ec5..bc746e3de8 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -147,23 +147,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_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 373238df3b..a9b6e860e4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -40,8 +40,10 @@ 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; @@ -67,7 +69,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; @@ -565,12 +566,18 @@ 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); + + 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)) .duration(1 * MINUTES).eut(3).addTo(brewingRecipes); @@ -1080,8 +1087,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)) - .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_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/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 0e20941d2d..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; @@ -955,21 +891,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), @@ -1384,7 +1305,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/core/slots/SlotVolumetricFlask.java b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java index 3d365c08b7..c84c88a0b5 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java @@ -2,15 +2,12 @@ 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; 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/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)); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index b72d3bddfe..28d017d749 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -1,17 +1,10 @@ package gtPlusPlus.core.util.minecraft; import java.lang.reflect.Field; -import java.util.HashMap; 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 +14,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 +38,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..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; @@ -13,69 +9,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 +107,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..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 { @@ -81,46 +79,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..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; @@ -52,11 +51,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 +71,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 +96,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 +109,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) { @@ -143,46 +128,6 @@ 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..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; @@ -216,27 +214,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 +282,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..8a472f5b84 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; @@ -48,40 +41,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) { @@ -132,19 +115,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)); } /** @@ -238,17 +215,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; - } - return false; - } - /** * Returns a cached {@link Field} object. * @@ -278,21 +244,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. * @@ -316,20 +267,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); @@ -405,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); } } @@ -431,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); } } @@ -453,97 +390,11 @@ 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); } - 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; @@ -572,159 +423,10 @@ 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 */ - // 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)) { - 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 */ @@ -734,20 +436,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); } } @@ -975,10 +672,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..11d0894075 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,20 +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) { 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 6a4ef65f17..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; @@ -47,10 +46,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/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/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/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/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]; } - */ - } 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/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index faeae0ba5a..47101dad12 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; @@ -21,10 +20,6 @@ public class TexturesGtBlock { private static AutoMap mCustomiconMap = new AutoMap<>(); - static {} - - // public static ITexture[] CASING_BLOCKS_GTPP = new ITexture[256]; - /* * Handles Custom Textures. */ @@ -69,51 +64,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"); public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; @@ -121,14 +76,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 +92,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 +123,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 +143,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( @@ -253,7 +184,7 @@ public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aR // 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"); @@ -284,41 +215,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 +295,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 +328,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 +345,12 @@ 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 +365,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 +373,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 +394,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 +416,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 +450,20 @@ 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, 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/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index defa3d558b..204e05394d 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; @@ -38,8 +35,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")); @@ -158,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( @@ -297,50 +292,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"); - } - } } 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/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/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() { 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 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)); - } -} 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..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; @@ -25,8 +23,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..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; @@ -261,39 +260,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; 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 15c2b758ce..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/DevCape.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/FancyCape.png b/src/main/resources/assets/miscutils/textures/FancyCape.png deleted file mode 100644 index ca63a0f335..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/FancyCape.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/TesterCape.png b/src/main/resources/assets/miscutils/textures/TesterCape.png deleted file mode 100644 index 8504d06049..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/TesterCape.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png b/src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png deleted file mode 100644 index a2c461f94e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png and /dev/null differ 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 fd2c42414d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/aspects/Slusium.png and /dev/null differ 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 a19d64039a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/aspects/Xablum.png and /dev/null differ 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 e3b5ecda82..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/aspects/Xenil.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/aspects/Zetralt.png b/src/main/resources/assets/miscutils/textures/aspects/Zetralt.png deleted file mode 100644 index 001edf8ea3..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/aspects/Zetralt.png and /dev/null differ 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 78e400a5a0..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png deleted file mode 100644 index e79a08a151..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png deleted file mode 100644 index 45d8feb48b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png and /dev/null differ 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 337d5fd1bc..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png and /dev/null differ 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 e13c73be5b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png and /dev/null differ 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 2b920a8387..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png deleted file mode 100644 index ee332fba19..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png and /dev/null differ 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 787572ea3b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png and /dev/null differ 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 771fef125a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png deleted file mode 100644 index d766cc9f3f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png deleted file mode 100644 index 05c8741fa7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png and /dev/null differ 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 4f7290c571..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png and /dev/null differ 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 de786a5cc9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_QFT_COIL_STATIC.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png deleted file mode 100644 index 373cccb65d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png and /dev/null differ 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 52e1a73063..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png deleted file mode 100644 index ab3a76d006..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png and /dev/null differ 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 91d3660711..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png and /dev/null differ 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 c82b335f0c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png deleted file mode 100644 index 42c1df75cf..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png deleted file mode 100644 index 57d9cc6f86..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png deleted file mode 100644 index 869b06039f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png and /dev/null differ 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 8ae37e61d4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png deleted file mode 100644 index ce051d468c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png and /dev/null differ 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 a8a857b5b8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png and /dev/null differ 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 7037204d20..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png deleted file mode 100644 index 600def1e1b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png and /dev/null differ 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 652245a61c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png deleted file mode 100644 index 455264cffa..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png and /dev/null differ 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 eeb0bae10f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.png deleted file mode 100644 index 19456fb462..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE.png and /dev/null differ 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 870d09e8f2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_BLUE_REDSTONE.png and /dev/null differ 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 ba9dfee948..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png deleted file mode 100644 index 61d7b97402..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_CYAN_REDSTONE.png and /dev/null differ 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 00614a28ee..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN.png and /dev/null differ 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 15e5e3807e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_GREEN_REDSTONE.png and /dev/null differ 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 89a22fde86..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE.png and /dev/null differ 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 2b577185f7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_PURPLE_REDSTONE.png and /dev/null differ 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 78f0f3a7b7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED.png and /dev/null differ 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 120c04d087..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_RED_REDSTONE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.png deleted file mode 100644 index 6ed62a002d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_SIDE_CABINET.png and /dev/null differ 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 0f26874430..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png deleted file mode 100644 index eacf4df06f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/OVERLAY_YELLOW_REDSTONE.png and /dev/null differ 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 faa25b4887..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.png deleted file mode 100644 index 652245a61c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_side.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.png deleted file mode 100644 index 568a7332ab..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.png deleted file mode 100644 index 0e4219dbab..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/bronze_top_crafting.png and /dev/null differ 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 9fd8c3be81..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png and /dev/null differ 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 6f1e9c0664..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.png deleted file mode 100644 index 24f983dbc5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_off.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.png deleted file mode 100644 index 1b31323313..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_main_on.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.png deleted file mode 100644 index 1a0d063865..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_off.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.png deleted file mode 100644 index 2c2d01db7a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_bottom_redstone_on.png and /dev/null differ 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 14d33b6e4b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_off.png and /dev/null differ 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 baa8fff68a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_main_on.png and /dev/null differ 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 9751d83585..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_off.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.png deleted file mode 100644 index 53d80ccab9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_side_redstone_on.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.png deleted file mode 100644 index 24f983dbc5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_off.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.png deleted file mode 100644 index 1b31323313..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_main_on.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.png deleted file mode 100644 index 1a0d063865..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_off.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.png deleted file mode 100644 index 2c2d01db7a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/redstone/machine_top_redstone_on.png and /dev/null differ 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 fe779e8a9e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png and /dev/null differ 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 4168d9d934..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png b/src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png deleted file mode 100644 index d23f8721e4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/blockDefault.png b/src/main/resources/assets/miscutils/textures/blocks/blockDefault.png deleted file mode 100644 index 84a6b68e0e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/blockDefault.png and /dev/null differ 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 f5f51c7175..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png b/src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png deleted file mode 100644 index b7155ba3dc..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png deleted file mode 100644 index befbe80c9f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png and /dev/null differ 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 4f84e52ab1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png and /dev/null differ 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 ba4f079ba9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png and /dev/null differ 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 28b1b4dbed..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png and /dev/null differ 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 8d56915ff2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png deleted file mode 100644 index a08f7e1c25..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png and /dev/null differ 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 46c385c4ea..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png and /dev/null differ 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 1e9356ba6c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png deleted file mode 100644 index f555273f65..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png deleted file mode 100644 index 6a1c62579d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png and /dev/null differ 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 e93c9c35c2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png and /dev/null differ 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 1952b3d14e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png and /dev/null differ 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 0d32fdeec8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png and /dev/null differ 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 84a6b68e0e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/clear_flow.png and /dev/null differ 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 84a6b68e0e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/clear_still.png and /dev/null differ 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 87b1b2b7d3..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png and /dev/null differ 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 631045a936..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png deleted file mode 100644 index e987c60374..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png deleted file mode 100644 index 67965b0c01..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png and /dev/null differ 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 c587e84b78..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png and /dev/null differ 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 2beea822b4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png deleted file mode 100644 index 75ddf4ddfe..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png deleted file mode 100644 index 29d3ebf7ad..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png and /dev/null differ 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 9cb8b98946..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png deleted file mode 100644 index c80ab691f1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png deleted file mode 100644 index f647ed3621..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png and /dev/null differ 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 ef08c75bc8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png and /dev/null differ 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 61d77a51d3..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png deleted file mode 100644 index f79564ea36..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png and /dev/null differ 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 251206d195..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png deleted file mode 100644 index 6e44e97212..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png and /dev/null differ 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 512df7ce04..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png and /dev/null differ 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 00355135df..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png deleted file mode 100644 index 2ff3fb6e7b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png deleted file mode 100644 index 902015b8e1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png and /dev/null differ 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 fee5f03cd5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png deleted file mode 100644 index 73fa814eb5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png and /dev/null differ 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 63e9189c45..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png and /dev/null differ 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 05d4c69e1a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png and /dev/null differ 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 90cbef3417..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png and /dev/null differ 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 90cbef3417..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png and /dev/null differ 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 2780ffe2dd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png and /dev/null differ 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 c3ca19138c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png deleted file mode 100644 index d04b15cd89..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png and /dev/null differ 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 d8ec997508..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png and /dev/null differ 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 3466822e04..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png and /dev/null differ 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 853e88b189..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png deleted file mode 100644 index 3979e4ae76..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png and /dev/null differ 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 503022d656..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png deleted file mode 100644 index e1ae9fafb0..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png and /dev/null differ 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 7b14db3bda..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png deleted file mode 100644 index d8880393ce..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png deleted file mode 100644 index 84f6f55c22..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png deleted file mode 100644 index b79fa87cf6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png deleted file mode 100644 index 49e957bc1f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png deleted file mode 100644 index 150c1312c9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png deleted file mode 100644 index 2c5541ec6d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png deleted file mode 100644 index c62b04a499..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png and /dev/null differ 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 3712f39fdd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png deleted file mode 100644 index 719aad5646..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png deleted file mode 100644 index 855132c0b3..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png deleted file mode 100644 index 3354bbe815..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png deleted file mode 100644 index 16e4db14ad..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png deleted file mode 100644 index 3466822e04..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png and /dev/null differ 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 f332bb77e5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png and /dev/null differ 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 b6576c39e4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png and /dev/null differ 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 2c11681fcd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png deleted file mode 100644 index 0d3178a481..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png and /dev/null differ 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 b0f38da9c9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png and /dev/null differ 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 f614e41d52..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png and /dev/null differ 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 c011a999de..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png deleted file mode 100644 index 21a2847a7c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png deleted file mode 100644 index 49e957bc1f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png deleted file mode 100644 index 98bf3224ce..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png deleted file mode 100644 index cad7674ce5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png and /dev/null differ 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 a5501d12d2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png and /dev/null differ 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 b294af5b63..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png and /dev/null differ 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 6b3bdee64e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_COBBLE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONNECTOR.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONNECTOR.png deleted file mode 100644 index 91385fe0b1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONNECTOR.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png deleted file mode 100644 index 574f481c68..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png deleted file mode 100644 index 8b5f405322..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png deleted file mode 100644 index 2424eef68f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FIRE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FIRE.png deleted file mode 100644 index 2ed6d34918..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FIRE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png deleted file mode 100644 index 6a749e96a9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png and /dev/null differ 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 92910c9cdf..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png and /dev/null differ 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 b62d2b59fa..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GRINDER.png and /dev/null differ 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 d81efabf11..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_GT.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ICE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ICE.png deleted file mode 100644 index a693664179..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ICE.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_IMPLOSION.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_IMPLOSION.png deleted file mode 100644 index 537aa06353..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_IMPLOSION.png and /dev/null differ 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 82109b7dd2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_LAPO.png and /dev/null differ 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 f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/mash_flow.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/mash_still.png b/src/main/resources/assets/miscutils/textures/blocks/mash_still.png deleted file mode 100644 index f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/mash_still.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png deleted file mode 100644 index 950a44d2b7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png and /dev/null differ 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 50be701a0b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png and /dev/null differ 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 47f1792843..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png and /dev/null differ 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 44bc5362ac..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png deleted file mode 100644 index 48315c82cd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png and /dev/null differ 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 e3a652f3f9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png deleted file mode 100644 index d759a163a4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png deleted file mode 100644 index eb6c62491e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png deleted file mode 100644 index f8d0b84c10..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png deleted file mode 100644 index a5d73f716d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png and /dev/null differ 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 53df62051b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_E.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_E.png deleted file mode 100644 index 9880dcab11..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_E.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_F.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_F.png deleted file mode 100644 index 882115d975..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_F.png and /dev/null differ 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 3c19830902..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_G.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_I.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_I.png deleted file mode 100644 index 4a59e02f78..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_I.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png deleted file mode 100644 index f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png deleted file mode 100644 index f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png deleted file mode 100644 index f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png deleted file mode 100644 index f155520eae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/workbench_top.png b/src/main/resources/assets/miscutils/textures/blocks/workbench_top.png deleted file mode 100644 index 5cd53a54bf..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/blocks/workbench_top.png and /dev/null differ 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 147fc906fc..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/boar.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png b/src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png deleted file mode 100644 index 5e05105be5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png and /dev/null differ 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 3fa3b44ea7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png deleted file mode 100644 index 9b2912aba5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png and /dev/null differ 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 6e37c611cb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png and /dev/null differ 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 cd539c5773..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/entity/australia/octopus.png b/src/main/resources/assets/miscutils/textures/entity/australia/octopus.png deleted file mode 100644 index 8ce98b003c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/australia/octopus.png and /dev/null differ 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 ced2722563..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/batKing.png and /dev/null differ 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 cd0474869f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png and /dev/null differ 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 afe65842cb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/villager/banker.png and /dev/null differ 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 3df6503f9e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/villager/technician.png and /dev/null differ 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 f21c4eea6c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/entity/villager/trader.png and /dev/null differ 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 9131d0f58c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png and /dev/null differ 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 6c25e9c637..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/enviroment/sun.png and /dev/null differ 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 1a455d4f95..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/ModularityTable.png and /dev/null differ 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 54c06f22ae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png and /dev/null differ 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 b22d0ed947..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png and /dev/null differ 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 08ac08a2db..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/itemBackpack.png and /dev/null differ 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 98ccb311d0..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/itemGrindle.png and /dev/null differ 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 482c67e6be..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_0.png and /dev/null differ 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 2b4fc73611..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_1.png and /dev/null differ 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 45b8ec9f6f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_2.png and /dev/null differ 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 bad33ed910..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_3.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_4.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_4.png deleted file mode 100644 index 2787d8530e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_4.png and /dev/null differ 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 355cbe2719..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_5.png and /dev/null differ 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 44d30c40dd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_6.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_7.png b/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_7.png deleted file mode 100644 index 2c2c84a1e7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_7.png and /dev/null differ 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 dcfe6ac299..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_8.png and /dev/null differ 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 a7c2aec6ec..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/mode_9.png and /dev/null differ 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 6416b809c0..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_0.png and /dev/null differ 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 5bada8dd71..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_1.png and /dev/null differ 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 808c265981..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_2.png and /dev/null differ 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 de9cbead42..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/gui/overlay_button/throughput_3.png and /dev/null differ 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 65fc3f7d6e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png and /dev/null differ 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 98c4b4f2b7..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png and /dev/null differ 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 87d68083fa..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png and /dev/null differ 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 197729ce5c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png and /dev/null differ 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 9f75ddb6f2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png deleted file mode 100644 index 011f12583d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png and /dev/null differ 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 2968f9e0f9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png and /dev/null differ 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 ab26c57778..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png and /dev/null differ 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 84cb315d59..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png and /dev/null differ 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 ac695c9089..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png deleted file mode 100644 index 9555795cbe..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png deleted file mode 100644 index b8294d66d5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png and /dev/null differ 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 d1ddb92013..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png and /dev/null differ 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 db0d4d4dde..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png and /dev/null differ 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 dd3de3ecff..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png and /dev/null differ 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 dd3de3ecff..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png and /dev/null differ 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 506ab6621b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png deleted file mode 100644 index 506ab6621b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png deleted file mode 100644 index 506ab6621b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png deleted file mode 100644 index 05c3440206..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png and /dev/null differ 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 23b7878fdd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png and /dev/null differ 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 511366e648..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/bomb.png b/src/main/resources/assets/miscutils/textures/items/bomb.png deleted file mode 100644 index e8e9b0f532..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bomb.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/bomb_casing.png b/src/main/resources/assets/miscutils/textures/items/bomb_casing.png deleted file mode 100644 index d4238babe2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bomb_casing.png and /dev/null differ 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 e40029160b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bomb_lit.png and /dev/null differ 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 99a6af0f18..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png and /dev/null differ 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 624e9b674b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameChocolate.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/frameHealing.png b/src/main/resources/assets/miscutils/textures/items/frameHealing.png deleted file mode 100644 index 7756b84da2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameHealing.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/frameNova.png b/src/main/resources/assets/miscutils/textures/items/frameNova.png deleted file mode 100644 index 3ed54fef87..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameNova.png and /dev/null differ 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 4fc5cd3ab4..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameRestraint.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/frameSoul.png b/src/main/resources/assets/miscutils/textures/items/frameSoul.png deleted file mode 100644 index c044632ec9..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameSoul.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/frameVoid.png b/src/main/resources/assets/miscutils/textures/items/frameVoid.png deleted file mode 100644 index 45fc307328..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/frameVoid.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png deleted file mode 100644 index d83a131004..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png and /dev/null differ 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 1c91860461..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png and /dev/null differ 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 6c7e63b924..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png deleted file mode 100644 index ae13305b96..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png deleted file mode 100644 index d6ba7ec2ca..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png deleted file mode 100644 index d83a131004..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png and /dev/null differ 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 6c7e63b924..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemBolt.png b/src/main/resources/assets/miscutils/textures/items/itemBolt.png deleted file mode 100644 index 8675564a9b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemBolt.png and /dev/null differ 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 942a9ffb5f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemBottle.png and /dev/null differ 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 13658b477f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemCentidust.png and /dev/null differ 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 1d7766cca5..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemDecidust.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemDefault.png b/src/main/resources/assets/miscutils/textures/items/itemDefault.png deleted file mode 100644 index 9ed71de6dd..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemDefault.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemDroplet.png b/src/main/resources/assets/miscutils/textures/items/itemDroplet.png deleted file mode 100644 index 31f30e524a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemDroplet.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemFiber.png b/src/main/resources/assets/miscutils/textures/items/itemFiber.png deleted file mode 100644 index c2eb959c6c..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemFiber.png and /dev/null differ 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 1804dc358b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemFineWire.png and /dev/null differ 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 ad5126851a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemGem.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png deleted file mode 100644 index e09ff6d1df..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png deleted file mode 100644 index c3835b07c1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png and /dev/null differ 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 f86ce276cc..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png and /dev/null differ 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 d7c34334b2..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemHelmet.png and /dev/null differ 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 29296faf74..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemKey.png b/src/main/resources/assets/miscutils/textures/items/itemKey.png deleted file mode 100644 index 19527cc2ae..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemKey.png and /dev/null differ 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 fb293722f6..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png and /dev/null differ 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 edb7970730..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png and /dev/null differ 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 a1ff53ef8d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemPotion.png and /dev/null differ 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 07a5951140..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png and /dev/null differ 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 b6b611bbbb..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemPotionRed.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemRing.png b/src/main/resources/assets/miscutils/textures/items/itemRing.png deleted file mode 100644 index eb9dfd5e21..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemRing.png and /dev/null differ 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 18c9ee59c1..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemRod.png and /dev/null differ 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 1580b911f0..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemRodLong.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemRotor.png b/src/main/resources/assets/miscutils/textures/items/itemRotor.png deleted file mode 100644 index c593cee35b..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemRotor.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemScrew.png b/src/main/resources/assets/miscutils/textures/items/itemScrew.png deleted file mode 100644 index faca2c6e3d..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemScrew.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png b/src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png deleted file mode 100644 index f711563765..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png and /dev/null differ 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 54b3afb24e..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemSpring.png b/src/main/resources/assets/miscutils/textures/items/itemSpring.png deleted file mode 100644 index df442ed454..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSpring.png and /dev/null differ 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 5e7201a558..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png and /dev/null differ diff --git a/src/main/resources/assets/miscutils/textures/items/itemSunnariumBit.png b/src/main/resources/assets/miscutils/textures/items/itemSunnariumBit.png deleted file mode 100644 index acf4cbd064..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSunnariumBit.png and /dev/null differ 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 56ac390aa8..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemSword.png and /dev/null differ 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 8e10b0529a..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemTablet.png and /dev/null differ 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 942a9ffb5f..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png and /dev/null differ 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 2aa4a893ed..0000000000 Binary files a/src/main/resources/assets/miscutils/textures/space/RocketGui.png and /dev/null differ