remove Polystyrene, Polysiloxane

GregTechCEu · Sep 8, 2021 · c25044f · c25044f
1 parent f3db325
commit c25044f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 55 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java
@@ -449,7 +449,6 @@ public static void register() {
      * Organic chemistry
      */
     public static Material SiliconeRubber;
-    public static Material Polystyrene;
     public static Material RawRubber;
     public static Material RawStyreneButadieneRubber;
     public static Material StyreneButadieneRubber;
@@ -462,7 +461,6 @@ public static void register() {
     public static Material Polydimethylsiloxane;
     public static Material Polyethylene;
     public static Material Epoxy;
-    public static Material Polysiloxane;
     public static Material Polycaprolactam;
     public static Material Polytetrafluoroethylene;
     public static Material Sugar;

diff --git a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java
@@ -18,12 +18,7 @@ public static void register() {
                 .components(Carbon, 2, Hydrogen, 6, Oxygen, 1, Silicon, 1)
                 .build();
 
-        Polystyrene = new Material.Builder(1001, "polystyrene")
-                .ingot().fluid()
-                .color(0xBEB4AA)
-                .flags(DISABLE_DECOMPOSITION, GENERATE_FOIL, NO_SMASHING)
-                .components(Carbon, 8, Hydrogen, 8)
-                .build();
+        // Free ID 1001
 
         RawRubber = new Material.Builder(1002, "raw_rubber")
                 .dust()
@@ -113,12 +108,7 @@ public static void register() {
                 .components(Carbon, 21, Hydrogen, 25, Chlorine, 1, Oxygen, 5)
                 .build();
 
-        Polysiloxane = new Material.Builder(1014, "polysiloxane")
-                .ingot(1).fluid()
-                .color(0xDCDCDC)
-                .flags(STD_METAL, FLAMMABLE, NO_SMASHING, DISABLE_DECOMPOSITION)
-                .components(Carbon, 1, Hydrogen, 1, Silicon, 2, Oxygen, 1)
-                .build();
+        // Free ID 1014
 
         Polycaprolactam = new Material.Builder(1015, "polycaprolactam")
                 .ingot(1).fluid()

diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
@@ -791,11 +791,6 @@ private static void boardRecipes() {
                 .buildAndRegister();
 
         // Wetware Board
-        FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16)
-                .notConsumable(SHAPE_MOLD_CYLINDER)
-                .fluidInputs(Polystyrene.getFluid(L / 4))
-                .output(PETRI_DISH)
-                .buildAndRegister();
 
         FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16)
                 .notConsumable(SHAPE_MOLD_CYLINDER)

diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
@@ -336,36 +336,6 @@ public static void init() {
                 .fluidOutputs(Hydrogen.getFluid(1000))
                 .duration(80).EUt(30).buildAndRegister();
 
-        CHEMICAL_RECIPES.recipeBuilder()
-                .notConsumable(new IntCircuitIngredient(1))
-                .fluidInputs(Air.getFluid(1000))
-                .fluidInputs(Styrene.getFluid(144))
-                .fluidOutputs(Polystyrene.getFluid(144))
-                .duration(160).EUt(30).buildAndRegister();
-
-        CHEMICAL_RECIPES.recipeBuilder()
-                .notConsumable(new IntCircuitIngredient(1))
-                .fluidInputs(Oxygen.getFluid(1000))
-                .fluidInputs(Styrene.getFluid(144))
-                .fluidOutputs(Polystyrene.getFluid(216))
-                .duration(160).EUt(30).buildAndRegister();
-
-        CHEMICAL_RECIPES.recipeBuilder()
-                .notConsumable(new IntCircuitIngredient(2))
-                .fluidInputs(Air.getFluid(7500))
-                .fluidInputs(Styrene.getFluid(2160))
-                .fluidInputs(TitaniumTetrachloride.getFluid(100))
-                .fluidOutputs(Polystyrene.getFluid(3240))
-                .duration(800).EUt(30).buildAndRegister();
-
-        CHEMICAL_RECIPES.recipeBuilder()
-                .notConsumable(new IntCircuitIngredient(2))
-                .fluidInputs(Oxygen.getFluid(7500))
-                .fluidInputs(Styrene.getFluid(2160))
-                .fluidInputs(TitaniumTetrachloride.getFluid(100))
-                .fluidOutputs(Polystyrene.getFluid(4320))
-                .duration(800).EUt(30).buildAndRegister();
-
         CHEMICAL_RECIPES.recipeBuilder()
                 .notConsumable(new IntCircuitIngredient(3))
                 .fluidInputs(Oxygen.getFluid(1000))

diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -1402,7 +1402,6 @@ material.obsidian=Obsidian
 material.phosphate=Phosphate
 material.pig_iron=Pig Iron
 material.plastic=Polyethylene (PE)
-material.polysiloxane=Polysiloxane
 material.polycaprolactam=Polycaprolactam
 material.polytetrafluoroethylene=Polytetrafluoroethylene (PTFE)
 material.powellite=Powellite
@@ -1464,7 +1463,6 @@ material.silicone_rubber=Silicone Rubber
 material.polydimethylsiloxane=Polydimethylsiloxane
 material.dimethyldichlorosilane=Dimethyldichlorosilane
 material.styrene=Styrene
-material.polystyrene=Polystyrene
 material.butadiene=Butadiene
 material.raw_styrene_butadiene_rubber=Raw Styrene-Butadiene Rubber
 material.styrene_butadiene_rubber=Styrene-Butadiene Rubber
@@ -1810,10 +1808,6 @@ item.reinforced_epoxy_resin.nugget=Fiber-Reinforced Epoxy Resin Chip
 item.reinforced_epoxy_resin.plateDense=Dense Fiber-Reinforced Epoxy Resin Sheet
 item.reinforced_epoxy_resin.plate=Fiber-Reinforced Epoxy Resin Sheet
 item.reinforced_epoxy_resin.foil=Thin Fiber-Reinforced Epoxy Resin Sheet
-item.polysiloxane.dustTiny=Tiny Pile of Polysiloxane Pulp
-item.polysiloxane.dustSmall=Small Pile of Polysiloxane Pulp
-item.polysiloxane.dust=Polysiloxane Pulp
-item.polysiloxane.plate=Polysiloxane Sheet
 item.polycaprolactam.dustTiny=Tiny Pile of Polycaprolactam Pulp
 item.polycaprolactam.dustSmall=Small Pile of Polycaprolactam Pulp
 item.polycaprolactam.dust=Polycaprolactam Pulp