Collisions (#3284)

2 files changed, 1 insertions, 25 deletions

diff --git a/src/main/java/gtPlusPlus/core/material/MaterialMisc.java b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
index d00529d044..19c9f53194 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java
@@ -21,7 +21,6 @@ public final class MaterialMisc {
         MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
         MaterialUtils.generateSpecialDustAndAssignToAMaterial(CYANOACETIC_ACID, false);
         MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_CYANIDE, false);
-        MaterialUtils.generateSpecialDustAndAssignToAMaterial(CALCIUM_CHLORIDE, false);
         MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE, false);
         MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE_HYDRATED, false);
         WATER.registerComponentForMaterial(FluidUtils.getWater(1000));
@@ -447,21 +446,6 @@ public final class MaterialMisc {
         new MaterialStack(MaterialsElements.getInstance().CARBON, 1),
         new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1));
 
-    public static final Material CALCIUM_CHLORIDE = new Material(
-        "Calcium Chloride",
-        MaterialState.SOLID, // State
-        new short[] { 180, 190, 255 }, // Material Colour
-        563, // Melting Point in C
-        1496, // Boiling Point in C
-        -1, // Protons
-        -1,
-        false, // Uses Blast furnace?
-        "CaCl2",
-        0,
-        false,
-        new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1),
-        new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2));
-
     public static final Material CYANOACETIC_ACID = new Material(
         "Cyanoacetic Acid",
         MaterialState.SOLID, // State
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
index 45329aac16..d110124086 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.recipe;
 
 import static gregtech.api.enums.Mods.EnderIO;
-import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
@@ -34,7 +33,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 
 public class RecipesGeneral {
@@ -420,11 +418,6 @@ public class RecipesGeneral {
         generateWireRecipes(MaterialsElements.STANDALONE.HYPOGEN);
         generateWireRecipes(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS);
 
-        // No Material for void, natch.
-        if (Thaumcraft.isModLoaded()) {
-            generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15);
-        }
-
         Material[] gtpp = new Material[] { MaterialsAlloy.STABALLOY, MaterialsAlloy.TANTALLOY_60,
             MaterialsAlloy.TANTALLOY_61, MaterialsAlloy.POTIN, MaterialsAlloy.MARAGING300, MaterialsAlloy.MARAGING350,
             MaterialsAlloy.INCONEL_690, MaterialsAlloy.INCONEL_792, MaterialsAlloy.HASTELLOY_X,
@@ -435,8 +428,7 @@ public class RecipesGeneral {
             generatePipeRecipes(mat.getLocalizedName(), mat.getMass(), mat.vVoltageMultiplier / 8);
         }
 
-        Materials[] h = new Materials[] { Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay,
-            Materials.Lead, };
+        Materials[] h = new Materials[] { Materials.Clay };
 
         for (Materials e : h) {
             if (e == Materials.DarkSteel) {