1
0
mirror of https://github.com/cekis/swg-api synced 2026-01-16 19:05:10 -05:00

Added Player data

This commit is contained in:
Cekis
2021-04-19 23:58:25 -07:00
parent f57a0be08e
commit afb406c80e
8 changed files with 1926 additions and 13 deletions

3
.gitignore vendored
View File

@@ -21,4 +21,5 @@ build/
nbbuild/
dist/
nbdist/
.nb-gradle/
.nb-gradle/
/exe/

View File

@@ -11,6 +11,7 @@ import java.util.List;
@Repository
public interface CityObjectDao extends JpaRepository<CityObject, Integer> {
public CityObject findByObjectId(Long objectId);
@Query(value = "SELECT * FROM CITY_OBJECTS WHERE object_id = (SELECT object_id from PROPERTY_LISTS WHERE LIST_ID = 12 AND VALUE LIKE '%::%')", nativeQuery = true)
public CityObject findByName(String name);
}

View File

@@ -0,0 +1,452 @@
package swg.entity;
import javax.persistence.*;
@Entity
@Table(name = "CREATURE_OBJECTS")
public class CreatureObject {
@Column(name = "OBJECT_ID")
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long objectId;
@Column(name = "SCALE_FACTOR")
private float scaleFactor;
@Column(name = "STATES", length = 38)
private int states;
@Column(name = "POSTURE", length = 38)
private int posture;
@Column(name = "SHOCK_WOUNDS", length = 38)
private int shockWounds;
@Column(name = "MASTER_ID", length = 20)
private int masterId;
@Column(name = "RANK", length = 38)
private int rank;
@Column(name = "BASE_WALK_SPEED")
private float baseWalkSpeed;
@Column(name = "BASE_RUN_SPEED")
private float baseRunSpeed;
@Column(name = "ATTRIBUTE_0", length = 38)
private int attribute0;
@Column(name = "ATTRIBUTE_1", length = 38)
private int attribute1;
@Column(name = "ATTRIBUTE_2", length = 38)
private int attribute2;
@Column(name = "ATTRIBUTE_3", length = 38)
private int attribute3;
@Column(name = "ATTRIBUTE_4", length = 38)
private int attribute4;
@Column(name = "ATTRIBUTE_5", length = 38)
private int attribute5;
@Column(name = "ATTRIBUTE_6", length = 38)
private int attribute6;
@Column(name = "ATTRIBUTE_7", length = 38)
private int attribute7;
@Column(name = "ATTRIBUTE_8", length = 38)
private int attribute8;
@Column(name = "ATTRIBUTE_9", length = 38)
private int attribute9;
@Column(name = "ATTRIBUTE_10", length = 38)
private int attribute10;
@Column(name = "ATTRIBUTE_11", length = 38)
private int attribute11;
@Column(name = "ATTRIBUTE_12", length = 38)
private int attribute12;
@Column(name = "ATTRIBUTE_13", length = 38)
private int attribute13;
@Column(name = "ATTRIBUTE_14", length = 38)
private int attribute14;
@Column(name = "ATTRIBUTE_15", length = 38)
private int attribute15;
@Column(name = "ATTRIBUTE_16", length = 38)
private int attribute16;
@Column(name = "ATTRIBUTE_17", length = 38)
private int attribute17;
@Column(name = "ATTRIBUTE_18", length = 38)
private int attribute18;
@Column(name = "ATTRIBUTE_19", length = 38)
private int attribute19;
@Column(name = "ATTRIBUTE_20", length = 38)
private int attribute20;
@Column(name = "ATTRIBUTE_21", length = 38)
private int attribute21;
@Column(name = "ATTRIBUTE_22", length = 38)
private int attribute22;
@Column(name = "ATTRIBUTE_23", length = 38)
private int attribute23;
@Column(name = "ATTRIBUTE_24", length = 38)
private int attribute24;
@Column(name = "ATTRIBUTE_25", length = 38)
private int attribute25;
@Column(name = "ATTRIBUTE_26", length = 38)
private int attribute26;
@Column(name = "PERSISTED_BUFFS", length = 1000)
private String persistedBuffs;
@Column(name = "WS_X")
private float wsx;
@Column(name = "WS_Y")
private float wsy;
@Column(name = "wsz")
private float wsz;
protected CreatureObject() {
}
public Long getObjectId() {
return objectId;
}
public void setObjectId(Long objectId) {
this.objectId = objectId;
}
public float getScaleFactor() {
return scaleFactor;
}
public void setScaleFactor(float scaleFactor) {
this.scaleFactor = scaleFactor;
}
public int getStates() {
return states;
}
public void setStates(int states) {
this.states = states;
}
public int getPosture() {
return posture;
}
public void setPosture(int posture) {
this.posture = posture;
}
public int getShockWounds() {
return shockWounds;
}
public void setShockWounds(int shockWounds) {
this.shockWounds = shockWounds;
}
public int getMasterId() {
return masterId;
}
public void setMasterId(int masterId) {
this.masterId = masterId;
}
public int getRank() {
return rank;
}
public void setRank(int rank) {
this.rank = rank;
}
public float getBaseWalkSpeed() {
return baseWalkSpeed;
}
public void setBaseWalkSpeed(float baseWalkSpeed) {
this.baseWalkSpeed = baseWalkSpeed;
}
public float getBaseRunSpeed() {
return baseRunSpeed;
}
public void setBaseRunSpeed(float baseRunSpeed) {
this.baseRunSpeed = baseRunSpeed;
}
public int getAttribute0() {
return attribute0;
}
public void setAttribute0(int attribute0) {
this.attribute0 = attribute0;
}
public int getAttribute1() {
return attribute1;
}
public void setAttribute1(int attribute1) {
this.attribute1 = attribute1;
}
public int getAttribute2() {
return attribute2;
}
public void setAttribute2(int attribute2) {
this.attribute2 = attribute2;
}
public int getAttribute3() {
return attribute3;
}
public void setAttribute3(int attribute3) {
this.attribute3 = attribute3;
}
public int getAttribute4() {
return attribute4;
}
public void setAttribute4(int attribute4) {
this.attribute4 = attribute4;
}
public int getAttribute5() {
return attribute5;
}
public void setAttribute5(int attribute5) {
this.attribute5 = attribute5;
}
public int getAttribute6() {
return attribute6;
}
public void setAttribute6(int attribute6) {
this.attribute6 = attribute6;
}
public int getAttribute7() {
return attribute7;
}
public void setAttribute7(int attribute7) {
this.attribute7 = attribute7;
}
public int getAttribute8() {
return attribute8;
}
public void setAttribute8(int attribute8) {
this.attribute8 = attribute8;
}
public int getAttribute9() {
return attribute9;
}
public void setAttribute9(int attribute9) {
this.attribute9 = attribute9;
}
public int getAttribute10() {
return attribute10;
}
public void setAttribute10(int attribute10) {
this.attribute10 = attribute10;
}
public int getAttribute11() {
return attribute11;
}
public void setAttribute11(int attribute11) {
this.attribute11 = attribute11;
}
public int getAttribute12() {
return attribute12;
}
public void setAttribute12(int attribute12) {
this.attribute12 = attribute12;
}
public int getAttribute13() {
return attribute13;
}
public void setAttribute13(int attribute13) {
this.attribute13 = attribute13;
}
public int getAttribute14() {
return attribute14;
}
public void setAttribute14(int attribute14) {
this.attribute14 = attribute14;
}
public int getAttribute15() {
return attribute15;
}
public void setAttribute15(int attribute15) {
this.attribute15 = attribute15;
}
public int getAttribute16() {
return attribute16;
}
public void setAttribute16(int attribute16) {
this.attribute16 = attribute16;
}
public int getAttribute17() {
return attribute17;
}
public void setAttribute17(int attribute17) {
this.attribute17 = attribute17;
}
public int getAttribute18() {
return attribute18;
}
public void setAttribute18(int attribute18) {
this.attribute18 = attribute18;
}
public int getAttribute19() {
return attribute19;
}
public void setAttribute19(int attribute19) {
this.attribute19 = attribute19;
}
public int getAttribute20() {
return attribute20;
}
public void setAttribute20(int attribute20) {
this.attribute20 = attribute20;
}
public int getAttribute21() {
return attribute21;
}
public void setAttribute21(int attribute21) {
this.attribute21 = attribute21;
}
public int getAttribute22() {
return attribute22;
}
public void setAttribute22(int attribute22) {
this.attribute22 = attribute22;
}
public int getAttribute23() {
return attribute23;
}
public void setAttribute23(int attribute23) {
this.attribute23 = attribute23;
}
public int getAttribute24() {
return attribute24;
}
public void setAttribute24(int attribute24) {
this.attribute24 = attribute24;
}
public int getAttribute25() {
return attribute25;
}
public void setAttribute25(int attribute25) {
this.attribute25 = attribute25;
}
public int getAttribute26() {
return attribute26;
}
public void setAttribute26(int attribute26) {
this.attribute26 = attribute26;
}
public String getPersistedBuffs() {
return persistedBuffs;
}
public void setPersistedBuffs(String persistedBuffs) {
this.persistedBuffs = persistedBuffs;
}
public float getWsx() {
return wsx;
}
public void setWsx(float wsx) {
this.wsx = wsx;
}
public float getWsy() {
return wsy;
}
public void setWsy(float wsy) {
this.wsy = wsy;
}
public float getWsz() {
return wsz;
}
public void setWsz(float wsz) {
this.wsz = wsz;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,12 +1,16 @@
package swg.entity;
import javax.persistence.*;
import java.util.Date;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Optional;
@Entity
@Table(name = "PLAYERS")
public class Player {
final private static int PLAYER_OBJECT_TYPE_ID = 1347174745;
@Column(name = "CHARACTER_OBJECT")
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -22,14 +26,17 @@ public class Player {
private String characterFullName;
@Column(name = "CREATE_TIME", nullable = true)
private Date createTime;
private Timestamp createTime;
@Column(name = "LAST_LOGIN_TIME", nullable = true)
private Date lastLoginTime;
private Timestamp lastLoginTime;
@OneToMany(mappedBy = "objectId")
private List<PropertyList> propertyLists;
@OneToMany(mappedBy = "containedBy")
private List<Objects> containers;
protected Player() {
}
@@ -65,27 +72,43 @@ public class Player {
this.characterFullName = characterFullName;
}
public Date getCreateTime() {
return createTime;
public String getCreateTime() {
return new SimpleDateFormat("MMMMM dd, yyyy hh:mm:ss a").format(createTime);
}
public void setCreateTime(Date createTime) {
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
public Date getLastLoginTime() {
return lastLoginTime;
}
public String getLastLoginTime() {
return new SimpleDateFormat("MMMMM dd, yyyy hh:mm:ss a").format(lastLoginTime); }
public void setLastLoginTime(Date lastLoginTime) {
public void setLastLoginTime(Timestamp lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public List<PropertyList> getPropertyList() {
public List<PropertyList> getPropertyLists() {
return propertyLists;
}
public void setPropertyList(List<PropertyList> propertyLists) {
public void setPropertyLists(List<PropertyList> propertyLists) {
this.propertyLists = propertyLists;
}
public List<Objects> getContainers() {
return containers;
}
public void setContainers(List<Objects> containers) {
this.containers = containers;
}
public Long getPlayerObjectId() {
Optional<Objects> o = this.containers.stream().filter(c -> c.getTypeId() == PLAYER_OBJECT_TYPE_ID).findFirst();
if(o.isPresent()) {
Objects playerObject = o.get();
return playerObject.getObjectId();
}
return null;
}
}

View File

@@ -0,0 +1,374 @@
package swg.entity;
import javax.persistence.*;
@Entity
@Table(name = "PLAYER_OBJECTS")
public class PlayerObject {
@Id
@Column(name = "OBJECT_ID", nullable = false, length = 20)
private Long objectId;
@Column(name = "STATION_ID", nullable = true, length = 38)
private Long stationId;
@Column(name = "PERSONAL_PROFILE_ID", nullable = true, length = 200)
private String personalProfileId;
@Column(name = "CHARACTER_PROFILE_ID", nullable = true, length = 200)
private String characterProfileId;
@Column(name = "SKILL_TITLE", nullable = true, length = 200)
private String skillTitle;
@Column(name = "BORN_DATE", nullable = true, length = 38)
private int bornDate;
@Column(name = "PLAYED_TIME", nullable = true, length = 38)
private int playedTime;
@Column(name = "FORCE_REGEN_RATE", nullable = true)
private float forceRegenRate;
@Column(name = "FORCE_POWER", nullable = true, length = 38)
private int forcePower;
@Column(name = "MAX_FORCE_POWER", nullable = true, length = 38)
private int maxForcePower;
@Column(name = "NUM_LOTS", nullable = true, length = 38)
private int numLots;
@Column(name = "ACTIVE_QUESTS", nullable = true, length = 512)
private String activeQuests;
@Column(name = "COMPLETED_QUESTS", nullable = true, length = 512)
private String completedQuests;
@Column(name = "CURRENT_QUEST", nullable = true, length = 38)
private int currentQuest;
@Column(name = "ROLE_ICON_CHOICE", nullable = true, length = 38)
private int roleIconChoice;
@Column(name = "QUESTS", nullable = true, length = 4000)
private String quests;
@Column(name = "QUESTS2", nullable = true, length = 4000)
private String quests2;
@Column(name = "QUESTS3", nullable = true, length = 4000)
private String quests3;
@Column(name = "QUESTS4", nullable = true, length = 4000)
private String quests4;
@Column(name = "SKILL_TEMPLATE", nullable = true, length = 200)
private String skillTemplate;
@Column(name = "WORKING_SKILL", nullable = true, length = 200)
private String workingSkill;
@Column(name = "CURRENT_GCW_POINTS", nullable = true, length = 38)
private int currentGcwPoints;
@Column(name = "CURRENT_GCW_RATING", nullable = true, length = 38)
private int currentGcwRating;
@Column(name = "CURRENT_PVP_KILLS", nullable = true, length = 38)
private int currentGcwKills;
@Column(name = "LIFETIME_GCW_POINTS", nullable = true, length = 38)
private int lifetimeGcwPoints;
@Column(name = "MAX_GCW_IMPERIAL_RATING", nullable = true, length = 38)
private int maxGcwImperialRating;
@Column(name = "MAX_GCW_REBEL_RATING", nullable = true, length = 38)
private int maxGcwRebelRating;
@Column(name = "LIFETIME_PVP_KILLS", nullable = true, length = 38)
private int lifetimePvpKills;
@Column(name = "NEXT_GCW_RATING_CALC_TIME", nullable = true, length = 38)
private int nextGcwRatingCalcTime;
@Column(name = "COLLECTIONS", nullable = true, length = 4000)
private String collections;
@Column(name = "COLLECTIONS2", nullable = true, length = 4000)
private String collections2;
@Column(name = "SHOW_BACKPACK", nullable = true, length = 1)
private char showBackpack;
@Column(name = "SHOW_HELMET", nullable = true, length = 1)
private char showHelmet;
protected PlayerObject() {
}
public Long getObjectId() {
return objectId;
}
public void setObjectId(Long objectId) {
this.objectId = objectId;
}
public Long getStationId() {
return stationId;
}
public void setStationId(Long stationId) {
this.stationId = stationId;
}
public String getPersonalProfileId() {
return personalProfileId;
}
public void setPersonalProfileId(String personalProfileId) {
this.personalProfileId = personalProfileId;
}
public String getCharacterProfileId() {
return characterProfileId;
}
public void setCharacterProfileId(String characterProfileId) {
this.characterProfileId = characterProfileId;
}
public String getSkillTitle() {
return skillTitle;
}
public void setSkillTitle(String skillTitle) {
this.skillTitle = skillTitle;
}
public int getBornDate() {
return bornDate;
}
public void setBornDate(int bornDate) {
this.bornDate = bornDate;
}
public int getPlayedTime() {
return playedTime;
}
public void setPlayedTime(int playedTime) {
this.playedTime = playedTime;
}
public float getForceRegenRate() {
return forceRegenRate;
}
public void setForceRegenRate(float forceRegenRate) {
this.forceRegenRate = forceRegenRate;
}
public int getForcePower() {
return forcePower;
}
public void setForcePower(int forcePower) {
this.forcePower = forcePower;
}
public int getMaxForcePower() {
return maxForcePower;
}
public void setMaxForcePower(int maxForcePower) {
this.maxForcePower = maxForcePower;
}
public int getNumLots() {
return numLots;
}
public void setNumLots(int numLots) {
this.numLots = numLots;
}
public String getActiveQuests() {
return activeQuests;
}
public void setActiveQuests(String activeQuests) {
this.activeQuests = activeQuests;
}
public String getCompletedQuests() {
return completedQuests;
}
public void setCompletedQuests(String completedQuests) {
this.completedQuests = completedQuests;
}
public int getCurrentQuest() {
return currentQuest;
}
public void setCurrentQuest(int currentQuest) {
this.currentQuest = currentQuest;
}
public int getRoleIconChoice() {
return roleIconChoice;
}
public void setRoleIconChoice(int roleIconChoice) {
this.roleIconChoice = roleIconChoice;
}
public String getQuests() {
return quests;
}
public void setQuests(String quests) {
this.quests = quests;
}
public String getQuests2() {
return quests2;
}
public void setQuests2(String quests2) {
this.quests2 = quests2;
}
public String getQuests3() {
return quests3;
}
public void setQuests3(String quests3) {
this.quests3 = quests3;
}
public String getQuests4() {
return quests4;
}
public void setQuests4(String quests4) {
this.quests4 = quests4;
}
public String getSkillTemplate() {
return skillTemplate;
}
public void setSkillTemplate(String skillTemplate) {
this.skillTemplate = skillTemplate;
}
public String getWorkingSkill() {
return workingSkill;
}
public void setWorkingSkill(String workingSkill) {
this.workingSkill = workingSkill;
}
public int getCurrentGcwPoints() {
return currentGcwPoints;
}
public void setCurrentGcwPoints(int currentGcwPoints) {
this.currentGcwPoints = currentGcwPoints;
}
public int getCurrentGcwRating() {
return currentGcwRating;
}
public void setCurrentGcwRating(int currentGcwRating) {
this.currentGcwRating = currentGcwRating;
}
public int getCurrentGcwKills() {
return currentGcwKills;
}
public void setCurrentGcwKills(int currentGcwKills) {
this.currentGcwKills = currentGcwKills;
}
public int getLifetimeGcwPoints() {
return lifetimeGcwPoints;
}
public void setLifetimeGcwPoints(int lifetimeGcwPoints) {
this.lifetimeGcwPoints = lifetimeGcwPoints;
}
public int getMaxGcwImperialRating() {
return maxGcwImperialRating;
}
public void setMaxGcwImperialRating(int maxGcwImperialRating) {
this.maxGcwImperialRating = maxGcwImperialRating;
}
public int getMaxGcwRebelRating() {
return maxGcwRebelRating;
}
public void setMaxGcwRebelRating(int maxGcwRebelRating) {
this.maxGcwRebelRating = maxGcwRebelRating;
}
public int getLifetimePvpKills() {
return lifetimePvpKills;
}
public void setLifetimePvpKills(int lifetimePvpKills) {
this.lifetimePvpKills = lifetimePvpKills;
}
public int getNextGcwRatingCalcTime() {
return nextGcwRatingCalcTime;
}
public void setNextGcwRatingCalcTime(int nextGcwRatingCalcTime) {
this.nextGcwRatingCalcTime = nextGcwRatingCalcTime;
}
public String getCollections() {
return collections;
}
public void setCollections(String collections) {
this.collections = collections;
}
public String getCollections2() {
return collections2;
}
public void setCollections2(String collections2) {
this.collections2 = collections2;
}
public char getShowBackpack() {
return showBackpack;
}
public void setShowBackpack(char showBackpack) {
this.showBackpack = showBackpack;
}
public char getShowHelmet() {
return showHelmet;
}
public void setShowHelmet(char showHelmet) {
this.showHelmet = showHelmet;
}
}

View File

@@ -758,10 +758,12 @@ public class SwgConfiguration {
private String type;
private String path;
private List<LogTargetFilter> filters;
private boolean status;
LogTarget() {}
public String toString() {
if(!status) return null;
StringBuilder output = new StringBuilder(type + ":" + path);
if(filters != null && filters.size() > 0) {
int filterSize = filters.size();
@@ -785,6 +787,7 @@ public class SwgConfiguration {
public String toString() {
return getTypeValue() + getFilteredValue() + (isNegate() ? "!" : "") + match;
}
private String getTypeValue() {
@@ -839,6 +842,14 @@ public class SwgConfiguration {
}
}
public boolean isStatus() {
return status;
}
public void setStatus(boolean status) {
this.status = status;
}
public String getType() {
return type;
}

View File

@@ -140,6 +140,7 @@ sharedLog:
- type: net
path: 127.0.0.1:44467
filters:
status: true
- type: file
path: logs/log.txt
filters:
@@ -151,6 +152,7 @@ sharedLog:
match: CustomerService
negate: false
filtered: true
status: true
sharedNetwork:
oldestUnacknowledgedTimeout: 0
noDataTimeout: 1000000