diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index c4acf60ca..ca314d371 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -55,7 +55,7 @@ public class CompatHandler { @Optional.Interface(iface = "li.cil.oc.api.network.Analyzable", modid = "OpenComputers"), @Optional.Interface(iface = "li.cil.oc.api.network.ManagedPeripheral", modid = "OpenComputers"), }) - @SimpleComponent.SkipInjection + @SimpleComponent.SkipInjection // make sure OC doesn't inject this shit into the interface and crash public interface OCComponent extends SimpleComponent, SidedComponent, Analyzable, ManagedPeripheral { /** diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index f8f08cede..419bb807e 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -978,12 +978,11 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple @Callback(direct = true, limit = 4) @Optional.Method(modid = "OpenComputers") public Object[] setTargeting(Context context, Arguments args) { - Object[] oldTargeting = new Object[] {this.targetPlayers, this.targetAnimals, this.targetMobs, this.targetMachines}; this.targetPlayers = args.checkBoolean(0); this.targetAnimals = args.checkBoolean(1); this.targetMobs = args.checkBoolean(2); this.targetMachines = args.checkBoolean(3); - return oldTargeting; + return new Object[] {}; } @Callback(direct = true) @@ -1020,7 +1019,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple } @Override - public String[] methods() { + public String[] methods() { // :vomit: return new String[] { "setActive", "isActive",