Merge remote-tracking branch 'origin/re/1.21-with-love' into re/1.21-with-love

Author: Saereth

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java

@@ -311,10 +311,14 @@ private static List<WoodTypeEntry> getDefaultEntries() {
                             .build());
         }
         if (CUSTOM_ENTRIES == null) {
-            CUSTOM_ENTRIES = new ArrayList<WoodTypeEntry>();
-            var evt = new RegisterWoodsKubeEvent();
-            GTCEuStartupEvents.REGISTER_WOODS.post(evt);
-            CUSTOM_ENTRIES = new ArrayList<WoodTypeEntry>(evt.woods);
+            if (GTCEu.Mods.isKubeJSLoaded()) {
+                CUSTOM_ENTRIES = new ArrayList<WoodTypeEntry>();
+                var evt = new RegisterWoodsKubeEvent();
+                GTCEuStartupEvents.REGISTER_WOODS.post(evt);
+                CUSTOM_ENTRIES = new ArrayList<WoodTypeEntry>(evt.woods);
+            } else {
+                CUSTOM_ENTRIES = List.of();
+            }
         }
 
         List<WoodTypeEntry> entries = new ArrayList<WoodTypeEntry>();

src/main/java/com/gregtechceu/gtceu/integration/kjs/events/RegisterWoodsKubeEvent.java

@@ -36,17 +36,6 @@ public class Wrapped {
             this.woodName = woodName;
         }
 
-        // public Wrapped id(KubeResourceLocation _id) {
-        // String namespace = id.wrapped().getNamespace();
-        // // if (namespace.equals("kubejs")) {
-        // // namespace = this.type.id.getNamespace();
-        // // }
-        // var idWithoutType = ResourceLocation.fromNamespaceAndPath(namespace,
-        // _id.wrapped().getPath());
-        // var id = idWithoutType.withPrefix(this.type.id.getPath() + "/");
-        // return this;
-        // }
-
         private String _recipeId;
         private Item _plank;
         private Item _strippedLog;
@@ -236,7 +225,7 @@ public WoodTypeEntry toEntry() throws IllegalArgumentException {
                 throw new IllegalArgumentException("Need a pressurePlate");
             }
 
-            var builder = new WoodTypeEntry.Builder(this.modId, this.woodName)
+            return new WoodTypeEntry.Builder(this.modId, this.woodName)
                     .planks(this._plank, this._recipeId + "_planks")
                     .log(Items.OAK_LOG).removeCharcoalRecipe()
                     .strippedLog(this._strippedLog)
@@ -256,14 +245,14 @@ public WoodTypeEntry toEntry() throws IllegalArgumentException {
                     .pressurePlate(this._pressurePlate, this._recipeId + "_pressure_plate")
                     .registerAllMaterialInfo()
                     .build();
-            return builder;
         }
 
-        boolean wasRegisted = false;
+        boolean wasRegistered = false;
 
         @HideFromJS
         public void register() {
-            if (!this.wasRegisted) {
+            if (!this.wasRegistered) {
+                this.wasRegistered = true;
                 try {
                     woods.add(this.toEntry());
                 } catch (Exception e) {
@@ -273,7 +262,7 @@ public void register() {
             } else
                 GTCEu.LOGGER.warn("Tried registering a wood type twice!");
         }
-    };
+    }
 
     public Wrapped register(String modId, String woodName) {
         var wrap = new Wrapped(modId, woodName);

src/test/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredientTest.java

@@ -25,8 +25,6 @@
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.neoforged.neoforge.common.crafting.SizedIngredient;
-import net.neoforged.neoforge.gametest.GameTestHolder;
-import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
 
 import lombok.Getter;
 
@@ -39,8 +37,9 @@
  * Rolls of 0
  * Forced rolls of 0 breaking recipes
  */
-@PrefixGameTestTemplate(false)
-@GameTestHolder(GTCEu.MOD_ID)
+// @PrefixGameTestTemplate(false)
+// @GameTestHolder(GTCEu.MOD_ID)
+// Gametests blocked until gtm#4326 is fixed
 public class IntProviderIngredientTest {
 
     private static GTRecipeType CR_RECIPE_TYPE;
@@ -246,7 +245,7 @@ public static void rangedIngredientGetStacksTest(GameTestHelper helper) {
     // Test for singleblock machine with ranged item input.
     // Forcibly sabotages the first recipe run, setting its output amount to 0 to ensure that doesn't break the recipe.
     // This is specifically a test for #3593 / #3594
-    @GameTest(template = "singleblock_charged_cr", batch = "RangedIngredients")
+    @GameTest(template = "singleblock_charged_cr", batch = "RangedIngredients", required = false)
     public static void singleblockRangedItemOutputSabotaged(GameTestHelper helper) {
         SimpleTieredMachine machine = (SimpleTieredMachine) getMetaMachine(
                 helper.getBlockEntity(new BlockPos(0, 1, 0)));