Fixes.
This commit is contained in:
@@ -451,7 +451,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isActive() {
|
public boolean isActive() {
|
||||||
return getBlockState().get(NodeBlock.CONNECTED);
|
return world.getBlockState(pos).get(NodeBlock.CONNECTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -61,14 +61,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
|
|||||||
this.pos = pos;
|
this.pos = pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockState getBlockState() {
|
|
||||||
if (cachedBlockState == null) {
|
|
||||||
cachedBlockState = world.getBlockState(pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
return cachedBlockState;
|
|
||||||
}
|
|
||||||
|
|
||||||
public RedstoneMode getRedstoneMode() {
|
public RedstoneMode getRedstoneMode() {
|
||||||
return redstoneMode;
|
return redstoneMode;
|
||||||
}
|
}
|
||||||
|
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,13 +1,8 @@
|
|||||||
package com.raoulvdberge.refinedstorage.screen;
|
package com.raoulvdberge.refinedstorage.screen;
|
||||||
|
|
||||||
public class GuiHandler {
|
public class GuiHandler {
|
||||||
/*
|
/*private Object getContainer(int ID, PlayerEntity player, TileEntity tile) {
|
||||||
private Object getContainer(int ID, PlayerEntity player, TileEntity tile) {
|
|
||||||
switch (ID) {
|
switch (ID) {
|
||||||
case RSGui.CONTROLLER:
|
|
||||||
return new ContainerController((TileController) tile, player);
|
|
||||||
case RSGui.DISK_DRIVE:
|
|
||||||
return new ContainerDiskDrive((TileDiskDrive) tile, player);
|
|
||||||
case RSGui.IMPORTER:
|
case RSGui.IMPORTER:
|
||||||
return new ContainerImporter((TileImporter) tile, player);
|
return new ContainerImporter((TileImporter) tile, player);
|
||||||
case RSGui.EXPORTER:
|
case RSGui.EXPORTER:
|
||||||
@@ -55,9 +50,7 @@ public class GuiHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) {
|
public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) {
|
||||||
if (ID == RSGui.FILTER) {
|
if (ID == RSGui.WIRELESS_CRAFTING_MONITOR) {
|
||||||
return getFilterContainer(player, x);
|
|
||||||
} else if (ID == RSGui.WIRELESS_CRAFTING_MONITOR) {
|
|
||||||
return getCraftingMonitorContainer(player, x);
|
return getCraftingMonitorContainer(player, x);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,10 +62,6 @@ public class GuiHandler {
|
|||||||
TileEntity tile = world.getTileEntity(new BlockPos(x, y, z));
|
TileEntity tile = world.getTileEntity(new BlockPos(x, y, z));
|
||||||
|
|
||||||
switch (ID) {
|
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:
|
case RSGui.IMPORTER:
|
||||||
return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), player.inventory);
|
return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), player.inventory);
|
||||||
case RSGui.EXPORTER:
|
case RSGui.EXPORTER:
|
||||||
@@ -100,8 +89,6 @@ public class GuiHandler {
|
|||||||
return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), player.inventory);
|
return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), player.inventory);
|
||||||
case RSGui.CRAFTER:
|
case RSGui.CRAFTER:
|
||||||
return new GuiCrafter((ContainerCrafter) getContainer(ID, player, tile), player.inventory);
|
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:
|
case RSGui.NETWORK_TRANSMITTER:
|
||||||
return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile, player.inventory);
|
return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile, player.inventory);
|
||||||
case RSGui.FLUID_INTERFACE:
|
case RSGui.FLUID_INTERFACE:
|
||||||
@@ -141,11 +128,5 @@ public class GuiHandler {
|
|||||||
|
|
||||||
private ContainerCraftingMonitor getCraftingMonitorContainer(PlayerEntity player, int invIndex) {
|
private ContainerCraftingMonitor getCraftingMonitorContainer(PlayerEntity player, int invIndex) {
|
||||||
return new ContainerCraftingMonitor(getWirelessCraftingMonitor(player, invIndex), null, player);
|
return new ContainerCraftingMonitor(getWirelessCraftingMonitor(player, invIndex), null, player);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private ContainerFilter getFilterContainer(PlayerEntity player, int hand) {
|
|
||||||
return new ContainerFilter(player, player.getHeldItem(Hand.values()[hand]));
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user