diff options
Diffstat (limited to 'src/Java/miscutil/gregtech/gui')
| -rw-r--r-- | src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java | 22 | ||||
| -rw-r--r-- | src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java | 31 |
2 files changed, 25 insertions, 28 deletions
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java index eff42eb4d5..4d7b94db0e 100644 --- a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java +++ b/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java @@ -3,19 +3,13 @@ package miscutil.gregtech.gui; import gregtech.api.gui.GT_ContainerMetaTile_Machine; import gregtech.api.gui.GT_Slot_Holo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.util.GT_Utility; -import miscutil.core.handler.UnbreakableBlockManager; -import miscutil.core.util.Utils; +import miscutil.core.util.PlayerCache; import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import org.lwjgl.Sys; - public class CONTAINER_SafeBlock extends GT_ContainerMetaTile_Machine { public CONTAINER_SafeBlock(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { @@ -24,6 +18,7 @@ extends GT_ContainerMetaTile_Machine { //public String UUID = ((BaseMetaTileEntity)mTileEntity).getMetaTileEntity().getBaseMetaTileEntity().getOwnerName(); public String ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID; + public String tempPlayer = PlayerCache.lookupPlayerByUUID(ownerUUID); public boolean blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable; @Override @@ -52,7 +47,7 @@ extends GT_ContainerMetaTile_Machine { if (aSlotIndex == 27) { - ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput); + /*((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput); if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput) { if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bOutput != false)) { @@ -64,7 +59,9 @@ extends GT_ContainerMetaTile_Machine { } else { GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy"); } - return null; + return null;*/ + + } if (aSlotIndex == 28) {} /* ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull); @@ -91,14 +88,17 @@ extends GT_ContainerMetaTile_Machine { { ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable); - if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) { + blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable; + ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID; + //Utils.messagePlayer(aPlayer, "Is the safe locked? "+String.valueOf(((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable).toUpperCase()); + /*if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) { UnbreakableBlockManager Xasda = new UnbreakableBlockManager(); Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer); } else { UnbreakableBlockManager Xasda = new UnbreakableBlockManager(); Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer); - } + }*/ return null; } diff --git a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java b/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java index 264cc7c556..fea5c1bfc1 100644 --- a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java +++ b/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java @@ -3,7 +3,6 @@ package miscutil.gregtech.gui; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import miscutil.core.lib.CORE; -import miscutil.core.util.PlayerCache; import net.minecraft.entity.player.InventoryPlayer; public class GUI_SafeBlock @@ -12,31 +11,29 @@ public class GUI_SafeBlock super(new CONTAINER_SafeBlock(aInventoryPlayer, aTileEntity), CORE.MODID + ":" + "textures/gui/" + "SafeBlock.png"); } - String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID; + //String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID.toString(); boolean blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus; - String tempPlayer = PlayerCache.lookupPlayerByUUID(UUID); + //String tempPlayer; + + private void updateVars(){ + //UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID; + blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus; + // tempPlayer = PlayerCache.lookupPlayerByUUID(UUID); + } @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - - UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID; - blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus; - tempPlayer = PlayerCache.lookupPlayerByUUID(UUID); - + updateVars(); + //this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752); + //this.fontRendererObj.drawString(": "+ UUID.toLowerCase(), 44, 82, 4210752); + this.fontRendererObj.drawString("Safe Status", 76, 61, 4210752); if (blockStatus){ - this.fontRendererObj.drawString("Safe Status: Locked", 64, 62, 4210752); + this.fontRendererObj.drawString("Locked", 88, 73, 4210752); } else { - this.fontRendererObj.drawString("Safe Status: Unlocked", 64, 62, 4210752); + this.fontRendererObj.drawString("Unlocked", 82, 73, 4210752); } - - this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752); - this.fontRendererObj.drawString(": "+ tempPlayer, 64, 82, 4210752); - - if (!CORE.DEBUG){ - - } } @Override |