Change Pam's Harvest the Nether script to Fether

dependencies.gradle

@@ -1,11 +1,11 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.294:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.314:dev")
     api("com.github.GTNewHorizons:Yamcl:0.7.4:dev")
     api("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.9.20:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.9.27:dev")
 
     implementation("net.glease:tc4recipelib:1.5.37:dev")
 
@@ -15,33 +15,33 @@ dependencies {
     compileOnly("secondderivative.irontankminecarts:IronTankMinecarts:1.0.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.7.19:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.27-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.30-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.4.7:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
-    compileOnly("com.github.GTNewHorizons:Chisel:2.17.14-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Botania:1.13.14-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.17.18-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Botania:1.13.15-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.12:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
     compileOnly("com.github.GTNewHorizons:amunra:0.8.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.17-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.4:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.6:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:MatterManipulator:0.1.14-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.7.1:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.10-GTNH:dev")
-    compileOnly("com.github.GTNewHorizons:Backhand:1.8.2:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Backhand:1.8.3:dev") { transitive = false }
     compileOnly("com.cubefury.vendingmachine:VendingMachine:0.4.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.28-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.30-GTNH:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
     //compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.4-GTNH:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.17-GTNH:dev")
 
     //uncomment to test RC and Forestry recipes
-    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.17:dev")
-    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.4:dev")
+    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.20:dev")
+    //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.6:dev")
 
     // RecEx, for testing purposes
     //runtimeOnlyNonPublishable("com.github.GTNewHorizons:RecEx:1.1.5:dev")

src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java

@@ -8,7 +8,6 @@
 
 public class AvaritiaHelper {
 
-    @SuppressWarnings("unchecked")
     public static void removeExtremeCraftingRecipe(ItemStack output) {
         ExtremeCraftingManager.getInstance().getRecipeList().removeIf(
                 r -> r instanceof IRecipe && GTUtility.areStacksEqual(((IRecipe) r).getRecipeOutput(), output, true));

src/main/java/com/dreammaster/coremod/DownloadProgressDialog.java

@@ -25,7 +25,6 @@ class DownloadProgressDialog extends JDialog implements IDownloadProgress {
     private static final long serialVersionUID = 6041491111144915139L;
 
     public static final String WINDOW_TITLE = Refstrings.NAME;
-    private Thread netThread;
     private JProgressBar progressBar;
 
     @Override

src/main/java/com/dreammaster/fluids/FluidList.java

@@ -1,7 +1,6 @@
 package com.dreammaster.fluids;
 
 import net.minecraft.block.material.Material;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import com.dreammaster.creativetab.ModTabList;
@@ -38,7 +37,6 @@ public enum FluidList {
     }
 
     public static boolean AddToItemManager(ModFluidManager pFluidManager) {
-        Fluid t = null;
         boolean tResult = true;
         for (FluidList il : FluidList.values()) {
             if (il.Fluid != null) {

src/main/java/com/dreammaster/gthandler/DTPFCalculator.java

@@ -7,7 +7,6 @@
 import java.util.Collection;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -38,9 +37,6 @@ public class DTPFCalculator {
     Collection<GTRecipe> ebfRecipes = blastFurnaceRecipes.getAllRecipes();
     Collection<GTRecipe> freezerRecipes = vacuumFreezerRecipes.getAllRecipes();
     private int[] catalystAmounts = new int[5];
-    private static final FluidStack[] CATALYSTS = new FluidStack[] { Materials.ExcitedDTCC.getFluid(1),
-            Materials.ExcitedDTPC.getFluid(1), Materials.ExcitedDTRC.getFluid(1), Materials.ExcitedDTEC.getFluid(1),
-            Materials.ExcitedDTSC.getFluid(1) };
     // These were calculated based on their respective mixer + laser engraver recipes & their plasma energy values
     private static final long[] CATALYST_ENERGY_VALUES = new long[] { 14_514_983L, 66_768_460L, 269_326_451L,
             1_073_007_393L, 4_276_767_521L };

src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java

@@ -25,6 +25,7 @@
 import static gregtech.api.enums.OrePrefixes.screw;
 import static gregtech.api.util.GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES;
 import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
 import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL;
 import static gtPlusPlus.core.material.MaterialsAlloy.INCONEL_792;
 import static gtPlusPlus.core.material.MaterialsAlloy.LEAGRISIUM;
@@ -64,7 +65,6 @@
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
-import gregtech.common.GTProxy;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtneioreplugin.plugin.block.ModBlocks;
 import gtneioreplugin.util.DimensionHelper;
@@ -1078,15 +1078,15 @@ public void run() {
                 NHItemList.UnfiredClayBrick.get(8),
                 GTModHandler.RecipeBits.NOT_REMOVABLE,
                 new Object[] { "CCC", "CFC", "CCC", 'C', new ItemStack(Items.clay_ball, 1, 0), 'F',
-                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
         GTModHandler.addShapelessCraftingRecipe(
                 NHItemList.UnfiredClayBrick.get(),
                 GTModHandler.RecipeBits.NOT_REMOVABLE,
                 new Object[] { new ItemStack(Items.clay_ball, 1, 0),
-                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
         if (TinkerConstruct.isModLoaded()) {
             Recipe.of(
-                    new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W),
+                    new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD),
                     ToolDictNames.craftingToolKnife,
                     GTModHandler.getModItem(aTextTConstruct, "blankPattern", 1L, 0))
                     .provideTo(shapelessUnremovableGtRecipes())
@@ -1096,31 +1096,31 @@ public void run() {
                     GTModHandler.RecipeBits.NOT_REMOVABLE,
                     new Object[] { "GGG", "GFG", "GGG", 'G',
                             GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), 'F',
-                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
             Recipe.of(
                     NHItemList.UnfiredSearedBrick.get(),
                     GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1),
-                    new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W))
+                    new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD))
                     .provideTo(shapelessUnremovableGtRecipes())
                     .provideTo(MANTLE.manualShapedCraftingRecipeNamed("unfiredsearedbrick"));
             GTModHandler.addCraftingRecipe(
                     NHItemList.UnfiredSlimeSoilBrick.get(8),
                     GTModHandler.RecipeBits.NOT_REMOVABLE,
                     new Object[] { "SSS", "SFS", "SSS", 'S',
                             GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), 'F',
-                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
             GTModHandler.addShapelessCraftingRecipe(
                     NHItemList.UnfiredSlimeSoilBrick.get(),
                     GTModHandler.RecipeBits.NOT_REMOVABLE,
                     new Object[] { GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6),
-                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                            new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
         }
         GTModHandler.addCraftingRecipe(
                 NHItemList.UnfiredCokeOvenBrick.get(3),
                 GTModHandler.RecipeBits.NOT_REMOVABLE,
                 new Object[] { "CCC", "SFS", "SSS", 'C', new ItemStack(Items.clay_ball, 1, 0), 'S',
                         GTOreDictUnificator.get("sand", 1L), 'F',
-                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) });
+                        new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) });
 
         GTModHandler.addCraftingRecipe(
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L),
@@ -1159,44 +1159,44 @@ public void run() {
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
                 GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
                 new Object[] { ToolDictNames.craftingToolMortar,
-                        new ItemStack(Blocks.stained_hardened_clay, 1, GTValues.W) });
+                        new ItemStack(Blocks.stained_hardened_clay, 1, WILDCARD) });
         GTModHandler.addShapelessCraftingRecipe(
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
                 GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED,
                 new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.hardened_clay, 1) });
 
         GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W),
+                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD),
                 bits,
                 new Object[] { "RCR", "RAR", "RTR", 'R',
                         GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatREDischarged", 1, 0), 'C',
                         OrePrefixes.circuit.get(Materials.LV), 'A', OrePrefixes.itemCasing.get(Materials.Aluminium),
                         'T', OrePrefixes.wireGt02.get(Materials.Tin) });
         GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, GTValues.W),
