Merge pull request 'Add ExtendedSimplePositionWidget and MultiTabWrapperWidget' (#35) from dev into master

Reviewed-on: #35

.gitea/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -32,7 +32,15 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'oracle'
+          distribution: 'temurin'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: | 
@@ -43,7 +51,7 @@ jobs:
   deploy:
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     if: ${{ gitea.ref == 'refs/heads/master' && gitea.event_name == 'push' }}
@@ -57,7 +65,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'oracle'
+          distribution: 'temurin'
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: | 

Core/build.gradle

@@ -0,0 +1,4 @@
+
+loom {
+    accessWidenerPath = file("src/main/resources/core.accesswidener")
+}

Core/src/main/java/fr/altarik/toolbox/core/client/gui/ExtendedSimplePositionWidget.java

@@ -0,0 +1,34 @@
+package fr.altarik.toolbox.core.client.gui;
+
+import net.minecraft.client.gui.widget.Positioner;
+import net.minecraft.client.gui.widget.SimplePositioningWidget;
+import net.minecraft.client.gui.widget.Widget;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public abstract class ExtendedSimplePositionWidget extends SimplePositioningWidget {
+
+    private final List<Element> elements = new ArrayList<>();
+
+    public ExtendedSimplePositionWidget(int x, int y, int width, int height) {
+        super(x, y, width, height);
+    }
+
+    @Override
+    public <T extends Widget> T add(T widget, Positioner positioner) {
+        this.elements.add(new Element(widget, positioner));
+        return widget;
+    }
+
+    public <T extends Widget> void remove(T widget) {
+        this.elements.remove(new Element(widget, this.copyPositioner()));
+    }
+
+    @Override
+    public void forEachElement(Consumer<Widget> consumer) {
+        this.elements.forEach((element) -> consumer.accept(element.widget));
+    }
+
+}

Core/src/main/java/fr/altarik/toolbox/core/client/gui/MultiTabWrapperWidget.java

@@ -0,0 +1,39 @@
+package fr.altarik.toolbox.core.client.gui;
+
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.widget.WrapperWidget;
+
+import java.util.function.Consumer;
+
+public abstract class MultiTabWrapperWidget<A extends Enum<A>, B extends Widget> extends WrapperWidget {
+
+    protected final Screen parent;
+    protected A currentTab;
+
+    public MultiTabWrapperWidget(Screen parent) {
+        this(parent, 0, 0, 0, 0);
+    }
+
+    public MultiTabWrapperWidget(Screen parent, int x, int y, int width, int height) {
+        super(x, y, width, height);
+        this.parent = parent;
+    }
+
+    protected void setCurrentTab(A currentTab) {
+        this.currentTab = currentTab;
+        update();
+    }
+
+    protected abstract B getCurrentTab();
+
+    public abstract void update();
+
+    public abstract void remove();
+
+    @Override
+    public void forEachElement(Consumer<Widget> consumer) {
+        // ignore
+    }
+
+}

Core/src/main/java/fr/altarik/toolbox/core/config/ConfigI.java

@@ -0,0 +1,64 @@
+package fr.altarik.toolbox.core.config;
+
+import com.google.gson.*;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Code "inspired" from <a href="https://github.com/CaffeineMC/sodium-fabric/blob/dev/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java">
+ *     https://github.com/CaffeineMC/sodium-fabric/blob/dev/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java
+ *     </a>
+ */
+public class ConfigI {
+
+    protected static final Gson GSON = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).setPrettyPrinting().excludeFieldsWithModifiers(Modifier.PROTECTED, Modifier.PRIVATE).create();
+
+    protected Path configPath;
+
+    protected static Path getConfigPath(Path configPath, String name) {
+        return configPath.resolve(name);
+    }
+
+    public static <T extends ConfigI> T load(Path configPath, String name, Class<T> clazz) throws IOException, JsonSyntaxException, JsonIOException {
+        Path path = getConfigPath(configPath, name);
+
+        T file;
+
+        if(Files.exists(path)) {
+            FileReader reader = new FileReader(path.toFile());
+            file = GSON.fromJson(reader, clazz);
+        } else {
+            try {
+                file = clazz.getConstructor().newInstance();
+            } catch (InstantiationException | InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+                throw new IOException(e);
+            }
+        }
+
+        file.configPath = path;
+
+        file.writeChanges();
+        return file;
+    }
+
+    public void writeChanges() throws IOException {
+        Path dir = this.configPath.getParent();
+        if(!Files.exists(dir)) {
+            Files.createDirectories(dir);
+        } else if (!Files.isDirectory(dir)) {
+            throw new IOException("Not a directory: " + dir);
+        }
+        // Use a temporary location next to the config's final destination to replace it atomically
+//        Path tempPath = this.configPath.resolveSibling(this.configPath.getFileName() + ".tmp");
+        Files.writeString(this.configPath, GSON.toJson(this));
+//        Files.copy(tempPath, this.configPath, StandardCopyOption.REPLACE_EXISTING);
+//        Files.delete(tempPath);
+        // commented because throws an error on windows each time if the file already exist
+    }
+
+}

