added distribution task to client buildscript

.gitlab-ci.yml

@@ -28,6 +28,12 @@ build:
     paths:
       - build
       - .gradle
+  artifacts:
+    paths:
+      - "**/build/distributions/*.tar"
+      - "**/build/distributions/*.zip"
+      - "**/build/libs/*.jar"
+    expire_in: 7 days
 
 test:
   stage: test

wizard-client/build.gradle

@@ -1,6 +1,7 @@
-
+subprojects {
     dependencies {
         implementation project(':wizard-common')
     }
+}
 
 description = 'wizard-client'

wizard-client/wizard-client-libgdx/build.gradle

@@ -14,7 +14,7 @@ project(":wizard-client:wizard-client-libgdx:desktop") {
 
     dependencies {
         implementation project(":wizard-client:wizard-client-libgdx:core")
-        api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
     }

wizard-client/wizard-client-libgdx/core/src/main/resources/skin/uiskin.json

@@ -1,10 +1,10 @@
 {
     "com.badlogic.gdx.graphics.g2d.BitmapFont": {
         "default-font": {
-            "file": "../font/coolvetica.fnt"
+            "file": "font/coolvetica.fnt"
         },
         "enchanted": {
-            "file": "../font/enchanted.fnt"
+            "file": "font/enchanted.fnt"
         }
     },
     "com.badlogic.gdx.graphics.Color": {

wizard-client/wizard-client-libgdx/desktop/build.gradle

@@ -1,14 +1,17 @@
-//file:noinspection GroovyAssignabilityCheck
+plugins {
-//file:noinspection GroovyAccessibility
+    id 'application'
-ext {
-    javaMainClass = "eu.jonahbauer.wizard.client.libgdx.desktop.DesktopLauncher"
-    assetsDir = new File("../core/src/main/resources")
 }
 
-task run(type: JavaExec, dependsOn: classes) {
+application {
-    mainClass = javaMainClass
+    mainClass = "eu.jonahbauer.wizard.client.libgdx.desktop.DesktopLauncher"
-    classpath = sourceSets.main.runtimeClasspath
+
-    standardInput = System.in
+    run {
-    workingDir = project.assetsDir
         ignoreExitValue true
     }
+}
+
+distributions {
+    main {
+        distributionBaseName = 'wizard-client'
+    }
+}

wizard-client/wizard-client-libgdx/desktop/src/main/java/eu/jonahbauer/wizard/client/libgdx/desktop/DesktopLauncher.java

@@ -1,14 +1,14 @@
 package eu.jonahbauer.wizard.client.libgdx.desktop;
 
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
 
 public class DesktopLauncher {
 	public static void main (String[] arg) {
-		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
+		Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
-		config.title = "Wizard Jubilaeumsedition 2021";
+		config.setTitle("Wizard Jubilaeumsedition 2021");
-		config.foregroundFPS = 60;
+		config.setForegroundFPS(60);
-		new LwjglApplication(new WizardGame(), config);
+		new Lwjgl3Application(new WizardGame(), config);
 	}
 }

wizard-common/src/main/java/eu/jonahbauer/wizard/common/machine/Context.java

@@ -54,14 +54,13 @@ public abstract class Context<S extends State<S,C>, C extends Context<S,C>> {
      * @see State#onEnter(Context)
      * @see #handleError(Throwable)
      */
+    @SuppressWarnings("unchecked")
     public void transition(@NotNull S state) {
         lock.lock();
         try {
-            //noinspection unchecked
             this.state.onExit((C) this);
             onTransition(this.state, state);
             this.state = state;
-            //noinspection unchecked
             state.onEnter((C) this).ifPresent(this::transition);
         } catch (Throwable t) {
             handleError(t);

wizard-common/src/main/java/eu/jonahbauer/wizard/common/machine/TimeoutContext.java

@@ -15,12 +15,12 @@ public abstract class TimeoutContext<S extends TimeoutState<S,C>, C extends Time
         super(initialState);
     }
 
+    @SuppressWarnings("unchecked")
     public void timeout(@NotNull S currentState, long delay) {
         scheduler.schedule(() -> {
             if (Objects.equals(getState(), currentState)) {
                 execute(() -> {
                     if (Objects.equals(getState(), currentState)) {
-                        //noinspection unchecked
                         return currentState.onTimeout((C) this);
                     } else {
                         return Optional.empty();

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/GameData.java

@@ -14,6 +14,7 @@ import org.jetbrains.annotations.Unmodifiable;
 import java.util.*;
 import java.util.function.Supplier;
 
+@SuppressWarnings("unchecked")
 @Unmodifiable
 @EqualsAndHashCode(of = {"values", "present"})
 public final class GameData {
@@ -59,12 +60,10 @@ public final class GameData {
     public <T> T get(@NotNull Key<T> key) {
         int index = key.index();
         if (present[index]) {
-            //noinspection unchecked
             return (T) values[index];
         } else if (key.defaultValue() != null) {
             present[index] = true;
             values[index] = key.defaultValue().get();
-            //noinspection unchecked
             return (T) values[index];
         } else {
             throw new NoSuchElementException();