dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove receiver GUI again...

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-31 16:40:12 +02:00
parent 9b9c1959f5
commit 89c9ea4265
8 changed files with 8 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/refinedstorage/RefinedStorageGui.java
View File

@@ -20,5 +20,4 @@ public final class RefinedStorageGui {
public static final int PROCESSING_PATTERN_ENCODER = 16;
public static final int GRID_FILTER = 17;
public static final int NETWORK_TRANSMITTER = 18;
public static final int NETWORK_RECEIVER = 19;
}

16
src/main/java/refinedstorage/block/BlockNetworkReceiver.java
View File

@@ -1,15 +1,8 @@
package refinedstorage.block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui;
import refinedstorage.tile.TileNetworkReceiver;
public class BlockNetworkReceiver extends BlockNode {
@@ -17,15 +10,6 @@ public class BlockNetworkReceiver extends BlockNode {
super("network_receiver");
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
if (!world.isRemote) {
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.NETWORK_RECEIVER, world, pos.getX(), pos.getY(), pos.getZ());
}
return true;
}
@Override
public TileEntity createTileEntity(World world, IBlockState state) {
return new TileNetworkReceiver();

11
src/main/java/refinedstorage/container/ContainerNetworkReceiver.java
View File

@@ -1,11 +0,0 @@
package refinedstorage.container;
import net.minecraft.entity.player.EntityPlayer;
public class ContainerNetworkReceiver extends ContainerBase {
public ContainerNetworkReceiver(EntityPlayer player) {
super(player);
addPlayerInventory(8, 50);
}
}

4
src/main/java/refinedstorage/gui/GuiHandler.java
View File

@@ -52,8 +52,6 @@ public class GuiHandler implements IGuiHandler {
return new ContainerProcessingPatternEncoder(player, (TileProcessingPatternEncoder) tile);
case RefinedStorageGui.NETWORK_TRANSMITTER:
return new ContainerNetworkTransmitter(player, (TileNetworkTransmitter) tile);
case RefinedStorageGui.NETWORK_RECEIVER:
return new ContainerNetworkReceiver(player);
default:
return null;
}
@@ -113,8 +111,6 @@ public class GuiHandler implements IGuiHandler {
return new GuiGridFilter(getGridFilterContainer(player, x));
case RefinedStorageGui.NETWORK_TRANSMITTER:
return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile);
case RefinedStorageGui.NETWORK_RECEIVER:
return new GuiNetworkReceiver((ContainerNetworkReceiver) getContainer(ID, player, tile), (TileNetworkReceiver) tile);
default:
return null;
}

37
src/main/java/refinedstorage/gui/GuiNetworkReceiver.java
View File

@@ -1,37 +0,0 @@
package refinedstorage.gui;
import refinedstorage.container.ContainerNetworkReceiver;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import refinedstorage.tile.TileNetworkReceiver;
public class GuiNetworkReceiver extends GuiBase {
private TileNetworkReceiver networkReceiver;
public GuiNetworkReceiver(ContainerNetworkReceiver container, TileNetworkReceiver networkReceiver) {
super(container, 176, 131);
this.networkReceiver = networkReceiver;
}
@Override
public void init(int x, int y) {
addSideButton(new SideButtonRedstoneMode(networkReceiver));
}
@Override
public void update(int x, int y) {
}
@Override
public void drawBackground(int x, int y, int mouseX, int mouseY) {
bindTexture("gui/network_receiver.png");
drawTexture(x, y, 0, 0, width, height);
}
@Override
public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t("gui.refinedstorage:network_receiver"));
drawString(7, 39, t("container.inventory"));
}
}

13
src/main/java/refinedstorage/tile/TileNetworkReceiver.java
View File

@@ -2,13 +2,9 @@ package refinedstorage.tile;
import net.minecraft.inventory.Container;
import refinedstorage.RefinedStorage;
import refinedstorage.container.ContainerNetworkReceiver;
import refinedstorage.tile.config.RedstoneMode;
public class TileNetworkReceiver extends TileNode {
public TileNetworkReceiver() {
rebuildOnUpdateChange = true;
}
@Override
public void updateNode() {
}
@@ -20,6 +16,11 @@ public class TileNetworkReceiver extends TileNode {
@Override
public Class<? extends Container> getContainer() {
return ContainerNetworkReceiver.class;
return null;
}
@Override
public void setRedstoneMode(RedstoneMode mode) {
// NO OP
}
}

2
src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
View File

@@ -125,6 +125,6 @@ public class TileNetworkTransmitter extends TileNode {
}
public boolean isReceiverValid() {
return worldObj.isRemote ? receiverValid : (receiver != null && isInSameDimension() && worldObj.getTileEntity(receiver) instanceof TileNetworkReceiver && ((TileNetworkReceiver) worldObj.getTileEntity(receiver)).canUpdate());
return worldObj.isRemote ? receiverValid : (receiver != null && isInSameDimension() && worldObj.getTileEntity(receiver) instanceof TileNetworkReceiver);
}
}