Project cleanup pre merge.

2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -20,100 +20,101 @@ import java.util.ArrayList;

 public class NPCRune extends AbstractGameObject {

-	private final RuneBase runeBase;
-	private final int player;
-	private final ArrayList<SkillReq> skillsGranted;
-	private final ArrayList<RuneBaseEffect> effectsGranted;
+    private final RuneBase runeBase;
+    private final int player;
+    private final ArrayList<SkillReq> skillsGranted;
+    private final ArrayList<RuneBaseEffect> effectsGranted;

-	/**
-	 * No Table ID Constructor
-	 */
-	public NPCRune(RuneBase runeBase, int characterID) {
-		super();
-		this.runeBase = runeBase;
-		this.player = characterID;
-		if (this.runeBase != null)
-			this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
-		else
-			this.skillsGranted = new ArrayList<>();
-		this.effectsGranted = new ArrayList<>();
-	}
+    /**
+     * No Table ID Constructor
+     */
+    public NPCRune(RuneBase runeBase, int characterID) {
+        super();
+        this.runeBase = runeBase;
+        this.player = characterID;
+        if (this.runeBase != null)
+            this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
+        else
+            this.skillsGranted = new ArrayList<>();
+        this.effectsGranted = new ArrayList<>();
+    }

-	/**
-	 * Normal Constructor
-	 */
-	public NPCRune(RuneBase runeBase, int characterID, int newUUID) {
-		super(newUUID);
-		this.runeBase = runeBase;
-		this.player = characterID;
-		if (this.runeBase == null)
-			this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
-		else
-			this.skillsGranted = new ArrayList<>();
-		this.effectsGranted = new ArrayList<>();
-	}
-	/**
-	 * ResultSet Constructor
-	 */
-	public NPCRune(ResultSet rs) throws SQLException {
-		super(rs);
+    /**
+     * Normal Constructor
+     */
+    public NPCRune(RuneBase runeBase, int characterID, int newUUID) {
+        super(newUUID);
+        this.runeBase = runeBase;
+        this.player = characterID;
+        if (this.runeBase == null)
+            this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
+        else
+            this.skillsGranted = new ArrayList<>();
+        this.effectsGranted = new ArrayList<>();
+    }

-		this.runeBase = RuneBase.getRuneBase(rs.getInt("RuneBaseID"));
-		this.player = rs.getInt("NpcID");
-		if (this.runeBase != null) {
-			this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
-			this.effectsGranted = DbManager.RuneBaseEffectQueries.GET_EFFECTS_FOR_RUNEBASE(this.runeBase.getObjectUUID());
-		} else {
-			Logger.error("Failed to find RuneBase for NPCRune " + this.getObjectUUID());
-			this.skillsGranted = new ArrayList<>();
-			this.effectsGranted =  new ArrayList<>();
-		}
-	}
+    /**
+     * ResultSet Constructor
+     */
+    public NPCRune(ResultSet rs) throws SQLException {
+        super(rs);

-	/*
-	 * Getters
-	 */
-	public RuneBase getRuneBase() {
-		return this.runeBase;
-	}
+        this.runeBase = RuneBase.getRuneBase(rs.getInt("RuneBaseID"));
+        this.player = rs.getInt("NpcID");
+        if (this.runeBase != null) {
+            this.skillsGranted = DbManager.SkillReqQueries.GET_REQS_FOR_RUNE(this.runeBase.getObjectUUID());
+            this.effectsGranted = DbManager.RuneBaseEffectQueries.GET_EFFECTS_FOR_RUNEBASE(this.runeBase.getObjectUUID());
+        } else {
+            Logger.error("Failed to find RuneBase for NPCRune " + this.getObjectUUID());
+            this.skillsGranted = new ArrayList<>();
+            this.effectsGranted = new ArrayList<>();
+        }
+    }

-	public int getRuneBaseID() {
-		if (this.runeBase != null)
-			return this.runeBase.getObjectUUID();
-		return 0;
-	}
+    public static void serializeForClientMsg(NPCRune npcRune, ByteBufferWriter writer) {
+        if (npcRune.runeBase != null) {
+            writer.putInt(npcRune.runeBase.getType());
+            writer.putInt(0);
+            writer.putInt(npcRune.runeBase.getObjectUUID());
+            writer.putInt(npcRune.getObjectType().ordinal());
+            writer.putInt(npcRune.getObjectUUID());
+        } else {
+            for (int i = 0; i < 5; i++)
+                writer.putInt(0);
+        }
+    }

-	public int getPlayerID() {
-		return this.player;
-	}
+    /*
+     * Getters
+     */
+    public RuneBase getRuneBase() {
+        return this.runeBase;
+    }

-	public ArrayList<SkillReq> getSkillsGranted() {
-		return this.skillsGranted;
-	}
+    public int getRuneBaseID() {
+        if (this.runeBase != null)
+            return this.runeBase.getObjectUUID();
+        return 0;
+    }

-	public ArrayList<RuneBaseEffect> getEffectsGranted() {
-		return this.effectsGranted;
-	}
+    public int getPlayerID() {
+        return this.player;
+    }

-	/*
-	 * Serializing
-	 */
-	
-	public static void serializeForClientMsg(NPCRune npcRune,ByteBufferWriter writer) {
-		if (npcRune.runeBase != null) {
-			writer.putInt(npcRune.runeBase.getType());
-			writer.putInt(0);
-			writer.putInt(npcRune.runeBase.getObjectUUID());
-			writer.putInt(npcRune.getObjectType().ordinal());
-			writer.putInt(npcRune.getObjectUUID());
-		} else {
-			for (int i = 0; i < 5; i++)
-				writer.putInt(0);
-		}
-	}
+    public ArrayList<SkillReq> getSkillsGranted() {
+        return this.skillsGranted;
+    }

-	@Override
-	public void updateDatabase() {
+    /*
+     * Serializing
+     */

-	}
+    public ArrayList<RuneBaseEffect> getEffectsGranted() {
+        return this.effectsGranted;
+    }
+
+    @Override
+    public void updateDatabase() {
+
+    }
 }