修复虚空采掘机等矿机无法输入坐标卡的问题

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/crafttweaker/util/IDataUtilsCrt.java

@@ -0,0 +1,91 @@
+package github.kasuminova.novaeng.common.crafttweaker.util;
+
+import crafttweaker.annotations.ZenRegister;
+import crafttweaker.api.data.IData;
+import github.kasuminova.novaeng.common.util.IDataUtils;
+import stanhebben.zenscript.annotations.Optional;
+import stanhebben.zenscript.annotations.ZenExpansion;
+import stanhebben.zenscript.annotations.ZenMethod;
+
+import java.util.List;
+import java.util.Map;
+
+@ZenRegister
+@ZenExpansion("crafttweaker.data.IData")
+public class IDataUtilsCrt {
+
+    @ZenMethod
+    public static IData get(IData data, String path, @Optional IData defaultValue) {
+        return IDataUtils.get(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static boolean getBool(IData data, String path, @Optional boolean defaultValue) {
+        return IDataUtils.getBool(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static byte getByte(IData data, String path, @Optional byte defaultValue) {
+        return IDataUtils.getByte(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static double getDouble(IData data, String path, @Optional double defaultValue) {
+        return IDataUtils.getDouble(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static float getFloat(IData data, String path, @Optional float defaultValue) {
+        return IDataUtils.getFloat(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static int getInt(IData data, String path, @Optional int defaultValue) {
+        return IDataUtils.getInt(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static List<IData> getList(IData data, String path, @Optional List<IData> defaultValue) {
+        return IDataUtils.getList(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static long getLong(IData data, String path, @Optional long defaultValue) {
+        return IDataUtils.getLong(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static Map<String, IData> getMap(IData data, String path, @Optional Map<String, IData> defaultValue) {
+        return IDataUtils.getMap(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static short getShort(IData data, String path, @Optional short defaultValue) {
+        return IDataUtils.getShort(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static String getString(IData data, String path, @Optional String defaultValue) {
+        return IDataUtils.getString(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static byte[] getByteArray(IData data, String path, @Optional byte[] defaultValue) {
+        return IDataUtils.getByteArray(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static int[] getIntArray(IData data, String path, @Optional int[] defaultValue) {
+        return IDataUtils.getIntArray(data, path, defaultValue);
+    }
+
+    @ZenMethod
+    public static boolean check(IData data, String path) {
+        return IDataUtils.check(data, path);
+    }
+
+    @ZenMethod
+    public static boolean check(IData data, String[] path) {
+        return IDataUtils.check(data, path);
+    }
+}

src/main/java/github/kasuminova/novaeng/common/machine/drills/Drill.kt

@@ -23,7 +23,8 @@ import github.kasuminova.novaeng.common.handler.OreHandler
 import github.kasuminova.novaeng.common.machine.MachineSpecial
 import github.kasuminova.novaeng.common.machine.drills.Drill.Type.RANGE
 import github.kasuminova.novaeng.common.machine.drills.Drill.Type.SINGLE
-import github.kasuminova.novaeng.common.util.IDataUtils
+import github.kasuminova.novaeng.common.util.IDataUtils.check
+import github.kasuminova.novaeng.common.util.IDataUtils.getIntArray
 import hellfirepvp.modularmachinery.ModularMachinery
 import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeBuilder
 import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeModifierBuilder
@@ -243,13 +244,13 @@ abstract class Drill : MachineSpecial {
         repeat(size) {
             this.addOutput(stone)
             if (this@Drill.isDimensional()) {
-                this.addItemModifier { ctrl, item ->
+                this.addItemModifier { ctrl, _ ->
                     val poss = ctrl.controller.customDataTag.getIntArray("pos")
                     val pos = BlockPos(poss[0], poss[1], poss[2])
                     return@addItemModifier getOreOutput(ctrl.controller, pos, poss[3], i, ii)
                 }
             } else {
-                this.addItemModifier { ctrl, item ->
+                this.addItemModifier { ctrl, _ ->
                     return@addItemModifier getOreOutput(
                         ctrl.controller,
                         ctrl.controller.getPos(),
@@ -373,7 +374,7 @@ abstract class Drill : MachineSpecial {
                     .addOutputs(4, 1, 1)
                     .requireComputationPoint(1.5f)
                     .addOutput(stone)
-                    .addItemModifier { ctrl, item ->
+                    .addItemModifier { ctrl, _ ->
                         getCcrystalOutput(ctrl.controller)
                     }
                     .setChance(0.1f)
@@ -396,7 +397,7 @@ abstract class Drill : MachineSpecial {
                     .addOutputs(4, 1, 1)
                     .requireComputationPoint(1.5f)
                     .addOutput(stone)
-                    .addItemModifier { ctrl, item ->
+                    .addItemModifier { ctrl, _ ->
                         getCcrystalOutput(ctrl.controller)
                     }.setChance(0.1f)
                     .setParallelized(true)
@@ -427,7 +428,7 @@ abstract class Drill : MachineSpecial {
                             .addOutputs(3, i, ii)
                             .requireComputationPoint(3f)
                             .addOutput(stone)
-                            .addItemModifier { ctrl, item ->
+                            .addItemModifier { ctrl, _ ->
                                 getCcrystalOutput(ctrl.controller)
                             }.setChance(0.035f)
                             .setMaxThreads(1)
@@ -452,7 +453,7 @@ abstract class Drill : MachineSpecial {
                             .addOutputs(3, i, ii)
                             .requireComputationPoint(3f)
                             .addOutput(stone)
-                            .addItemModifier { ctrl, item ->
+                            .addItemModifier { ctrl, _ ->
                                 getCcrystalOutput(ctrl.controller)
                             }
                             .setChance(0.04f)
@@ -579,11 +580,11 @@ abstract class Drill : MachineSpecial {
             RecipeBuilder.newBuilder("excavatorzb$name", name, 10)
                 .addInput(itemUtils.getItem("contenttweaker:zbk", 0))
                 .setNBTChecker { ctrl, item ->
-                    val data = ctrl.controller.customDataTag
-                    if (!data.hasKey("binding")) {
+                    if (!item.tag.check("binding")) {
                         return@setNBTChecker false
                     }
-                    val pos = IDataUtils.getIntArray(item.tag, "pos", null) ?: return@setNBTChecker false
+                    val pos = item.tag.getIntArray("pos", null) ?: return@setNBTChecker false
+                    val data = ctrl.controller.customDataTag
                     data.setIntArray("poss", pos)
                     true
                 }