Merge pull request #1558 from BallOfEnergy1/OC_bugfix

oops (fixing OC bug)

src/main/java/com/hbm/handler/CompatHandler.java

@@ -14,6 +14,8 @@ import net.minecraft.util.ChatStyle;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.lang.reflect.Array;
+
 
 /**
  * General handler for OpenComputers compatibility.
@@ -96,11 +98,9 @@ public class CompatHandler {
                 if(!info.equals(""))
                     player.addChatComponentMessage(new ChatComponentTranslation(info).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
             }
-            TileEntity te = player.worldObj.getTileEntity((int) hitX, (int) hitY, (int) hitZ);
+            TileEntity te = (TileEntity) this;
-            OCComponent component = (OCComponent) te;
+            if(Array.getLength(this.methods()) == 0 && te instanceof TileEntityProxyCombo || this.getComponentName().equals("ntm_null"))
-            if((component.methods() == null && te instanceof TileEntityProxyCombo) || component.getComponentName().equals("ntm_null")) {
                 player.addChatComponentMessage(new ChatComponentTranslation("analyze.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
-            }
             return null;
         }
 
@@ -109,7 +109,7 @@ public class CompatHandler {
          * @return Array of methods to expose to the computer.
          */
         @Override
-        default String[] methods() {return null;}
+        default String[] methods() {return new String[0];}
 
         /**
          * Standard invoke function from {@link li.cil.oc.api.network.ManagedPeripheral} extending {@link li.cil.oc.api.network.SimpleComponent}.

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java

@@ -404,11 +404,6 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
 		return new Object[] {true};
 	}
 
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
-
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new ContainerRBMKGeneric(player.inventory);

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java

@@ -166,9 +166,4 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase im
 		targetLevel = MathHelper.clamp_double(newLevel, 0, 1);
 		return new Object[] {};
 	}
-
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
 }

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java

@@ -180,9 +180,4 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidAc
 	public Object[] getInfo(Context context, Arguments args) {
 		return new Object[]{heat, tank.getFill(), tank.getMaxFill(), xCoord, yCoord, zCoord};
 	}
-
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
 }

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java

@@ -336,11 +336,6 @@ public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements I
 		return new Object[] {xCoord, yCoord, zCoord};
 	}
 
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
-
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new ContainerRBMKHeater(player.inventory, this);

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java

@@ -264,11 +264,6 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement
 		return new Object[] {gas.getFill(), gas.getMaxFill(), progress, gas.getTankType().getID(), xCoord, yCoord, zCoord};
 	}
 
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
-
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new ContainerRBMKOutgasser(player.inventory, this);

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java

@@ -496,11 +496,6 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
 		return new Object[] {xCoord, yCoord, zCoord};
 	}
 
-	@Override
-	public boolean canConnectNode(ForgeDirection side) {
-		return side == ForgeDirection.DOWN;
-	}
-
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new ContainerRBMKRod(player.inventory, this);