diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2023-07-22 13:18:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-22 14:18:05 +0200 |
commit | dd025431efe8122bc316bc2f1b99a939c0ca149a (patch) | |
tree | a7ed15a796af06e298a820ebd0e70f271ee8422a /src/main/java/gtPlusPlus/core | |
parent | 517764c721ca818e640fe60df4bb4cd194ddc385 (diff) | |
download | GT5-Unofficial-dd025431efe8122bc316bc2f1b99a939c0ca149a.tar.gz GT5-Unofficial-dd025431efe8122bc316bc2f1b99a939c0ca149a.tar.bz2 GT5-Unofficial-dd025431efe8122bc316bc2f1b99a939c0ca149a.zip |
Remove the duplicate pu239 (#698)
* pu239 cleanup
* lang cleanup
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/ELEMENT.java | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 33 |
3 files changed, 6 insertions, 50 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 060285f551..2ce19155d5 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -579,9 +579,6 @@ public final class ModItems { // in radioisotope thermoelectric generators (RTGs) // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null) { - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM239, false); - } // RTG Fuel Materials MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().STRONTIUM90, false); diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index ac94fa78ba..a46559b56b 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -374,7 +374,10 @@ public final class ELEMENT { false, "Np", 2); // Not a GT Inherited Material - public final Material PLUTONIUM244 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium); + + public final Material PLUTONIUM244 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium); // This one + // looks + // incorrect. public final Material PLUTONIUM241 = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium241); public final Material AMERICIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Americium); // Americium public final Material CURIUM = new Material( @@ -512,20 +515,7 @@ public final class ELEMENT { StringUtils.superscript("232Th"), 1, true); // Not a GT Inherited Material - public final Material PLUTONIUM239 = new Material( - "Plutonium-239", - MaterialState.SOLID, - TextureSets.NUCLEAR.get(), - Materials.Plutonium.mDurability, - Materials.Plutonium.mRGBa, - Materials.Plutonium.mMeltingPoint, - Materials.Plutonium.mBlastFurnaceTemp, - 94, - 145, - false, - StringUtils.superscript("239Pu"), - 4, - true); // Not a GT Inherited Material + // RTG Fuels public final Material PLUTONIUM238 = new Material( "Plutonium-238", diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 92d1301a1d..6b5bce553d 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -210,37 +210,6 @@ public class RECIPES_GREGTECH { 64, 2); - // Convert GT++ Plutonium239 into normal Plutonium - if (Materials.Plutonium.mDefaultLocalName.equals("Plutonium 239")) { - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getDust(1) }, - new FluidStack[] {}, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1) }, - new FluidStack[] {}, - 5 * 20, - 1, - 2); - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1) }, - new FluidStack[] {}, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1) }, - new FluidStack[] {}, - 5 * 20, - 1, - 2); - CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(16), - ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1) }, - new FluidStack[] {}, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1) }, - new FluidStack[] {}, - 5 * 20, - 1, - 2); - } - int aLaureniumTier = ALLOY.LAURENIUM.vTier; // Adding Recipes for Casings CORE.RA.addChemicalPlantRecipe( @@ -1652,7 +1621,7 @@ public class RECIPES_GREGTECH { // Strontium pu239 CORE.RA.addCyclotronRecipe( CI.getNumberedCircuit(1), - FluidUtils.getFluidStack("molten.plutonium239", 10), + FluidUtils.getFluidStack("molten.plutonium", 10), new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, new int[] { 220 }, |