tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Feature: #0856 - Crafting Terminal requires Crafting Permissions to open.

Browse source 
Whenever a player without "craft"-ing permissions attempts to open a crafting or pattern terminal, they will open the normal terminal GUI instead
This commit is contained in:
The Paper Pilot 2014-09-26 16:26:41 -05:00
parent 181b0b0a6a
commit 15f9a64ba3
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/appeng/parts/reporting/PartCraftingTerminal.java
View file

@ -2,6 +2,9 @@ package appeng.parts.reporting;
import java.util.List; import java.util.List;
import appeng.api.networking.security.ISecurityGrid;
import appeng.util.Platform;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -10,6 +13,8 @@ import appeng.core.sync.GuiBridge;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.IAEAppEngInventory;
import appeng.tile.inventory.InvOperation; import appeng.tile.inventory.InvOperation;
import net.minecraft.util.Vec3;
import net.minecraftforge.common.util.ForgeDirection;
public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInventory public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInventory
{ {
@ -48,9 +53,19 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven
// frontSolid = CableBusTextures.PartCraftingTerm_Solid; // frontSolid = CableBusTextures.PartCraftingTerm_Solid;
} }
public GuiBridge getGui() public GuiBridge getGui( EntityPlayer p )
{ {
int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ;
if ( getHost().getTile() != null )
{
x = tile.xCoord;
y = tile.yCoord;
z = tile.zCoord;
}
if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( getHost().getTile(), x, y, z, side, p ) )
return GuiBridge.GUI_CRAFTING_TERMINAL; return GuiBridge.GUI_CRAFTING_TERMINAL;
return GuiBridge.GUI_ME;
} }
@Override @Override

13
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
View file

@ -2,6 +2,7 @@ package appeng.parts.reporting;
import java.util.List; import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -58,9 +59,19 @@ public class PartPatternTerminal extends PartTerminal implements IAEAppEngInvent
frontDark = CableBusTextures.PartPatternTerm_Dark; frontDark = CableBusTextures.PartPatternTerm_Dark;
} }
public GuiBridge getGui() public GuiBridge getGui( EntityPlayer p )
{ {
int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ;
if ( getHost().getTile() != null )
{
x = tile.xCoord;
y = tile.yCoord;
z = tile.zCoord;
}
if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( getHost().getTile(), x, y, z, side, p ) )
return GuiBridge.GUI_PATTERN_TERMINAL; return GuiBridge.GUI_PATTERN_TERMINAL;
return GuiBridge.GUI_ME;
} }
@Override @Override

5
src/main/java/appeng/parts/reporting/PartTerminal.java
View file

@ -77,7 +77,7 @@ public class PartTerminal extends PartMonitor implements ITerminalHost, IConfigM
cm.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING ); cm.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING );
} }
public GuiBridge getGui() public GuiBridge getGui( EntityPlayer player )
{ {
return GuiBridge.GUI_ME; return GuiBridge.GUI_ME;
} }
@ -92,7 +92,7 @@ public class PartTerminal extends PartMonitor implements ITerminalHost, IConfigM
if ( Platform.isClient() ) if ( Platform.isClient() )
return true; return true;
Platform.openGUI( player, getHost().getTile(), side, getGui() ); Platform.openGUI( player, getHost().getTile(), side, getGui( player ) );
return true; return true;
} }
@ -151,5 +151,4 @@ public class PartTerminal extends PartMonitor implements ITerminalHost, IConfigM
{ {
host.markForSave(); host.markForSave();
} }
} }