load knife item lazily

PssbleTrngle · Apr 18, 2024 · dbc6f4b · dbc6f4b
1 parent 8b0ba1f
commit dbc6f4b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/possible_triangle/sliceanddice/mixins/HarvesterMovementBehaviourMixin.java b/src/main/java/com/possible_triangle/sliceanddice/mixins/HarvesterMovementBehaviourMixin.java
@@ -1,5 +1,7 @@
 package com.possible_triangle.sliceanddice.mixins;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.possible_triangle.sliceanddice.compat.ModCompat;
 import com.simibubi.create.content.contraptions.actors.harvester.HarvesterMovementBehaviour;
 import net.minecraft.world.item.ItemStack;
@@ -13,15 +15,18 @@
 public class HarvesterMovementBehaviourMixin {
 
     @Unique
-    private static final ItemStack sliceanddice$TOOL = ModCompat.INSTANCE.ifLoaded(ModCompat.FARMERS_DELIGHT, () -> new ItemStack(ModItems.IRON_KNIFE.get()));
+    private static final Supplier<ItemStack> sliceanddice$TOOL = Suppliers.memoize(() -> {
+        return ModCompat.INSTANCE.ifLoaded(ModCompat.FARMERS_DELIGHT, () -> new ItemStack(ModItems.IRON_KNIFE.get()));
+    });
 
     @ModifyVariable(
             require = 0,
             method = "visitNewPosition(Lcom/simibubi/create/content/contraptions/behaviour/MovementContext;Lnet/minecraft/core/BlockPos;)V",
             at = @At("STORE")
     )
     private ItemStack overwriteDefaultItem(ItemStack stack) {
-        if (sliceanddice$TOOL != null) return sliceanddice$TOOL;
+        var tool = sliceanddice$TOOL.get();
+        if (tool != null) return tool;
         return stack;
     }