From b032fb98a50a751df7ba6a5530c25c803ea11c4b Mon Sep 17 00:00:00 2001 From: mckuhei <31839741+mckuhei@users.noreply.github.com> Date: Thu, 22 Aug 2024 09:52:39 +0800 Subject: [PATCH] Handle number better in OC integration (#8211) --- .../common/tile/TileEntityDigitalMiner.java | 24 +++++++++---------- .../common/tile/TileEntityFactory.java | 15 +++++++----- .../tile/TileEntityLogisticalSorter.java | 14 +++++------ .../tile/TileEntityResistiveHeater.java | 4 ++-- .../TileEntityReactorLogicAdapter.java | 4 ++-- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index c96ccb1fc..6ba83e935 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -931,38 +931,38 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public Object[] invoke(int method, Object[] arguments) throws NoSuchMethodException { if (method == 0) { - if (arguments.length != 1 || !(arguments[0] instanceof Double)) { + if (arguments.length != 1 || !(arguments[0] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - setRadius(Math.min(((Double) arguments[0]).intValue(), MekanismConfig.current().general.digitalMinerMaxRadius.val())); + setRadius(Math.min(((Number) arguments[0]).intValue(), MekanismConfig.current().general.digitalMinerMaxRadius.val())); } else if (method == 1) { - if (arguments.length != 1 || !(arguments[0] instanceof Double)) { + if (arguments.length != 1 || !(arguments[0] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - minY = ((Double) arguments[0]).intValue(); + minY = ((Number) arguments[0]).intValue(); } else if (method == 2) { - if (arguments.length != 1 || !(arguments[0] instanceof Double)) { + if (arguments.length != 1 || !(arguments[0] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - maxY = ((Double) arguments[0]).intValue(); + maxY = ((Number) arguments[0]).intValue(); } else if (method == 3) { - if (arguments.length < 1 || !(arguments[0] instanceof Double)) { + if (arguments.length < 1 || !(arguments[0] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - int id = ((Double) arguments[0]).intValue(); + int id = ((Number) arguments[0]).intValue(); int meta = 0; if (arguments.length > 1) { - if (arguments[1] instanceof Double) { - meta = ((Double) arguments[1]).intValue(); + if (arguments[1] instanceof Number) { + meta = ((Number) arguments[1]).intValue(); } } filters.add(new MItemStackFilter(new ItemStack(Item.getItemById(id), 1, meta))); return new Object[]{"Added filter."}; } else if (method == 4) { - if (arguments.length < 1 || !(arguments[0] instanceof Double)) { + if (arguments.length < 1 || !(arguments[0] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - int id = ((Double) arguments[0]).intValue(); + int id = ((Number) arguments[0]).intValue(); Iterator iter = filters.iterator(); while (iter.hasNext()) { MinerFilter filter = iter.next(); diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 46cbf48e2..f5e371f25 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -821,6 +821,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt @Override public Object[] invoke(int method, Object[] arguments) throws NoSuchMethodException { + int index; switch (method) { case 0: return new Object[]{electricityStored}; @@ -828,27 +829,29 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt if (arguments[0] == null) { return new Object[]{"Please provide a target operation."}; } - if (!(arguments[0] instanceof Double) && !(arguments[0] instanceof Integer)) { + if (!(arguments[0] instanceof Number)) { return new Object[]{"Invalid characters."}; } - if ((Integer) arguments[0] < 0 || (Integer) arguments[0] > progress.length) { + index = ((Number) arguments[0]).intValue(); + if (index < 0 || index > progress.length) { return new Object[]{"No such operation found."}; } - return new Object[]{progress[(Integer) arguments[0]]}; + return new Object[]{progress[index]}; case 2: return new Object[]{facing}; case 3: if (arguments[0] == null) { return new Object[]{"Please provide a target operation."}; } - if (!(arguments[0] instanceof Double) && !(arguments[0] instanceof Integer)) { + if (!(arguments[0] instanceof Number)) { return new Object[]{"Invalid characters."}; } - if ((Integer) arguments[0] < 0 || (Integer) arguments[0] > progress.length) { + index = ((Number) arguments[0]).intValue(); + if (index < 0 || index > progress.length) { return new Object[]{"No such operation found."}; } return new Object[]{ - canOperate(getInputSlot((Integer) arguments[0]), getOutputSlot((Integer) arguments[0]))}; + canOperate(getInputSlot(index), getOutputSlot(index))}; case 4: return new Object[]{getMaxEnergy()}; case 5: diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index d3170986e..89648a74c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -546,24 +546,24 @@ public class TileEntityLogisticalSorter extends TileEntityEffectsBlock implement autoEject = (Boolean) arguments[0]; return new Object[]{"Auto-eject mode set to " + autoEject}; } else if (method == 3) { - if (arguments.length != 6 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Double) || + if (arguments.length != 6 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Number) || !(arguments[2] instanceof String) || !(arguments[3] instanceof Boolean) || - !(arguments[4] instanceof Double) || !(arguments[5] instanceof Double)) { + !(arguments[4] instanceof Number) || !(arguments[5] instanceof Number)) { return new Object[]{"Invalid parameters."}; } TItemStackFilter filter = new TItemStackFilter(); - filter.setItemStack(new ItemStack(Item.getByNameOrId((String) arguments[0]), 1, ((Double) arguments[1]).intValue())); + filter.setItemStack(new ItemStack(Item.getByNameOrId((String) arguments[0]), 1, ((Number) arguments[1]).intValue())); filter.color = EnumColor.getFromDyeName((String) arguments[2]); filter.sizeMode = (Boolean) arguments[3]; - filter.min = ((Double) arguments[4]).intValue(); - filter.max = ((Double) arguments[5]).intValue(); + filter.min = ((Number) arguments[4]).intValue(); + filter.max = ((Number) arguments[5]).intValue(); filters.add(filter); return new Object[]{"Added filter."}; } else if (method == 4) { - if (arguments.length != 2 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Double)) { + if (arguments.length != 2 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Number)) { return new Object[]{"Invalid parameters."}; } - ItemStack stack = new ItemStack(Item.getByNameOrId((String) arguments[0]), 1, ((Double) arguments[1]).intValue()); + ItemStack stack = new ItemStack(Item.getByNameOrId((String) arguments[0]), 1, ((Number) arguments[1]).intValue()); Iterator iter = filters.iterator(); while (iter.hasNext()) { TransporterFilter filter = iter.next(); diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 9e9d272e0..84df18285 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -271,8 +271,8 @@ public class TileEntityResistiveHeater extends TileEntityEffectsBlock implements return new Object[]{temperature}; case 3: if (arguments.length == 1) { - if (arguments[0] instanceof Double) { - energyUsage = (Double) arguments[0]; + if (arguments[0] instanceof Number) { + energyUsage = ((Number) arguments[0]).doubleValue(); return new Object[]{"Set energy usage."}; } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 5b9f12b48..91cfd9322 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -135,8 +135,8 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem case 6: return new Object[]{getReactor().getInjectionRate()}; case 7: - if (arguments[0] instanceof Double) { - getReactor().setInjectionRate(((Double) arguments[0]).intValue()); + if (arguments[0] instanceof Number) { + getReactor().setInjectionRate(((Number) arguments[0]).intValue()); return new Object[]{"Injection rate set."}; } return new Object[]{"Invalid parameters."};