From 82d0eab6462fa811a2869b55e5194dbe0de01436 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 1 Aug 2016 01:33:17 +0200 Subject: [PATCH] Finish it up --- .../container/ContainerNetworkTransmitter.java | 6 +++--- .../tile/controller/TileController.java | 4 ++-- .../textures/items/interdimension_upgrade.png | Bin 0 -> 354 bytes 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png diff --git a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java index 55fb669a4..6946738bd 100755 --- a/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerNetworkTransmitter.java @@ -25,11 +25,11 @@ public class ContainerNetworkTransmitter extends ContainerBase { if (slot != null && slot.getHasStack()) { stack = slot.getStack(); - if (index == 0) { - if (!mergeItemStack(stack, 1, inventorySlots.size(), false)) { + if (index <= 1) { + if (!mergeItemStack(stack, 2, inventorySlots.size(), false)) { return null; } - } else if (!mergeItemStack(stack, 0, 1, false)) { + } else if (!mergeItemStack(stack, 0, 2, false)) { return null; } diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 2a9d699f7..bd15f6707 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -373,7 +373,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageToClient() { - for (EntityPlayer player : worldObj.playerEntities) { + for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { if (isWatchingGrid(player)) { sendStorageToClient((EntityPlayerMP) player); } @@ -387,7 +387,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageDeltaToClient(ItemStack stack, int delta) { - for (EntityPlayer player : worldObj.playerEntities) { + for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { if (isWatchingGrid(player)) { RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), (EntityPlayerMP) player); } diff --git a/src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/interdimension_upgrade.png new file mode 100755 index 0000000000000000000000000000000000000000..df8e37ddaca664bf3992c2c661a5f2b10e49edff GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dj`L74IQk1J+CLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$itc;5 zIEGmGFP-Sk-Q*y1wOyG$-?T=H2wVc{y%n&5(a+b2FXGFi*#y3#3hnZ{E!{fm#cE2ywMP+)fZ z%yio-DMRi;t_73Efx?EQvYxotT8H{?bM44Cc=0xITfWAL#T5+yj~Fzcb2?tSvfI>l zo{rc7MaF{b7H73A&aY;=U|x2TG3>bL@ngx_>l_u2_gvP;6uP+Kb sd%EM^7zfEcncVbw-&uW#)AT(2CrKG3TSp00i_>zopr03p_j1^@s6 literal 0 HcmV?d00001