Update WerkstoffMaterialPool.java - Fix "Impure Samarium ..." naming (#…

…88) * Update WerkstoffMaterialPool.java Renamed "Impure Samarium Oxalate" -> "Coarse Samarium Oxalate". Reason: Deny it from entering OreProc Systems utilizing "dustImpure*" filtering to gather any Impure Dust that can be centrifuged - but Impure Samarium Oxalate needs an LSC instead ! * Update WerkstoffMaterialPool.java * Update WerkstoffMaterialPool.java * update * if a material was renamed you need to check the usage --------- Co-authored-by: Martin Robertz <[email protected]> (cherry picked from commit cfdc7a5)
GTNewHorizons · May 19, 2024 · d64a85a · d64a85a
1 parent 17fa6ba
commit d64a85a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.130:dev')
-    implementation('com.github.GTNewHorizons:GTplusplus:1.11.49:dev')
-    implementation('com.github.GTNewHorizons:GoodGenerator:0.8.18:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.05:dev')
+    implementation('com.github.GTNewHorizons:GTplusplus:1.12.2:dev')
+    implementation('com.github.GTNewHorizons:GoodGenerator:0.9.1:dev')
 }
diff --git a/gradle.properties b/gradle.properties
@@ -117,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
 }
 
 
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -981,20 +981,20 @@ public class WerkstoffMaterialPool implements Runnable {
             offsetID5 + 3,
             TextureSet.SET_FLUID);
 
-    public static final Werkstoff ImpureSamariumOxalate = new Werkstoff(
+    public static final Werkstoff SamariumOxalate = new Werkstoff(
             new short[] { 248, 248, 180 },
-            "Impure Samarium Oxalate",
+            "Samarium(III) Oxalate",
             subscriptNumbers("?Sm2(C2O4)3"),
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             offsetID5 + 4,
             TextureSet.SET_DULL);
 
-    public static final Werkstoff ImpureSamariumChloride = new Werkstoff(
+    public static final Werkstoff SamariumChloride = new Werkstoff(
             new short[] { 248, 248, 120 },
-            "Impure Samarium Chloride",
-            subscriptNumbers("?SmCl3"),
+            "Samarium(III)-Chloride",
+            subscriptNumbers("SmCI3"),
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(),

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -2093,15 +2093,15 @@ public static void loadLanthanideRecipes() {
                         DilutedSamariumRareEarthSolution.getFluidOrGas(2000),
                         MyMaterial.oxalate.getFluidOrGas(3000))
                 .itemOutputs(
-                        ImpureSamariumOxalate.get(OrePrefixes.dust, 5),
+                        SamariumOxalate.get(OrePrefixes.dust, 5),
                         DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 3))
                 .fluidOutputs(MuddySamariumRareEarthSolution.getFluidOrGas(50)).outputChances(10000, 1000)
                 .eut(TierEU.RECIPE_EV).duration(10 * SECONDS).addTo(multiblockChemicalReactorRecipes);
 
         // 5 ImpureSamariumOxalate + 6B HCL = 8 ImpureSamariumChloride + 6B CO
-        GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumOxalate.get(OrePrefixes.dust, 5))
+        GT_Values.RA.stdBuilder().itemInputs(SamariumOxalate.get(OrePrefixes.dust, 5))
                 .fluidInputs(Materials.HydrochloricAcid.getFluid(6000))
-                .itemOutputs(ImpureSamariumChloride.get(OrePrefixes.dust, 8))
+                .itemOutputs(SamariumChloride.get(OrePrefixes.dust, 8))
                 .fluidOutputs(Materials.CarbonMonoxide.getGas(6000)).eut(960).duration(10 * SECONDS)
                 .addTo(multiblockChemicalReactorRecipes);
 
@@ -2112,11 +2112,10 @@ public static void loadLanthanideRecipes() {
          */
 
         // 2 ImpureSamariumChloride + 1 NaCl =LV@5s= 3 SamariumChlorideSodiumChlorideBlend
-        GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 2), Materials.Salt.getDust(1))
+        GT_Values.RA.stdBuilder().itemInputs(SamariumChloride.get(OrePrefixes.dust, 2), Materials.Salt.getDust(1))
                 .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).eut(30).duration(5 * SECONDS)
                 .addTo(mixerRecipes);
-        GT_Values.RA.stdBuilder()
-                .itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 2), Materials.Sodium.getDust(1))
+        GT_Values.RA.stdBuilder().itemInputs(SamariumChloride.get(OrePrefixes.dust, 2), Materials.Sodium.getDust(1))
                 .itemOutputs(SamariumChlorideSodiumChlorideBlend.get(OrePrefixes.dust, 3)).eut(30).duration(5 * SECONDS)
                 .addTo(mixerNonCellRecipes);
 
@@ -2146,14 +2145,14 @@ public static void loadLanthanideRecipes() {
         // ZPM molten distilling method
 
         // melt ImpureSamariumChloride
-        GT_Values.RA.stdBuilder().itemInputs(ImpureSamariumChloride.get(OrePrefixes.dust, 1))
-                .fluidOutputs(ImpureSamariumChloride.getMolten(144)).eut(TierEU.RECIPE_EV).duration(24)
+        GT_Values.RA.stdBuilder().itemInputs(SamariumChloride.get(OrePrefixes.dust, 1))
+                .fluidOutputs(SamariumChloride.getMolten(144)).eut(TierEU.RECIPE_EV).duration(24)
                 .addTo(fluidExtractionRecipes);
 
         // distill with LanthanumDust 36*144L moltenSmCl3 = 16*144L moltenSm + 27B Cl
         GT_Values.RA.stdBuilder().itemInputs(Materials.Lanthanum.getDust(9))
                 .itemOutputs(ImpureLanthanumChloride.get(OrePrefixes.dust, 36))
-                .fluidInputs(ImpureSamariumChloride.getMolten(5184)).fluidOutputs(Materials.Samarium.getMolten(2304))
+                .fluidInputs(SamariumChloride.getMolten(5184)).fluidOutputs(Materials.Samarium.getMolten(2304))
                 .eut(TierEU.RECIPE_ZPM).duration(5 * SECONDS).noOptimize().addTo(distillationTowerRecipes);
 
         // Centrifuge ImpureLanthanumChlorideDust