+                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, WILDCARD),
                 bits,
                 new Object[] { "RCR", "RAR", "RTR", 'R',
-                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, GTValues.W), 'C',
+                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, WILDCARD), 'C',
                         OrePrefixes.circuit.get(Materials.MV), 'A',
-                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W), 'T',
+                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD), 'T',
                         OrePrefixes.wireGt04.get(Materials.AnnealedCopper) });
         GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1, GTValues.W),
+                GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1, WILDCARD),
                 bits,
                 new Object[] { "CSC", "EXE", "STS", 'E',
-                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1, GTValues.W), 'C',
+                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1, WILDCARD), 'C',
                         OrePrefixes.circuit.get(Materials.HV), 'X',
-                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, GTValues.W), 'T',
+                        GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, WILDCARD), 'T',
                         OrePrefixes.wireGt08.get(Materials.Gold), 'S',
                         OrePrefixes.itemCasing.get(Materials.StainlessSteel) });
         GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, GTValues.W),
+                GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, WILDCARD),
                 bits,
                 new Object[] { "WdW", "HBH", "HXH", 'W', OrePrefixes.wireGt02.get(Materials.Copper), 'H',
                         OrePrefixes.itemCasing.get(Materials.Copper), 'X', OrePrefixes.itemCasing.get(Materials.Lead),
                         'B', ItemList.Battery_Hull_MV });
         if (GalacticraftCore.isModLoaded()) GTModHandler.addCraftingRecipe(
-                GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1, GTValues.W),
+                GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1, WILDCARD),
                 bits,
                 new Object[] { "AXA", "RBR", "SdS", 'A',
                         GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchDiamond", 1, 1), 'X',
@@ -1207,13 +1207,13 @@ public void run() {
 
         if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe(
                 GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0),
-                GTProxy.tBits,
+                GTModHandler.RecipeBits.BITS_STD,
                 new Object[] { "IwI", "ICI", " I ", 'I', OrePrefixes.ingot.get(Materials.Iron), 'C',
                         GTModHandler.getModItem(OpenComputers.ID, "item", 1, 24) });
 
         if (OpenPrinters.isModLoaded()) GTModHandler.addCraftingRecipe(
                 GTModHandler.getModItem(OpenPrinters.ID, "openprinter.folder", 1L, 0),
-                GTProxy.tBits,
+                GTModHandler.RecipeBits.BITS_STD,
                 new Object[] { "PGP", " P ", 'P', new ItemStack(Items.paper, 1, 0), 'G',
                         new ItemStack(Items.slime_ball, 1, 0) });
 
@@ -1244,7 +1244,7 @@ public void run() {
             }
             GTModHandler.addCraftingRecipe(
                     new ItemStack(Items.clay_ball, 3, 0),
-                    GTProxy.tBits,
+                    GTModHandler.RecipeBits.BITS_STD,
                     new Object[] { "CCC", "CBC", "CCC", 'C', OrePrefixes.dustSmall.get(Materials.Clay), 'B',
                             waterBucket });
         }
