remove teflon

GTNewHorizons · Jan 13, 2025 · ae6c24a · ae6c24a
1 parent 79d4df8
commit ae6c24a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 61 deletions.
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java
@@ -56,7 +56,6 @@
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.recipe.Scanning;
-import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.material.MaterialsAlloy;
 import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.recipe.common.CI;
@@ -1556,8 +1555,8 @@ public static void RecipeLoad() {
                 MaterialsAlloy.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8),
                 ItemList.Field_Generator_UHV.get(8),
                 GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) },
-            new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), GGMaterial.dalisenite.getMolten(1152),
-                MaterialsAlloy.BOTMIUM.getFluidStack(288) },
+            new FluidStack[] { MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(144),
+                GGMaterial.dalisenite.getMolten(1152), MaterialsAlloy.BOTMIUM.getFluidStack(288) },
             ItemRefer.Compact_Fusion_MK4.get(1),
             6000,
             (int) TierEU.RECIPE_UV);

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -21,7 +21,6 @@
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TextureSet;
 import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
@@ -30,13 +29,8 @@
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
 import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialMisc;
-import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.MaterialsElements;
-import gtPlusPlus.core.material.MaterialsOther;
-import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -45,28 +39,6 @@
 
 public class GenericChem extends ItemPackage {
 
-    /**
-     * Materials
-     */
-
-    // Refined PTFE
-    public static final Material TEFLON = new Material(
-        "Teflon",
-        MaterialState.SOLID,
-        TextureSet.SET_SHINY,
-        new short[] { 75, 45, 75 },
-        330,
-        640,
-        -1,
-        -1,
-        false,
-        null,
-        0,
-        new MaterialStack(MaterialsOther.PTFE, 75),
-        new MaterialStack(MaterialsOther.PLASTIC, 15),
-        new MaterialStack(MaterialsElements.getInstance().CARBON, 5),
-        new MaterialStack(MaterialsElements.getInstance().SODIUM, 5));
-
     /**
      * Fluids
      */
@@ -140,8 +112,6 @@ public class GenericChem extends ItemPackage {
     @Override
     public void items() {
 
-        MaterialGenerator.generate(TEFLON, false);
-
         mGenericChemItem1 = new ItemGenericChemBase();
         mAdvancedCircuit = new GTPPIntegratedCircuitItem("T3RecipeSelector", "science/general/AdvancedCircuit");
         GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit);

diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang
@@ -2215,7 +2215,6 @@ block.Tantalloy61.frame.name=Tantalloy-61 Frame Box
 block.Tantalloy61.standard.name=Block of Tantalloy-61
 block.TantalumCarbide.frame.name=Tantalum Carbide Frame Box
 block.TantalumCarbide.standard.name=Block of Tantalum Carbide
-block.Teflon.standard.name=Block of Teflon
 block.Thallium.frame.name=Thallium Frame Box
 block.Thallium.standard.name=Block of Thallium
 block.Titansteel.frame.name=Titansteel Frame Box
@@ -3104,15 +3103,6 @@ item.itemPlateNylon.name=Nylon Plate
 item.itemPlateDoubleNylon.name=Double Nylon Plate
 item.itemCellNylon.name=Nylon Cell
 tile.Block of Nylon.name=Block of Nylon
-item.itemIngotTeflon.name=Teflon Ingot
-item.itemDustTeflon.name=Teflon Dust
-item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
-item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
-item.itemNuggetTeflon.name=Teflon Nugget
-item.itemPlateTeflon.name=Teflon Plate
-item.itemPlateDoubleTeflon.name=Double Teflon Plate
-item.itemCellTeflon.name=Teflon Cell
-tile.Block of Teflon.name=Block of Teflon
 
 # Added 17/4/19
 # Spelling Corrections

diff --git a/src/main/resources/assets/miscutils/lang/ru_RU.lang b/src/main/resources/assets/miscutils/lang/ru_RU.lang
@@ -2745,15 +2745,6 @@ item.itemPlateNylon.name=Nylon Plate
 item.itemPlateDoubleNylon.name=Double Nylon Plate
 item.itemCellNylon.name=Nylon Cell
 tile.Block of Nylon.name=Block of Nylon
-item.itemIngotTeflon.name=Teflon Ingot
-item.itemDustTeflon.name=Teflon Dust
-item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
-item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
-item.itemNuggetTeflon.name=Teflon Nugget
-item.itemPlateTeflon.name=Teflon Plate
-item.itemPlateDoubleTeflon.name=Double Teflon Plate
-item.itemCellTeflon.name=Teflon Cell
-tile.Block of Teflon.name=Block of Teflon
 
 //Added 17/4/19
 //Spelling Corrections

diff --git a/src/main/resources/assets/miscutils/lang/zh_CN.lang b/src/main/resources/assets/miscutils/lang/zh_CN.lang
@@ -2745,15 +2745,6 @@ item.itemPlateNylon.name=尼龙板
 item.itemPlateDoubleNylon.name=双重尼龙板
 item.itemCellNylon.name=尼龙单元
 tile.Block of Nylon.name=尼龙块
-item.itemIngotTeflon.name=特氟龙锭
-item.itemDustTeflon.name=特氟龙粉
-item.itemDustTinyTeflon.name=小撮特氟龙粉
-item.itemDustSmallTeflon.name=小堆特氟龙粉
-item.itemNuggetTeflon.name=特氟龙粒
-item.itemPlateTeflon.name=特氟龙板
-item.itemPlateDoubleTeflon.name=双重特氟龙板
-item.itemCellTeflon.name=特氟龙单元
-tile.Block of Teflon.name=特氟龙块
 
 //Added 17/4/19
 //Spelling Corrections