Merge branch 'master' of github.com:ago1024/WurmServerModLauncher into develop

Author: ago1024

modules/dist/pom.xml

@@ -13,6 +13,17 @@
 		<relativePath>../..</relativePath>
 	</parent>
 
+	<pluginRepositories>
+		<pluginRepository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<id>bintray-cy6ergn0m-maven</id>
+			<name>bintray-plugins</name>
+			<url>http://dl.bintray.com/cy6ergn0m/maven</url>
+		</pluginRepository>
+	</pluginRepositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -126,7 +137,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>make-assembly</id>
@@ -140,6 +151,7 @@
 							</descriptors>
 							<finalName>server-modlauncher-${project.version}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
+							<attach>false</attach> <!-- we pick it up with the groovy script below -->
 						</configuration>
 					</execution>
 					<execution>
@@ -158,6 +170,68 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.gmaven</groupId>
+				<artifactId>groovy-maven-plugin</artifactId>
+				<version>2.0</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-all</artifactId>
+						<version>2.0.6</version>
+					</dependency>
+				</dependencies>
+
+				<executions>
+					<execution>
+						<id>attach-modules</id>
+						<phase>package</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<properties>
+								<path>${project.build.directory}/dist-${project.version}</path>
+							</properties>
+							<source>
+								println 'Hello';
+								println properties.path;
+								println project.attachedArtifacts;
+								def projectHelper = container.lookup("org.apache.maven.project.MavenProjectHelper")
+								new File(properties.path).eachFile() { file ->
+									projectHelper.attachArtifact(project, 'mod', file.name, file);
+								}
+								println project.attachedArtifacts;
+
+							</source>
+						</configuration>
+					</execution>
+				</executions>
+
+			</plugin>
+
+			<plugin>
+				<groupId>cy.github</groupId>
+				<artifactId>github-release-plugin</artifactId>
+				<version>0.5.1</version>
+
+				<configuration>
+					<tagName>v${project.version}</tagName>
+					<releaseTitle>Version v${project.version}</releaseTitle>
+					<preRelease>true</preRelease>
+				</configuration>
+
+				<executions>
+					<execution>
+						<id>github-upload</id>
+						<goals>
+							<goal>gh-upload</goal>
+						</goals>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

modules/modlauncher/pom.xml

@@ -40,6 +40,12 @@
 			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.8.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<properties>

modules/modlauncher/src/dist/modlauncher.sh

@@ -6,7 +6,7 @@ fi
 
 if test -x "runtime/jre1.8.0_121/bin/java"; then
 	JAVA="runtime/jre1.8.0_121/bin/java"
-elif test -x "../runtime/jre1.8.0_1210/bin/java"; then
+elif test -x "../runtime/jre1.8.0_121/bin/java"; then
 	JAVA="../runtime/jre1.8.0_121/bin/java"
 else
 	JAVA="java"

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/NonFreezingNamedIdParser.java

