From ff24ce4de6bfb34d55916cf3c7c9f87b03631e4e Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Sun, 5 Jan 2014 01:06:33 -0400 Subject: [PATCH] Minor Changes Fixed indentation and removed pointless annotations. --- .../commands/CommandCreateDungeonRift.java | 56 +++++++++---------- .../tileentities/TileEntityRift.java | 2 - 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java index 44bbb98f..e3913033 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java @@ -15,26 +15,26 @@ import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; -@SuppressWarnings("deprecation") public class CommandCreateDungeonRift extends DDCommandBase { private static CommandCreateDungeonRift instance = null; - + private CommandCreateDungeonRift() { super("dd-rift", ""); } - + public static CommandCreateDungeonRift instance() { if (instance == null) instance = new CommandCreateDungeonRift(); - + return instance; } @Override - public String getCommandUsage(ICommandSender sender) { + public String getCommandUsage(ICommandSender sender) + { return "Usage: /dd-rift \r\n" + " /dd-rift list\r\n" + " /dd-rift random"; @@ -45,7 +45,7 @@ public class CommandCreateDungeonRift extends DDCommandBase { NewDimData dimension; DungeonHelper dungeonHelper = DungeonHelper.instance(); - + if (sender.worldObj.isRemote) { return DDCommandResult.SUCCESS; @@ -58,15 +58,15 @@ public class CommandCreateDungeonRift extends DDCommandBase { return DDCommandResult.TOO_MANY_ARGUMENTS; } - + if (command[0].equals("list")) { Collection dungeonNames = dungeonHelper.getDungeonNames(); for (String name : dungeonNames) { - sendChat(sender,(name)); + sendChat(sender, name); } - sendChat(sender,("")); + sendChat(sender, ""); } else { @@ -79,12 +79,12 @@ public class CommandCreateDungeonRift extends DDCommandBase if (command[0].equals("random")) { - - dimension = PocketManager.getDimensionData(sender.worldObj); - link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,orientation); - sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID,0,3); - sendChat(sender,("Created a rift to a random dungeon.")); + dimension = PocketManager.getDimensionData(sender.worldObj); + link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON, orientation); + sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID, 0, 3); + + sendChat(sender, "Created a rift to a random dungeon."); } else { @@ -94,17 +94,17 @@ public class CommandCreateDungeonRift extends DDCommandBase result = findDungeonByPartialName(command[0], dungeonHelper.getUntaggedDungeons()); } //Check if we found any matches - if (result != null) - { - //Create a rift to our selected dungeon and notify the player - //TODO currently crashes, need to create the dimension first - dimension = PocketManager.getDimensionData(sender.worldObj); - link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,orientation); - PocketBuilder.generateSelectedDungeonPocket(link, mod_pocketDim.properties, result); - - sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID,0,3); - sendChat(sender,("Created a rift to \"" + result.schematicName() + "\" dungeon (Dimension ID = " + link.destination().getDimension() + ").")); - } + if (result != null) + { + //Create a rift to our selected dungeon and notify the player + //TODO currently crashes, need to create the dimension first + dimension = PocketManager.getDimensionData(sender.worldObj); + link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON, orientation); + PocketBuilder.generateSelectedDungeonPocket(link, mod_pocketDim.properties, result); + + sender.worldObj.setBlock(x, y + 1, z, mod_pocketDim.blockRift.blockID, 0, 3); + sendChat(sender, "Created a rift to \"" + result.schematicName() + "\" dungeon (Dimension ID = " + link.destination().getDimension() + ")."); + } else { //No matches! @@ -114,7 +114,7 @@ public class CommandCreateDungeonRift extends DDCommandBase } return DDCommandResult.SUCCESS; } - + private DungeonData findDungeonByPartialName(String query, Collection dungeons) { //Search for the shortest dungeon name that contains the lowercase query string. @@ -122,12 +122,12 @@ public class CommandCreateDungeonRift extends DDCommandBase String normalQuery = query.toLowerCase(); DungeonData bestMatch = null; int matchLength = Integer.MAX_VALUE; - + for (DungeonData dungeon : dungeons) { //We need to extract the file's name. Comparing against schematicPath could //yield false matches if the query string is contained within the path. - + dungeonName = dungeon.schematicName().toLowerCase(); if (dungeonName.length() < matchLength && dungeonName.contains(normalQuery)) { diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java index 0cee0c4d..97e75a37 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java @@ -43,7 +43,6 @@ public class TileEntityRift extends TileEntity private boolean hasUpdated = false; public HashMap renderingCenters = new HashMap(); - @SuppressWarnings("deprecation") public DimLink nearestRiftData; public int spawnedEndermenID=0; DataWatcher watcher = new DataWatcher(); @@ -156,7 +155,6 @@ public class TileEntityRift extends TileEntity { if (random.nextInt(30) == 0) { - @SuppressWarnings("unchecked") List list = worldObj.getEntitiesWithinAABB(EntityEnderman.class, AxisAlignedBB.getBoundingBox(xCoord - 9, yCoord - 3, zCoord - 9, xCoord + 9, yCoord + 3, zCoord + 9));