Core/src/main/java/fr/altarik/toolbox/core/event/PlayerLifecycleCallback.java

@@ -0,0 +1,37 @@
+package fr.altarik.toolbox.core.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+
+public interface PlayerLifecycleCallback {
+
+    Event<PlayerJoin> PLAYER_JOIN = EventFactory.createArrayBacked(PlayerJoin.class, listeners -> player -> {
+        for(PlayerJoin listener : listeners) {
+            ActionResult result = listener.onPlayerJoin(player);
+            if (result != ActionResult.PASS)
+                return result;
+        }
+        return ActionResult.PASS;
+    });
+
+    Event<PlayerLeave> PLAYER_LEAVE = EventFactory.createArrayBacked(PlayerLeave.class, listeners -> player -> {
+        for(PlayerLeave listener : listeners) {
+            ActionResult result = listener.onPlayerLeave(player);
+            if (result != ActionResult.PASS)
+                return result;
+        }
+        return ActionResult.PASS;
+    });
+
+    @FunctionalInterface
+    interface PlayerJoin {
+        ActionResult onPlayerJoin(ServerPlayerEntity player);
+    }
+
+    @FunctionalInterface
+    interface PlayerLeave {
+        ActionResult onPlayerLeave(ServerPlayerEntity player);
+    }
+}

Core/src/main/java/fr/altarik/toolbox/core/mixin/PlayerJoinEvent.java

@@ -0,0 +1,20 @@
+package fr.altarik.toolbox.core.mixin;
+
+import fr.altarik.toolbox.core.event.PlayerLifecycleCallback;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerManager.class)
+public class PlayerJoinEvent {
+
+    @Inject(method = "onPlayerConnect", at = @At(value = "RETURN"))
+    private void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
+        PlayerLifecycleCallback.PLAYER_JOIN.invoker().onPlayerJoin(player);
+    }
+}

Core/src/main/java/fr/altarik/toolbox/core/mixin/PlayerLeaveEvent.java

@@ -0,0 +1,23 @@
+package fr.altarik.toolbox.core.mixin;
+
+import fr.altarik.toolbox.core.event.PlayerLifecycleCallback;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ServerPlayNetworkHandler.class)
+public class PlayerLeaveEvent {
+
+    @Shadow
+    public ServerPlayerEntity player;
+
+    @Inject(at = @At(value = "HEAD"), method = "onDisconnected")
+    private void onPlayerQuit(Text reason, CallbackInfo ci) {
+        PlayerLifecycleCallback.PLAYER_LEAVE.invoker().onPlayerLeave(player);
+    }
+}

Core/src/main/resources/Core.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "fr.altarik.toolbox.core.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+    "PlayerJoinEvent",
+    "PlayerLeaveEvent"
+  ],
+  "verbose": false,
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

