Merge branch 'develop'

ago1024 · ago1024 · commit 7bdd0ad5c756 · 2017-07-04T19:03:38.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sh	text eol=lf
diff --git a/modules/demo/actiondemo/pom.xml b/modules/demo/actiondemo/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/demo/christmasmod/pom.xml b/modules/demo/christmasmod/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/demo/creaturedemo/pom.xml b/modules/demo/creaturedemo/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/demo/digtoground/pom.xml b/modules/demo/digtoground/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/demo/digtoground/src/main/java/org/gotti/wurmunlimited/mods/digtoground/DigToGround.java b/modules/demo/digtoground/src/main/java/org/gotti/wurmunlimited/mods/digtoground/DigToGround.java
@@ -47,6 +47,7 @@ public void preInit() {
 					CtClass.intType,
 					CtClass.intType,
 					CtClass.floatType,
+					CtClass.booleanType,
 					classpool.get("com.wurmonline.mesh.MeshIO")
 			});
 			classpool.get("com.wurmonline.server.behaviours.Terraforming").getMethod("dig", descriptor).instrument(new ExprEditor() {
@@ -96,7 +97,8 @@ public void edit(MethodCall m) throws CannotCompileException {
 					CtClass.intType,
 					CtClass.intType,
 					CtClass.intType,
-					CtClass.booleanType
+					CtClass.booleanType,
+					classpool.get("com.wurmonline.server.behaviours.Action")
 			});
 			classpool.get("com.wurmonline.server.behaviours.Flattening").getMethod("getDirt", descriptor).instrument(new ExprEditor() {
 				@Override
diff --git a/modules/demo/hitchingpost/pom.xml b/modules/demo/hitchingpost/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/demo/serverfixes/pom.xml b/modules/demo/serverfixes/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/dist/pom.xml b/modules/dist/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/modules/modlauncher/pom.xml b/modules/modlauncher/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>common</artifactId>
-			<version>1798592</version>
+			<version>1936222</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server</artifactId>
-			<version>1798592</version>
+			<version>1936222</version>
 		</dependency>
 		<dependency>
 			<groupId>org.javassist</groupId>
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformer.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformer.java
@@ -22,16 +22,26 @@
  */
 public interface ActionPerformer extends ActionPerformerBase {
 
+	@Deprecated
 	public default boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
 		setServerPropagation(action, true);
 		return true;
 	}
 
+	public default boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return action(action, performer, source, tilex, tiley, onSurface, corner, tile, num, counter);
+	}
+
+	@Deprecated
 	public default boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
 		setServerPropagation(action, true);
 		return true;
 	}
 
+	public default boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return action(action, performer, tilex, tiley, onSurface, corner, tile, num, counter);
+	}
+
 	public default boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, int tile, short num, float counter) {
 		setServerPropagation(action, true);
 		return true;
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformerBase.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformerBase.java
@@ -15,8 +15,12 @@ public interface ActionPerformerBase {
 
 	boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter);
 
+	boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter);
+
 	boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter);
 
+	boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter);
+
 	boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, int tile, short num, float counter);
 
 	boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, int heightOffset, int tile, short num, float counter);
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformerChain.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/ActionPerformerChain.java
@@ -37,12 +37,12 @@ public void addActionPerformer(ActionPerformer actionPerformer) {
 		actionPerformers.add(actionPerformer);
 	}
 	
-	public boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
-		return wrap(action).action(action, performer, source, tilex, tiley, onSurface, corner, tile, num, counter);
+	public boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return wrap(action).action(action, performer, source, tilex, tiley, onSurface, corner, tile, heightOffset, num, counter);
 	}
 
