From a3b50964ea3ef6e29c78873769e090ac37e7ad4d Mon Sep 17 00:00:00 2001 From: Fryslan Date: Sun, 26 Jun 2016 21:54:29 +0200 Subject: [PATCH] [CLEANUP] Removing redundant modifiers in multiple interfaces --- .../org/rev317/min/accessors/Character.java | 14 ++--- .../java/org/rev317/min/accessors/Client.java | 52 +++++++++---------- .../rev317/min/accessors/CollisionMap.java | 2 +- .../java/org/rev317/min/accessors/Deque.java | 4 +- .../java/org/rev317/min/accessors/Ground.java | 10 ++-- .../org/rev317/min/accessors/Interface.java | 8 +-- .../java/org/rev317/min/accessors/Item.java | 2 +- .../java/org/rev317/min/accessors/Node.java | 2 +- .../java/org/rev317/min/accessors/Npc.java | 2 +- .../java/org/rev317/min/accessors/NpcDef.java | 2 +- .../java/org/rev317/min/accessors/Scene.java | 2 +- .../rev317/min/accessors/SceneObjectTile.java | 2 +- 12 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/org/rev317/min/accessors/Character.java b/src/main/java/org/rev317/min/accessors/Character.java index 148f9ab..0502d5c 100644 --- a/src/main/java/org/rev317/min/accessors/Character.java +++ b/src/main/java/org/rev317/min/accessors/Character.java @@ -2,19 +2,19 @@ package org.rev317.min.accessors; public interface Character { - public int getX(); + int getX(); - public int getY(); + int getY(); - public int getAnimation(); + int getAnimation(); - public int getLoopCycleStatus(); + int getLoopCycleStatus(); - public int getCurrentHealth(); + int getCurrentHealth(); - public int getMaxHealth(); + int getMaxHealth(); - public int getInteractingEntity(); + int getInteractingEntity(); String getName(); } diff --git a/src/main/java/org/rev317/min/accessors/Client.java b/src/main/java/org/rev317/min/accessors/Client.java index a5fb9f2..f9555de 100644 --- a/src/main/java/org/rev317/min/accessors/Client.java +++ b/src/main/java/org/rev317/min/accessors/Client.java @@ -2,56 +2,56 @@ package org.rev317.min.accessors; public interface Client { - public Scene getScene(); + Scene getScene(); - public Player getMyPlayer(); + Player getMyPlayer(); - public Interface[] getInterfaceCache(); + Interface[] getInterfaceCache(); - public Npc[] getNpcs(); + Npc[] getNpcs(); - public Player[] getPlayers(); + Player[] getPlayers(); - public int getOpenInterfaceId(); + int getOpenInterfaceId(); - public int getBaseX(); + int getBaseX(); - public int getBaseY(); + int getBaseY(); - public void setInterface(int id); + void setInterface(int id); - public int[] getCurrentExp(); + int[] getCurrentExp(); - public Deque[][][] getGroundItems(); + Deque[][][] getGroundItems(); - public int getLoopCycle(); + int getLoopCycle(); - public int getBackDialogId(); + int getBackDialogId(); - public int getPlane(); + int getPlane(); - public int[] getMenuActionId(); + int[] getMenuActionId(); - public int[] getMenuAction1(); + int[] getMenuAction1(); - public int[] getMenuAction2(); + int[] getMenuAction2(); - public int[] getMenuAction3(); + int[] getMenuAction3(); - public int[] getMenuAction4(); + int[] getMenuAction4(); - public CollisionMap[] getCollisionMap(); + CollisionMap[] getCollisionMap(); // args switched - public boolean walkTo(int clickType, int sizeX, int sizeY, int startX, int startY, int destX, int destY, int type, int face, boolean arbitrary, int rotation); + boolean walkTo(int clickType, int sizeX, int sizeY, int startX, int startY, int destX, int destY, int type, int face, boolean arbitrary, int rotation); - public void doAction(int i); + void doAction(int i); - public void dropClient(); + void dropClient(); - public int[] getCurrentStats(); + int[] getCurrentStats(); - public int[] getSettings(); + int[] getSettings(); - public boolean isLoggedIn(); + boolean isLoggedIn(); } diff --git a/src/main/java/org/rev317/min/accessors/CollisionMap.java b/src/main/java/org/rev317/min/accessors/CollisionMap.java index b59c57b..768dec6 100644 --- a/src/main/java/org/rev317/min/accessors/CollisionMap.java +++ b/src/main/java/org/rev317/min/accessors/CollisionMap.java @@ -3,7 +3,7 @@ package org.rev317.min.accessors; public interface CollisionMap { - public int[][] getFlags(); + int[][] getFlags(); } diff --git a/src/main/java/org/rev317/min/accessors/Deque.java b/src/main/java/org/rev317/min/accessors/Deque.java index c1b73cd..6634828 100644 --- a/src/main/java/org/rev317/min/accessors/Deque.java +++ b/src/main/java/org/rev317/min/accessors/Deque.java @@ -2,8 +2,8 @@ package org.rev317.min.accessors; public interface Deque { - public Node getHead(); + Node getHead(); - public Node getCurrent(); + Node getCurrent(); } diff --git a/src/main/java/org/rev317/min/accessors/Ground.java b/src/main/java/org/rev317/min/accessors/Ground.java index 5ca2b8e..38c39b7 100644 --- a/src/main/java/org/rev317/min/accessors/Ground.java +++ b/src/main/java/org/rev317/min/accessors/Ground.java @@ -2,14 +2,14 @@ package org.rev317.min.accessors; public interface Ground { - public SceneObjectTile getWallObject(); + SceneObjectTile getWallObject(); - public SceneObjectTile getWallDecoration(); + SceneObjectTile getWallDecoration(); - public SceneObjectTile getGroundDecoration(); + SceneObjectTile getGroundDecoration(); - public SceneObjectTile getGroundItem(); + SceneObjectTile getGroundItem(); - public SceneObjectTile[] getInteractiveObjects(); + SceneObjectTile[] getInteractiveObjects(); } diff --git a/src/main/java/org/rev317/min/accessors/Interface.java b/src/main/java/org/rev317/min/accessors/Interface.java index b1cd498..f4ea49d 100644 --- a/src/main/java/org/rev317/min/accessors/Interface.java +++ b/src/main/java/org/rev317/min/accessors/Interface.java @@ -2,17 +2,17 @@ package org.rev317.min.accessors; public interface Interface { - public int[] getItems(); + int[] getItems(); - public int[] getStackSizes(); + int[] getStackSizes(); /** * This is meant for the clients that have a long value as their stacksizes, simply because they have no logic... * * @return long version of #getStackSizes */ - public long[] getLongStackSizes(); + long[] getLongStackSizes(); - public String getMessage(); + String getMessage(); } diff --git a/src/main/java/org/rev317/min/accessors/Item.java b/src/main/java/org/rev317/min/accessors/Item.java index 1f9c46c..113cf71 100644 --- a/src/main/java/org/rev317/min/accessors/Item.java +++ b/src/main/java/org/rev317/min/accessors/Item.java @@ -2,7 +2,7 @@ package org.rev317.min.accessors; public interface Item { - public int getId(); + int getId(); } diff --git a/src/main/java/org/rev317/min/accessors/Node.java b/src/main/java/org/rev317/min/accessors/Node.java index 9ecbb2d..32c5aae 100644 --- a/src/main/java/org/rev317/min/accessors/Node.java +++ b/src/main/java/org/rev317/min/accessors/Node.java @@ -2,6 +2,6 @@ package org.rev317.min.accessors; public interface Node { - public Node getNext(); + Node getNext(); } diff --git a/src/main/java/org/rev317/min/accessors/Npc.java b/src/main/java/org/rev317/min/accessors/Npc.java index bb7e68e..22830f8 100644 --- a/src/main/java/org/rev317/min/accessors/Npc.java +++ b/src/main/java/org/rev317/min/accessors/Npc.java @@ -2,6 +2,6 @@ package org.rev317.min.accessors; public interface Npc extends Character { - public NpcDef getDef(); + NpcDef getDef(); } \ No newline at end of file diff --git a/src/main/java/org/rev317/min/accessors/NpcDef.java b/src/main/java/org/rev317/min/accessors/NpcDef.java index 0f346c6..3e71fba 100644 --- a/src/main/java/org/rev317/min/accessors/NpcDef.java +++ b/src/main/java/org/rev317/min/accessors/NpcDef.java @@ -2,6 +2,6 @@ package org.rev317.min.accessors; public interface NpcDef { - public int getId(); + int getId(); } diff --git a/src/main/java/org/rev317/min/accessors/Scene.java b/src/main/java/org/rev317/min/accessors/Scene.java index a659d8f..d6bc2dd 100644 --- a/src/main/java/org/rev317/min/accessors/Scene.java +++ b/src/main/java/org/rev317/min/accessors/Scene.java @@ -2,6 +2,6 @@ package org.rev317.min.accessors; public interface Scene { - public Ground[][][] getGroundArray(); + Ground[][][] getGroundArray(); } diff --git a/src/main/java/org/rev317/min/accessors/SceneObjectTile.java b/src/main/java/org/rev317/min/accessors/SceneObjectTile.java index 793bfd3..51875e5 100644 --- a/src/main/java/org/rev317/min/accessors/SceneObjectTile.java +++ b/src/main/java/org/rev317/min/accessors/SceneObjectTile.java @@ -2,6 +2,6 @@ package org.rev317.min.accessors; public interface SceneObjectTile { - public int getHash(); + int getHash(); } \ No newline at end of file