- Extract static method form IMachineController to MachineController.

Author: KasumiNova

src/main/java/github/kasuminova/mmce/common/helper/IMachineController.java

@@ -3,7 +3,6 @@
 import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.block.IBlockState;
 import crafttweaker.api.data.IData;
-import crafttweaker.api.minecraft.CraftTweakerMC;
 import crafttweaker.api.world.IBlockPos;
 import crafttweaker.api.world.IFacing;
 import crafttweaker.api.world.IWorld;
@@ -13,9 +12,6 @@
 import hellfirepvp.modularmachinery.common.modifier.RecipeModifier;
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
 import hellfirepvp.modularmachinery.common.util.SmartInterfaceData;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenGetter;
 import stanhebben.zenscript.annotations.ZenMethod;
@@ -27,44 +23,6 @@
 @ZenClass("mods.modularmachinery.IMachineController")
 public interface IMachineController {
 
-    /**
-     * 获取对应 IWorld 中的某个坐标的控制器。
-     *
-     * @param worldCT IWorld
-     * @param posCT   IBlockPos
-     * @return 如果无控制器则返回 null，否则返回 IMachineController 实例。
-     */
-    @ZenMethod
-    static IMachineController getControllerAt(IWorld worldCT, IBlockPos posCT) {
-        World world = CraftTweakerMC.getWorld(worldCT);
-        BlockPos pos = CraftTweakerMC.getBlockPos(posCT);
-        if (world == null || pos == null || !world.isBlockLoaded(pos)) {
-            return null;
-        }
-
-        TileEntity te = world.getTileEntity(pos);
-        return te instanceof IMachineController ? (IMachineController) te : null;
-    }
-
-    /**
-     * 获取对应 IWorld 中的某个坐标的控制器。
-     *
-     * @param worldCT IWorld
-     * @return 如果无控制器则返回 null，否则返回 IMachineController 实例。
-     */
-    @ZenMethod
-    static IMachineController getControllerAt(IWorld worldCT, int x, int y, int z) {
-        World world = CraftTweakerMC.getWorld(worldCT);
-        BlockPos pos = new BlockPos(x, y, z);
-
-        if (world == null || !world.isBlockLoaded(pos)) {
-            return null;
-        }
-
-        TileEntity te = world.getTileEntity(pos);
-        return te instanceof IMachineController ? (IMachineController) te : null;
-    }
-
     /**
      * 获取控制器所在的世界。
      *

src/main/java/github/kasuminova/mmce/common/helper/MachineController.java

@@ -0,0 +1,55 @@
+package github.kasuminova.mmce.common.helper;
+
+import crafttweaker.annotations.ZenRegister;
+import crafttweaker.api.minecraft.CraftTweakerMC;
+import crafttweaker.api.world.IBlockPos;
+import crafttweaker.api.world.IWorld;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
+
+@ZenRegister
+@ZenClass("mods.modularmachinery.MachineController")
+public class MachineController {
+
+    /**
+     * 获取对应 IWorld 中的某个坐标的控制器。
+     *
+     * @param worldCT IWorld
+     * @param posCT   IBlockPos
+     * @return 如果无控制器则返回 null，否则返回 IMachineController 实例。
+     */
+    @ZenMethod
+    static IMachineController getControllerAt(IWorld worldCT, IBlockPos posCT) {
+        World world = CraftTweakerMC.getWorld(worldCT);
+        BlockPos pos = CraftTweakerMC.getBlockPos(posCT);
+        if (world == null || pos == null || !world.isBlockLoaded(pos)) {
+            return null;
+        }
+
+        TileEntity te = world.getTileEntity(pos);
+        return te instanceof IMachineController ? (IMachineController) te : null;
+    }
+
+    /**
+     * 获取对应 IWorld 中的某个坐标的控制器。
+     *
+     * @param worldCT IWorld
+     * @return 如果无控制器则返回 null，否则返回 IMachineController 实例。
+     */
+    @ZenMethod
+    static IMachineController getControllerAt(IWorld worldCT, int x, int y, int z) {
+        World world = CraftTweakerMC.getWorld(worldCT);
+        BlockPos pos = new BlockPos(x, y, z);
+
+        if (world == null || !world.isBlockLoaded(pos)) {
+            return null;
+        }
+
+        TileEntity te = world.getTileEntity(pos);
+        return te instanceof IMachineController ? (IMachineController) te : null;
+    }
+
+}