Clean-up v2 (#729)

* Remove test items from NEI with no texture

* Add number formatting to hand pumps

* Remove heavy plates (no recipes & completely unused).

* Remove helium generator (no texture, no recipe)

* Remove fire pit and fire starter (no use, no recipe, no textures)

* Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore.

* Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why?

* Remove trade bench, no recipe, missing textures. Unused.

* Remove farm processors, no texture, no recipe. Unused.

* Remove MAX tier components, these exist in GT now, have no recipe here and are unused.

* Hide untextured light block from NEI

* Update buildscript

* Remove unused backpacks, no recipe and contains dupe bugs. Bad.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2

* Remove dragon catcher (what?), no texture, no recipe, unused.

* Remove empty item, does nothing, has no recipe, no idea why it is here.

* Empty item v2 removal

* Revert "Empty item v2 removal"

This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d.

* Revert "Remove empty item, does nothing, has no recipe, no idea why it is here."

This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36.

* Remove debug square. No recipe, unused.

* Number formatting overflow covers

* Remove JVM garbage collection block. Unused, no recipe.

* Remove nanotubes, no recipe for them. Unused.

* Remove "git" item, doesn't seem to work. Has no recipe.

* Remove uncraftable food with awful textures.

* Remove "bat king" mob, unused content. Does not spawn.

* Remove uncraftable doors with bad textures. Unused content.

* Remove uncraftable, unlocalised redstone stuff that crashes game when placed.

* Remove weird spawner item. No recipe, does not exist in world.

* Remove sunnarium bit, no recipe, no usage.

* Remove unused modularity table and some misc uncraftable, unused items.

* Remove Interconnecting Storage Crate, no recipe, unused.

* Delete worse debug power gen, this already exists as part of GT. Unneeded duplication.

* Delete unused placeholder circuit

* Delete uncraftable generator hatches.

* Spotless

* Remove XP tank thing, unused and uncraftable.

* Remove null item, this fluid registry only seemed to register one null fluid. All others exist?

* Remove EU -> RF battery. Unused in GTNH.

* Remove some shelf nonsense, why is this in this mod?

* Remove some weird random tools. These have no realistic usage in GTNH.

* Remove firemaker. Useless in GTNH.

* Removed helium blob. Deprecated item, not used anymore, uncraftable.

* spotlessApply (#730)

Co-authored-by: GitHub GTNH Actions <>

* Stop modulators generating unused blocks with no textures

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock.

* spotlessApply (#732)

Co-authored-by: GitHub GTNH Actions <>

* Remove gem shards, unused.

* Remove unused atoms

* Remove unused gum

* Remove unused elements/materials

* Bye bye

* Remove some unused reflection stuff

* Remove control cores, obsolete now.

* Remove mob killing thing with no texture and no recipe.

* Remove uncraftable covers

* Remove pizza gloves

* Net and rope removal, unused

* Remove force crop

* Removal of some old event stuff

* Remove unused nuclear chem items

* Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord.

* Remove Force material and associated other nonsense. Also remove some nuclear chem stuff.

* Remove force for realsies

* Skookum Chooker purge.

* Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete.

* spotlessApply (#733)

Co-authored-by: GitHub GTNH Actions <>

* Unused textures

* Bump dep

* Revert "Remove force for realsies"

This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e.

* Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff."

This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b.

* Remove nuclear items that are unused

* spotlessApply (#734)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

2 files changed, 6 insertions, 177 deletions

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 f7f935fdf1..d7eccc0d6b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -5,8 +5,6 @@ import static gregtech.client.GT_TooltipHandler.Tier.*;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
 
-import net.minecraft.item.EnumAction;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -18,7 +16,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_FoodStat;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.covers.GT_Cover_Arm;
 import gregtech.common.covers.GT_Cover_Conveyor;
@@ -57,7 +54,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 
         // Simplify life.
         registerComponents_ULV();
-        registerComponents_MAX();
 
         // Extruder Shape
         GregtechItemList.Shape_Extruder_WindmillShaft
@@ -192,21 +188,11 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                                 getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
         this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true);
 
-        // FOOOOOOOOOOOOOOD
-        GregtechItemList.Food_Baked_Raisin_Bread.set(
-                this.addItem(
-                        tLastID = 60,
-                        "Raisin Bread",
-                        "Extra Raisins, Just for ImQ009",
-                        new Object[] { new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]),
-                                getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L),
-                                getTcAspectStack(TC_Aspects.IGNIS, 1L) }));
-
         GregtechItemList.Cover_Overflow_ULV.set(
                 this.addItem(
                         71,
                         "Overflow Valve (ULV)",
-                        "Maximum void amount: 8000",
+                        "Maximum void amount: 8,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -214,7 +200,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 this.addItem(
                         72,
                         "Overflow Valve (LV)",
-                        "Maximum void amount: 64000",
+                        "Maximum void amount: 64,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -222,7 +208,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 this.addItem(
                         73,
                         "Overflow Valve (MV)",
-                        "Maximum void amount: 512000",
+                        "Maximum void amount: 512,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -230,7 +216,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 this.addItem(
                         74,
                         "Overflow Valve (HV)",
-                        "Maximum void amount: 4096000",
+                        "Maximum void amount: 4,096,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -238,7 +224,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 this.addItem(
                         75,
                         "Overflow Valve (EV)",
-                        "Maximum void amount: 32768000",
+                        "Maximum void amount: 32,768,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -246,7 +232,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                 this.addItem(
                         76,
                         "Overflow Valve (IV)",
-                        "Maximum void amount: 262144000",
+                        "Maximum void amount: 262,144,000",
                         new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
                                 getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
                                 getTcAspectStack(TC_Aspects.AQUA, 1L) }));
