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

Fixes.

Browse Source
This commit is contained in:
raoulvdberge
2019-10-09 18:20:37 +02:00
parent 4f4aaf420f
commit f79a162d69
4 changed files with 4 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java
View File

@@ -451,7 +451,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
@Override
public boolean isActive() {
return getBlockState().get(NodeBlock.CONNECTED);
return world.getBlockState(pos).get(NodeBlock.CONNECTED);
}
@Override

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

@@ -61,14 +61,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
this.pos = pos;
}
public BlockState getBlockState() {
if (cachedBlockState == null) {
cachedBlockState = world.getBlockState(pos);
}
return cachedBlockState;
}
public RedstoneMode getRedstoneMode() {
return redstoneMode;
}

37
src/main/java/com/raoulvdberge/refinedstorage/network/MessageConfigSync.java.off
View File

@@ -1,37 +0,0 @@
package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSOldConfig;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
public class MessageConfigSync implements IMessage, IMessageHandler<MessageConfigSync, IMessage> {
@Override
public void fromBytes(ByteBuf buf) {
RSConfig serverVersion = new RSConfig(RS.INSTANCE.config, RS.INSTANCE.config.getConfig());
serverVersion.controllerCapacity = buf.readInt();
serverVersion.wirelessGridCapacity = buf.readInt();
serverVersion.portableGridCapacity = buf.readInt();
serverVersion.wirelessFluidGridCapacity = buf.readInt();
serverVersion.wirelessCraftingMonitorCapacity = buf.readInt();
RS.INSTANCE.config = serverVersion;
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(RS.INSTANCE.config.controllerCapacity);
buf.writeInt(RS.INSTANCE.config.wirelessGridCapacity);
buf.writeInt(RS.INSTANCE.config.portableGridCapacity);
buf.writeInt(RS.INSTANCE.config.wirelessFluidGridCapacity);
buf.writeInt(RS.INSTANCE.config.wirelessCraftingMonitorCapacity);
}
@Override
public IMessage onMessage(MessageConfigSync message, MessageContext ctx) {
return null;
}
}

25
src/main/java/com/raoulvdberge/refinedstorage/screen/GuiHandler.java
View File

@@ -1,13 +1,8 @@
package com.raoulvdberge.refinedstorage.screen;
public class GuiHandler {
/*
private Object getContainer(int ID, PlayerEntity player, TileEntity tile) {
/*private Object getContainer(int ID, PlayerEntity player, TileEntity tile) {
switch (ID) {
case RSGui.CONTROLLER:
return new ContainerController((TileController) tile, player);
case RSGui.DISK_DRIVE:
return new ContainerDiskDrive((TileDiskDrive) tile, player);
case RSGui.IMPORTER:
return new ContainerImporter((TileImporter) tile, player);
case RSGui.EXPORTER:
@@ -55,9 +50,7 @@ public class GuiHandler {
@Override
public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) {
if (ID == RSGui.FILTER) {
return getFilterContainer(player, x);
} else if (ID == RSGui.WIRELESS_CRAFTING_MONITOR) {
if (ID == RSGui.WIRELESS_CRAFTING_MONITOR) {
return getCraftingMonitorContainer(player, x);
}
@@ -69,10 +62,6 @@ public class GuiHandler {
TileEntity tile = world.getTileEntity(new BlockPos(x, y, z));
switch (ID) {
case RSGui.CONTROLLER:
return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile, player.inventory);
case RSGui.DISK_DRIVE:
return new GuiStorage((ContainerDiskDrive) getContainer(ID, player, tile), ((TileDiskDrive) tile).getNode(), "gui/disk_drive.png", player.inventory);
case RSGui.IMPORTER:
return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), player.inventory);
case RSGui.EXPORTER:
@@ -100,8 +89,6 @@ public class GuiHandler {
return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), player.inventory);
case RSGui.CRAFTER:
return new GuiCrafter((ContainerCrafter) getContainer(ID, player, tile), player.inventory);
case RSGui.FILTER:
return new GuiFilter(getFilterContainer(player, x), player.inventory);
case RSGui.NETWORK_TRANSMITTER:
return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile, player.inventory);
case RSGui.FLUID_INTERFACE:
@@ -141,11 +128,5 @@ public class GuiHandler {
private ContainerCraftingMonitor getCraftingMonitorContainer(PlayerEntity player, int invIndex) {
return new ContainerCraftingMonitor(getWirelessCraftingMonitor(player, invIndex), null, player);
}
private ContainerFilter getFilterContainer(PlayerEntity player, int hand) {
return new ContainerFilter(player, player.getHeldItem(Hand.values()[hand]));
}
*/
}*/
}