diff options
Diffstat (limited to 'src/main/java/GoodGenerator/Loader')
3 files changed, 136 insertions, 3 deletions
diff --git a/src/main/java/GoodGenerator/Loader/FuelRodLoader.java b/src/main/java/GoodGenerator/Loader/FuelRodLoader.java index 45aed4275d..c1fc82fc67 100644 --- a/src/main/java/GoodGenerator/Loader/FuelRodLoader.java +++ b/src/main/java/GoodGenerator/Loader/FuelRodLoader.java @@ -14,25 +14,43 @@ public class FuelRodLoader { public static Item rodCompressedUraniumDepleted; public static Item rodCompressedUraniumDepleted_2; public static Item rodCompressedUraniumDepleted_4; + public static Item rodCompressedPlutoniumDepleted; + public static Item rodCompressedPlutoniumDepleted_2; + public static Item rodCompressedPlutoniumDepleted_4; public static Item rodCompressedUranium; public static Item rodCompressedUranium_2; public static Item rodCompressedUranium_4; + public static Item rodCompressedPlutonium; + public static Item rodCompressedPlutonium_2; + public static Item rodCompressedPlutonium_4; public static void RegisterRod() { rodCompressedUraniumDepleted = new RadioactiveItem("rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); rodCompressedUraniumDepleted_2 = new RadioactiveItem("rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); rodCompressedUraniumDepleted_4 = new RadioactiveItem("rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); + rodCompressedPlutoniumDepleted = new RadioactiveItem("rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); + rodCompressedPlutoniumDepleted_2 = new RadioactiveItem("rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); + rodCompressedPlutoniumDepleted_4 = new RadioactiveItem("rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID); rodCompressedUranium = new FuelRod("rodCompressedUranium", 1, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG); - rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG); - rodCompressedUranium_4 = new FuelRod("rodCompressedUranium4", 4, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG); + rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 1600, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG); + rodCompressedUranium_4 = new FuelRod("rodCompressedUranium4", 4, 100, 4, 3200, 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG); + rodCompressedPlutonium = new FuelRod("rodCompressedPlutonium", 1, 80, 4, 1000, 40000, 9, new ItemStack(rodCompressedPlutoniumDepleted, 1), GoodGenerator.GG); + rodCompressedPlutonium_2 = new FuelRod("rodCompressedPlutonium2", 2, 80, 4, 2000, 40000, 9, new ItemStack(rodCompressedPlutoniumDepleted_2, 1), GoodGenerator.GG); + rodCompressedPlutonium_4 = new FuelRod("rodCompressedPlutonium4", 4, 80, 4, 4000, 40000, 9, new ItemStack(rodCompressedPlutoniumDepleted_4, 1), GoodGenerator.GG); GameRegistry.registerItem(rodCompressedUranium, "rodCompressedUranium", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodCompressedUranium_2, "rodCompressedUranium2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodCompressedUranium_4, "rodCompressedUranium4", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutonium, "rodCompressedPlutonium", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutonium_2, "rodCompressedPlutonium2", GoodGenerator.MOD_ID); + GameRegistry.registerItem(rodCompressedPlutonium_4, "rodCompressedPlutonium4", GoodGenerator.MOD_ID); } } diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java index d3bfa95ea1..6cfc48d0cf 100644 --- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java @@ -952,7 +952,29 @@ public class NaquadahReworkRecipeLoader { } //I don't understand. . . - //I use some private methods in Bartworks because his system runs well. + //I use and copy some private methods in Bartworks because his system runs well. + //Bartworks is under MIT License + /* + * Copyright (c) 2018-2020 bartimaeusnek + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ public static void replaceInCraftTable(Object obj) { Constructor<?> cs = null; diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java index ef6fb341a7..0c3e4075b5 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java @@ -115,6 +115,51 @@ public class RecipeLoader_02 { 220, 1920 ); + + GT_Values.RA.addCannerRecipe( + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.High_Density_Plutonium.get(1), + ItemRefer.Fuel_Rod_Pu_1.get(1), + null, + 400, + 120 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_Pu_1.get(2), + MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) + }, + null, + ItemRefer.Fuel_Rod_Pu_2.get(1), + 200, + 1920 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_Pu_2.get(2), + MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) + }, + null, + ItemRefer.Fuel_Rod_Pu_4.get(1), + 200, + 1920 + ); + + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemRefer.Fuel_Rod_Pu_1.get(4), + MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) + }, + null, + ItemRefer.Fuel_Rod_Pu_4.get(1), + 220, + 1920 + ); } public static void InitLoadRecipe() { @@ -165,5 +210,53 @@ public class RecipeLoader_02 { 200, 1920 ); + + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_Pu_Depleted_1.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(32), + ItemRefer.Advanced_Fuel_Rod.get(1), + Materials.Plutonium.getDust(5), + Materials.Plutonium241.getDust(2), + Materials.Carbon.getDust(2), + Materials.Uranium.getDust(1), + Materials.Uranium235.getDust(1), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); + + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_Pu_Depleted_2.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(64), + ItemRefer.Advanced_Fuel_Rod.get(2), + Materials.Plutonium.getDust(10), + Materials.Plutonium241.getDust(4), + Materials.Carbon.getDust(4), + Materials.Uranium.getDust(2), + Materials.Uranium235.getDust(2), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); + + GT_Values.RA.addCentrifugeRecipe( + ItemRefer.Fuel_Rod_Pu_Depleted_4.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(128), + ItemRefer.Advanced_Fuel_Rod.get(4), + Materials.Plutonium.getDust(20), + Materials.Plutonium241.getDust(8), + Materials.Carbon.getDust(8), + Materials.Uranium.getDust(4), + Materials.Uranium235.getDust(4), + new int[]{10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920 + ); } } |