@@ -0,0 +1,31 @@
+package org.gotti.wurmunlimited.modsupport;
+
+import org.gotti.wurmunlimited.modloader.DefrostingClassLoader;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+
+import javassist.CannotCompileException;
+import javassist.NotFoundException;
+
+/**
+ * Create a NamedIdParser using the DefrostingClassLoader.
+ * <p>
+ * This means the class generated to read the names will be defrosted
+ * after use and is available for further modifications
+ */
+public abstract class NonFreezingNamedIdParser extends NamedIdParser {
+	
+	/**
+	 * Get the name of the class holding the names.
+	 * @return class name
+	 */
+	protected abstract String getNamesClassName();
+	
+	@Override
+	protected final Class<?> getNamesClass() {
+		try (DefrostingClassLoader classLoader =  new DefrostingClassLoader(HookManager.getInstance().getClassPool())) {
+			return classLoader.loadClass(getNamesClassName());
+		} catch (ClassNotFoundException | NotFoundException | CannotCompileException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/creatures/CreatureTemplateParser.java

@@ -1,31 +1,29 @@
 package org.gotti.wurmunlimited.modsupport.creatures;
 
-import org.gotti.wurmunlimited.modsupport.NamedIdParser;
-
-import com.wurmonline.server.creatures.CreatureTemplateIds;
+import org.gotti.wurmunlimited.modsupport.NonFreezingNamedIdParser;
 
 /**
  * Parse a list of creature templates and creature template ids.
  */
-public class CreatureTemplateParser extends NamedIdParser {
+public class CreatureTemplateParser extends NonFreezingNamedIdParser {
 
 	@Override
-	protected Class<?> getNamesClass() {
-		return CreatureTemplateIds.class;
+	protected String getNamesClassName() {
+		return "com.wurmonline.server.creatures.CreatureTemplateIds";
 	}
 
 	@Override
 	protected boolean isValidName(String fieldName) {
-		return fieldName.endsWith("_cid");
+		return fieldName.endsWith("_CID");
 	}
 
 	@Override
 	protected String cleanupFieldName(String fieldName) {
-		return fieldName.replaceAll("_cid$", "");
+		return fieldName.replaceAll("_CID$", "");
 	}
 
 	@Override
 	protected int unparsable(String name) {
-		throw new IllegalArgumentException(name + "is not a valid CreatureTemplateId");
+		throw new IllegalArgumentException(name + " is not a valid creature template id");
 	}
 }

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/creatures/CreatureTypesParser.java

@@ -1,17 +1,15 @@
 package org.gotti.wurmunlimited.modsupport.creatures;
 
-import org.gotti.wurmunlimited.modsupport.NamedIdParser;
-
-import com.wurmonline.server.creatures.CreatureTypes;
+import org.gotti.wurmunlimited.modsupport.NonFreezingNamedIdParser;
 
 /**
  * Parse a list of creature types and creature type ids.
  */
-public class CreatureTypesParser extends NamedIdParser {
+public class CreatureTypesParser extends NonFreezingNamedIdParser {
 
 	@Override
-	protected Class<?> getNamesClass() {
-		return CreatureTypes.class;
+	protected String getNamesClassName() {
+		return "com.wurmonline.server.creatures.CreatureTypes";
 	}
 
 	@Override
@@ -26,6 +24,6 @@ protected String cleanupFieldName(String fieldName) {
 
 	@Override
 	protected int unparsable(String name) {
-		throw new IllegalArgumentException(name + "is not a valid CreatureType");
+		throw new IllegalArgumentException(name + " is not a valid creature type");
 	}
 }

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modsupport/items/ItemIdParser.java

@@ -1,21 +1,19 @@
 package org.gotti.wurmunlimited.modsupport.items;
 
-import org.gotti.wurmunlimited.modsupport.NamedIdParser;
-
-import com.wurmonline.server.items.ItemList;
+import org.gotti.wurmunlimited.modsupport.NonFreezingNamedIdParser;
 
 /**
  * Parse a list of item names and ids.
  */
-public class ItemIdParser extends NamedIdParser {
+public class ItemIdParser extends NonFreezingNamedIdParser {
 
 	@Override
-	protected Class<?> getNamesClass() {
-		return ItemList.class;
+	protected String getNamesClassName() {
+		return "com.wurmonline.server.items.ItemList";
 	}
 
 	@Override
 	protected int unparsable(String name) {
-		throw new IllegalArgumentException(name + "is not a valid item name");
+		throw new IllegalArgumentException(name + " is not a valid item name");
 	}
 }

modules/modlauncher/src/test/java/org/gotti/wurmunlimited/modsupport/creatures/CreatureTemplateParserTest.java

@@ -0,0 +1,70 @@
+package org.gotti.wurmunlimited.modsupport.creatures;
+
+import org.assertj.core.api.Assertions;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javassist.CtClass;
+import javassist.CtField;
+
+public class CreatureTemplateParserTest {
+	
+	private CreatureTemplateParser parser;
+	
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+	
+	@Before
+	public void setup() {
+		parser = new CreatureTemplateParser();
+	}
+
+	/**
+	 * Simple test case. Parse a name
+	 */
+	@Test
+	public void test() {
+		Assertions.assertThat(parser.parse("troll king")).isEqualTo(27);
+	}
+	
+	/**
+	 * Simple test case. Parse an id
+	 */
+	@Test
+	public void testId() {
+		Assertions.assertThat(parser.parse("27")).isEqualTo(27);
+	}
+	
+	/**
+	 * Simple test case. Parse an invalid value
+	 */
+	@Test
+	public void testInvalid() {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("test is not a valid creature template id");
+		Assertions.assertThat(parser.parse("test")).isEqualTo(37);
+	}
+	
+	/**
+	 * Test adding a new id after querying an id
+	 */
+	@Test
+	public void testDefrosting() throws Exception {
+		Assertions.assertThat(parser.parse("troll king")).isEqualTo(27);
+		
+		// Add a new field
+		CtClass ctIds = HookManager.getInstance().getClassPool().get("com.wurmonline.server.creatures.CreatureTemplateIds");
+		ctIds.addField(CtField.make("public static final int TEST_CID = 37;", ctIds));
+		
+		// Test that it works
+		Assertions.assertThat(new CreatureTemplateParser().parse("test")).isEqualTo(37);
+		
+		// test that same does not work on the old parser
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("test is not a valid creature template id");
+		Assertions.assertThat(parser.parse("test")).isEqualTo(37);
+	}
+}

modules/modlauncher/src/test/java/org/gotti/wurmunlimited/modsupport/creatures/CreatureTypesParserTest.java

@@ -0,0 +1,70 @@
+package org.gotti.wurmunlimited.modsupport.creatures;
+
+import org.assertj.core.api.Assertions;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javassist.CtClass;
+import javassist.CtField;
+
+public class CreatureTypesParserTest {
+	
+	private CreatureTypesParser parser;
+	
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+	
+	@Before
+	public void setup() {
+		parser = new CreatureTypesParser();
+	}
+
+	/**
+	 * Simple test case. Parse a name
+	 */
+	@Test
+	public void test() {
+		Assertions.assertThat(parser.parse("herd")).isEqualTo(10);
+	}
+	
+	/**
+	 * Simple test case. Parse an id
+	 */
+	@Test
+	public void testId() {
+		Assertions.assertThat(parser.parse("10")).isEqualTo(10);
+	}
+	
+	/**
+	 * Simple test case. Parse an invalid value
+	 */
+	@Test
+	public void testInvalid() {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("test is not a valid creature type");
+		Assertions.assertThat(parser.parse("test")).isEqualTo(37);
+	}
+	
+	/**
+	 * Test adding a new id after querying an id
+	 */
+	@Test
+	public void testDefrosting() throws Exception {
+		Assertions.assertThat(parser.parse("herd")).isEqualTo(10);
+		
+		// Add a new field
+		CtClass ctIds = HookManager.getInstance().getClassPool().get("com.wurmonline.server.creatures.CreatureTypes");
+		ctIds.addField(CtField.make("public static final int C_TYPE_TEST = 37;", ctIds));
+		
+		// Test that it works
+		Assertions.assertThat(new CreatureTypesParser().parse("test")).isEqualTo(37);
+		
+		// test that same does not work on the old parser
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("test is not a valid creature type");
+		Assertions.assertThat(parser.parse("test")).isEqualTo(37);
+	}
+}