@@ -295,21 +281,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
                         "Hypervisor Matrix (Fusion)",
                         "A memory unit containing an RI (Restricted Intelligence)"));
 
-        // NanoTubes
-        GregtechItemList.NanoTube_Base_Substrate
-                .set(this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes"));
-        GregtechItemList.NanoTube_Finished.set(
-                this.addItem(102, "Carbon Nanotubes", "Multi-walled Zigzag nanotubes, possibly Carbon's final form"));
-        GregtechItemList.Carbyne_Tube_Finished.set(
-                this.addItem(
-                        103,
-                        "Linear Acetylenic Carbon (LAC/Carbyne)",
-                        "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable"));
-        GregtechItemList.Carbyne_Sheet_Finished.set(
-                this.addItem(
-                        104,
-                        "Carbyne Composite Panel",
-                        "Nanotubes which contain LAC, arranged side by side and compressed further"));
         GregtechItemList.Laser_Lens_Special
                 .set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers"));
 
@@ -341,51 +312,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         /*
          * High Tier 'Saws' for the tree Farm
          */
-        GregtechItemList.Farm_Processor_EV.set(
-                this.addItem(
-                        tLastID = 120,
-                        "Farm Processor [EV]",
-                        "Reusable",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                                getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[5] * 10 * 60 * 20, GT_Values.V[4], 4L, -3L, false);
-        GregtechItemList.Farm_Processor_IV.set(
-                this.addItem(
-                        tLastID = 122,
-                        "Farm Processor [IV]",
-                        "Reusable",
-                        new Object[] { 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, false);
-        GregtechItemList.Farm_Processor_LuV.set(
-                this.addItem(
-                        tLastID = 124,
-                        "Farm Processor [LuV]",
-                        "Reusable",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                                getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 10 * 60 * 20, GT_Values.V[6], 6L, -3L, false);
-        GregtechItemList.Farm_Processor_ZPM.set(
-                this.addItem(
-                        tLastID = 126,
-                        "Farm Processor [ZPM]",
-                        "Reusable",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                                getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 10 * 60 * 20, GT_Values.V[7], 7L, -3L, false);
-        GregtechItemList.Farm_Processor_UV.set(
-                this.addItem(
-                        tLastID = 128,
-                        "Farm Processor [UV]",
-                        "Reusable",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.METALLUM, 8L),
-                                getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
-        this.setElectricStats(32000 + tLastID, GT_Values.V[9] * 10 * 60 * 20, GT_Values.V[8], 8L, -3L, false);
 
         GregtechItemList.Laser_Lens_WoodsGlass.set(
                 this.addItem(
@@ -500,88 +426,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         return true;
     }
 
-    private boolean registerComponents_MAX() {
-        GregtechItemList.Electric_Pump_MAX.set(
-                this.addItem(
-                        3,
-                        "Electric Pump (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
-                                getTcAspectStack(TC_Aspects.AQUA, 8L) }));
-        GregtechItemList.Electric_Motor_MAX.set(
-                this.addItem(
-                        7,
-                        "Electric Motor (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
-        GregtechItemList.Conveyor_Module_MAX.set(
-                this.addItem(
-                        11,
-                        "Conveyor Module (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
-        GregtechItemList.Electric_Piston_MAX.set(
-                this.addItem(
-                        15,
-                        "Electric Piston (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
-        GregtechItemList.Robot_Arm_MAX.set(
-                this.addItem(
-                        19,
-                        "Robot Arm (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L),
-                                getTcAspectStack("COGNITIO", 8L) }));
-        GregtechItemList.Field_Generator_MAX.set(
-                this.addItem(
-                        23,
-                        "Field Generator (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.TUTAMEN, 8L) }));
-        GregtechItemList.Emitter_MAX.set(
-                this.addItem(
-                        27,
-                        "Emitter (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) }));
-        GregtechItemList.Sensor_MAX.set(
-                this.addItem(
-                        31,
-                        "Sensor (MAX)",
-                        "",
-                        new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.SENSUS, 8L) }));
-
-        GregTech_API.registerCover(
-                GregtechItemList.Electric_Pump_MAX.get(1L),
-                new GT_MultiTexture(
-                        new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                new GT_Cover_Pump(524288, TextureFactory.of(OVERLAY_PUMP)));
-        GregTech_API.registerCover(
-                GregtechItemList.Conveyor_Module_MAX.get(1L),
-                new GT_MultiTexture(
-                        new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                new GT_Cover_Conveyor(4, 1, TextureFactory.of(OVERLAY_CONVEYOR)));
-        GregTech_API.registerCover(
-                GregtechItemList.Robot_Arm_MAX.get(1L),
-                new GT_MultiTexture(
-                        new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
-                                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
-                new GT_Cover_Arm(4, TextureFactory.of(OVERLAY_ARM)));
-
-        return true;
-    }
-
     public boolean registerOldCircuits() {
         // Enable Old Circuits
         Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index cd81bfce76..a07ed2131a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -6,7 +6,6 @@ import gregtech.api.enums.ToolDictNames;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
@@ -15,7 +14,6 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
     public static final short ELECTRIC_LIGHTER = 7534;
     public static final short ELECTRIC_BUTCHER_KNIFE = 7634;
-    public static final short SKOOKUM_CHOOCHER = 7734;
     public static final short ANGLE_GRINDER = 7834;
     public static final short ELECTRIC_SNIPS = 7934;
     public static GT_MetaGenerated_Tool INSTANCE;
@@ -30,19 +28,6 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
     private MetaGeneratedGregtechTools() {
         super("plusplus.metatool.01");
-        // Skookum Choocher
-        GregTech_API.registerTool(
-                this.addTool(
-                        SKOOKUM_CHOOCHER,
-                        "Skookum Choocher",
-                        "Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.",
-                        new TOOL_Gregtech_Choocher(),
-                        new Object[] { GregtechToolDictNames.craftingToolSkookumChoocher,
-                                ToolDictNames.craftingToolHardHammer, ToolDictNames.craftingToolWrench,
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }),
-                GregTech_API.sWrenchList);
 
         // Electric File
         this.addTool(