add bartwork copyright statement

12 files changed, 161 insertions, 4 deletions

diff --git a/src/main/java/GoodGenerator/Items/FuelRod.java b/src/main/java/GoodGenerator/Items/FuelRod.java
index 5886cce095..c7c47195af 100644
--- a/src/main/java/GoodGenerator/Items/FuelRod.java
+++ b/src/main/java/GoodGenerator/Items/FuelRod.java
@@ -23,6 +23,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa
     private final int maxDmg;
     private final float Power;
     private final int Heat;
+    private float HeatBonus = 0;
     private final ItemStack result;
 
     public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) {
@@ -35,6 +36,17 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa
         this.Heat = aHeat;
     }
 
+    public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, ItemStack aResult, CreativeTabs Tab) {
+        super(aName, Tab, aRads);
+        this.setMaxStackSize(64);
+        this.numberOfCells = aCells;
+        this.maxDmg = aDuration;
+        this.Power = (float)aEUt / 25.0F;
+        this.result = aResult;
+        this.Heat = aHeat;
+        this.HeatBonus = aHeatBonus;
+    }
+
     public void processChamber(IReactor reactor, ItemStack stack, int x, int y, boolean heatRun) {
         if (reactor.produceEnergy()) {
             for(int iteration = 0; iteration < this.numberOfCells; ++iteration) {
@@ -93,7 +105,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa
 
     public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) {
         if (!heatrun) {
-            reactor.addOutput(Power);
+            reactor.addOutput(Power * (1 + HeatBonus * ((float) reactor.getHeat() /(float) reactor.getMaxHeat())));
         }
         return true;
     }
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
+        );
     }
 }
diff --git a/src/main/java/GoodGenerator/util/ItemRefer.java b/src/main/java/GoodGenerator/util/ItemRefer.java
index e3abaa44f8..f7a2dde83a 100644
--- a/src/main/java/GoodGenerator/util/ItemRefer.java
+++ b/src/main/java/GoodGenerator/util/ItemRefer.java
@@ -44,6 +44,12 @@ public final class ItemRefer {
     public static ItemRefer Fuel_Rod_U_1 = getItemStack(rodCompressedUranium);
     public static ItemRefer Fuel_Rod_U_2 = getItemStack(rodCompressedUranium_2);
     public static ItemRefer Fuel_Rod_U_4 = getItemStack(rodCompressedUranium_4);
+    public static ItemRefer Fuel_Rod_Pu_Depleted_1 = getItemStack(rodCompressedPlutoniumDepleted);
+    public static ItemRefer Fuel_Rod_Pu_Depleted_2 = getItemStack(rodCompressedPlutoniumDepleted_2);
+    public static ItemRefer Fuel_Rod_Pu_Depleted_4 = getItemStack(rodCompressedPlutoniumDepleted_4);
+    public static ItemRefer Fuel_Rod_Pu_1 = getItemStack(rodCompressedPlutonium);
+    public static ItemRefer Fuel_Rod_Pu_2 = getItemStack(rodCompressedPlutonium_2);
+    public static ItemRefer Fuel_Rod_Pu_4 = getItemStack(rodCompressedPlutonium_4);
 
     public static ItemRefer Field_Restriction_Casing = getItemStack(MAR_Casing);
     public static ItemRefer Naquadah_Fuel_Refinery_Casing = getItemStack(FRF_Casings);
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 38ad2663ef..bc686da3aa 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -50,6 +50,12 @@ item.rodCompressedUraniumDepleted4.name=Quad Fuel Rod (Depleted High Density Ura
 item.rodCompressedUranium.name=Fuel Rod (High Density Uranium)
 item.rodCompressedUranium2.name=Dual Fuel Rod (High Density Uranium)
 item.rodCompressedUranium4.name=Quad Fuel Rod (High Density Uranium)
+item.rodCompressedPlutoniumDepleted.name=Fuel Rod (Depleted High Density Plutonium)
+item.rodCompressedPlutoniumDepleted2.name=Dual Fuel Rod (Depleted High Density Plutonium)
+item.rodCompressedPlutoniumDepleted4.name=Quad Fuel Rod (Depleted High Density Plutonium)
+item.rodCompressedPlutonium.name=Fuel Rod (High Density Plutonium)
+item.rodCompressedPlutonium2.name=Dual Fuel Rod (High Density Plutonium)
+item.rodCompressedPlutonium4.name=Quad Fuel Rod (High Density Plutonium)
 item.advancedFuelRod.name=Advanced Fuel Rod (Empty)
 
 #Tooltip
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium.png
new file mode 100644
index 0000000000..d298e9386b
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium.png
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium2.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium2.png
new file mode 100644
index 0000000000..322c3a4ef6
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium2.png
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium4.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium4.png
new file mode 100644
index 0000000000..cda19212aa
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutonium4.png
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted.png
new file mode 100644
index 0000000000..59f289b8a0
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted.png
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted2.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted2.png
new file mode 100644
index 0000000000..d4bde7c9d2
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted2.png
diff --git a/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted4.png b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted4.png
new file mode 100644
index 0000000000..38d6ec643d
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/rodCompressedPlutoniumDepleted4.png