Refactor out item useID

This commit is contained in:
2024-03-11 12:07:46 -04:00
parent efab8eefba
commit 96b4e1c639
4 changed files with 16 additions and 18 deletions
-13
View File
@@ -30,10 +30,7 @@ public class ItemBase {
public final int uuid;
private final int modTable;
private final int useID;
private int hashID;
private final byte useAmount;
private final short percentRequired;
private final short defense;
private final float dexPenalty;
@@ -51,8 +48,6 @@ public class ItemBase {
public ItemBase(ResultSet rs) throws SQLException {
this.uuid = rs.getInt("ID");
this.useID = rs.getInt("useID");
this.useAmount = rs.getByte("useAmount");
this.modTable = rs.getInt("modTable");
this.hashID = rs.getInt("itemHashID");
@@ -167,14 +162,6 @@ public class ItemBase {
}
public int getUseID() {
return this.useID;
}
public byte getUseAmount() {
return this.useAmount;
}
public int getModTable() {
return modTable;
}
+7
View File
@@ -84,6 +84,7 @@ public class ItemTemplate {
public static HashMap<String, Integer> item_power_grant = new HashMap<>();
public HashMap<String, int[]> item_power_action = new HashMap<>();
public HashMap<Enum.ResourceType, Integer> item_resource_cost = new HashMap<>();
public int deed_structure_id;
public ItemTemplate(JSONObject jsonObject) {
@@ -368,6 +369,12 @@ public class ItemTemplate {
item_resource_cost.put(resource_type, resource_value);
}
// Deed related fields
if (item_type.equals(Enum.ItemType.DEED)) {
deed_structure_id = ((Long) jsonObject.get("deed_structure_id")).intValue();
}
} catch (Exception e) {
Logger.error(e);
}