Merge remote-tracking branch 'origin/1.18' into 1.19.2

Author: embeddedt

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id "maven-publish"
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
     id 'com.palantir.git-version' version '1.0.0'
+    id 'org.ajoberstar.grgit' version '5.2.0'
     id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '1.79.0'
     id "com.modrinth.minotaur" version "2.+" apply false
 	id("com.diffplug.spotless") version "6.18.0" apply false
@@ -35,7 +36,7 @@ allprojects {
         plusIndex = details.lastTag.length()
     }
     def baseVersion = details.lastTag.substring(0, plusIndex)
-    def dirtyMarker = details.isCleanTag ? "" : ".dirty"
+    def dirtyMarker = grgit.status().clean ? "" : ".dirty"
     def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash) : ""
     def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
     def versionString = "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
@@ -176,3 +177,43 @@ tasks.register('checkCleanTag') {
         }
     }
 }
+
+configure(subprojects.findAll {it.name == "forge" || it.name == "fabric"}) {
+    apply plugin: 'com.matthewprenger.cursegradle'
+    apply plugin: 'com.modrinth.minotaur'
+
+    def isBeta = project.version.toString().contains("beta")
+
+    curseforge {
+        if (System.getenv("CURSEFORGE_TOKEN") != null) {
+            apiKey = System.getenv("CURSEFORGE_TOKEN")
+            project {
+                id = "790626"
+                changelog = file('../CHANGELOG.md')
+                changelogType = "markdown"
+                releaseType = isBeta ? "beta" : "release"
+                addGameVersion project.name.capitalize()
+                gameVersionStrings.addAll(supported_minecraft_versions.tokenize(","))
+                mainArtifact remapJar
+            }
+        }
+    }
+
+    modrinth {
+        token = System.getenv("MODRINTH_TOKEN")
+        projectId = "modernfix" // This can be the project ID or the slug. Either will work!
+        versionType = isBeta ? "beta" : "release" // This is the default -- can also be `beta` or `alpha`
+        uploadFile = remapJar
+        gameVersions = supported_minecraft_versions.tokenize(",")
+        loaders = [project.name]
+        changelog.set(provider { file("CHANGELOG.md").getText('UTF-8') })
+    }
+
+    tasks.curseforge.dependsOn(rootProject.generateChangelog)
+    tasks.modrinth.dependsOn(rootProject.generateChangelog)
+
+    tasks.register('publishToModSites') {
+        publishToModSites.dependsOn(tasks.modrinth)
+        publishToModSites.dependsOn(tasks.curseforge)
+    }
+}

common/src/main/java/org/embeddedt/modernfix/tickables/LoadableTickableObject.java

@@ -0,0 +1,47 @@
+package org.embeddedt.modernfix.tickables;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+public class LoadableTickableObject<T> implements TickableObject {
+    private volatile int ticksInactive = 0;
+    private final int timeout;
+    private final Supplier<T> loader;
+    private final Consumer<T> finalizer;
+    private volatile T theObject = null;
+
+    public LoadableTickableObject(int timeout, Supplier<T> loader, Consumer<T> finalizer) {
+        this(timeout, loader, finalizer, null);
+    }
+
+    public LoadableTickableObject(int timeout, Supplier<T> loader, Consumer<T> finalizer, @Nullable T initialValue) {
+        this.timeout = timeout;
+        this.loader = loader;
+        this.finalizer = finalizer;
+        this.theObject = initialValue;
+    }
+
+    public T get() {
+        synchronized (this) {
+            ticksInactive++;
+            T obj = theObject;
+            if(obj == null) {
+                obj = loader.get();
+                theObject = obj;
+            }
+            return obj;
+        }
+    }
+
+    public final void tick() {
+        synchronized (this) {
+            ticksInactive++;
+            if(ticksInactive >= this.timeout) {
+                finalizer.accept(theObject);
+                theObject = null;
+            }
+        }
+    }
+}

common/src/main/java/org/embeddedt/modernfix/tickables/TickableObject.java

@@ -0,0 +1,5 @@
+package org.embeddedt.modernfix.tickables;
+
+public interface TickableObject {
+    void tick();
+}