@@ -1446,15 +1446,15 @@ public void run() {
 
         if (Mods.GraviSuite.isModLoaded()) {
             GTModHandler.addCraftingRecipe(
-                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GTValues.W),
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, WILDCARD),
                     bits,
                     new Object[] { "SCS", "MBM", "EWE", 'S', OrePrefixes.itemCasing.get(Materials.StainlessSteel), 'C',
                             OrePrefixes.circuit.get(Materials.HV), 'M', ItemList.Electric_Motor_HV, 'B',
-                            GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W), 'W',
+                            GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD), 'W',
                             OrePrefixes.wireGt04.get(Materials.AnnealedCopper), 'E',
                             GTModHandler.getModItem(Mods.GraviSuite.ID, "itemSimpleItem", 1, 6) });
             if ((BuildCraftFactory.isModLoaded()) && (AdventureBackpack.isModLoaded())) GTModHandler.addCraftingRecipe(
-                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1, GTValues.W),
+                    GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1, WILDCARD),
                     bits,
                     new Object[] { "SXS", "TCT", "EZE", 'S', OrePrefixes.itemCasing.get(Materials.StainlessSteel), 'X',
                             OrePrefixes.circuit.get(Materials.HV), 'T',
@@ -1776,14 +1776,14 @@ public void run() {
                     GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0),
                     GTModHandler.RecipeBits.REVERSIBLE,
                     new Object[] { " G ", "GDG", " G ", 'G', new ItemStack(Blocks.glass, 1), 'D',
-                            new ItemStack(Items.dye, 1, GTValues.W) });
+                            new ItemStack(Items.dye, 1, WILDCARD) });
             GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0));
             // actual
             GTModHandler.addCraftingRecipe(
                     GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0),
                     bits4,
                     new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D',
-                            new ItemStack(Items.dye, 1, GTValues.W) });
+                            new ItemStack(Items.dye, 1, WILDCARD) });
             GTModHandler.addCraftingRecipe(
                     GTModHandler.getModItem(ZTones.ID, "minicharcoal", 7L, 0),
                     bits,