-	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
-		return wrap(action).action(action, performer, tilex, tiley, onSurface, corner, tile, num, counter);
+	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return wrap(action).action(action, performer, tilex, tiley, onSurface, corner, tile, heightOffset, num, counter);
 	}
 
 	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, int tile, short num, float counter) {
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/BehaviourProvider.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/BehaviourProvider.java
@@ -43,14 +43,24 @@ public default List<ActionEntry> getBehavioursFor(Creature performer, int tilex,
 		return null;
 	}
 
+	@Deprecated
 	public default List<ActionEntry> getBehavioursFor(Creature performer, Item object, int tilex, int tiley, boolean onSurface, boolean corner, int tile) {
 		return null;
 	}
 
+	public default List<ActionEntry> getBehavioursFor(Creature performer, Item object, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+		return getBehavioursFor(performer, object, tilex, tiley, onSurface, corner, tile);
+	}
+
+	@Deprecated
 	public default List<ActionEntry> getBehavioursFor(Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile) {
 		return null;
 	}
 
+	public default List<ActionEntry> getBehavioursFor(Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+		return getBehavioursFor(performer, tilex, tiley, onSurface, corner, tile);
+	}
+
 	public default List<ActionEntry> getBehavioursFor(Creature performer, Item subject, Skill skill) {
 		return null;
 	}
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/WrappedBehaviour.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/WrappedBehaviour.java
@@ -49,12 +49,12 @@ public WrappedBehaviour(Behaviour behaviour, List<ActionPerformer> actionPerform
 		this.actionPerformers = actionPerformers;
 	}
 	
-	public boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
-		return action(action, actionPerformer -> actionPerformer.action(action, performer, source, tilex, tiley, onSurface, corner, tile, num, counter));
+	public boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return action(action, actionPerformer -> actionPerformer.action(action, performer, source, tilex, tiley, onSurface, corner, tile, heightOffset, num, counter));
 	}
 
