Final stretch for GT RA2 conversions (#2038)

* (un)boxing RA2

* fuel ra2

* blast RA2

* primitive blast RA2

* remaining cutter ra2

* fix

2 files changed, 86 insertions, 12 deletions

diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 7240d9268e..3863b5c952 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -3,6 +3,8 @@ package gregtech.loaders.load;
 import static gregtech.api.enums.Mods.BloodMagic;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -18,6 +20,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_RecipeConstants;
 
 public class GT_FuelLoader implements Runnable {
 
@@ -147,14 +150,55 @@ public class GT_FuelLoader implements Runnable {
             0,
             20000);
 
-        GT_Values.RA.addFuel(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4), null, 4, 5);
-        GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);
-        GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5);
-        GT_Values.RA.addFuel(
-            new ItemStack(Blocks.beacon, 1),
-            null,
-            Materials.NetherStar.mFuelPower * 2,
-            Materials.NetherStar.mFuelType);
-        GT_Values.RA.addFuel(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1), null, 250, 1);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4))
+            .noItemOutputs()
+            .noFluidInputs()
+            .noFluidOutputs()
+            .metadata(FUEL_VALUE, 4)
+            .metadata(FUEL_TYPE, 5)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.experience_bottle, 1))
+            .noItemOutputs()
+            .noFluidInputs()
+            .noFluidOutputs()
+            .metadata(FUEL_VALUE, 10)
+            .metadata(FUEL_TYPE, 5)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.ghast_tear, 1))
+            .noItemOutputs()
+            .noFluidInputs()
+            .noFluidOutputs()
+            .metadata(FUEL_VALUE, 50)
+            .metadata(FUEL_TYPE, 5)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.beacon, 1))
+            .noItemOutputs()
+            .noFluidInputs()
+            .noFluidOutputs()
+            .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2)
+            .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1))
+            .noItemOutputs()
+            .noFluidInputs()
+            .noFluidOutputs()
+            .metadata(FUEL_VALUE, 250)
+            .metadata(FUEL_TYPE, 1)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
     }
 }
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index 277bb7b65e..b4a20b65f2 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -2,6 +2,8 @@ package gregtech.loaders.load;
 
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -25,6 +27,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GT_RecipeConstants;
 import gregtech.api.util.GT_Utility;
 import mods.railcraft.api.core.items.IToolCrowbar;
 
@@ -238,10 +241,28 @@ public class GT_ItemIterator implements Runnable {
                             GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Vinteum, new ItemStack(tItem, 1, 0));
                         }
                         if (tName.equals("item.ArsMagica:purified_vinteum")) {
-                            GT_Values.RA.addFuel(new ItemStack(tItem, 1, 0), null, 256, 5);
+                            GT_Values.RA.stdBuilder()
+                                .itemInputs(new ItemStack(tItem, 1, 0))
+                                .noItemOutputs()
+                                .noFluidInputs()
+                                .noFluidOutputs()
+                                .metadata(FUEL_VALUE, 256)
+                                .metadata(FUEL_TYPE, 5)
+                                .duration(0)
+                                .eut(0)
+                                .addTo(GT_RecipeConstants.Fuel);
                         }
                         if ((tName.equals("item.fieryBlood")) || (tName.equals("item.fieryTears"))) {
-                            GT_Values.RA.addFuel(new ItemStack(tItem, 1, 0), null, 2048, 5);
+                            GT_Values.RA.stdBuilder()
+                                .itemInputs(new ItemStack(tItem, 1, 0))
+                                .noItemOutputs()
+                                .noFluidInputs()
+                                .noFluidOutputs()
+                                .metadata(FUEL_VALUE, 2048)
+                                .metadata(FUEL_TYPE, 5)
+                                .duration(0)
+                                .eut(0)
+                                .addTo(GT_RecipeConstants.Fuel);
                         }
                         if (tName.equals("tile.TFRoots")) {
                             GT_ModHandler.addPulverisationRecipe(
@@ -253,7 +274,16 @@ public class GT_ItemIterator implements Runnable {
                                 new ItemStack(tItem, 1, 0),
                                 new ItemStack(Items.stick, 4),
                                 new ItemStack(Items.stick, 2));
-                            GT_Values.RA.addFuel(new ItemStack(tItem, 1, 1), new ItemStack(Items.stick, 4), 32, 5);
+                            GT_Values.RA.stdBuilder()
+                                .itemInputs(new ItemStack(tItem, 1, 1))
+                                .itemOutputs(new ItemStack(Items.stick, 4))
+                                .noFluidInputs()
+                                .noFluidOutputs()
+                                .metadata(FUEL_VALUE, 32)
+                                .metadata(FUEL_TYPE, 5)
+                                .duration(0)
+                                .eut(0)
+                                .addTo(GT_RecipeConstants.Fuel);
                         }
                         if (tName.equals("item.tconstruct.manual")) {
                             GT_OreDictUnificator.registerOre("bookTinkersManual", new ItemStack(tItem, 1, 32767));