Various GT fixes (#2002)

* TE items cant be required

* remove from itemlist

* TE does not exist

* this never worked anyway but also unecessary

* these are broken. have a working replacement already

* give valid id to fix rockbreaker fake recipes

* fix texture and text

* no NC its fake anyway

8 files changed, 5 insertions, 122 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 15f2e4bcb6..471176d500 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -24,10 +24,6 @@ public enum ItemList implements IItemContainer {
 
     Display_ITS_FREE,
     Display_Fluid,
-    TE_Slag,
-    TE_Slag_Rich,
-    TE_Rockwool,
-    TE_Hardened_Glass,
     FR_Lemon,
     FR_Mulch,
     FR_Fertilizer,
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 6d802a0789..0946811ff6 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -792,10 +792,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
             }
         }
         GT_Log.out.println("GT_Mod: Getting required Items of other Mods.");
-        ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slag", 1L));
-        ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slagRich", 1L));
-        ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "rockwool", 1L));
-        ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L));
 
         ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.ID, "machine.delta", 1L, 0));
         ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.ID, "frame", 1L, 0));
@@ -1002,8 +998,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
         GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "waxCast", 1L, 32767));
         GT_ModHandler.sNonReplaceableItems
             .add(GT_ModHandler.getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 32767));
-        GT_ModHandler.sNonReplaceableItems
-            .add(GT_ModHandler.getModItem(IC2NuclearControl.ID, "ItemToolThermometer", 1L, 32767));
 
         RecipeSorter.register(
             "gregtech:shaped",
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index d1e6653c77..aa524e14f9 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -1806,102 +1806,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             ItemList.Plank_DarkOak.get(2L),
             GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
             new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Larch.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 0) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Teak.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Acacia_Green.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 2) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Lime.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 3) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Chestnut.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 4) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Wenge.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 5) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Baobab.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 6) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Sequoia.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 7) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Kapok.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 0) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Ebony.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Mahagony.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 2) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Balsa.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 3) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Willow.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 4) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Walnut.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 5) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Greenheart.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 6) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Cherry.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 7) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Mahoe.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 0) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Poplar.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 1) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Palm.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 2) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Papaya.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 3) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Pine.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 4) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Plum.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 5) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Maple.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 6) });
-        GT_ModHandler.addCraftingRecipe(
-            ItemList.Plank_Citrus.get(2L),
-            GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE,
-            new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 7) });
 
         GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null);
         GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null);
@@ -2803,7 +2707,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
         }
         ItemList.Display_ITS_FREE.set(
             addItem(
-                tLastID = 766,
+                tLastID = 765,
                 "ITS FREE",
                 "(or at least almost free)",
                 SubTag.INVISIBLE,
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
index cab8e9a7a0..e44d764df7 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
@@ -18,7 +18,6 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.ItemList;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_LanguageManager;
@@ -37,8 +36,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
         Blocks.stained_glass,
         Blocks.stained_glass_pane,
         Blocks.carpet,
-        Blocks.hardened_clay,
-        ItemList.TE_Rockwool.getBlock());
+        Blocks.hardened_clay);
     private final String mTooltip;
     private final String mTooltipUses = GT_LanguageManager
         .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:");
diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
index b0c6392de4..54ef19a9d0 100644
--- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
+++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
@@ -351,7 +351,7 @@ public class GT_PostLoad {
             0);
         GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe(
             false,
-            new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Side") },
+            new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Side") },
             new ItemStack[] { new ItemStack(Blocks.cobblestone, 1) },
             null,
             null,
@@ -361,7 +361,7 @@ public class GT_PostLoad {
             0);
         GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe(
             false,
-            new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Top") },
+            new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(1L, "IT'S FREE! Place Lava on Top") },
             new ItemStack[] { new ItemStack(Blocks.stone, 1) },
             null,
             null,
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
index a7c306a0c0..662f9725d0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
@@ -818,7 +818,7 @@ public class CentrifugeRecipes implements Runnable {
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1))
             .itemOutputs(
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1),
-                ItemList.TE_Slag.get(1L, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)))
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))
             .noFluidInputs()
             .noFluidOutputs()
             .duration(12 * SECONDS + 10 * TICKS)
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
index bc85770c01..7a73c3a7c3 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
@@ -6,7 +6,6 @@ import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
-import static gregtech.api.enums.Mods.ThermalExpansion;
 import static gregtech.api.enums.Mods.TwilightForest;
 
 import net.minecraft.init.Blocks;
@@ -110,16 +109,8 @@ public class GT_Loader_OreDictionary implements Runnable {
             .registerOre(OreDictNames.craftingAnvil, GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0));
         GT_OreDictUnificator
             .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.dust,
-            Materials.Wood,
-            GT_ModHandler.getModItem(ThermalExpansion.ID, "sawdust", 1L));
         GT_OreDictUnificator
             .registerOre(OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L));
-        GT_OreDictUnificator.registerOre(
-            OrePrefixes.glass,
-            Materials.Reinforced,
-            GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L));
 
         GT_OreDictUnificator
             .registerOre(OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 6));
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/765.png
index 2926dee5f2..2926dee5f2 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/765.png