Browse Source

Table refactor to conform with sb.

master
MagicBot 1 year ago
parent
commit
a7abe6c4c5
  1. 12
      src/engine/db/handlers/dbLootTableHandler.java
  2. 2
      src/engine/gameManager/LootManager.java
  3. 2
      src/engine/loot/GenTableRow.java

12
src/engine/db/handlers/dbLootTableHandler.java

@ -101,7 +101,7 @@ public class dbLootTableHandler extends dbHandlerBase {
int recordsRead = 0; int recordsRead = 0;
try (Connection connection = DbManager.getConnection(); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `modGroup`,`minRoll`,`maxRoll`,`subTableID` FROM `static_modgroups`")) { PreparedStatement preparedStatement = connection.prepareStatement("SELECT `modGroup`,`minRoll`,`maxRoll`,`subTableID` FROM `static_modtypetables`")) {
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
@ -145,7 +145,7 @@ public class dbLootTableHandler extends dbHandlerBase {
while (rs.next()) { while (rs.next()) {
GenTableRow row = new GenTableRow(rs); GenTableRow row = new GenTableRow(rs);
LootManager.AddGenTableRow(rs.getInt("groupID"), row); LootManager.AddGenTableRow(rs.getInt("gentable"), row);
} }
} catch (SQLException e) { } catch (SQLException e) {
@ -167,7 +167,7 @@ public class dbLootTableHandler extends dbHandlerBase {
while (rs.next()) { while (rs.next()) {
recordsRead++; recordsRead++;
ItemTableRow row = new ItemTableRow(rs); ItemTableRow row = new ItemTableRow(rs);
LootManager.AddItemTableRow(rs.getInt("lootTable"), row); LootManager.AddItemTableRow(rs.getInt("itemTable"), row);
} }
} catch (SQLException e) { } catch (SQLException e) {
@ -177,18 +177,18 @@ public class dbLootTableHandler extends dbHandlerBase {
Logger.info("read: " + recordsRead); Logger.info("read: " + recordsRead);
} }
public void LOAD_ALL_MODGROUPS() { public void LOAD_ALL_MODTYPES() {
int recordsRead = 0; int recordsRead = 0;
try (Connection connection = DbManager.getConnection(); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_modgroups")) { PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_modtypetables")) {
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) { while (rs.next()) {
recordsRead++; recordsRead++;
ModTypeTableRow mttr = new ModTypeTableRow(rs); ModTypeTableRow mttr = new ModTypeTableRow(rs);
LootManager.AddModTypeTableRow(rs.getInt("modGroup"), mttr); LootManager.AddModTypeTableRow(rs.getInt("modType"), mttr);
} }
} catch (SQLException e) { } catch (SQLException e) {

2
src/engine/gameManager/LootManager.java

@ -50,7 +50,7 @@ public enum LootManager {
DbManager.LootQueries.LOAD_ALL_GENTABLES(); DbManager.LootQueries.LOAD_ALL_GENTABLES();
DbManager.LootQueries.LOAD_ALL_ITEMTABLES(); DbManager.LootQueries.LOAD_ALL_ITEMTABLES();
DbManager.LootQueries.LOAD_ALL_MODGROUPS(); DbManager.LootQueries.LOAD_ALL_MODTYPES();
DbManager.LootQueries.LOAD_ALL_MODTABLES(); DbManager.LootQueries.LOAD_ALL_MODTABLES();
// Cache drop rate values from Config manager. // Cache drop rate values from Config manager.

2
src/engine/loot/GenTableRow.java

@ -13,7 +13,7 @@ public class GenTableRow {
public GenTableRow(ResultSet rs) throws SQLException { public GenTableRow(ResultSet rs) throws SQLException {
this.minRoll = rs.getInt("minRoll"); this.minRoll = rs.getInt("minRoll");
this.maxRoll = rs.getInt("maxRoll"); this.maxRoll = rs.getInt("maxRoll");
this.itemTableID = rs.getInt("lootTableID"); this.itemTableID = rs.getInt("itemTableID");
this.pModTable = rs.getInt("pModTableID"); this.pModTable = rs.getInt("pModTableID");
this.sModTable = rs.getInt("sModTableID"); this.sModTable = rs.getInt("sModTableID");
} }

Loading…
Cancel
Save