diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index d40b7fb3e..d42e2a861 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -1,5 +1,8 @@ package mekanism.client; +import java.util.HashMap; +import java.util.Map; + import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.api.MekanismConfig.general; @@ -9,12 +12,15 @@ import mekanism.common.Mekanism; import mekanism.common.base.IModule; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; +import mekanism.common.security.SecurityData; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; public class MekanismClient extends Mekanism { + public static Map clientSecurityMap = new HashMap(); + public static VoiceClient voiceClient; public static long ticksPassed = 0; @@ -32,6 +38,8 @@ public class MekanismClient extends Mekanism public static void reset() { + clientSecurityMap.clear(); + if(general.voiceServerEnabled) { if(MekanismClient.voiceClient != null) diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index d4022c29b..ff852df05 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -3,6 +3,7 @@ package mekanism.client.gui.element; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; +import mekanism.client.MekanismClient; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -10,6 +11,7 @@ import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -56,17 +58,17 @@ public class GuiSecurityTab extends GuiElement guiObj.drawTexturedRect(guiWidth + 176, guiHeight + 32, 0, 0, 26, 26); SecurityMode mode = getSecurity(); - SecurityFrequency freq = getFrequency(); + SecurityData data = MekanismClient.clientSecurityMap.get(getOwner()); - if(freq != null && freq.override) + if(data != null && data.override) { - mode = freq.securityMode; + mode = data.mode; } int renderX = 26 + (18*mode.ordinal()); if(getOwner() != null && getOwner().equals(mc.thePlayer.getName()) && - (getFrequency() == null || !getFrequency().override)) + (data == null || !data.override)) { if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { @@ -90,12 +92,12 @@ public class GuiSecurityTab extends GuiElement if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { - String securityDisplay = isItem ? SecurityUtils.getSecurityDisplay(getItem()) : SecurityUtils.getSecurityDisplay(tileEntity); + String securityDisplay = isItem ? SecurityUtils.getSecurityDisplay(getItem(), Side.CLIENT) : SecurityUtils.getSecurityDisplay(tileEntity, Side.CLIENT); String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + securityDisplay; String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getName(), getOwner()); String overrideText = EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"; - if(isItem ? SecurityUtils.isOverridden(getItem()) : SecurityUtils.isOverridden(tileEntity)) + if(isItem ? SecurityUtils.isOverridden(getItem(), Side.CLIENT) : SecurityUtils.isOverridden(tileEntity, Side.CLIENT)) { displayTooltips(ListUtils.asList(securityText, ownerText, overrideText), xAxis, yAxis); } diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 943e929f4..8788813b7 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,6 +6,8 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; +import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; +import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -29,6 +31,7 @@ public class CommonPlayerTracker Mekanism.packetHandler.sendTo(new BoxBlacklistMessage(), (EntityPlayerMP)event.player); Mekanism.packetHandler.sendTo(new JetpackDataMessage(JetpackPacket.FULL, null, false), (EntityPlayerMP)event.player); Mekanism.packetHandler.sendTo(new ScubaTankDataMessage(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)event.player); + Mekanism.packetHandler.sendTo(new SecurityUpdateMessage(SecurityPacket.FULL, null, null), (EntityPlayerMP)event.player); Mekanism.logger.info("Sent config to '" + event.player.getDisplayName() + ".'"); } diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 4226b72bc..99edda28d 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -59,6 +59,8 @@ import mekanism.common.network.PacketScubaTankData; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketSecurityMode; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.network.PacketSecurityUpdate; +import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import mekanism.common.network.PacketSimpleGui; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity; @@ -138,6 +140,7 @@ public class PacketHandler netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.SERVER); netHandler.registerMessage(PacketDropperUse.class, DropperUseMessage.class, 28, Side.SERVER); netHandler.registerMessage(PacketEntityMove.class, EntityMoveMessage.class, 29, Side.CLIENT); + netHandler.registerMessage(PacketSecurityUpdate.class, SecurityUpdateMessage.class, 30, Side.CLIENT); } /** @@ -271,6 +274,20 @@ public class PacketHandler { netHandler.sendTo(message, player); } + + /** + * Send this message to everyone connected to the server. + * @param message - message to send + */ + public void sendToAll(IMessage message) + { + MinecraftServer server = MinecraftServer.getServer(); + + for(EntityPlayerMP player : server.getConfigurationManager().playerEntityList) + { + sendTo(message, player); + } + } /** * Send this message to everyone within a certain range of a point. diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index dbabc15ee..b3e9bc5e3 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -173,7 +173,6 @@ public class BlockEnergyCube extends BlockContainer for(EnergyCubeTier tier : EnergyCubeTier.values()) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); ((ItemBlockEnergyCube)discharged.getItem()).setEnergyCubeTier(discharged, tier); list.add(discharged); ItemStack charged = new ItemStack(this); diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index a9966126c..50d36ac92 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -8,6 +8,7 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityEnergyCube; @@ -38,6 +39,7 @@ public class WailaDataProvider implements IWailaDataProvider registrar.registerHeadProvider(provider, TileEntityInductionProvider.class); registrar.registerHeadProvider(provider, TileEntityFactory.class); registrar.registerHeadProvider(provider, TileEntityBoundingBlock.class); + registrar.registerHeadProvider(provider, TileEntityAdvancedBoundingBlock.class); registrar.registerHeadProvider(provider, TileEntityFluidTank.class); registrar.registerHeadProvider(provider, TileEntityGasTank.class); registrar.registerHeadProvider(provider, TileEntityBin.class); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 7e002d726..3acde9a6f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -58,7 +58,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE super(block); metaBlock = block; setMaxStackSize(1); - setMaxDamage(100); setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -77,9 +76,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(hasSecurity(itemstack)) { list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); - list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); - if(SecurityUtils.isOverridden(itemstack)) + if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) { list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); } @@ -93,7 +92,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { ItemStack stack = new ItemStack(this); setEnergyCubeTier(stack, tier); - stack.setItemDamage(100); return stack; } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index cb7d7a609..4d6001a41 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -39,6 +39,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; +import net.minecraftforge.fml.relauncher.Side; public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem { @@ -131,9 +132,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(hasSecurity(itemstack)) { list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); - list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); - if(SecurityUtils.isOverridden(itemstack)) + if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) { list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 07bf9e258..f7a7c7d88 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -194,9 +194,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(hasSecurity(itemstack)) { list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); - list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); - if(SecurityUtils.isOverridden(itemstack)) + if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) { list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); } diff --git a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java new file mode 100644 index 000000000..84381a99d --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java @@ -0,0 +1,116 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.MekanismClient; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.frequency.Frequency; +import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; +import mekanism.common.security.SecurityData; +import mekanism.common.security.SecurityFrequency; +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 PacketSecurityUpdate implements IMessageHandler +{ + @Override + public IMessage onMessage(SecurityUpdateMessage message, MessageContext context) + { + if(message.packetType == SecurityPacket.UPDATE) + { + MekanismClient.clientSecurityMap.put(message.playerUsername, message.securityData); + } + + return null; + } + + public static class SecurityUpdateMessage implements IMessage + { + public SecurityPacket packetType; + + public String playerUsername; + public SecurityData securityData; + + public SecurityUpdateMessage() {} + + public SecurityUpdateMessage(SecurityPacket type, String username, SecurityData data) + { + packetType = type; + + if(packetType == SecurityPacket.UPDATE) + { + playerUsername = username; + securityData = data; + } + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + if(packetType == SecurityPacket.UPDATE) + { + PacketHandler.writeString(dataStream, playerUsername); + securityData.write(dataStream); + } + else if(packetType == SecurityPacket.FULL) + { + List frequencies = new ArrayList(); + + for(Frequency frequency : Mekanism.securityFrequencies.getFrequencies()) + { + if(frequency instanceof SecurityFrequency) + { + frequencies.add((SecurityFrequency)frequency); + } + } + + dataStream.writeInt(frequencies.size()); + + for(SecurityFrequency frequency : frequencies) + { + PacketHandler.writeString(dataStream, frequency.owner); + new SecurityData(frequency).write(dataStream); + } + } + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + packetType = SecurityPacket.values()[dataStream.readInt()]; + + if(packetType == SecurityPacket.UPDATE) + { + playerUsername = PacketHandler.readString(dataStream); + securityData = SecurityData.read(dataStream); + } + else if(packetType == SecurityPacket.FULL) + { + MekanismClient.clientSecurityMap.clear(); + + int amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + String owner = PacketHandler.readString(dataStream); + SecurityData data = SecurityData.read(dataStream); + + MekanismClient.clientSecurityMap.put(owner, data); + } + } + } + } + + public static enum SecurityPacket + { + UPDATE, + FULL; + } +} diff --git a/src/main/java/mekanism/common/recipe/inputs/MachineInput.java b/src/main/java/mekanism/common/recipe/inputs/MachineInput.java index 04824923b..7340c5888 100644 --- a/src/main/java/mekanism/common/recipe/inputs/MachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/MachineInput.java @@ -27,7 +27,7 @@ public abstract class MachineInput> public static boolean inputContains(ItemStack container, ItemStack contained) { - if(container.stackSize >= contained.stackSize) + if(container != null && container.stackSize >= contained.stackSize) { if(MekanismUtils.getOreDictName(container).contains("treeSapling")) { diff --git a/src/main/java/mekanism/common/security/SecurityData.java b/src/main/java/mekanism/common/security/SecurityData.java new file mode 100644 index 000000000..89a0a4ff5 --- /dev/null +++ b/src/main/java/mekanism/common/security/SecurityData.java @@ -0,0 +1,34 @@ +package mekanism.common.security; + +import io.netty.buffer.ByteBuf; +import mekanism.common.security.ISecurityTile.SecurityMode; + +public class SecurityData +{ + public SecurityMode mode = SecurityMode.PUBLIC; + public boolean override; + + public SecurityData() {} + + public SecurityData(SecurityFrequency frequency) + { + mode = frequency.securityMode; + override = frequency.override; + } + + public void write(ByteBuf dataStream) + { + dataStream.writeInt(mode.ordinal()); + dataStream.writeBoolean(override); + } + + public static SecurityData read(ByteBuf dataStream) + { + SecurityData data = new SecurityData(); + + data.mode = SecurityMode.values()[dataStream.readInt()]; + data.override = dataStream.readBoolean(); + + return data; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index ee24a0b6d..fa5bf32f6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -177,6 +177,12 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement return side != 0 && side != 1; } + @Override + public int[] getSlotsForFace(EnumFacing side) + { + return new int[] {0}; + } + @Override public void setActive(boolean active) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 67875ad64..5815499b0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -3,7 +3,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -262,12 +261,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i factory.markDirty(); } - - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index e695fb913..9f8b75029 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -7,6 +7,7 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; public class TileEntityPersonalChest extends TileEntityContainerBlock implements ISecurityTile { @@ -77,7 +78,7 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements @Override public int[] getSlotsForFace(EnumFacing side) { - if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this) != SecurityMode.PUBLIC) + if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this, Side.SERVER) != SecurityMode.PUBLIC) { return InventoryUtils.EMPTY; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e6bddf9c7..fcaf63f71 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -10,9 +10,12 @@ import mekanism.common.PacketHandler; import mekanism.common.base.IBoundingBlock; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; +import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; +import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import mekanism.common.security.IOwnerItem; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; @@ -167,6 +170,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements if(frequency != null) { frequency.override = !frequency.override; + + Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, owner, new SecurityData(frequency))); } } else if(type == 3) @@ -174,6 +179,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements if(frequency != null) { frequency.securityMode = SecurityMode.values()[dataStream.readInt()]; + + Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, owner, new SecurityData(frequency))); } } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 582f0610e..64f001b06 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -158,7 +158,7 @@ public class RecipeUtils { ItemStack itemstack = inv.getStackInSlot(i); - if(itemstack.getItem() instanceof ISecurityItem) + if(itemstack != null && itemstack.getItem() instanceof ISecurityItem) { ((ISecurityItem)toReturn.getItem()).setOwner(toReturn, ((ISecurityItem)itemstack.getItem()).getOwner(itemstack)); ((ISecurityItem)toReturn.getItem()).setSecurity(toReturn, ((ISecurityItem)itemstack.getItem()).getSecurity(itemstack)); diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index feb24bc49..5e51f3e8b 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -1,18 +1,20 @@ package mekanism.common.util; import mekanism.api.EnumColor; +import mekanism.client.MekanismClient; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; import mekanism.common.security.IOwnerItem; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraftforge.fml.relauncher.Side; public final class SecurityUtils { @@ -25,7 +27,7 @@ public final class SecurityUtils return owner == null || owner.equals(player.getName()); } - if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || stack == null || !(stack.getItem() instanceof ISecurityItem)) + if(stack == null || !(stack.getItem() instanceof ISecurityItem)) { return true; } @@ -37,7 +39,7 @@ public final class SecurityUtils public static boolean canAccess(EntityPlayer player, TileEntity tile) { - if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || tile == null || !(tile instanceof ISecurityTile)) + if(tile == null || !(tile instanceof ISecurityTile)) { return true; } @@ -112,55 +114,91 @@ public final class SecurityUtils player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("gui.noAccessDesc"))); } - public static SecurityMode getSecurity(ISecurityTile security) + public static SecurityMode getSecurity(ISecurityTile security, Side side) { - SecurityFrequency freq = security.getSecurity().getFrequency(); - - if(freq != null && freq.override) + if(side == Side.SERVER) { - return freq.securityMode; + SecurityFrequency freq = security.getSecurity().getFrequency(); + + if(freq != null && freq.override) + { + return freq.securityMode; + } + } + else if(side == Side.CLIENT) + { + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + + if(data != null && data.override) + { + return data.mode; + } } return security.getSecurity().getMode(); } - public static String getSecurityDisplay(ItemStack stack) + public static String getSecurityDisplay(ItemStack stack, Side side) { ISecurityItem security = (ISecurityItem)stack.getItem(); SecurityMode mode = security.getSecurity(stack); if(security.getOwner(stack) != null) { - SecurityFrequency freq = getFrequency(security.getOwner(stack)); - - if(freq != null && freq.override) + if(side == Side.SERVER) { - mode = freq.securityMode; + SecurityFrequency freq = getFrequency(security.getOwner(stack)); + + if(freq != null && freq.override) + { + mode = freq.securityMode; + } + } + else if(side == Side.CLIENT) + { + SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwner(stack)); + + if(data != null && data.override) + { + mode = data.mode; + } } } return mode.getDisplay(); } - public static String getSecurityDisplay(TileEntity tile) + public static String getSecurityDisplay(TileEntity tile, Side side) { ISecurityTile security = (ISecurityTile)tile; SecurityMode mode = security.getSecurity().getMode(); if(security.getSecurity().getOwner() != null) { - SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); - - if(freq != null && freq.override) + if(side == Side.SERVER) { - mode = freq.securityMode; + SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + + if(freq != null && freq.override) + { + mode = freq.securityMode; + } + } + else if(side == Side.CLIENT) + { + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + + if(data != null && data.override) + { + mode = data.mode; + } } } return mode.getDisplay(); } - public static boolean isOverridden(ItemStack stack) + public static boolean isOverridden(ItemStack stack, Side side) { ISecurityItem security = (ISecurityItem)stack.getItem(); @@ -169,12 +207,20 @@ public final class SecurityUtils return false; } - SecurityFrequency freq = getFrequency(security.getOwner(stack)); - - return freq != null && freq.override; + if(side == Side.SERVER) + { + SecurityFrequency freq = getFrequency(security.getOwner(stack)); + + return freq != null && freq.override; + } + else { + SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwner(stack)); + + return data != null && data.override; + } } - public static boolean isOverridden(TileEntity tile) + public static boolean isOverridden(TileEntity tile, Side side) { ISecurityTile security = (ISecurityTile)tile; @@ -183,8 +229,16 @@ public final class SecurityUtils return false; } - SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); - - return freq != null && freq.override; + if(side == Side.SERVER) + { + SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + + return freq != null && freq.override; + } + else { + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + + return data != null && data.override; + } } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 7b140605a..15fdd0d7c 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -129,9 +129,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(hasSecurity(itemstack)) { list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); - list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); - if(SecurityUtils.isOverridden(itemstack)) + if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) { list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); } diff --git a/src/main/resources/assets/mekanism/lang/de_DE.lang b/src/main/resources/assets/mekanism/lang/de_DE.lang index 5fc847496..de5fd7633 100644 --- a/src/main/resources/assets/mekanism/lang/de_DE.lang +++ b/src/main/resources/assets/mekanism/lang/de_DE.lang @@ -157,6 +157,7 @@ tile.MachineBlock3.SolarNeutronActivator.name=Solarneutronenaktivator tile.MachineBlock3.Oredictionificator.name=Oredictionificator tile.MachineBlock3.ResistiveHeater.name=Stromwärmeheizung tile.MachineBlock3.FormulaicAssemblicator.name=Formelfertigungsfabrikator +tile.MachineBlock3.FuelwoodHeater.name=Feuerholzverfeuerer //Plastic tile.PlasticBlock.name=Plastikblock @@ -828,6 +829,7 @@ tooltip.Oredictionificator=Eine Maschine, verwendet, um zwischen verschiedenen i tooltip.Factory=Eine Maschine, die als Upgrade zu gewöhnlichen Machinen dient; erlaubt das Ausführen mehrerer Operationen auf einmal. tooltip.ResistiveHeater=Ein dichter, gewundener Widerstand, der elektrische Energie direkt in Wärme umwandeln kann. tooltip.FormulaicAssemblicator=Eine Maschine, die mithilfe von Energie mit hohem Tempo Items und Blöcke nach Fertigungsformeln fertigt. Fungiert auch als Werkbank. +tooltip.FuelwoodHeater=Eine Maschine, die große Mengen an Wärmeenergie durch das Verbrennen brennbarer Dinge erzeugt. tooltip.HeatGenerator=Ein Generator, der die Wärme aus Lava oder !nanderen Brennstoffen zur Energieerzeugung nutzt. tooltip.SolarGenerator=Ein Generator, der die Energie der Sonne !nzur Energieerzeugung nutzt.