Skip to content
This repository has been archived by the owner on Dec 29, 2024. It is now read-only.

Update WerkstoffMaterialPool.java - Fix "Impure Samarium ..." naming #88

Merged
merged 5 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
}


Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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
Expand Down