Reformat and clean up "client" package

This commit is contained in:
P0nk
2021-09-09 23:21:39 +02:00
parent 07f55fa53c
commit 9bf1b68924
108 changed files with 1770 additions and 1543 deletions

View File

@@ -33,21 +33,25 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
*
* @author RonanLana
*/
public class CharacterFactoryRecipe {
private Job job;
private int level, map, top, bottom, shoes, weapon;
private final Job job;
private final int level;
private final int map;
private final int top;
private final int bottom;
private final int shoes;
private final int weapon;
private int str = 4, dex = 4, int_ = 4, luk = 4;
private int maxHp = 50, maxMp = 5;
private int ap = 0, sp = 0;
private int meso = 0;
private List<Pair<Skill, Integer>> skills = new LinkedList<>();
private List<Pair<Item, InventoryType>> itemsWithType = new LinkedList<>();
private Map<InventoryType, AtomicInteger> runningTypePosition = new LinkedHashMap<>();
private final List<Pair<Skill, Integer>> skills = new LinkedList<>();
private final List<Pair<Item, InventoryType>> itemsWithType = new LinkedList<>();
private final Map<InventoryType, AtomicInteger> runningTypePosition = new LinkedHashMap<>();
public CharacterFactoryRecipe(Job job, int level, int map, int top, int bottom, int shoes, int weapon) {
this.job = job;
this.level = level;
@@ -56,7 +60,7 @@ public class CharacterFactoryRecipe {
this.bottom = bottom;
this.shoes = shoes;
this.weapon = weapon;
if (!YamlConfig.config.server.USE_STARTING_AP_4) {
if (YamlConfig.config.server.USE_AUTOASSIGN_STARTERS_AP) {
str = 12;
@@ -66,129 +70,129 @@ public class CharacterFactoryRecipe {
}
}
}
public void setStr(int v) {
str = v;
}
public void setDex(int v) {
dex = v;
}
public void setInt(int v) {
int_ = v;
}
public void setLuk(int v) {
luk = v;
}
public void setMaxHp(int v) {
maxHp = v;
}
public void setMaxMp(int v) {
maxMp = v;
}
public void setRemainingAp(int v) {
ap = v;
}
public void setRemainingSp(int v) {
sp = v;
}
public void setMeso(int v) {
meso = v;
}
public void addStartingSkillLevel(Skill skill, int level) {
skills.add(new Pair<>(skill, level));
}
public void addStartingEquipment(Item eqpItem) {
itemsWithType.add(new Pair<>(eqpItem, InventoryType.EQUIP));
}
public void addStartingItem(int itemid, int quantity, InventoryType itemType) {
AtomicInteger p = runningTypePosition.get(itemType);
if(p == null) {
if (p == null) {
p = new AtomicInteger(0);
runningTypePosition.put(itemType, p);
}
itemsWithType.add(new Pair<>(new Item(itemid, (short) p.getAndIncrement(), (short) quantity), itemType));
}
public Job getJob() {
return job;
}
public int getLevel() {
return level;
}
public int getMap() {
return map;
}
public int getTop() {
return top;
}
public int getBottom() {
return bottom;
}
public int getShoes() {
return shoes;
}
public int getWeapon() {
return weapon;
}
public int getStr() {
return str;
}
public int getDex() {
return dex;
}
public int getInt() {
return int_;
}
public int getLuk() {
return luk;
}
public int getMaxHp() {
return maxHp;
}
public int getMaxMp() {
return maxMp;
}
public int getRemainingAp() {
return ap;
}
public int getRemainingSp() {
return sp;
}
public int getMeso() {
return meso;
}
public List<Pair<Skill, Integer>> getStartingSkillLevel() {
return skills;
}
public List<Pair<Item, InventoryType>> getStartingItems() {
return itemsWithType;
}