From ecc9ea39cf0dce40de1d92d20a989e43dc8188b5 Mon Sep 17 00:00:00 2001 From: Mathijs Riezebos Date: Thu, 19 Jan 2017 04:13:04 +0100 Subject: [PATCH] Privatized some variables As a contingency against misuse --- .../dimdoors/blocks/BlockDimDoorBase.java | 2 +- .../zixiken/dimdoors/items/ItemDoorBase.java | 6 +++--- .../dimdoors/items/ItemRiftConnectionTool.java | 8 ++++---- .../tileentities/DDTileEntityBase.java | 18 +++++++++++++++--- .../tileentities/TileEntityDimDoor.java | 4 ++-- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java b/src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java index 9466ef16..2ff0e9d0 100644 --- a/src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java +++ b/src/main/java/com/zixiken/dimdoors/blocks/BlockDimDoorBase.java @@ -166,7 +166,7 @@ public abstract class BlockDimDoorBase extends BlockDoor implements IDimDoor, IT world.setBlockState(pos, ModBlocks.blockRift.getDefaultState()); DDTileEntityBase newRift = (DDTileEntityBase) world.getTileEntity(pos); newRift.loadDataFrom(origRift); - DimDoors.log(this.getClass(), "New Rift rift-ID after breaking door " + newRift.riftID); + DimDoors.log(this.getClass(), "New Rift rift-ID after breaking door " + newRift.getRiftID()); } } diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java b/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java index 66c75817..8afd12f7 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemDoorBase.java @@ -108,7 +108,7 @@ public abstract class ItemDoorBase extends ItemDoor { //start logging code if (possibleOldRift instanceof DDTileEntityBase) { // DDTileEntityBase oldRift = (DDTileEntityBase) possibleOldRift; - DimDoors.log(this.getClass(), "Old Rift rift-ID before placement: " + oldRift.riftID); + DimDoors.log(this.getClass(), "Old Rift rift-ID before placement: " + oldRift.getRiftID()); } //end of logging code EnumFacing enumfacing = EnumFacing.fromAngle((double) playerIn.rotationYaw); @@ -123,12 +123,12 @@ public abstract class ItemDoorBase extends ItemDoor { DDTileEntityBase newTileEntityDimDoor = (DDTileEntityBase) worldIn.getTileEntity(pos.up()); if (possibleOldRift instanceof DDTileEntityBase) { // DDTileEntityBase oldRift = (DDTileEntityBase) possibleOldRift; - DimDoors.log(this.getClass(), "Old Rift rift-ID after placement: " + oldRift.riftID); + DimDoors.log(this.getClass(), "Old Rift rift-ID after placement: " + oldRift.getRiftID()); newTileEntityDimDoor.loadDataFrom(oldRift); } else { newTileEntityDimDoor.register(); } - DimDoors.log(this.getClass(), "New Door rift-ID after placement: " + newTileEntityDimDoor.riftID); + DimDoors.log(this.getClass(), "New Door rift-ID after placement: " + newTileEntityDimDoor.getRiftID()); return EnumActionResult.SUCCESS; } else { diff --git a/src/main/java/com/zixiken/dimdoors/items/ItemRiftConnectionTool.java b/src/main/java/com/zixiken/dimdoors/items/ItemRiftConnectionTool.java index d812aa44..6762c1f5 100644 --- a/src/main/java/com/zixiken/dimdoors/items/ItemRiftConnectionTool.java +++ b/src/main/java/com/zixiken/dimdoors/items/ItemRiftConnectionTool.java @@ -61,12 +61,12 @@ public class ItemRiftConnectionTool extends ItemTool { } private ActionResult selectRift(ItemStack stack, World worldIn, DDTileEntityBase rift, EntityPlayer playerIn) { - DimDoors.log(this.getClass(), "Selecting rift with ID: " + rift.riftID); + DimDoors.log(this.getClass(), "Selecting rift with ID: " + rift.getRiftID()); NBTTagCompound compound = stack.getTagCompound(); if (compound.getBoolean("isInConnectMode")) { if (compound.hasKey("RiftID")) { int primaryRiftID = compound.getInteger("RiftID"); - int secondaryRiftID = rift.riftID; + int secondaryRiftID = rift.getRiftID(); if (!worldIn.isRemote) { DimDoors.log(this.getClass(), "Pairing rifts with IDs: " + primaryRiftID + " and " + secondaryRiftID); RiftRegistry.Instance.pair(primaryRiftID, secondaryRiftID); @@ -74,11 +74,11 @@ public class ItemRiftConnectionTool extends ItemTool { compound.removeTag("RiftID"); stack.damageItem(1, playerIn); } else { - compound.setInteger("RiftID", rift.riftID); + compound.setInteger("RiftID", rift.getRiftID()); } } else { if (!worldIn.isRemote) { - RiftRegistry.Instance.unpair(rift.riftID); + RiftRegistry.Instance.unpair(rift.getRiftID()); } stack.damageItem(1, playerIn); } diff --git a/src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java b/src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java index 00d8c28c..9accd999 100644 --- a/src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java +++ b/src/main/java/com/zixiken/dimdoors/tileentities/DDTileEntityBase.java @@ -12,9 +12,9 @@ import net.minecraft.world.World; public abstract class DDTileEntityBase extends TileEntity { - public boolean isPaired = false; - public int riftID = -1; //should not start at 0 - public int pairedRiftID = -1; + private boolean isPaired = false; + private int riftID = -1; //should not start at 0 + private int pairedRiftID = -1; /** * @@ -87,6 +87,18 @@ public abstract class DDTileEntityBase extends TileEntity { } } + public int getRiftID() { + return riftID; + } + + public int getPairedRiftID() { + return pairedRiftID; + } + + public boolean isPaired() { + return isPaired; + } + public Location getTeleportTarget() { return new Location(this.getWorld().provider.getDimension(), this.getPos()); } diff --git a/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java b/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java index e2a029eb..3beb516c 100644 --- a/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/tileentities/TileEntityDimDoor.java @@ -66,10 +66,10 @@ public class TileEntityDimDoor extends DDTileEntityBase { @Override public boolean tryTeleport(Entity entity) { - if (!isPaired) { + if (!isPaired()) { //@todo try to automatically pair this door somehow } - RiftRegistry.Instance.teleportEntityToRift(entity, pairedRiftID); + RiftRegistry.Instance.teleportEntityToRift(entity, getPairedRiftID()); return true; } }