diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-23 17:50:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 21:50:52 +0000 |
| commit | ec16529a6e4bf0d79a7f5ca5e8ab386b987a9aa4 (patch) | |
| tree | 13a110c607171f170bd595ea5c6d422265dfcff8 /src/main/java/gtPlusPlus/core/item | |
| parent | 95d749f1d690f63e862aa0a86142e036cc0ada8a (diff) | |
| download | GT5-Unofficial-ec16529a6e4bf0d79a7f5ca5e8ab386b987a9aa4.tar.gz GT5-Unofficial-ec16529a6e4bf0d79a7f5ca5e8ab386b987a9aa4.tar.bz2 GT5-Unofficial-ec16529a6e4bf0d79a7f5ca5e8ab386b987a9aa4.zip | |
Remove duplicate materials from gt++ (#3268)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java | 14 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java | 5 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 014b399044..0929b0b0ce 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -275,28 +275,16 @@ public final class ModItems { MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE); MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct - MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM); MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct - MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM); - MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct - MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM); MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM); MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM); MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM); // RADIOACTIVE ELEMENTS MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false); - // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false); MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false); - MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false); MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false); MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false); - MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false); MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false); MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false); @@ -310,8 +298,6 @@ public final class ModItems { // lithium a // strong requirement for the possible use in lithium fluoride reactors. MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false); - // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case. - MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232); // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U // as an impurity // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232: diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 86e40f0330..2fc6a2ab88 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.chemistry; +import static bartworks.system.material.WerkstoffLoader.PTMetallicPowder; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.util.GTRecipeBuilder.MINUTES; @@ -276,8 +277,8 @@ public class MilledOreProcessing extends ItemPackage { GTValues.RA.stdBuilder() .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 64), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 64), + PTMetallicPowder.get(OrePrefixes.dust, 64), + PTMetallicPowder.get(OrePrefixes.dust, 64), MaterialsElements.getInstance().RHODIUM.getDust(60), MaterialsElements.getInstance().SELENIUM.getDust(40), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tellurium, 10)) |