diff options
author | Speecker <jan.speecker.mayer@googlemail.com> | 2024-05-10 10:25:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-10 10:25:22 +0200 |
commit | cfdc7a5c9d039884a2ff8f4f9226efc86013a156 (patch) | |
tree | ea8d7802c68ff1bcd5b29bd6f524fe9dcb80a468 | |
parent | 17fa6ba8e4f6be1dba0d61e2ab5c933cad107387 (diff) | |
download | GT5-Unofficial-cfdc7a5c9d039884a2ff8f4f9226efc86013a156.tar.gz GT5-Unofficial-cfdc7a5c9d039884a2ff8f4f9226efc86013a156.tar.bz2 GT5-Unofficial-cfdc7a5c9d039884a2ff8f4f9226efc86013a156.zip |
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 <dream-master@gmx.net>
-rw-r--r-- | dependencies.gradle | 6 | ||||
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43453 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rw-r--r-- | settings.gradle | 2 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java | 10 | ||||
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 17 |
7 files changed, 19 insertions, 20 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 1728bb3381..cd7cee3783 100644 --- 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 index 60451a92b0..b55d7895ef 100644 --- 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 Binary files differindex d64cd49177..e6441136f3 100644 --- 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 index a80b22ce5c..b82aa23a4f 100644 --- 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 index c52d518d35..94c2daf35c 100644 --- 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 index c706df80e0..0d5ad5f25b 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -981,9 +981,9 @@ 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, @@ -991,10 +991,10 @@ public class WerkstoffMaterialPool implements Runnable { 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 index 2d19c8ab4b..6e253c3542 100644 --- 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 class RecipeLoader { 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 class RecipeLoader { */ // 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 class RecipeLoader { // 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 |