Merge 2df68f9 into 87a925a

pehala · Aug 26, 2020 · c9dbe8c · c9dbe8c
2 parents 87a925a + 2df68f9
commit c9dbe8c
Show file tree

Hide file tree

Showing 30 changed files with 742 additions and 378 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,102 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  pull_request:
+    branches:
+      - master
+
+name: Create Release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Install Dependencies
+        run: sudo apt-get install -y genisoimage
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Get Maven version
+        run: echo "::set-env name=VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+          draft: true
+          prerelease: false
+      - name: Upload Tracks
+        id: upload-tracks
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          asset_path: shared/target/tracks.zip
+          asset_name: tracks.zip
+          asset_content_type: application/zip
+      - name: Upload Server Jar
+        id: upload-server-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          asset_path: server/target/server-${{ env.VERSION }}.jar
+          asset_name: server-${{ env.VERSION }}.jar
+          asset_content_type: application/jar
+      - name: Upload Editor Jar
+        id: upload-editor-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          asset_path: editor/target/editor-${{ env.VERSION }}.jar
+          asset_name: editor-${{ env.VERSION }}.jar
+          asset_content_type: application/jar
+      - name: Upload Client Jar
+        id: upload-client-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          asset_path: client/target/client-${{ env.VERSION }}.jar
+          asset_name: client-${{ env.VERSION }}.jar
+          asset_content_type: application/jar
+      - name: Upload Client exe
+        id: upload-client-exe
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: client/target/client-${{ env.VERSION }}.exe
+          asset_name: client-${{ env.VERSION }}.exe
+          asset_content_type: application/exe
+      - name: Upload Client dmg
+        id: upload-client-dmg
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: client/target/client-${{ env.VERSION }}.dmg
+          asset_name: client-${{ env.VERSION }}.dmg
+          asset_content_type: application/octet-stream
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/workspace.xml
+.idea/
 excluded
 out
diff --git a/.travis.yml b/.travis.yml
diff --git a/client/build.xml b/client/build.xml
diff --git a/client/client.iml b/client/client.iml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="eclipse" classpath-dir="$MODULE_DIR$" rename-to="moduleName" type="JAVA_MODULE" version="4" />
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" rename-to="moduleName" type="JAVA_MODULE" version="4" />
diff --git a/client/pom.xml b/client/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>client</artifactId>
+    <version>1.0</version>
+
+    <parent>
+        <groupId>org.moparforia</groupId>
+        <artifactId>playforia-minigolf</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <properties>
+        <project.mainClass>org.moparforia.client.Launcher</project.mainClass>
+        <project.name>Playforia Minigolf Client</project.name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.6.6.Final</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>res</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>${project.mainClass}</mainClass>
+                    <addResourcesToClasspath>true</addResourcesToClasspath>
+                    <longClasspath>true</longClasspath>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>sh.tak.appbundler</groupId>
+                <artifactId>appbundle-maven-plugin</artifactId>
+                <version>1.2.0</version>
+                <configuration>
+                    <bundleName>${project.name}</bundleName>
+                    <iconFile>res/icons/playforia.icns</iconFile>
+                    <mainClass>${project.mainClass}</mainClass>
+                    <generateDiskImageFile>true</generateDiskImageFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>osx-build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+                <artifactId>launch4j-maven-plugin</artifactId>
+                <version>1.5.1</version>
+                <executions>
+                    <execution>
+                        <id>windows-build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>launch4j</goal>
+                        </goals>
+                        <configuration>
+                            <headerType>gui</headerType>
+                            <jar>${project.build.directory}/${project.artifactId}-${project.version}.jar</jar>
+                            <outfile>${project.build.directory}/${project.artifactId}-${project.version}.exe</outfile>
+                            <downloadUrl>http://java.com/download</downloadUrl>
+                            <classPath>
+                                <mainClass>${project.mainClass}</mainClass>
+                                <preCp>anything</preCp>
+                            </classPath>
+                            <icon>res/icons/playforia.ico</icon>
+                            <jre>
+                                <minVersion>1.8.0</minVersion>
+                                <jdkPreference>preferJre</jdkPreference>
+                            </jre>
+                            <versionInfo>
+                                <fileVersion>1.0.0.0</fileVersion>
+                                <txtFileVersion>${project.version}</txtFileVersion>
+                                <fileDescription>${project.name}</fileDescription>
+                                <copyright>Maintained by Philipp v. K. - 2020</copyright>
+                                <productVersion>1.0.0.0</productVersion>
+                                <txtProductVersion>1.0.0.0</txtProductVersion>
+                                <productName>${project.name}</productName>
+                                <internalName>${project.name}</internalName>
+                                <originalFilename>${project.artifactId}-${project.version}.exe</originalFilename>
+                            </versionInfo>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/client/res/icons/playforia.icns b/client/res/icons/playforia.icns
diff --git a/client/res/icons/playforia.ico b/client/res/icons/playforia.ico
diff --git a/client/src/com/aapeli/tools/EncodedXmlReader.java b/client/src/com/aapeli/tools/EncodedXmlReader.java
@@ -1,7 +1,5 @@
 package com.aapeli.tools;
 
-import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
-
 import java.io.*;
 import java.net.URL;
 

diff --git a/editor/build.xml b/editor/build.xml