Merge pull request '1.20.2' (#26) from dev into master

Reviewed-on: #26

.gitea/workflows/ci.yml

@@ -3,7 +3,7 @@
 # certain platforms or Java versions, and provides a first line of defence
 # against bad commits.
 
-name: 
+name: Test and Deploy
 on:   
   push:
     branches: [ master, dev ]
@@ -39,16 +39,14 @@ jobs:
           chmod +x ./gradlew
           touch local.properties
       - name: build
-        run: ./gradlew build --no-daemon --max-workers 1
+        run: ./gradlew build # compile classes, testClasses, assemble in jar and javadocJar, and then test
-      #- name: test
-      #  run: ./gradlew test --no-daemon
   deploy:
     strategy:
       matrix:
         java: [ '17' ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
-    if: gitea.ref == 'refs/heads/master'
+    if: ${{ gitea.ref == 'refs/heads/master' && gitea.event_name == 'push' }}
     needs: build
     steps:
       - name: checkout repository
@@ -66,7 +64,9 @@ jobs:
           chmod +x ./gradlew
           touch local.properties
       - name: deploy
-        run: |
+        run: ./gradlew publish
-          ./gradlew publish
+      - name: create tag
-          ./gradlew reportToDiscord
+        run: ./gradlew createTag
+      - name: Report to Discord
+        run: ./gradlew reportToDiscord
 

Core/src/main/java/fr/altarik/toolbox/core/command/AbstractCommand.java

@@ -0,0 +1,15 @@
+package fr.altarik.toolbox.core.command;
+
+import com.mojang.brigadier.context.CommandContext;
+import net.minecraft.server.command.ServerCommandSource;
+
+public abstract class AbstractCommand implements Command {
+
+    protected final ServerCommandSource source;
+    protected final CommandContext<ServerCommandSource> context;
+
+    protected AbstractCommand(CommandContext<ServerCommandSource> c) {
+        this.context = c;
+        this.source = c.getSource();
+    }
+}

Core/src/main/java/fr/altarik/toolbox/core/command/Command.java

@@ -0,0 +1,9 @@
+package fr.altarik.toolbox.core.command;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
+public interface Command {
+
+    int run() throws CommandSyntaxException;
+
+}

Core/src/main/resources/fabric.mod.json

@@ -21,9 +21,9 @@
   },
   "mixins": [],
   "depends": {
-    "fabricloader": "^0.14.12",
+    "fabricloader": "^${loaderVersion}",
     "fabric-api": "*",
-    "minecraft": "1.19.3",
+    "minecraft": "${minecraftVersion}",
     "java": ">=17"
   }
 }

Database/src/main/resources/fabric.mod.json

@@ -21,9 +21,9 @@
   },
   "mixins": [],
   "depends": {
-    "fabricloader": "^0.14.12",
+    "fabricloader": "^${loaderVersion}",
     "fabric-api": "*",
-    "minecraft": "1.19.3",
+    "minecraft": "${minecraftVersion}",
     "java": ">=17",
     "toolbox-core":  "${version}"
   }

Pagination/src/main/resources/fabric.mod.json

@@ -25,9 +25,9 @@
     "Pagination.mixins.json"
   ],
   "depends": {
-    "fabricloader": "^0.14.12",
+    "fabricloader": "^${loaderVersion}",
     "fabric-api": "*",
-    "minecraft": "1.19.3",
+    "minecraft": "${minecraftVersion}",
     "java": ">=17"
   }
 }

Tasks/src/main/resources/fabric.mod.json

@@ -25,9 +25,9 @@
       "Task.mixins.json"
     ],
     "depends": {
-      "fabricloader": "^0.14.12",
+      "fabricloader": "^${loaderVersion}",
       "fabric-api": "*",
-      "minecraft": "1.19.3",
+      "minecraft": "${minecraftVersion}",
       "java": ">=17"
     }
   }

build.gradle

@@ -1,7 +1,8 @@
+import fr.altarik.CreateTag
 import fr.altarik.ReportDiscord
 
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.4-SNAPSHOT' apply false
 }
 
 Properties local = new Properties()
@@ -16,7 +17,12 @@ String webhookId = getEnv("DISCORD_PUB_ID", local.getProperty("discord_pub_id"))
 String webhookToken = getEnv("DISCORD_PUB_TOKEN", local.getProperty("discord_pub_token"))
 String repoUrl = "https://repo.altarik.fr/#/" + (project.version.endsWith('SNAPSHOT') ? 'snapshots/' : 'releases/') + project.group.replace(".", "/") + "/" + project.rootProject.name + "/" + project.version
 