Core/src/main/resources/core.accesswidener

@@ -0,0 +1,4 @@
+accessWidener v2 named
+
+accessible class net/minecraft/client/gui/widget/SimplePositioningWidget$Element
+accessible method net/minecraft/client/gui/widget/SimplePositioningWidget$Element <init> (Lnet/minecraft/client/gui/widget/Widget;Lnet/minecraft/client/gui/widget/Positioner;)V

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

@@ -8,7 +8,7 @@
     "Altarik"
   ],
   "contributors": [
-    "Legot Quentin<legotquentin@gmail.com>"
+
   ],
   "contact": {
     "homepage": "https://altarik.fr"
@@ -19,11 +19,21 @@
   "entrypoints": {
     "main": []
   },
-  "mixins": [],
+  "mixins": [
+    "Core.mixins.json"
+  ],
   "depends": {
     "fabricloader": "^${loaderVersion}",
     "fabric-api": "*",
     "minecraft": "${minecraftVersion}",
     "java": ">=17"
+  },
+  "custom": {
+    "modmenu": {
+      "badges": [ "library" ],
+      "parent": {
+        "parent": "toolbox"
+      }
+    }
   }
 }

Core/src/test/java/BuilderImpl.java

@@ -32,7 +32,7 @@ public class BuilderImpl implements IBuilder<BuilderResult> {
 
 
     @Override
-    public BuilderResult build() throws Exception {
+    public BuilderResult build() {
         return new BuilderResult(collection.get(), numberOfSentences.get());
     }
 }

Core/src/test/java/ConfigITest.java

@@ -0,0 +1,40 @@
+import fr.altarik.toolbox.core.config.ConfigI;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class ConfigITest {
+
+    public static class ConfigClazz extends ConfigI {
+
+        public int par1 = 5;
+        public String par2 = "bad";
+        public double para3 = 3.14;
+
+        public static ConfigClazz load() throws IOException {
+            return load(Path.of("."), "test.json", ConfigClazz.class);
+        }
+
+    }
+
+    @Test
+    public void testConfig() throws IOException {
+        ConfigClazz config = ConfigClazz.load();
+        Assertions.assertEquals(5, config.par1);
+        Assertions.assertEquals("bad", config.par2);
+        Assertions.assertEquals(3.14, config.para3);
+        config.par1 = 6;
+        config.par2 = "good";
+        config.para3 = 4.2;
+        Assertions.assertEquals(6, config.par1);
+        config.writeChanges();
+        config = ConfigClazz.load();
+        Assertions.assertEquals(6, config.par1);
+        Assertions.assertEquals("good", config.par2);
+        Assertions.assertEquals(4.2, config.para3);
+
+        Path.of(".").resolve("test.json").toFile().delete();
+    }
+}

Database/build.gradle

@@ -1,7 +1,20 @@
 dependencies {
-    implementation 'org.postgresql:postgresql:42.6.0'
+    implementation 'org.postgresql:postgresql:42.7.5'
     testImplementation 'com.google.code.gson:gson:2.10'
     implementation project(':Core')
+//    implementation "org.hibernate.orm:hibernate-core:${project.hibernate_version}"
+    include "org.hibernate.orm:hibernate-core:${project.hibernate_version}"
+    include "jakarta.activation:jakarta.activation-api:2.1.1"
+    include "jakarta.inject:jakarta.inject-api:2.0.1"
+    include "jakarta.persistence:jakarta.persistence-api:3.1.0"
+    include "jakarta.transaction:jakarta.transaction-api:2.0.1"
+    include "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
+    include "org.hibernate.common:hibernate-commons-annotations:7.0.3.Final"
+    include "org.jboss.logging:jboss-logging:3.5.0.Final"
+    include "com.fasterxml:classmate:1.5.1"
+    include "net.bytebuddy:byte-buddy:1.14.18"
+    include "org.antlr:antlr4-runtime:4.13.0"
+    include "io.smallrye:jandex:3.2.0"
 }
 
 test {

Database/src/main/java/fr/altarik/toolbox/database/AbstractSqlConnection.java

@@ -25,13 +25,6 @@ public abstract class AbstractSqlConnection implements SqlConnection {
         return connection;
     }
 
-    @Override
-    public void closeConnection() {
-        try {
-            close();
-        } catch (Exception ignored) {}
-    }
-
     @Override
     public void close() throws Exception {
         if(!connection.isClosed()) {

Database/src/main/java/fr/altarik/toolbox/database/SqlConnection.java

@@ -23,10 +23,4 @@ public interface SqlConnection extends AutoCloseable {
      */
     void checkConnection() throws SQLException;
 
-    /**
-     * @deprecated replaced with {@link AutoCloseable#close()}
-     */
-    @Deprecated(forRemoval = true)
-    void closeConnection();
-
 }

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

@@ -8,7 +8,7 @@
     "Altarik"
   ],
   "contributors": [
-    "Legot Quentin<legotquentin@gmail.com>"
+
   ],
   "contact": {
     "homepage": "https://altarik.fr"
@@ -26,5 +26,13 @@
     "minecraft": "${minecraftVersion}",
     "java": ">=17",
     "toolbox-core":  "${version}"
+  },
+  "custom": {
+    "modmenu": {
+      "badges": [ "library" ],
+      "parent": {
+        "parent": "toolbox"
+      }
+    }
   }
 }

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

@@ -8,7 +8,7 @@
     "Altarik"
   ],
   "contributors": [
-    "Legot Quentin<legotquentin@gmail.com>"
+
   ],
   "contact": {
     "homepage": "https://altarik.fr"
@@ -29,5 +29,13 @@
     "fabric-api": "*",
     "minecraft": "${minecraftVersion}",
     "java": ">=17"
+  },
+  "custom": {
+    "modmenu": {
+      "badges": [ "library" ],
+      "parent": {
+          "parent": "toolbox"
+      }
+    }
   }
 }

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

