Cleaning! (#881)

* Remove fluorite from sandstone references * Remove some unused content, rogue useless configs * Remove more junk * Remove more * Remove RF converter, I think this is disabled anyway? Or should be? * Opps missed this * Cleaning * Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI? * Delete unused Australia textures * Unused texture loading * Bulk remove seemingly unused textures. * Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed. * Clean * Unused tooltips * Remove hydrogen blob * Spotless apply for branch Cleaning! for #881 (#882) spotlessApply Co-authored-by: GitHub GTNH Actions <> * More cleaning * Lots of unused code. * Some reflection cleanup * Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?" This reverts commit d244b7d. * Restore random conversion recipes * Unused texture * Unused stuff * Restore some missing textures * Spotless apply for branch Cleaning! for #881 (#883) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Conditionally enable xpjuice recipe on OpenBlocks loaded * Spotless apply for branch Cleaning! for #881 (#884) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · May 22, 2024 · 23494ad · 23494ad
1 parent 846c083
commit 23494ad
Show file tree

Hide file tree

Showing 349 changed files with 73 additions and 2,882 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");