diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-03-14 20:19:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 20:19:00 +0100 |
| commit | 3f760a8651a9b51ab4594c020390044eb5eddd14 (patch) | |
| tree | cfb25d63fed0dea5cca752183af69bf3e3c511d6 | |
| parent | 702511d3287e31a4da38a59d41287093e6c45967 (diff) | |
| parent | d58cfeb0d555db9d4595b3bca7e4d9c8352224b3 (diff) | |
| download | GT5-Unofficial-3f760a8651a9b51ab4594c020390044eb5eddd14.tar.gz GT5-Unofficial-3f760a8651a9b51ab4594c020390044eb5eddd14.tar.bz2 GT5-Unofficial-3f760a8651a9b51ab4594c020390044eb5eddd14.zip | |
Merge pull request #52 from GTNewHorizons/fix/europium-exploit
patch up europium tier skip
| -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 | 29 |
2 files changed, 33 insertions, 6 deletions
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 a3f6e488b9..d2535a7064 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -523,6 +523,16 @@ public class WerkstoffMaterialPool implements Runnable { offsetID + 49, TextureSet.SET_DULL); + public static final Werkstoff EuropiumIIIOxide = new Werkstoff( + new short[] { 255, 230, 255 }, + "Europium III Oxide", + subscriptNumbers("Eu2O3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 50, + TextureSet.SET_DULL); + // TODO // BASTNASITE diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 350699999c..b6e962d966 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -620,23 +620,40 @@ public class RecipeLoader { GT_Values.RA.addElectromagneticSeparatorRecipe( WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium + WerkstoffMaterialPool.EuropiumIIIOxide.get(OrePrefixes.dust, 5), // Maybe also holmium null, new int[] { 9000, 500 }, 600, 1920); - // EuO + H2S = EuS + H2O + // 5Eu2O3 + Eu = 4EuO GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), + WerkstoffMaterialPool.EuropiumIIIOxide.get(OrePrefixes.dust, 5), + Materials.Europium.getDust(1), null, - Materials.HydricSulfide.getGas(1000), - Materials.Water.getFluid(1000), - WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2), + null, + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 4), 300, 8400); + // 4 EuO = 2 Eu + 2O2 + GT_Values.RA.addElectrolyzerRecipe( + WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), + null, + null, + Materials.Oxygen.getGas(1000L), + Materials.Europium.getDust(1), + null, + null, + null, + null, + null, + new int[] { 10000, 10000 }, + 300, + 33000); + // EuS = Eu + S + // TODO old recipe. for compat only. remove material and recipe half a year later, i.e. after September 2023. GT_Values.RA.addElectrolyzerRecipe( WerkstoffMaterialPool.EuropiumSulfide.get(OrePrefixes.dust, 2), null, |