update for latest GHS, update dependencies

Lurkars · Sep 4, 2024 · 6e618ee · 6e618ee
1 parent f66e212
commit 6e618ee
Show file tree

Hide file tree

Showing 5 changed files with 257 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,13 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
-		<revision>0.99.18</revision>
+		<revision>0.100.0</revision>
 	</properties>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.4</version>
+		<version>3.3.3</version>
 		<relativePath />
 	</parent>
 

diff --git a/src/main/java/de/champonthis/ghs/server/model/GameMonsterEntityModel.java b/src/main/java/de/champonthis/ghs/server/model/GameMonsterEntityModel.java
@@ -39,6 +39,12 @@ public class GameMonsterEntityModel {
 	private LinkedList<String> markers = new LinkedList<>();
 	@Required
 	private LinkedList<String> tags = new LinkedList<>();
+	private String shield;
+	private String shieldPersistent;
+	@Required
+	private LinkedList<String> retaliate = new LinkedList<>();
+	@Required
+	private LinkedList<String> retaliatePersistent = new LinkedList<>();
 
 	/**
 	 * Gets the number.
@@ -310,4 +316,76 @@ public void setTags(LinkedList<String> tags) {
 		this.tags = tags;
 	}
 
+	/**
+	 * Gets the shield.
+	 *
+	 * @return the shield
+	 */
+	public String getShield() {
+		return shield;
+	}
+
+	/**
+	 * Sets the shield.
+	 *
+	 * @param shield the new shield
+	 */
+	public void setShield(String shield) {
+		this.shield = shield;
+	}
+
+	/**
+	 * Gets the shield permanent.
+	 *
+	 * @return the shield permanent
+	 */
+	public String getShieldPersistent() {
+		return shieldPersistent;
+	}
+
+	/**
+	 * Sets the shield permanent.
+	 *
+	 * @param shieldPersistent the new shield permanent
+	 */
+	public void setShieldPersistent(String shieldPersistent) {
+		this.shieldPersistent = shieldPersistent;
+	}
+
+	/**
+	 * Gets the retaliate.
+	 *
+	 * @return the retaliate
+	 */
+	public LinkedList<String> getRetaliate() {
+		return retaliate;
+	}
+
+	/**
+	 * Sets the retaliate.
+	 *
+	 * @param retaliate the new retaliate
+	 */
+	public void setRetaliate(LinkedList<String> retaliate) {
+		this.retaliate = retaliate;
+	}
+
+	/**
+	 * Gets the retaliate permanent.
+	 *
+	 * @return the retaliate permanent
+	 */
+	public LinkedList<String> getRetaliatePersistent() {
+		return retaliatePersistent;
+	}
+
+	/**
+	 * Sets the retaliate permanent.
+	 *
+	 * @param retaliatePersistent the new retaliate permanent
+	 */
+	public void setRetaliatePersistent(LinkedList<String> retaliatePersistent) {
+		this.retaliatePersistent = retaliatePersistent;
+	}
+
 }
diff --git a/src/main/java/de/champonthis/ghs/server/model/GameObjectiveEntityModel.java b/src/main/java/de/champonthis/ghs/server/model/GameObjectiveEntityModel.java
@@ -35,6 +35,12 @@ public class GameObjectiveEntityModel {
 	private LinkedList<String> markers = new LinkedList<>();
 	@Required
 	private LinkedList<String> tags = new LinkedList<>();
+	private String shield;
+	private String shieldPersistent;
+	@Required
+	private LinkedList<String> retaliate = new LinkedList<>();
+	@Required
+	private LinkedList<String> retaliatePersistent = new LinkedList<>();
 
 	/**
 	 * Gets the uuid.
@@ -270,4 +276,76 @@ public void setTags(LinkedList<String> tags) {
 		this.tags = tags;
 	}
 
+	/**
+	 * Gets the shield.
+	 *
+	 * @return the shield
+	 */
+	public String getShield() {
+		return shield;
+	}
+
+	/**
+	 * Sets the shield.
+	 *
+	 * @param shield the new shield
+	 */
+	public void setShield(String shield) {
+		this.shield = shield;
+	}
+
+	/**
+	 * Gets the shield permanent.
+	 *
+	 * @return the shield permanent
+	 */
+	public String getShieldPersistent() {
+		return shieldPersistent;
+	}
+
+	/**
+	 * Sets the shield permanent.
+	 *
+	 * @param shieldPersistent the new shield permanent
+	 */
+	public void setShieldPersistent(String shieldPersistent) {
+		this.shieldPersistent = shieldPersistent;
+	}
+
+	/**
+	 * Gets the retaliate.
+	 *
+	 * @return the retaliate
+	 */
+	public LinkedList<String> getRetaliate() {
+		return retaliate;
+	}
+
+	/**
+	 * Sets the retaliate.
+	 *
+	 * @param retaliate the new retaliate
+	 */
+	public void setRetaliate(LinkedList<String> retaliate) {
+		this.retaliate = retaliate;
+	}
+
+	/**
+	 * Gets the retaliate permanent.
+	 *
+	 * @return the retaliate permanent
+	 */
+	public LinkedList<String> getRetaliatePersistent() {
+		return retaliatePersistent;
+	}
+
+	/**
+	 * Sets the retaliate permanent.
+	 *
+	 * @param retaliatePersistent the new retaliate permanent
+	 */
+	public void setRetaliatePersistent(LinkedList<String> retaliatePersistent) {
+		this.retaliatePersistent = retaliatePersistent;
+	}
+
 }
