Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemTemplate.java
+55 -55
View File
@@ -8,8 +8,8 @@
package engine.objects;
import engine.Enum;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.pmw.tinylog.Logger;
@@ -36,11 +36,11 @@ public class ItemTemplate {
public float combat_health_current;
public float combat_health_full;
public final HashMap<String, Float> combat_attack_resist = new HashMap<>();
public Enum.ItemType item_type;
public mbEnums.ItemType item_type;
public int item_eq_slots_value;
public boolean item_eq_slots_type;
public final EnumSet<Enum.EquipSlotType> item_eq_slots_or = EnumSet.noneOf(Enum.EquipSlotType.class);
public final EnumSet<Enum.EquipSlotType> item_eq_slots_and = EnumSet.noneOf(Enum.EquipSlotType.class);
public final EnumSet<mbEnums.EquipSlotType> item_eq_slots_or = EnumSet.noneOf(mbEnums.EquipSlotType.class);
public final EnumSet<mbEnums.EquipSlotType> item_eq_slots_and = EnumSet.noneOf(mbEnums.EquipSlotType.class);
public boolean item_takeable;
public int item_value;
public int item_wt;
@@ -53,34 +53,34 @@ public class ItemTemplate {
public String item_skill_mastery_used = "";
public int item_parry_anim_id;
public float item_bulk_factor;
public final HashMap<Enum.ShrineType, Integer> item_offering_info = new HashMap<>();
public final HashMap<mbEnums.ShrineType, Integer> item_offering_info = new HashMap<>();
public int item_defense_rating;
public float item_weapon_wepspeed;
public float item_weapon_max_range;
public int item_weapon_projectile_id;
public float item_weapon_projectile_speed;
public int item_weapon_combat_idle_anim;
public final HashMap<Enum.DamageType, int[]> item_weapon_damage = new HashMap<>();
public final HashMap<mbEnums.DamageType, int[]> item_weapon_damage = new HashMap<>();
public final ArrayList<int[]> weapon_attack_anim_right = new ArrayList<>();
public final ArrayList<int[]> weapon_attack_anim_left = new ArrayList<>();
public Enum.AttributeType item_primary_attr = Enum.AttributeType.None;
public Enum.AttributeType item_secondary_attr = Enum.AttributeType.None;
public final EnumSet<Enum.ItemFlags> item_flags = EnumSet.noneOf(Enum.ItemFlags.class);
public final EnumSet<Enum.ItemUseFlags> item_use_flags = EnumSet.noneOf(Enum.ItemUseFlags.class);
public mbEnums.AttributeType item_primary_attr = mbEnums.AttributeType.None;
public mbEnums.AttributeType item_secondary_attr = mbEnums.AttributeType.None;
public final EnumSet<mbEnums.ItemFlags> item_flags = EnumSet.noneOf(mbEnums.ItemFlags.class);
public final EnumSet<mbEnums.ItemUseFlags> item_use_flags = EnumSet.noneOf(mbEnums.ItemUseFlags.class);
public int item_initial_charges;
public final HashMap<String, Integer> item_skill_required = new HashMap<>();
public final EnumSet<Enum.MonsterType> item_race_req = EnumSet.noneOf(Enum.MonsterType.class);
public final EnumSet<Enum.MonsterType> item_race_res = EnumSet.noneOf(Enum.MonsterType.class);
public final EnumSet<Enum.ClassType> item_class_req = EnumSet.noneOf(Enum.ClassType.class);
public final EnumSet<Enum.ClassType> item_class_res = EnumSet.noneOf(Enum.ClassType.class);
public final EnumSet<Enum.DisciplineType> item_disc_req = EnumSet.noneOf(Enum.DisciplineType.class);
public final EnumSet<Enum.DisciplineType> item_disc_res = EnumSet.noneOf(Enum.DisciplineType.class);
public final EnumSet<mbEnums.MonsterType> item_race_req = EnumSet.noneOf(mbEnums.MonsterType.class);
public final EnumSet<mbEnums.MonsterType> item_race_res = EnumSet.noneOf(mbEnums.MonsterType.class);
public final EnumSet<mbEnums.ClassType> item_class_req = EnumSet.noneOf(mbEnums.ClassType.class);
public final EnumSet<mbEnums.ClassType> item_class_res = EnumSet.noneOf(mbEnums.ClassType.class);
public final EnumSet<mbEnums.DisciplineType> item_disc_req = EnumSet.noneOf(mbEnums.DisciplineType.class);
public final EnumSet<mbEnums.DisciplineType> item_disc_res = EnumSet.noneOf(mbEnums.DisciplineType.class);
public int item_level_req;
public Enum.SexType item_sex_req;
public mbEnums.SexType item_sex_req;
public final HashMap<String, int[]> item_user_power_action = new HashMap<>();
public final HashMap<String, Integer> item_power_grant = new HashMap<>();
public final HashMap<String, int[]> item_power_action = new HashMap<>();
public final HashMap<Enum.ResourceType, Integer> item_resource_cost = new HashMap<>();
public final HashMap<mbEnums.ResourceType, Integer> item_resource_cost = new HashMap<>();
public int modTable;
public int deed_type;
public int deed_furniture_id;
@@ -93,8 +93,8 @@ public class ItemTemplate {
public float deed_namelookup_val;
public boolean deed_custom_city;
public int deed_structure_id;
public final HashMap<Enum.AttributeType, Integer> rune_attr_adj = new HashMap<>();
public final HashMap<Enum.AttributeType, Integer> rune_max_attr_adj = new HashMap<>();
public final HashMap<mbEnums.AttributeType, Integer> rune_attr_adj = new HashMap<>();
public final HashMap<mbEnums.AttributeType, Integer> rune_max_attr_adj = new HashMap<>();
public final HashMap<String, Integer> rune_skill_grant = new HashMap<>();
public final HashMap<String, Integer> skill_granted_skills = new HashMap<>();
public final HashMap<String, Integer> power_granted_skills = new HashMap<>();
@@ -105,7 +105,7 @@ public class ItemTemplate {
public int rune_rank;
public int rune_pracs_per_level;
public float rune_exp_req_to_level;
public Enum.SexType rune_sex;
public mbEnums.SexType rune_sex;
public int rune_class_icon;
public int rune_health;
public int rune_mana;
@@ -115,22 +115,22 @@ public class ItemTemplate {
public int rune_attack;
public int rune_defense;
public int rune_level;
public final HashMap<Enum.MovementType, Float> rune_speed = new HashMap<>();
public final HashMap<mbEnums.MovementType, Float> rune_speed = new HashMap<>();
public int rune_group_type;
public boolean rune_group_is_faction = false;
public boolean rune_group_is_guild = false;
public String rune_dsc;
public String rune_fx_txt;
public EnumSet<Enum.MobBehaviourType> rune_group_tactics = EnumSet.noneOf(Enum.MobBehaviourType.class);
public EnumSet<mbEnums.MobBehaviourType> rune_group_tactics = EnumSet.noneOf(mbEnums.MobBehaviourType.class);
;
public EnumSet<Enum.MobBehaviourType> rune_group_role_set = EnumSet.noneOf(Enum.MobBehaviourType.class);
public EnumSet<mbEnums.MobBehaviourType> rune_group_role_set = EnumSet.noneOf(mbEnums.MobBehaviourType.class);
;
public boolean rune_renderable = false;
public int rune_natural_power_attack;
public final HashMap<String, String> rune_sparse_data = new HashMap<>();
public final HashMap<String, int[]> rune_skill_adj = new HashMap<>();
public final EnumSet<Enum.MonsterType> rune_enemy_monster_types = EnumSet.noneOf(Enum.MonsterType.class);
public final EnumSet<Enum.MonsterType> rune_not_enemy_monster_types = EnumSet.noneOf(Enum.MonsterType.class);
public final EnumSet<mbEnums.MonsterType> rune_enemy_monster_types = EnumSet.noneOf(mbEnums.MonsterType.class);
public final EnumSet<mbEnums.MonsterType> rune_not_enemy_monster_types = EnumSet.noneOf(mbEnums.MonsterType.class);
public final ArrayList<Integer> rune_groupee_monster_types = new ArrayList<>();
public final ArrayList<Integer> rune_helper_monster_types = new ArrayList<>();
@@ -194,7 +194,7 @@ public class ItemTemplate {
// Parsing an enum
item_type = Enum.ItemType.valueOf((String) jsonObject.get("item_type"));
item_type = mbEnums.ItemType.valueOf((String) jsonObject.get("item_type"));
item_eq_slots_value = ((Long) jsonObject.get("item_eq_slots_value")).intValue();
item_eq_slots_type = (boolean) jsonObject.get("item_eq_slots_type");
@@ -204,13 +204,13 @@ public class ItemTemplate {
if (eq_slots_or.isEmpty() == false)
for (Object o : eq_slots_or)
item_eq_slots_or.add(Enum.EquipSlotType.valueOf((String) o));
item_eq_slots_or.add(mbEnums.EquipSlotType.valueOf((String) o));
JSONArray eq_slots_and = (JSONArray) jsonObject.get("item_eq_slots_and");
if (eq_slots_and.isEmpty() == false)
for (Object o : eq_slots_and)
item_eq_slots_and.add(Enum.EquipSlotType.valueOf((String) o));
item_eq_slots_and.add(mbEnums.EquipSlotType.valueOf((String) o));
item_takeable = (boolean) jsonObject.get("item_takeable");
item_value = ((Long) jsonObject.get("item_value")).intValue();
@@ -243,19 +243,19 @@ public class ItemTemplate {
JSONObject offering_entry = (JSONObject) entry;
String offering_type = ((String) offering_entry.get("offering_type")).replaceAll("-", "");
int offering_value = ((Long) offering_entry.get("offering_value")).intValue();
item_offering_info.put(Enum.ShrineType.valueOf(offering_type), offering_value);
item_offering_info.put(mbEnums.ShrineType.valueOf(offering_type), offering_value);
}
// Fields only present for ARMOR
if (item_type.equals(Enum.ItemType.ARMOR)) {
if (item_type.equals(mbEnums.ItemType.ARMOR)) {
item_bulk_factor = ((Double) jsonObject.get("item_bulk_factor")).floatValue();
item_defense_rating = ((Long) jsonObject.get("item_defense_rating")).intValue();
}
// Fields only present for WEAPON
if (item_type.equals(Enum.ItemType.WEAPON)) {
if (item_type.equals(mbEnums.ItemType.WEAPON)) {
JSONObject item_weapon = (JSONObject) jsonObject.get("item_weapon");
item_weapon_wepspeed = ((Double) item_weapon.get("weapon_wepspeed")).floatValue();
@@ -269,7 +269,7 @@ public class ItemTemplate {
if (weapon_damage.isEmpty() == false)
for (Object o : weapon_damage) {
JSONObject damage_entry = (JSONObject) o;
Enum.DamageType damageType = Enum.DamageType.getDamageType(((String) damage_entry.get("damage_type")));
mbEnums.DamageType damageType = mbEnums.DamageType.getDamageType(((String) damage_entry.get("damage_type")));
int min = ((Long) damage_entry.get("damage_min")).intValue();
int max = ((Long) damage_entry.get("damage_max")).intValue();
int[] minMax = {min, max};
@@ -296,8 +296,8 @@ public class ItemTemplate {
weapon_attack_anim_left.add(new int[]{animation, duration});
}
item_primary_attr = Enum.AttributeType.valueOf((String) jsonObject.get("item_primary_attr"));
item_secondary_attr = Enum.AttributeType.valueOf((String) jsonObject.get("item_secondary_attr"));
item_primary_attr = mbEnums.AttributeType.valueOf((String) jsonObject.get("item_primary_attr"));
item_secondary_attr = mbEnums.AttributeType.valueOf((String) jsonObject.get("item_secondary_attr"));
}
JSONArray itemflags = (JSONArray) jsonObject.get("item_flags");
@@ -306,14 +306,14 @@ public class ItemTemplate {
for (Object o : itemflags) {
String flag = (String) o;
if (flag.equals("None") == false)
item_flags.add(Enum.ItemFlags.valueOf((String) o));
item_flags.add(mbEnums.ItemFlags.valueOf((String) o));
}
JSONArray itemUseflags = (JSONArray) jsonObject.get("item_use_flags");
if (itemUseflags.isEmpty() == false)
for (Object o : itemUseflags)
item_use_flags.add(Enum.ItemUseFlags.valueOf((String) o));
item_use_flags.add(mbEnums.ItemUseFlags.valueOf((String) o));
item_initial_charges = ((Long) jsonObject.get("item_initial_charges")).intValue();
@@ -341,9 +341,9 @@ public class ItemTemplate {
race = race.replaceAll("-", "");
if (restrict)
item_race_res.add(Enum.MonsterType.valueOf(race));
item_race_res.add(mbEnums.MonsterType.valueOf(race));
else
item_race_req.add(Enum.MonsterType.valueOf(race));
item_race_req.add(mbEnums.MonsterType.valueOf(race));
}
JSONObject class_required = (JSONObject) jsonObject.get("item_class_req");
@@ -357,9 +357,9 @@ public class ItemTemplate {
classEntry = classEntry.replaceAll(",", "");
if (restrict)
item_class_res.add(Enum.ClassType.valueOf(classEntry));
item_class_res.add(mbEnums.ClassType.valueOf(classEntry));
else
item_class_req.add(Enum.ClassType.valueOf(classEntry));
item_class_req.add(mbEnums.ClassType.valueOf(classEntry));
}
JSONObject disc_required = (JSONObject) jsonObject.get("item_disc_req");
@@ -373,13 +373,13 @@ public class ItemTemplate {
disc = disc.replaceAll(",", "");
if (restrict)
item_disc_res.add(Enum.DisciplineType.valueOf(disc));
item_disc_res.add(mbEnums.DisciplineType.valueOf(disc));
else
item_disc_req.add(Enum.DisciplineType.valueOf(disc));
item_disc_req.add(mbEnums.DisciplineType.valueOf(disc));
}
item_level_req = ((Long) jsonObject.get("item_level_req")).intValue();
item_sex_req = Enum.SexType.valueOf((String) jsonObject.get("item_sex_req"));
item_sex_req = mbEnums.SexType.valueOf((String) jsonObject.get("item_sex_req"));
JSONArray userPowerActions = (JSONArray) jsonObject.get("item_user_power_action");
@@ -432,14 +432,14 @@ public class ItemTemplate {
if (resource_costs.isEmpty() == false)
for (Object o : resource_costs) {
JSONObject resource_entry = (JSONObject) o;
Enum.ResourceType resource_type = Enum.ResourceType.valueOf(((String) resource_entry.get("resource_type")).toUpperCase());
mbEnums.ResourceType resource_type = mbEnums.ResourceType.valueOf(((String) resource_entry.get("resource_type")).toUpperCase());
int resource_value = ((Long) resource_entry.get("resource_value")).intValue();
item_resource_cost.put(resource_type, resource_value);
}
// Deed related fields
if (item_type.equals(Enum.ItemType.DEED)) {
if (item_type.equals(mbEnums.ItemType.DEED)) {
deed_type = ((Long) jsonObject.get("deed_type")).intValue();
deed_furniture_id = ((Long) jsonObject.get("deed_furniture_id")).intValue();
@@ -454,7 +454,7 @@ public class ItemTemplate {
deed_structure_id = ((Long) jsonObject.get("deed_structure_id")).intValue();
}
if (item_type.equals(Enum.ItemType.RUNE)) {
if (item_type.equals(mbEnums.ItemType.RUNE)) {
rune_type = (String) jsonObject.get("rune_type");
@@ -468,7 +468,7 @@ public class ItemTemplate {
rune_rank = ((Long) jsonObject.get("rune_rank")).intValue();
rune_pracs_per_level = ((Long) jsonObject.get("rune_pracs_per_level")).intValue();
rune_exp_req_to_level = ((Double) jsonObject.get("rune_exp_req_to_level")).floatValue();
rune_sex = Enum.SexType.valueOf((String) jsonObject.get("rune_sex"));
rune_sex = mbEnums.SexType.valueOf((String) jsonObject.get("rune_sex"));
rune_class_icon = ((Long) jsonObject.get("rune_class_icon")).intValue();
rune_health = ((Long) jsonObject.get("rune_health")).intValue();
rune_mana = ((Long) jsonObject.get("rune_mana")).intValue();
@@ -482,7 +482,7 @@ public class ItemTemplate {
JSONObject rune_speed_json = (JSONObject) jsonObject.get("rune_speed");
for (Object key : rune_speed_json.keySet()) {
Enum.MovementType movementType = Enum.MovementType.valueOf((String) key);
mbEnums.MovementType movementType = mbEnums.MovementType.valueOf((String) key);
float speed = ((Double) rune_speed_json.get(key)).floatValue();
rune_speed.put(movementType, speed);
}
@@ -497,18 +497,18 @@ public class ItemTemplate {
int group_tactics_bitvector = ((Long) jsonObject.get("rune_group_tactics")).intValue();
rune_group_tactics.addAll(Enum.fromLong(group_tactics_bitvector, Enum.MobBehaviourType.class));
rune_group_tactics.addAll(mbEnums.fromLong(group_tactics_bitvector, mbEnums.MobBehaviourType.class));
int group_role_bitvector = ((Long) jsonObject.get("rune_group_role_set")).intValue();
rune_group_role_set.addAll(Enum.fromLong(group_role_bitvector, Enum.MobBehaviourType.class));
rune_group_role_set.addAll(mbEnums.fromLong(group_role_bitvector, mbEnums.MobBehaviourType.class));
JSONArray enemy_types_json = (JSONArray) jsonObject.get("rune_enemy_monster_types");
for (Object o : enemy_types_json) {
String enemy = (String) o;
enemy = enemy.replaceAll("-", "");
Enum.MonsterType monsterType = Enum.MonsterType.valueOf(enemy);
mbEnums.MonsterType monsterType = mbEnums.MonsterType.valueOf(enemy);
rune_enemy_monster_types.add(monsterType);
}
@@ -517,7 +517,7 @@ public class ItemTemplate {
for (Object o : not_enemy_types_json) {
String notenemy = (String) o;
notenemy = notenemy.replaceAll("-", "");
Enum.MonsterType monsterType = Enum.MonsterType.valueOf(notenemy);
mbEnums.MonsterType monsterType = mbEnums.MonsterType.valueOf(notenemy);
rune_not_enemy_monster_types.add(monsterType);
}
@@ -565,7 +565,7 @@ public class ItemTemplate {
for (Object attributeEntry : attr_adj_json) {
JSONObject attribute = (JSONObject) attributeEntry;
String typeString = (String) attribute.get("attr_type");
Enum.AttributeType attributeType = Enum.AttributeType.valueOf(typeString);
mbEnums.AttributeType attributeType = mbEnums.AttributeType.valueOf(typeString);
int attributeValue = ((Long) attribute.get("attr_value")).intValue();
rune_attr_adj.put(attributeType, attributeValue);
}
@@ -575,7 +575,7 @@ public class ItemTemplate {
for (Object attributeEntry : max_attr_adj_json) {
JSONObject attribute = (JSONObject) attributeEntry;
String typeString = (String) attribute.get("attr_type");
Enum.AttributeType attributeType = Enum.AttributeType.valueOf(typeString);
mbEnums.AttributeType attributeType = mbEnums.AttributeType.valueOf(typeString);
int attributeValue = ((Long) attribute.get("attr_value")).intValue();
rune_max_attr_adj.put(attributeType, attributeValue);
}