mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Add network layer to make security preferences persistent
This commit is contained in:
1 parent
c4520a072b
commit
fe99d25305
13 files changed
+284
-41
No files matched your search
@@ -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 cpw.mods.fml.relauncher.Side;
|
||||
|
||||
public final class SecurityUtils
|
||||
{
|
||||
@@ -25,7 +27,7 @@ public final class SecurityUtils
|
||||
return owner == null || owner.equals(player.getCommandSenderName());
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user