-	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, short num, float counter) {
-		return action(action, actionPerformer -> actionPerformer.action(action, performer, tilex, tiley, onSurface, corner, tile, num, counter));
+	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter) {
+		return action(action, actionPerformer -> actionPerformer.action(action, performer, tilex, tiley, onSurface, corner, tile, heightOffset, num, counter));
 	}
 
 	public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, int tile, short num, float counter) {
diff --git a/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/WrappedBehaviourProvider.java b/modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/actions/WrappedBehaviourProvider.java
@@ -57,8 +57,8 @@ public List<ActionEntry> getBehavioursFor(Creature performer, int planetId) {
 	}
 
 	@Override
-	public List<ActionEntry> getBehavioursFor(Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile) {
-		return wrapped.getBehavioursFor(performer, tilex, tiley, onSurface, corner, tile);
+	public List<ActionEntry> getBehavioursFor(Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+		return wrapped.getBehavioursFor(performer, tilex, tiley, onSurface, corner, tile, heightOffset);
 	}
 
 	@Override
@@ -82,8 +82,8 @@ public List<ActionEntry> getBehavioursFor(Creature performer, Item object, int p
 	}
 
 	@Override
-	public List<ActionEntry> getBehavioursFor(Creature performer, Item object, int tilex, int tiley, boolean onSurface, boolean corner, int tile) {
-		return wrapped.getBehavioursFor(performer, object, tilex, tiley, onSurface, corner, tile);
+	public List<ActionEntry> getBehavioursFor(Creature performer, Item object, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+		return wrapped.getBehavioursFor(performer, object, tilex, tiley, onSurface, corner, tile, heightOffset);
 	}
 
 	@Override
diff --git a/modules/mods/announcer/pom.xml b/modules/mods/announcer/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/mods/announcer/src/dist/announcer.properties b/modules/mods/announcer/src/dist/announcer.properties
@@ -2,6 +2,8 @@ classname=org.gotti.wurmunlimited.mods.announcer.AnnounceMod
 classpath=announcer.jar
 # Enable announcing of players
 announcePlayers=true
+# Enable announcing of player logout
+announcePlayerLogout=true
 # Set the maximum player power to announce
 # The value of 0 only announces regular players
 # A value of 5 will announce the login of all players, even all levels of gms
diff --git a/modules/mods/announcer/src/main/java/org/gotti/wurmunlimited/mods/announcer/AnnounceMod.java b/modules/mods/announcer/src/main/java/org/gotti/wurmunlimited/mods/announcer/AnnounceMod.java
@@ -15,15 +15,18 @@
 
 public class AnnounceMod implements WurmServerMod, Initable, PreInitable, Configurable, PlayerLoginListener {
 
-	boolean announcePlayers = true;
-	int announceMaxPower = 0;
+	private boolean announcePlayers = true;
+	private boolean announcePlayerLogout = true;
+	private int announceMaxPower = 0;
 
 	@Override
 	public void configure(Properties properties) {
 		announcePlayers = Boolean.valueOf(properties.getProperty("announcePlayers", String.valueOf(announcePlayers)));
+		announcePlayerLogout = Boolean.valueOf(properties.getProperty("announcePlayerLogout", String.valueOf(announcePlayerLogout)));
 		announceMaxPower = Integer.valueOf(properties.getProperty("announceMaxPower", String.valueOf(announceMaxPower)));
 
 		Logger.getLogger(AnnounceMod.class.getName()).log(Level.INFO, "announcePlayers: " + announcePlayers);
+		Logger.getLogger(AnnounceMod.class.getName()).log(Level.INFO, "announcePlayerLogout: " + announcePlayerLogout);
 		Logger.getLogger(AnnounceMod.class.getName()).log(Level.INFO, "announceMaxPower: " + announceMaxPower);
 	}
 
@@ -41,5 +44,11 @@ public void onPlayerLogin(Player player) {
 			MessageServer.broadCastSafe("Player " + player.getName() + " has logged in.", (byte) 1);
 		}
 	}
+	
+	public void onPlayerLogout(Player player) {
+		if (this.announcePlayerLogout && player.getPower() <= this.announceMaxPower) {
+			MessageServer.broadCastSafe("Player " + player.getName() + " has logged out.", (byte) 1);
+		}
+	}
 
 }
diff --git a/modules/mods/bagofholding/pom.xml b/modules/mods/bagofholding/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/mods/creatureagemod/pom.xml b/modules/mods/creatureagemod/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/mods/cropmod/pom.xml b/modules/mods/cropmod/pom.xml
@@ -10,15 +10,15 @@
 	<parent>
 		<groupId>org.gotti.wurmunlimited</groupId>
 		<artifactId>server-modlauncher-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-beta1</version>
 		<relativePath>../../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.gotti.wurmunlimited</groupId>
 			<artifactId>server-modlauncher</artifactId>
-			<version>0.25</version>
+			<version>0.26-beta1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/mods/harvesthelper/pom.xml b/modules/mods/harvesthelper/pom.xml
diff --git a/modules/mods/harvesthelper/src/main/java/org/gotti/wurmunlimited/mods/harvesthelper/HarvestHelperMod.java b/modules/mods/harvesthelper/src/main/java/org/gotti/wurmunlimited/mods/harvesthelper/HarvestHelperMod.java
diff --git a/modules/mods/harvesthelper/src/main/java/org/gotti/wurmunlimited/mods/harvesthelper/HarvestHelperSeasons.java b/modules/mods/harvesthelper/src/main/java/org/gotti/wurmunlimited/mods/harvesthelper/HarvestHelperSeasons.java
diff --git a/modules/mods/inbreedwarning/pom.xml b/modules/mods/inbreedwarning/pom.xml
diff --git a/modules/mods/scriptrunner/pom.xml b/modules/mods/scriptrunner/pom.xml
diff --git a/modules/mods/scriptrunner/src/dist/scriptrunner/imports/actions.js b/modules/mods/scriptrunner/src/dist/scriptrunner/imports/actions.js
diff --git a/modules/mods/serverpacks/pom.xml b/modules/mods/serverpacks/pom.xml
diff --git a/modules/mods/spellmod/pom.xml b/modules/mods/spellmod/pom.xml
diff --git a/modules/mods/testmod/pom.xml b/modules/mods/testmod/pom.xml
diff --git a/modules/patcher/pom.xml b/modules/patcher/pom.xml
diff --git a/pom.xml b/pom.xml
