diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-13 22:00:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 22:00:33 +0100 |
| commit | 628fe2f0da60e08dcb3a6f900ce8e48278b8e639 (patch) | |
| tree | e3f0a65ec0616d0492be2a12b9e20f0fc320b88d /src/Java/gtPlusPlus/core/item | |
| parent | c2b4f33d9e7b3dbfdb430a33349741eb1e6f2758 (diff) | |
| parent | a52711dc135c700b0e72f49330e513523ff49d0f (diff) | |
| download | GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.tar.gz GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.tar.bz2 GT5-Unofficial-628fe2f0da60e08dcb3a6f900ce8e48278b8e639.zip | |
Merge pull request #67 from GTNewHorizons/Misc2
Rare Earth Changes + Minor bug fixes
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 7 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 4c6f0dc712..47278c559d 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -523,6 +523,9 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); + if (!CORE.GTNH) { + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM); + } //Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); @@ -534,8 +537,8 @@ public final class ModItems { //Custom Materials that are from Runescape MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL); - MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE, false, false); - MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE, false); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE); MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL, false); MISC_MATERIALS.run(); diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index dfc85c533b..8dd2cd1187 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -243,10 +243,10 @@ public class MilledOreProcessing extends ItemPackage { //milledMonazite TODO registerOreDataForMilledType( MonaziteFlotationFroth, - ELEMENT.getInstance().ERBIUM, 96, - ELEMENT.getInstance().LANTHANUM, 96, - ELEMENT.getInstance().PRASEODYMIUM, 96, - ELEMENT.getInstance().EUROPIUM, 32 + ELEMENT.getInstance().ERBIUM, 64, + ELEMENT.getInstance().LANTHANUM, 32, + ELEMENT.getInstance().LUTETIUM, 16, + ELEMENT.getInstance().EUROPIUM, 8 ); |