@@ -8,7 +8,7 @@
       "Altarik"
     ],
     "contributors": [
-      "Legot Quentin<legotquentin@gmail.com>"
+
     ],
     "contact": {
       "homepage": "https://altarik.fr"

build.gradle

@@ -2,7 +2,7 @@ import fr.altarik.CreateTag
 import fr.altarik.ReportDiscord
 
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT' apply false
+    id 'fabric-loom' version "${loom_version}" apply false
 }
 
 Properties local = new Properties()

buildSrc/gradle.properties

@@ -1 +1 @@
-okhttp_version=4.10.0
+okhttp_version=4.12.0

gradle.properties

@@ -2,13 +2,15 @@ org.gradle.jvmargs=-Xmx1G
 fabric.loom.multiProjectOptimisation=true
 
 junit_version=5.9.0
-minecraft_version=1.20.2
+minecraft_version=1.20.4
-yarn_mappings=1.20.2+build.4
+yarn_mappings=1.20.4+build.3
-loader_version=0.15.3
+loader_version=0.17.2
-fabric_version=0.91.3+1.20.2
+fabric_version=0.97.3+1.20.4
+hibernate_version=6.6.3.Final
+loom_version=1.11-SNAPSHOT
 
 maven_group=fr.altarik.toolbox
-maven_version=4.3.2-SNAPSHOT
+maven_version=5.2.0-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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/fabric.mod.json

@@ -8,7 +8,7 @@
       "Altarik"
     ],
     "contributors": [
-      "Legot Quentin<legotquentin@gmail.com>"
+
     ],
     "contact": {
       "homepage": "https://altarik.fr"
@@ -25,6 +25,11 @@
       "toolbox-database": "${version}",
       "toolbox-pagination": "${version}",
       "toolbox-task": "${version}"
+    },
+  "custom": {
+    "modmenu": {
+      "badges": [ "library" ]
     }
   }
+}