From e7832b973314a13ecc12d5e67cf55a323213f030 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 5 Mar 2018 21:34:48 +0200 Subject: [PATCH] fixed Optionals to obide by the new CrT update --- build.gradle | 2 +- .../java/com/blamejared/compat/betterwithmods/Cauldron.java | 4 ++-- .../java/com/blamejared/compat/betterwithmods/Crucible.java | 2 +- src/main/java/com/blamejared/compat/betterwithmods/Mill.java | 2 +- .../com/blamejared/compat/betterwithmods/StokedCauldron.java | 2 +- .../com/blamejared/compat/betterwithmods/StokedCrucible.java | 4 ++-- .../java/com/blamejared/compat/betterwithmods/Turntable.java | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 1b510af..98f4436 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ repositories { } dependencies { - deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.0.+" + deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.5.+" deobfCompile "mezz.jei:jei_1.12.2:4.8.5.+" deobfCompile "com.blamejared:MTLib:3.0.2.4" deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java b/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java index bb80dc8..5deb9f3 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java @@ -24,7 +24,7 @@ public class Cauldron { @ZenMethod @Deprecated - public static void add(IItemStack output, @Optional IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { + public static void add(IItemStack output, IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { add(output, inputs, secondaryOutput); } @@ -35,7 +35,7 @@ public class Cauldron { @ZenMethod @Deprecated - public static void remove(IItemStack output, @Optional IItemStack secondary, IIngredient[] inputs) { + public static void remove(IItemStack output, IItemStack secondary, IIngredient[] inputs) { remove(output, inputs, secondary); } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java b/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java index 9896ab3..be4e1fe 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java @@ -24,7 +24,7 @@ public class Crucible { @Deprecated @ZenMethod - public static void add(IItemStack output, @Optional IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { + public static void add(IItemStack output, IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { add(output, inputs, secondaryOutput); } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Mill.java b/src/main/java/com/blamejared/compat/betterwithmods/Mill.java index e388e2d..b9f92f8 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Mill.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Mill.java @@ -24,7 +24,7 @@ public class Mill { @ZenMethod @Deprecated - public static void add(IItemStack output, @Optional IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { + public static void add(IItemStack output, IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { add(output, inputs, secondaryOutput); } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/StokedCauldron.java b/src/main/java/com/blamejared/compat/betterwithmods/StokedCauldron.java index e887b9e..caf2754 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/StokedCauldron.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/StokedCauldron.java @@ -25,7 +25,7 @@ public class StokedCauldron { @ZenMethod @Deprecated - public static void add(IItemStack output, @Optional IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { + public static void add(IItemStack output, IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { add(output, inputs, secondaryOutput); } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/StokedCrucible.java b/src/main/java/com/blamejared/compat/betterwithmods/StokedCrucible.java index 509ea18..9ecc741 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/StokedCrucible.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/StokedCrucible.java @@ -24,7 +24,7 @@ public class StokedCrucible { @ZenMethod @Deprecated - public static void add(IItemStack output, @Optional IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { + public static void add(IItemStack output, IItemStack secondaryOutput, @NotNull IIngredient[] inputs) { add(output, inputs, secondaryOutput); } @@ -40,7 +40,7 @@ public class StokedCrucible { @ZenMethod @Deprecated - public static void remove(IItemStack output, @Optional IItemStack secondary, @NotNull IIngredient[] inputs) { + public static void remove(IItemStack output, IItemStack secondary, @NotNull IIngredient[] inputs) { remove(output, inputs, secondary); } } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java b/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java index 3b1cb4e..7d05196 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java @@ -13,6 +13,7 @@ import crafttweaker.api.item.IItemStack; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.*; +import stanhebben.zenscript.compiler.ITypeRegistry; import java.util.*;