From 1d9c4fec330706494a4d4ab05bea2b6c7746b119 Mon Sep 17 00:00:00 2001 From: Vaern Date: Thu, 23 Jun 2022 15:15:25 -0700 Subject: [PATCH] amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam --- .../com/hbm/blocks/machine/ReactorZirnox.java | 4 ++- .../machine/TileEntityReactorZirnox.java | 28 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java index 4aaaccea7..39c65cc59 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java @@ -29,7 +29,7 @@ public class ReactorZirnox extends BlockDummyable { if(meta >= 12) return new TileEntityReactorZirnox(); if(meta >= 6) - return new TileEntityProxyCombo(false, true, true); + return new TileEntityProxyCombo(true, true, true); return null; } @@ -75,6 +75,8 @@ public class ReactorZirnox extends BlockDummyable { this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * 2, y + 3, z + dir.offsetZ * o + rot.offsetZ * 2); this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * -2, y + 1, z + dir.offsetZ * o + rot.offsetZ * -2); this.makeExtra(world, x + dir.offsetX * o + rot.offsetX * -2, y + 3, z + dir.offsetZ * o + rot.offsetZ * -2); + //i still don't know why the ports were such an issue all those months ago + this.makeExtra(world, x + dir.offsetX * o, y + 4, z + dir.offsetZ * o); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 4fc78d35e..a36cf9736 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -98,32 +98,6 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF public boolean canExtractItem(int i, ItemStack stack, int j) { return i < 24 && !(stack.getItem() instanceof ItemZirnoxRod); } - - //fucking hate having to do this - private void loadFuel() { - TileEntity te = worldObj.getTileEntity(this.xCoord, this.yCoord + 5, this.zCoord); - - if(te instanceof IInventory) { - IInventory inv = (IInventory) te; - - for(int i = 0; i < inv.getSizeInventory(); i++) { - - ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemZirnoxRod) { - - for(int j = 0; j < 24; j++) { - //ZIRNOX rods cannot stack higher than 1 anyway - if(slots[j] == null) { - slots[j] = stack.copy(); - slots[j].stackSize = 1; - inv.decrStackSize(i, 1); - return; - } - } - } - } - } - } @Override public void readFromNBT(NBTTagCompound nbt) { @@ -219,8 +193,6 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF carbonDioxide.loadTank(24, 26, slots); water.loadTank(25, 27, slots); - loadFuel(); - if(isOn) { for(int i = 0; i < 24; i++) {