Bump dependencies, prep for NBT changes in MC-next

robotgryphon · robotgryphon · commit e8c0faa07d95 · 2025-02-26T15:27:56.000-05:00
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
@@ -3,6 +3,9 @@ name: Continuous Integration + Announcement
 env:
   GH_PKG_URL: "https://maven.pkg.github.com/${{ github.repository }}"
 
+permissions:
+  contents: write # For creating and pushing the tag
+
 on:
   workflow_dispatch:
     inputs:
@@ -32,8 +35,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 150
-          fetch-tags: true
+          fetch-depth: 1
+
+      - name: Fetch Tags
+        run: git fetch --tags
 
       - name: Version
         id: version
@@ -65,6 +70,22 @@ jobs:
     with:
       version: ${{ needs.vars.outputs.version }}
 
+  create-tag:
+    name: Create tag
+    needs: [vars, publish]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create tag
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/releases/v${{ needs.vars.outputs.version }}',
+              sha: context.sha
+            })
+
   announce:
     name: Discord Announcement
     needs: [ publish ]
diff --git a/core-api/build.gradle.kts b/core-api/build.gradle.kts
@@ -31,7 +31,7 @@ java {
 }
 
 neoForge {
-    version = neoforged.versions.neoforge
+    version = neoforged.versions.neoforge.get()
 
     parchment {
         enabled = true
diff --git a/gradle/mods.versions.toml b/gradle/mods.versions.toml
@@ -0,0 +1,28 @@
+[versions]
+jei = "17.3.0.49"
+
+# Jade
+[libraries.jade]
+module = "curse.maven:jade-324717"
+version = "5109393"
+
+# Just Enough Items
+[libraries.jeiCommon]
+module = "mezz.jei:jei-1.20.4-common-api"
+version.ref = "jei"
+
+[libraries.jeiNeo]
+module = "mezz.jei:jei-1.20.4-neoforge-api"
+version.ref = "jei"
+
+[bundles]
+jei = ["jeiCommon", "jeiNeo"]
+
+# Kube JS
+[libraries.kubeJS]
+module = "dev.latvian.mods:kubejs-neoforge"
+version = "2101.7.1-build.181"
+
+[libraries.rhino]
+module = "dev.latvian.mods:rhino"
+version = "2101.2.6-build.66"
diff --git a/gradle/neoforged.versions.toml b/gradle/neoforged.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-neoforge = "21.1.79"
-mdg = "2.0.42-beta"
-neoforgeRange = { require = "[21.1.79,)", prefer = "21.1.79" }
+neoforge = "21.1.122"
+mdg = "2.0.78"
+neoforgeRange = { require = "[21.1.122,)", prefer = "21.1.122" }
 
 [libraries.testframework]
 module = "net.neoforged:testframework"
diff --git a/neoforge-datagen/build.gradle.kts b/neoforge-datagen/build.gradle.kts
@@ -20,7 +20,7 @@ java {
 }
 
 neoForge {
-    version = neoforged.versions.neoforge
+    version = neoforged.versions.neoforge.get()
 
     mods.create(modId) {
         this.sourceSet(coreApi.sourceSets.main.get())
diff --git a/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/basic_room_templates/BasicRoomTemplatesDatapack.java b/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/basic_room_templates/BasicRoomTemplatesDatapack.java
@@ -4,6 +4,7 @@
 import dev.compactmods.machines.datagen.basic_room_templates.lang.RoomTemplatesEnglishLangGenerator;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.data.PackOutput;
 import net.minecraft.data.metadata.PackMetadataGenerator;
 import net.minecraft.network.chat.Component;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
diff --git a/neoforge-main/build.gradle.kts b/neoforge-main/build.gradle.kts
@@ -56,7 +56,9 @@ sourceSets.test {
 }
 
 neoForge {
-    version = neoforged.versions.neoforge
+    version = neoforged.versions.neoforge.get()
+
+    interfaceInjectionData.from("src/main/resources/interfaces.json")
 
     val cmMain = this.mods.create(modId) {
         modSourceSets.add(coreApi.sourceSets.main)
@@ -88,6 +90,11 @@ neoForge {
             if (!System.getenv().containsKey("CI")) {
               jvmArgument("-XX:+AllowEnhancedClassRedefinition")
             }
+
+            systemProperties.put("terminal.ansi", "true")
+
+            var additional = this.additionalRuntimeClasspathConfiguration
+            additional.dependencies.add(compactmods.feather.get())
         }
 
         create("client") {
@@ -188,6 +195,13 @@ repositories {
             includeGroup("top.theillusivec4.curios")
         }
     }
+
+    // saps.dev Maven (KubeJS and Rhino)
+    maven("https://maven.saps.dev/minecraft") {
+        content {
+            includeGroup("dev.latvian.mods")
+        }
+    }
 }
 
 dependencies {
@@ -196,7 +210,7 @@ dependencies {
         compileOnly(libs.jnanoid)
         testImplementation(libs.jnanoid)
         jarJar(libs.jnanoid)
-        additionalRuntimeClasspath(libs.jnanoid)
+        // additionalRuntimeClasspath(libs.jnanoid)
 
         compileOnly(coreApi)
         testCompileOnly(coreApi)
@@ -211,7 +225,6 @@ dependencies {
     compileOnly(compactmods.feather)
     testImplementation(compactmods.feather)
     jarJar(compactmods.feather) { isTransitive = false }
-    additionalRuntimeClasspath(compactmods.feather)
 
     implementation(compactmods.spatial)
     testImplementation(compactmods.spatial)
@@ -224,6 +237,10 @@ dependencies {
 
     // Curios API
     compileOnly(libs.curios)
+
+    // KubeJS Support
+    compileOnly(mods.kubeJS)
+    compileOnly(mods.rhino)
 }
 
 tasks.withType<Test> {
@@ -258,7 +275,8 @@ tasks.withType<Jar> {
                 "Implementation-Timestamp" to now,
                 "Minecraft-Version" to mojang.versions.minecraft.get(),
                 "NeoForge-Version" to neoforged.versions.neoforge.get(),
-                "Main-Commit" to gitVersion
+                "Main-Commit" to gitVersion,
+                "MixinConfigs" to "compactmachines.mixins.json"
             )
         )
     }
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/DataFileUtil.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/DataFileUtil.java
@@ -30,8 +30,7 @@ public static <T> T loadFileWithCodec(File file, Codec<T> codec) {
 			IOUtilities.cleanupTempFiles(Path.of(file.getParent()), file.getName());
 			try (var is = new FileInputStream(file)) {
 				final var tag = NbtIo.readCompressed(is, NbtAccounter.unlimitedHeap());
-				return codec.parse(NbtOps.INSTANCE, tag.contains("data") ? tag.getCompound("data") : new CompoundTag())
-					.getOrThrow();
+				return tag.read("data", codec).orElseThrow();
 			}
 		} catch (IOException e) {
 			throw new RuntimeException(e);
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMKeyedDataFileManager.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMKeyedDataFileManager.java
@@ -62,12 +62,7 @@ public void save() {
 	  cache.forEach((key, data) -> {
 		 var fullData = new CompoundTag();
 		 fullData.putString("version", data.getDataVersion());
-
-		 var fileData = data.codec()
-			 .encodeStart(NbtOps.INSTANCE, data)
-			 .getOrThrow();
-
-		 fullData.put("data", fileData);
+		 fullData.store("data", data.codec(), data);
 
 		 try {
 			 IOUtilities.writeNbtCompressed(fullData, data.getDataLocation(server).resolve(getFileKey(key) + ".dat"));
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMSingletonDataFileManager.java b/neoforge-main/src/main/java/dev/compactmods/machines/data/manager/CMSingletonDataFileManager.java
@@ -56,12 +56,7 @@ public void save() {
 
             var fullData = new CompoundTag();
             fullData.putString("version", instance.getDataVersion());
-
-            var fileData = instance.codec()
-                    .encodeStart(NbtOps.INSTANCE, instance)
-                    .getOrThrow();
-
-            fullData.put("data", fileData);
+            fullData.store("data", instance.codec(), instance);
 
             try {
                 IOUtilities.writeNbtCompressed(fullData, instance.getDataLocation(server).resolve(dataKey + ".dat"));
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/mixin/CodecNbtFunctions.java b/neoforge-main/src/main/java/dev/compactmods/machines/mixin/CodecNbtFunctions.java
@@ -0,0 +1,71 @@
+package dev.compactmods.machines.mixin;
+
+import com.mojang.logging.LogUtils;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
+
+import javax.annotation.Nullable;
+import java.util.Optional;
+
+public interface CodecNbtFunctions {
+
+    private CompoundTag self() {
+        return (CompoundTag) (Object) this;
+    }
+
+    default <T> void store(String key, Codec<T> codec, T data) {
+        this.store(key, codec, NbtOps.INSTANCE, data);
+    }
+
+    default <T> void storeNullable(String key, Codec<T> codec, @Nullable T data) {
+        if (data != null) {
+            this.store(key, codec, data);
+        }
+    }
+
+    default <T> void store(String key, Codec<T> codec, DynamicOps<Tag> ops, T data) {
+        self().put(key, codec.encodeStart(ops, data).getOrThrow());
+    }
+
+    default <T> void storeNullable(String key, Codec<T> codec, DynamicOps<Tag> ops, @Nullable T data) {
+        if (data != null) {
+            this.store(key, codec, ops, data);
+        }
+    }
+
+    default <T> void store(MapCodec<T> codec, T data) {
+        this.store(codec, NbtOps.INSTANCE, data);
+    }
+
+    default <T> void store(MapCodec<T> codec, DynamicOps<Tag> ops, T data) {
+        self().merge((CompoundTag)codec.encoder().encodeStart(ops, data).getOrThrow());
+    }
+
+    default <T> Optional<T> read(String key, Codec<T> codec) {
+        return this.read(key, codec, NbtOps.INSTANCE);
+    }
+
+    default <T> Optional<T> read(String key, Codec<T> codec, DynamicOps<Tag> ops) {
+        Tag tag = self().get(key);
+        return tag == null ? Optional.empty() : codec.parse(ops, tag).resultOrPartial($$2x -> {
+            var LOGGER = LogUtils.getLogger();
+            LOGGER.error("Failed to read field ({}={}): {}", key, tag, $$2x);
+        });
+    }
+
+    default <T> Optional<T> read(MapCodec<T> codec) {
+        return this.read(codec, NbtOps.INSTANCE);
+    }
+
+    default <T> Optional<T> read(MapCodec<T> codec, DynamicOps<Tag> ops) {
+        return codec.decode(ops, ops.getMap(self()).getOrThrow()).resultOrPartial(datax -> {
+            var LOGGER = LogUtils.getLogger();
+            LOGGER.error("Failed to read value ({}): {}", this, datax);
+        });
+    }
+}
+
diff --git a/neoforge-main/src/main/java/dev/compactmods/machines/mixin/impl/CodecNbtFunctionsMixin.java b/neoforge-main/src/main/java/dev/compactmods/machines/mixin/impl/CodecNbtFunctionsMixin.java
@@ -0,0 +1,9 @@
+package dev.compactmods.machines.mixin.impl;
+
+import dev.compactmods.machines.mixin.CodecNbtFunctions;
+import net.minecraft.nbt.CompoundTag;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = CompoundTag.class, priority = 999, remap = false)
+public abstract class CodecNbtFunctionsMixin implements CodecNbtFunctions {
+}
diff --git a/neoforge-main/src/main/resources/META-INF/neoforge.mods.toml b/neoforge-main/src/main/resources/META-INF/neoforge.mods.toml
@@ -5,6 +5,8 @@ license = "MIT"
 [[accessTransformers]]
 file = "META-INF/accesstransformer.cfg"
 
+[[mixins]]
+config = "compactmachines.mixins.json"
 
 [[mods]] #mandatory
 modId = "compactmachines"
diff --git a/neoforge-main/src/main/resources/compactmachines.mixins.json b/neoforge-main/src/main/resources/compactmachines.mixins.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "dev.compactmods.machines.mixin.impl",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "CodecNbtFunctionsMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/neoforge-main/src/main/resources/interfaces.json b/neoforge-main/src/main/resources/interfaces.json
@@ -0,0 +1,5 @@
+{
+  "net/minecraft/nbt/CompoundTag": [
+    "dev/compactmods/machines/mixin/CodecNbtFunctions"
+  ]
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,15 +2,7 @@ dependencyResolutionManagement {
     addVersionCatalog(this, "neoforged")
     addVersionCatalog(this, "mojang")
     addVersionCatalog(this, "compactmods")
-
-    versionCatalogs.create("mods") {
-        this.library("jei-common", "mezz.jei", "jei-1.20.4-common-api").versionRef("jei")
-        this.library("jei-neo", "mezz.jei", "jei-1.20.4-neoforge-api").versionRef("jei");
-        this.bundle("jei", listOf("jei-common", "jei-neo"))
-        this.version("jei", "17.3.0.49")
-
-        this.library("jade", "curse.maven", "jade-324717").version("5109393")
-    }
+    addVersionCatalog(this, "mods")
 }
 
 pluginManagement {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ java {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`neoForge {`
`34`		`- version = neoforged.versions.neoforge`
	`34`	`+ version = neoforged.versions.neoforge.get()`
`35`	`35`
`36`	`36`	`parchment {`
`37`	`37`	`enabled = true`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ java {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`neoForge {`
`23`		`- version = neoforged.versions.neoforge`
	`23`	`+ version = neoforged.versions.neoforge.get()`
`24`	`24`
`25`	`25`	`mods.create(modId) {`
`26`	`26`	`this.sourceSet(coreApi.sourceSets.main.get())`