common/src/main/java/org/embeddedt/modernfix/tickables/TickableObjectManager.java

@@ -0,0 +1,18 @@
+package org.embeddedt.modernfix.tickables;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class TickableObjectManager {
+    private static final List<TickableObject> TICKABLE_OBJECT_LIST = new CopyOnWriteArrayList<>();
+
+    public static void register(TickableObject object) {
+        TICKABLE_OBJECT_LIST.add(object);
+    }
+
+    public static void runTick() {
+        for(TickableObject o : TICKABLE_OBJECT_LIST) {
+            o.tick();
+        }
+    }
+}

fabric/build.gradle

@@ -2,9 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
-apply plugin: 'com.matthewprenger.cursegradle'
-apply plugin: 'com.modrinth.minotaur'
-
 architectury {
     platformSetupLoomIde()
     fabric()
@@ -96,37 +93,4 @@ publishing {
     repositories {
         // Add repositories to publish to here.
     }
-}
-
-curseforge {
-    if (System.getenv("CURSEFORGE_TOKEN") != null) {
-        apiKey = System.getenv("CURSEFORGE_TOKEN")
-        project {
-            id = "790626"
-            changelog = file('../CHANGELOG.md')
-            changelogType = "markdown"
-            releaseType = "beta"
-            addGameVersion "Fabric"
-            addGameVersion minecraft_version
-            mainArtifact remapJar
-        }
-    }
-}
-
-modrinth {
-    token = System.getenv("MODRINTH_TOKEN")
-    projectId = "modernfix" // This can be the project ID or the slug. Either will work!
-    versionType = "beta" // This is the default -- can also be `beta` or `alpha`
-    uploadFile = remapJar
-    gameVersions = [minecraft_version]
-    loaders = ["fabric"]
-    changelog.set(provider { file("../CHANGELOG.md").getText('UTF-8') })
-}
-
-tasks.curseforge.dependsOn(rootProject.generateChangelog)
-tasks.modrinth.dependsOn(rootProject.generateChangelog)
-
-tasks.register('publishToModSites') {
-    publishToModSites.dependsOn(tasks.modrinth)
-    publishToModSites.dependsOn(tasks.curseforge)
 }

forge/build.gradle

@@ -2,9 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
-apply plugin: 'com.matthewprenger.cursegradle'
-apply plugin: 'com.modrinth.minotaur'
-
 architectury {
     platformSetupLoomIde()
     forge()
@@ -114,37 +111,4 @@ publishing {
     repositories {
         // Add repositories to publish to here.
     }
-}
-
-curseforge {
-    if (System.getenv("CURSEFORGE_TOKEN") != null) {
-        apiKey = System.getenv("CURSEFORGE_TOKEN")
-        project {
-            id = "790626"
-            changelog = file('../CHANGELOG.md')
-            changelogType = "markdown"
-            releaseType = "release"
-            addGameVersion "Forge"
-            addGameVersion minecraft_version
-            mainArtifact remapJar
-        }
-    }
-}
-
-modrinth {
-    token = System.getenv("MODRINTH_TOKEN")
-    projectId = "modernfix" // This can be the project ID or the slug. Either will work!
-    versionType = "release" // This is the default -- can also be `beta` or `alpha`
-    uploadFile = remapJar
-    gameVersions = [minecraft_version]
-    loaders = ["forge"]
-    changelog.set(provider { file("../CHANGELOG.md").getText('UTF-8') })
-}
-
-tasks.curseforge.dependsOn(rootProject.generateChangelog)
-tasks.modrinth.dependsOn(rootProject.generateChangelog)
-
-tasks.register('publishToModSites') {
-    publishToModSites.dependsOn(tasks.modrinth)
-    publishToModSites.dependsOn(tasks.curseforge)
 }

gradle.properties

@@ -12,10 +12,11 @@ rei_version=9.1.591
 ctm_version=1.19.2-1.1.7+11
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
+supported_minecraft_versions=1.19.2
 
 fabric_loader_version=0.14.18
 fabric_api_version=0.76.0+1.19.2
 
 modmenu_version=4.1.2
 appeng_version=12.9.3
-diagonal_fences_version=4545943
+diagonal_fences_version=4545943