-var reportConfig = new ReportDiscord.ReportData("https://discord.com/api/", webhookId, webhookToken, project.rootProject.name, "Update " + project.version + " has been published", repoUrl);
+var reportConfig = new ReportDiscord.ReportData("https://discord.com/api/", webhookId, webhookToken, project.rootProject.name, "Update " + project.version + " has been published", repoUrl)
+
+String giteaToken = getEnv("GITEA_TOKEN", local.getProperty("gitea_token"))
+
+var releaseConfig = new CreateTag.CreateReleaseData("https://git.altarik.fr", project.git_owner, project.git_repo, "v" + project.version as String, giteaToken)
+
 
 allprojects {
     apply plugin: 'maven-publish'
@@ -24,9 +30,6 @@ allprojects {
 
     group = project.maven_group
     version = project.maven_version
-    
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 
     repositories {
         maven {
@@ -64,26 +67,17 @@ allprojects {
 
     processResources {
         inputs.property "version", project.version
+        inputs.property "minecraftVersion", project.minecraft_version
+        inputs.property "loaderVersion", project.loader_version
 
         filesMatching("fabric.mod.json") {
-            expand "version": project.version
+            expand inputs.properties
         }
     }
 
     tasks.withType(JavaCompile).configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
         it.options.encoding = "UTF-8"
-
+        it.options.release = 17
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 17
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
     }
 
     dependencies {
@@ -98,6 +92,9 @@ allprojects {
     java {
         withSourcesJar()
         withJavadocJar()
+
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     test {
@@ -107,8 +104,11 @@ allprojects {
 }
 
 dependencies {
+    implementation project(path: ":Core", configuration: "namedElements")
+    implementation project(path: ":Database", configuration: "namedElements")
+    implementation project(path: ":Pagination", configuration: "namedElements")
+    implementation project(path: ":Tasks", configuration: "namedElements")
     include subprojects.collect { project ->  project }
-    implementation subprojects.collect { project ->  project }
 }
 
 static def getEnv(String envName, String defaultValue) {
@@ -124,6 +124,11 @@ tasks.register("reportToDiscord", ReportDiscord) {
     config.set(reportConfig)
 }
 
+tasks.register("createTag", CreateTag) {
+    config.set(releaseConfig)
+}
+
+
 /*jar {
     dependsOn subprojects.jar 
     subprojects.each { project -> 

buildSrc/src/main/java/fr/altarik/CreateTag.java

@@ -0,0 +1,48 @@
+package fr.altarik;
+
+import okhttp3.*;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.GradleException;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.IOException;
+
+public abstract class CreateTag extends DefaultTask {
+
+    public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
+    private final OkHttpClient client = new OkHttpClient();
+
+    @Input
+    public abstract Property<CreateReleaseData> getConfig();
+
+
+    @TaskAction
+    public void create() throws IOException {
+        CreateReleaseData data = getConfig().get();
+        String postUrl = data.baseUrl() + "/api/v1/repos/" + data.owner() + "/" + data.repoName() + "/tags";
+        RequestBody body = RequestBody.create("""
+                {
+                    "tag_name": \"""" + data.tagName() + "\"" + """
+                }
+                """, JSON);
+        Request request = new Request.Builder()
+                .url(postUrl)
+                .post(body)
+                .header("Authorization", "token " + data.giteaToken())
+                .build();
+        try(Response response = client.newCall(request).execute()) {
+            if(!response.isSuccessful()) {
+                if(response.code() != 409)
+                    throw new GradleException("Cannot create tag, server answer with code " + response.code() + " and message : " + response.message());
+            }
+        }
+
+    }
+
+    public record CreateReleaseData(String baseUrl, String owner, String repoName, String tagName, String giteaToken) {
+    }
+
+
+}

gradle.properties

@@ -1,11 +1,14 @@
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx1G
 fabric.loom.multiProjectOptimisation=true
 
 junit_version=5.9.0
-minecraft_version=1.19.3
+minecraft_version=1.20.2
-yarn_mappings=1.19.3+build.5
+yarn_mappings=1.20.2+build.4
-loader_version=0.14.14
+loader_version=0.15.3
-fabric_version=0.75.1+1.19.3
+fabric_version=0.91.3+1.20.2
 
 maven_group=fr.altarik.toolbox
 maven_version=4.3.2-SNAPSHOT
+
+git_owner=quentinlegot
+git_repo=Toolbox

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/fabric.mod.json

@@ -17,9 +17,9 @@
     "icon": "assets/toolbox/icon.png",
     "environment": "*",
     "depends": {
-      "fabricloader": "^0.14.12",
+      "fabricloader": "^${loaderVersion}",
       "fabric-api": "*",
-      "minecraft": "1.19.3",
+      "minecraft": "${minecraftVersion}",
       "java": ">=17",
       "toolbox-core": "${version}",
       "toolbox-database": "${version}",