create a MOD ID for Core Mod

change all Core mod items match with ID
Add Soldering function to Material list
put all Railcraft recipes from Core mot to GT

2 files changed, 12 insertions, 2 deletions

diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 0c484d05e0..f30360ca58 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -174,7 +174,8 @@ public class GT_Values {
             MOD_ID_BC_CORE = "BuildCraft|Core",
             MOD_ID_GC_CORE = "GalacticraftCore",
             MOD_ID_GC_MARS = "GalacticraftMars",
-            MOD_ID_GC_PLANETS = "GalacticraftPlanets";
+            MOD_ID_GC_PLANETS = "GalacticraftPlanets",
+            MOD_ID_DC = "dreamcraft";
     /**
      * File Paths and Resource Paths
      */
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 840ffa06fa..dee3363245 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.GT_Values.MOD_ID_DC;
 
 @SuppressWarnings("ALL")
 public class Materials implements IColorModulationContainer, ISubTagContainer {
@@ -2094,7 +2095,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         initMaterialProperties(); //No more material addition or manipulation should be done past this point!
         MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[0]); //Generate standard object array. This is a lot faster to loop over.
         VALUES = Arrays.asList(MATERIALS_ARRAY);
-        if (!Loader.isModLoaded("dreamcraft") && !GT_Mod.gregtechproxy.mEnableAllComponents)
+        if (!Loader.isModLoaded(MOD_ID_DC) && !GT_Mod.gregtechproxy.mEnableAllComponents)
             OrePrefixes.initMaterialComponents();
         else {
             OrePrefixes.ingotHot.mDisabledItems.addAll(
@@ -2800,6 +2801,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         return new FluidStack(steamCrackedFluids[2], amount);
     }
 
+    /** Check that the material is a proper soldering fluid
+     ** @return true if Materials is a proper soldering fluid
+     */
+    public boolean isProperSolderingFluid() {
+        return mStandardMoltenFluid != null && contains(SubTag.SOLDERING_MATERIAL) && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !contains(SubTag.SOLDERING_MATERIAL_GOOD));
+    }
+
     public ItemStack getCells(int amount) {
         return GT_OreDictUnificator.get(OrePrefixes.cell, this, amount);
     }
@@ -2835,4 +2843,5 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public ItemStack getPlates(int amount) {
         return GT_OreDictUnificator.get(OrePrefixes.plate, this, amount);
     }
+
 }