From 8b9aa43c1bbf6acf26658fd27db026210fc10b1f Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 22 Oct 2026 12:42:19 -0400 Subject: [PATCH] Remove the dead skill and power DB loaders Deletes the uncalled static_rune_skill_adjusts, static_rune_maxskills, static_skill_skillsgranted, static_skill_skillreq and static_power_powergrant loaders and their ResultSet constructors. LOAD_RUNE_POWERS stays for the 14 Magister Captain guard contract ids. No value changes. Co-Authored-By: Claude Opus 5.5 --- src/engine/db/handlers/dbRuneBaseHandler.java | 40 -------------- .../db/handlers/dbSkillBaseHandler.java | 54 ------------------- src/engine/db/handlers/dbSkillReqHandler.java | 20 ------- src/engine/objects/MaxSkills.java | 13 ----- src/engine/objects/PowerGrantedTrains.java | 48 ----------------- src/engine/objects/SkillReq.java | 32 +---------- src/engine/powers/RuneSkillAdjustEntry.java | 10 ---- 7 files changed, 2 insertions(+), 215 deletions(-) diff --git a/src/engine/db/handlers/dbRuneBaseHandler.java b/src/engine/db/handlers/dbRuneBaseHandler.java index 897da5c9..d46c1fe4 100644 --- a/src/engine/db/handlers/dbRuneBaseHandler.java +++ b/src/engine/db/handlers/dbRuneBaseHandler.java @@ -13,7 +13,6 @@ import engine.gameManager.DbManager; import engine.mbEnums; import engine.objects.RuneBase; import engine.powers.RunePowerEntry; -import engine.powers.RuneSkillAdjustEntry; import org.pmw.tinylog.Logger; import java.sql.Connection; @@ -68,43 +67,4 @@ public class dbRuneBaseHandler extends dbHandlerBase { Logger.info("read: " + recordsRead + " cached: " + mobPowers.size()); return mobPowers; } - - public static HashMap> LOAD_RUNE_SKILL_ADJUSTS() { - - HashMap> runeSkillAdjusts = new HashMap<>(); - RuneSkillAdjustEntry runeSkillAdjustEntry; - - int rune_id; - int recordsRead = 0; - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_skill_adjusts")) { - - ResultSet rs = preparedStatement.executeQuery(); - - while (rs.next()) { - - recordsRead++; - - rune_id = rs.getInt("rune_id"); - runeSkillAdjustEntry = new RuneSkillAdjustEntry(rs); - - if (runeSkillAdjusts.get(rune_id) == null) { - ArrayList skillAdjustList = new ArrayList<>(); - skillAdjustList.add(runeSkillAdjustEntry); - runeSkillAdjusts.put(rune_id, skillAdjustList); - } else { - ArrayList powerList = runeSkillAdjusts.get(rune_id); - powerList.add(runeSkillAdjustEntry); - runeSkillAdjusts.put(rune_id, powerList); - } - } - } catch (SQLException e) { - Logger.error(e); - return runeSkillAdjusts; - } - - Logger.info("read: " + recordsRead + " cached: " + runeSkillAdjusts.size()); - return runeSkillAdjusts; - } } diff --git a/src/engine/db/handlers/dbSkillBaseHandler.java b/src/engine/db/handlers/dbSkillBaseHandler.java index 1cfa297f..f089a61e 100644 --- a/src/engine/db/handlers/dbSkillBaseHandler.java +++ b/src/engine/db/handlers/dbSkillBaseHandler.java @@ -12,7 +12,6 @@ package engine.db.handlers; import engine.gameManager.DbManager; import engine.mbEnums; import engine.mbEnums.GameObjectType; -import engine.objects.MaxSkills; import engine.objects.SkillsBase; import org.pmw.tinylog.Logger; @@ -20,8 +19,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; public class dbSkillBaseHandler extends dbHandlerBase { @@ -98,55 +95,4 @@ public class dbSkillBaseHandler extends dbHandlerBase { SkillsBase.putInCache(skillsBase); return skillsBase; } - - public void LOAD_ALL_MAX_SKILLS_FOR_CONTRACT() { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_rune_maxskills`")) { - - ResultSet rs = preparedStatement.executeQuery(); - - while (rs.next()) { - - MaxSkills maxSKills = new MaxSkills(rs); - - if (MaxSkills.MaxSkillsSet.get(maxSKills.getRuneID()) == null) { - ArrayList newMaxSkillsList = new ArrayList<>(); - newMaxSkillsList.add(maxSKills); - MaxSkills.MaxSkillsSet.put(maxSKills.getRuneID(), newMaxSkillsList); - } else - MaxSkills.MaxSkillsSet.get(maxSKills.getRuneID()).add(maxSKills); - - } - - } catch (SQLException e) { - Logger.error(e); - } - } - - - public void LOAD_ALL_RUNE_SKILLS() { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_skill_skillsgranted`")) { - - ResultSet rs = preparedStatement.executeQuery(); - - while (rs.next()) { - - int runeID = rs.getInt("runeID"); - int token = rs.getInt("token"); - int amount = rs.getInt("amount"); - - if (SkillsBase.runeSkillsCache.get(runeID) == null) - SkillsBase.runeSkillsCache.put(runeID, new HashMap<>()); - - SkillsBase.runeSkillsCache.get(runeID).put(token, amount); - } - - } catch (SQLException e) { - Logger.error(e); - } - } - } diff --git a/src/engine/db/handlers/dbSkillReqHandler.java b/src/engine/db/handlers/dbSkillReqHandler.java index 822682fb..e9db07c3 100644 --- a/src/engine/db/handlers/dbSkillReqHandler.java +++ b/src/engine/db/handlers/dbSkillReqHandler.java @@ -76,24 +76,4 @@ public class dbSkillReqHandler extends dbHandlerBase { Logger.error(e); } } - - public ArrayList GET_REQS_FOR_RUNE(final int objectUUID) { - - ArrayList skillReqsList = new ArrayList<>(); - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_skill_skillreq` WHERE `runeID`=?")) { - - preparedStatement.setInt(1, objectUUID); - - ResultSet rs = preparedStatement.executeQuery(); - skillReqsList = getObjectsFromRs(rs, 5); - - } catch (SQLException e) { - Logger.error(e); - } - - return skillReqsList; - } - } diff --git a/src/engine/objects/MaxSkills.java b/src/engine/objects/MaxSkills.java index 2410ba8b..8daade6a 100644 --- a/src/engine/objects/MaxSkills.java +++ b/src/engine/objects/MaxSkills.java @@ -14,8 +14,6 @@ import engine.parsers.objects.RuneTemplate; import engine.util.Hasher; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -29,17 +27,6 @@ public class MaxSkills { private int maxSkillPercent; - /** - * ResultSet Constructor - */ - - public MaxSkills(ResultSet rs) throws SQLException { - this.runeID = rs.getInt("runeID"); - this.skillToken = rs.getInt("skillToken"); - this.skillLevel = rs.getInt("skillLevel"); - this.maxSkillPercent = rs.getInt("maxSkillPercent"); - } - public MaxSkills(int runeID, int skillToken, int skillLevel, int maxSkillPercent) { super(); this.runeID = runeID; diff --git a/src/engine/objects/PowerGrantedTrains.java b/src/engine/objects/PowerGrantedTrains.java index 413eccd5..67cacdf9 100644 --- a/src/engine/objects/PowerGrantedTrains.java +++ b/src/engine/objects/PowerGrantedTrains.java @@ -9,17 +9,12 @@ package engine.objects; -import engine.gameManager.DbManager; import engine.mbEnums; import engine.parsers.objects.RuneTemplate; import engine.server.MBServerStatics; import engine.util.Hasher; import org.pmw.tinylog.Logger; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -31,14 +26,6 @@ public class PowerGrantedTrains { private int token; private ConcurrentHashMap runeGrants = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); - /** - * ResultSet Constructor - */ - public PowerGrantedTrains(ResultSet rs) throws SQLException { - this.token = rs.getInt("powerToken"); - runeGrants.put(rs.getInt("runeID"), rs.getShort("grantAmount")); - } - public PowerGrantedTrains(int token) { this.token = token; } @@ -124,41 +111,6 @@ public class PowerGrantedTrains { Logger.info("Loaded " + grantCount + " power train grants for " + powerGrants.size() + " powers"); } - public static void fillGrantedPowers() { - - PowerGrantedTrains.grantedPowers = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_powergrant")) { - - - ResultSet rs = preparedStatement.executeQuery(); - - if (PowerGrantedTrains.grantedPowers.size() > 0) { - rs.close(); - return; - } - - while (rs.next()) { - - int token = rs.getInt("powerToken"); - - PowerGrantedTrains pg; - - if (PowerGrantedTrains.grantedPowers.containsKey(token)) { - pg = PowerGrantedTrains.grantedPowers.get(token); - pg.addRuneGrant(rs.getInt("runeID"), rs.getShort("grantAmount")); - } else { - pg = new PowerGrantedTrains(rs); - PowerGrantedTrains.grantedPowers.put(token, pg); - } - } - rs.close(); - } catch (SQLException e) { - Logger.error("SQL Error number: " + e.getErrorCode(), e); - } - } - /* * Database */ diff --git a/src/engine/objects/SkillReq.java b/src/engine/objects/SkillReq.java index bcd53b0a..a17c489e 100644 --- a/src/engine/objects/SkillReq.java +++ b/src/engine/objects/SkillReq.java @@ -14,8 +14,6 @@ import engine.parsers.objects.RuneTemplate; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -24,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; public class SkillReq extends AbstractGameObject { - private static final int DB_SKILL_REQ_AMOUNT = 80; + private static final int DEFAULT_SKILL_REQ_AMOUNT = 80; private static final ConcurrentHashMap> skillReqsByRune = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); private int skillID; @@ -61,32 +59,6 @@ public class SkillReq extends AbstractGameObject { } */ - /** - * ResultSet Constructor - */ - public SkillReq(ResultSet rs) throws SQLException { - super(rs, 0); - this.skillID = rs.getInt("skillID"); - this.level = rs.getShort("level"); - skillReqs = new ArrayList<>(0); - skillReqAmounts = new HashMap<>(); - - int skillReq; - skillReq = rs.getInt("skillreq1"); - if (skillReq > 0) - skillReqs.add((byte) skillReq); - skillReq = rs.getInt("skillreq2"); - if (skillReq > 0) - skillReqs.add((byte) skillReq); - skillReq = rs.getInt("skillreq3"); - if (skillReq > 0) - skillReqs.add((byte) skillReq); - - // DB rows carry no amount; the server hard-codes 80 - for (byte reqSkillID : skillReqs) - skillReqAmounts.put(reqSkillID, DB_SKILL_REQ_AMOUNT); - } - // skill_value is the level the skill is granted at; skill_granted_skills are prereq skills with amounts public SkillReq(RuneTemplate.SkillGrant skillGrant, SkillsBase skillsBase, int runeID) { super(); @@ -165,7 +137,7 @@ public class SkillReq extends AbstractGameObject { } public int getSkillReqAmount(byte reqSkillID) { - return this.skillReqAmounts.getOrDefault(reqSkillID, DB_SKILL_REQ_AMOUNT); + return this.skillReqAmounts.getOrDefault(reqSkillID, DEFAULT_SKILL_REQ_AMOUNT); } diff --git a/src/engine/powers/RuneSkillAdjustEntry.java b/src/engine/powers/RuneSkillAdjustEntry.java index 7868d1cf..3a7e2d39 100644 --- a/src/engine/powers/RuneSkillAdjustEntry.java +++ b/src/engine/powers/RuneSkillAdjustEntry.java @@ -12,8 +12,6 @@ import engine.parsers.objects.RuneTemplate; import engine.util.Hasher; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -27,14 +25,6 @@ public class RuneSkillAdjustEntry { public int level; - public RuneSkillAdjustEntry(ResultSet rs) throws SQLException { - this.name = rs.getString("name"); - this.token = rs.getInt("token"); - this.skill_type = rs.getString("skill_type"); - this.rank = rs.getInt("rank"); - this.level = rs.getInt("level"); - } - public RuneSkillAdjustEntry(RuneTemplate rune, String skillType, int[] adjust) { this.name = rune.obj_name; this.token = Hasher.SBStringHash(skillType);