diff --git a/src/main/java/de/champonthis/ghs/server/model/GameSummonModel.java b/src/main/java/de/champonthis/ghs/server/model/GameSummonModel.java
@@ -49,6 +49,12 @@ public class GameSummonModel {
 	private String thumbnail;
 	private String thumbnailUrl;
 	private boolean noThumbnail = false;
+	private String shield;
+	private String shieldPersistent;
+	@Required
+	private LinkedList<String> retaliate = new LinkedList<>();
+	@Required
+	private LinkedList<String> retaliatePersistent = new LinkedList<>();
 
 	/**
 	 * Gets the uuid.
@@ -536,4 +542,76 @@ public void setNoThumbnail(boolean noThumbnail) {
 		this.noThumbnail = noThumbnail;
 	}
 
+	/**
+	 * Gets the shield.
+	 *
+	 * @return the shield
+	 */
+	public String getShield() {
+		return shield;
+	}
+
+	/**
+	 * Sets the shield.
+	 *
+	 * @param shield the new shield
+	 */
+	public void setShield(String shield) {
+		this.shield = shield;
+	}
+
+	/**
+	 * Gets the shield permanent.
+	 *
+	 * @return the shield permanent
+	 */
+	public String getShieldPersistent() {
+		return shieldPersistent;
+	}
+
+	/**
+	 * Sets the shield permanent.
+	 *
+	 * @param shieldPersistent the new shield permanent
+	 */
+	public void setShieldPersistent(String shieldPersistent) {
+		this.shieldPersistent = shieldPersistent;
+	}
+
+	/**
+	 * Gets the retaliate.
+	 *
+	 * @return the retaliate
+	 */
+	public LinkedList<String> getRetaliate() {
+		return retaliate;
+	}
+
+	/**
+	 * Sets the retaliate.
+	 *
+	 * @param retaliate the new retaliate
+	 */
+	public void setRetaliate(LinkedList<String> retaliate) {
+		this.retaliate = retaliate;
+	}
+
+	/**
+	 * Gets the retaliate permanent.
+	 *
+	 * @return the retaliate permanent
+	 */
+	public LinkedList<String> getRetaliatePersistent() {
+		return retaliatePersistent;
+	}
+
+	/**
+	 * Sets the retaliate permanent.
+	 *
+	 * @param retaliatePersistent the new retaliate permanent
+	 */
+	public void setRetaliatePersistent(LinkedList<String> retaliatePersistent) {
+		this.retaliatePersistent = retaliatePersistent;
+	}
+
 }
diff --git a/src/main/java/de/champonthis/ghs/server/model/Settings.java b/src/main/java/de/champonthis/ghs/server/model/Settings.java
@@ -186,6 +186,8 @@ public class Settings {
 	@Required
 	private boolean standees = true;
 	@Required
+	private boolean standeeShieldRetaliate = false;
+	@Required
 	private boolean standeeStats = false;
 	@Required
 	private boolean stats = true;
@@ -1722,6 +1724,25 @@ public void setStandees(boolean standees) {
 		this.standees = standees;
 	}
 
+	/**
+	 * Checks if is summon shield retaliate.
+	 *
+	 * @return true, if is summon shield retaliate
+	 */
+	public boolean isStandeeShieldRetaliate() {
+		return standeeShieldRetaliate;
+	}
+
+	/**
+	 * Sets the summon shield retaliate.
+	 *
+	 * @param standeeShieldRetaliate the new summon shield retaliate
+	 */
+	public void setStandeeShieldRetaliate(boolean standeeShieldRetaliate) {
+		this.standeeShieldRetaliate = standeeShieldRetaliate;
+	}
+
+
 	/**
 	 * Checks if is standee stats.
 	 *