Add alternative method signatures as to restore compatibility with addons (#64)

Signed-off-by: Kolja <104643407+Thatguyello@users.noreply.github.com>
Signed-off-by: Kolja <contact@kolja.lu>
Co-authored-by: Kolja <104643407+Thatguyello@users.noreply.github.com>

Author: ko-lja

src/main/java/appeng/api/crafting/IPatternDetails.java

@@ -23,6 +23,7 @@
 
 package appeng.api.crafting;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.world.item.crafting.Recipe;
@@ -67,7 +68,10 @@ default GenericStack getPrimaryOutput() {
 
     /**
      * The user who encoded this pattern.
+     * 
+     * @apiNote if you override this, you should return an empty string and not null
      */
+    @NotNull
     String getAuthor();
 
     /**

src/main/java/appeng/api/crafting/PatternDetailsHelper.java

@@ -91,6 +91,10 @@ public static IPatternDetails decodePattern(ItemStack stack, Level level, boolea
         return null;
     }
 
+    public static ItemStack encodeProcessingPattern(GenericStack[] in, GenericStack[] out) {
+        return encodeProcessingPattern(in, out, "");
+    }
+
     /**
      * Encodes a processing pattern which represents the ability to convert the given inputs into the given outputs
      * using some process external to the ME system.
@@ -103,6 +107,11 @@ public static ItemStack encodeProcessingPattern(GenericStack[] in, GenericStack[
         return AEItems.PROCESSING_PATTERN.asItem().encode(in, out, author);
     }
 
+    public static ItemStack encodeProcessingPattern(CraftingRecipe recipe, ItemStack[] in,
+            ItemStack out, boolean allowSubstitutes, boolean allowFluidSubstitutes) {
+        return encodeCraftingPattern(recipe, in, out, allowSubstitutes, allowFluidSubstitutes, "");
+    }
+
     /**
      * Encodes a crafting pattern which represents a Vanilla crafting recipe.
      *
@@ -121,6 +130,11 @@ public static ItemStack encodeCraftingPattern(CraftingRecipe recipe, ItemStack[]
                 author);
     }
 
+    public static ItemStack encodeStonecuttingPattern(StonecutterRecipe recipe, AEItemKey in, AEItemKey out,
+            boolean allowSubstitutes) {
+        return encodeStonecuttingPattern(recipe, in, out, allowSubstitutes, "");
+    }
+
     /**
      * Encodes a stonecutting pattern which represents a Vanilla Stonecutter recipe.
      *
@@ -140,6 +154,15 @@ public static ItemStack encodeStonecuttingPattern(StonecutterRecipe recipe, AEIt
         return AEItems.STONECUTTING_PATTERN.asItem().encode(recipe, in, out, allowSubstitutes, author);
     }
 
+    public static ItemStack encodeSmithingTablePattern(SmithingRecipe recipe,
+            AEItemKey template,
+            AEItemKey base,
+            AEItemKey addition,
+            AEItemKey out,
+            boolean allowSubstitutes) {
+        return encodeSmithingTablePattern(recipe, template, base, addition, out, allowSubstitutes, "");
+    }
+
     /**
      * Encodes a smithing table pattern which represents a Vanilla Smithing Table recipe.
      *

src/main/java/appeng/client/gui/me/common/PendingCraftingJobs.java

@@ -44,6 +44,15 @@ public static void clearPendingJobs() {
         jobs.clear();
     }
 
+    public static void jobStatus(UUID id,
+            AEKey what,
+            long requestedAmount,
+            long remainingAmount,
+            long elapsedTime,
+            CraftingJobStatusPacket.Status status) {
+        jobStatus(id, what, requestedAmount, remainingAmount, elapsedTime, false, status);
+    }
+
     public static void jobStatus(UUID id,
             AEKey what,
             long requestedAmount,

src/main/java/appeng/core/sync/packets/ConfirmAutoCraftPacket.java

@@ -40,6 +40,10 @@ public ConfirmAutoCraftPacket(FriendlyByteBuf stream) {
         this.isFollowing = stream.readBoolean();
     }
 
+    public ConfirmAutoCraftPacket(long craftAmt, boolean craftMissingAmount, boolean autoStart) {
+        this(craftAmt, craftMissingAmount, autoStart, false);
+    }
+
     public ConfirmAutoCraftPacket(long craftAmt, boolean craftMissingAmount, boolean autoStart, boolean isFollowing) {
         this.amount = craftAmt;
         this.craftMissingAmount = craftMissingAmount;

src/main/java/appeng/core/sync/packets/CraftingJobStatusPacket.java

@@ -41,6 +41,11 @@ public CraftingJobStatusPacket(FriendlyByteBuf stream) {
         this.isFollowing = stream.readBoolean();
     }
 
+    public CraftingJobStatusPacket(UUID jobId, AEKey what, long requestedAmount, long remainingAmount,
+            long elapsedTime, Status status) {
+        this(jobId, what, requestedAmount, remainingAmount, elapsedTime, false, status);
+    }
+
     public CraftingJobStatusPacket(UUID jobId, AEKey what, long requestedAmount, long remainingAmount,
             long elapsedTime, boolean isFollowing, Status status) {
         var data = new FriendlyByteBuf(Unpooled.buffer());

src/main/java/appeng/crafting/execution/CraftingCpuLogic.java

@@ -81,6 +81,11 @@ public CraftingCpuLogic(CraftingCPUCluster cluster) {
         this.cluster = cluster;
     }
 
+    public ICraftingSubmitResult trySubmitJob(IGrid grid, ICraftingPlan plan, IActionSource src,
+            @Nullable ICraftingRequester requester) {
+        return trySubmitJob(grid, plan, src, requester, false);
+    }
+
     public ICraftingSubmitResult trySubmitJob(IGrid grid, ICraftingPlan plan, IActionSource src,
             @Nullable ICraftingRequester requester, boolean isFollowing) {
         // Already have a job.

src/main/java/appeng/crafting/execution/ExecutingCraftingJob.java

@@ -66,6 +66,11 @@ interface CraftingDifferenceListener {
         void onCraftingDifference(AEKey what);
     }
 
+    ExecutingCraftingJob(ICraftingPlan plan, CraftingDifferenceListener postCraftingDifference, CraftingLink link,
+            @Nullable Integer playerId) {
+        this(plan, postCraftingDifference, link, playerId, false);
+    }
+
     ExecutingCraftingJob(ICraftingPlan plan, CraftingDifferenceListener postCraftingDifference, CraftingLink link,
             @Nullable Integer playerId, boolean isFollowing) {
         this.finalOutput = plan.finalOutput();

src/main/java/appeng/crafting/pattern/AECraftingPattern.java

@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.core.NonNullList;
@@ -151,7 +152,7 @@ public GenericStack[] getOutputs() {
     }
 
     @Override
-    public String getAuthor() {
+    public @NotNull String getAuthor() {
         return author;
     }
 

src/main/java/appeng/crafting/pattern/AEProcessingPattern.java

@@ -20,6 +20,7 @@
 
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.world.level.Level;
@@ -84,7 +85,7 @@ public GenericStack[] getOutputs() {
     }
 
     @Override
-    public String getAuthor() {
+    public @NotNull String getAuthor() {
         return author;
     }
 

src/main/java/appeng/crafting/pattern/AESmithingTablePattern.java

@@ -20,6 +20,7 @@
 
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.core.NonNullList;
@@ -160,7 +161,7 @@ public GenericStack[] getOutputs() {
     }
 
     @Override
-    public String getAuthor() {
+    public @NotNull String getAuthor() {
         return author;
     }