feat: ported to 26.1

Author: Sunekaer

.github/workflows/build-release.yml

@@ -11,7 +11,7 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: nanite/workflows/.github/workflows/release.yml@v1.3
     with:
-      java-version: 21
+      java-version: 25
       gradle-tasks: build publish publishMods
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}

CHANGELOG.md

@@ -1,78 +1,3 @@
-## 97.0.0
+# Changelog
 
-### Changed
-
-- Updated to 1.21.11
-
-## 96.0.0
-
-### Changed
-
-- Ported to 1.21.9/10
-
-## 94.0.0
-
-### Changed
-
-- Updated to 1.21.6/7/8
-
-## 91.0.0
-
-### Changed
-
-- Updated to 1.21.5
-
-## 90.0.0
-
-### Changed
-
-- Updated to 1.21.4
-
-## 89.0.0
-
-### Changed
-
-- Updated to 1.21.2/1.21.3
-- The `/tk clear` command now supports custom input filters as well as optionally being able to remove bedrock from the world
-  - This technically replaces existing functionality where a tag or blockstate would be read from the input but due to poor auto-complete, this is basically an unknown feature so we've changed it to one that's much more clear
-  - The new syntax is `/tk clear <size> [filter] [removeBedrock]`
-
-## 87.0.1
-
-### Changed
-
-- Added more copy types for the `/tk copy` command. You can now use the following types. Please note that `plain` is the default if no type is provided. Plain is the old default.
-  - `KUBEJS`
-  - `KUBEJS_NATIVE`
-  - `JSON`
-  - `SNBT`
-  - `NBT`
-  - `CRAFTTWEAKER`
-  - `PLAIN`
-  - `CSV`
-
-### Fixed
-
-- The mod works again on NeoForge
-
-## 87.0.0
-
-### Changed
-
-- Updated to 1.21
-
-## 85.0.0
-
-### Changed
-
-- Updated to 1.20.5
-
-## 84.0.1
-
-### Fixed
-
-- Restricted the `/toggledownfall` command to `gamemasters` (Minecrafts naming, not mine.)
-
-## 84.0.0
-
-### updated to 1.20.4
+Update to 26.1

build.gradle

@@ -1,26 +1,32 @@
 import groovy.json.JsonSlurper
 
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+    id 'java-library'
+    id 'fabric-loom' version '1.15-SNAPSHOT' apply(false)
+    id 'net.neoforged.moddev' version '2.0.141' apply(false)
     id "me.modmuss50.mod-publish-plugin" version "1.1.0"
 }
 
-architectury {
-    minecraft = rootProject.minecraft_version
-}
+version = mod_version
+group = maven_group
 
-subprojects {
-    apply plugin: "dev.architectury.loom"
-    apply plugin: "maven-publish"
+allprojects {
+    apply plugin: 'idea'
+    apply plugin: 'java-library'
+    apply plugin: 'maven-publish'
 
-    loom {
-        silentMojangMappingsLicense()
+    version = mod_version
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+        options.release = 25
     }
 
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.officialMojangMappings()
+    idea {
+        module {
+            downloadSources = true
+            downloadJavadoc = true
+        }
     }
 
     publishing {
@@ -38,27 +44,38 @@ subprojects {
     }
 }
 
-allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
-
-
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version
-    group = rootProject.maven_group
-
-    repositories {
-
+subprojects {
+    base {
+        archivesName = "${archives_base_name}-$project.name"
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 21
+    if (project.name != "common") {
+        dependencies {
+            api project(":common")
+        }
+
+        jar {
+            from project(":common").sourceSets.main.output
+        }
     }
 
-    java {
-        withSourcesJar()
+    def replaceProperties = [
+            mod_id: mod_id,
+            minecraft_version: minecraft_version,
+            minecraft_version_range: minecraft_version_range,
+            neoforge_version: neoforge_version,
+            neoforge_version_range: neoforge_version_range,
+            fabric_loader_version: fabric_loader_version,
+            fabric_api_version: fabric_api_version,
+            version: version,
+    ]
+
+    processResources {
+        inputs.properties replaceProperties
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
+            expand replaceProperties
+        }
     }
 }
 
@@ -69,13 +86,13 @@ publishMods {
     type = STABLE
 
     def fabricOptions = publishOptions {
-        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":fabric").tasks.jar }.flatMap { it.archiveFile }
         displayName = "[FABRIC][${minecraft_version}] ${project.name} ${mod_version}"
         modLoaders.add("fabric")
     }
 
     def neoForge = publishOptions {
-        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.jar }.flatMap { it.archiveFile }
         displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
         modLoaders.add("neoforge")
     }
@@ -94,9 +111,7 @@ publishMods {
 
     curseforge("curseforgeFabric") {
         from(curseForgeOptions, fabricOptions)
-        requires {
-            slug = "fabric-api"
-        }
+        requires("fabric-api")
     }
 
     curseforge("curseforgeNeoForge") {
@@ -106,9 +121,7 @@ publishMods {
     if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
         modrinth("modrinthFabric") {
             from(modrinthOptions, fabricOptions)
-            requires {
-                slug = "fabric-api"
-            }
+            requires("fabric-api")
         }
 
         modrinth("modrinthNeoforge") {

common/build.gradle

@@ -1,22 +1,24 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
+plugins {
+    id 'net.fabricmc.fabric-loom'
 }
 
 loom {
-    accessWidenerPath = file("src/main/resources/toolkit.accesswidener")
+    // accessWidenerPath = file("src/main/resources/toolkit.accesswidener")
 }
 
 sourceSets.main.resources { srcDirs += ['src/main/generated'] }
 
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = "${rootProject.archivesBaseName}-${project.name}"
-            from components.java
+repositories {
+    maven {
+        url = "https://repo.spongepowered.org/repository/maven-public/"
+        content {
+            includeGroup "org.spongepowered"
         }
     }
 }
+
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+
+    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+}

common/gradle.properties

@@ -0,0 +1 @@
+fabric.loom.dontRemap=true

common/src/main/java/com/sunekaer/toolkit/Toolkit.java

@@ -50,7 +50,7 @@ public void onServerPostTick(MinecraftServer server) {
     public void onPlayerJoin(ServerPlayer player) {
         if (player != null && Toolkit.SHOW_ON_JOIN_MESSAGE.get()) {
             if (!player.level().isClientSide()) {
-                player.displayClientMessage(Component.literal(Toolkit.JOIN_MESSAGE.get()), false);
+                player.sendSystemMessage(Component.literal(Toolkit.JOIN_MESSAGE.get()));
             }
         }
     }

common/src/main/java/com/sunekaer/toolkit/commands/TKCommand.java

@@ -24,12 +24,13 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher, Co
         dispatcher.register(Commands.literal("toggledownfall")
                 .requires(cs -> cs.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
                 .executes(c -> {
-                    ServerLevel overworld = c.getSource().getServer().overworld();
+                    var server = c.getSource().getServer();
+                    ServerLevel overworld = server.overworld();
 
                     if (overworld.isRaining() || overworld.isThundering()) {
-                        overworld.setWeatherParameters(6000, 0, false, false);
+                        server.setWeatherParameters(6000, 0, false, false);
                     } else {
-                        overworld.setWeatherParameters(0, 6000, true, false);
+                        server.setWeatherParameters(0, 6000, true, false);
                     }
 
                     return 1;

common/src/main/java/com/sunekaer/toolkit/commands/dev/DevEnvCommand.java

@@ -4,8 +4,10 @@
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.core.Holder;
 import net.minecraft.server.permissions.Permissions;
+import net.minecraft.world.clock.WorldClock;
+import net.minecraft.world.clock.WorldClocks;
 import net.minecraft.world.level.gamerules.GameRules;
 
 public class DevEnvCommand {
@@ -19,16 +21,15 @@ public class DevEnvCommand {
 
     private static int setDevEnv(CommandSourceStack source, Boolean value) {
         var server = source.getServer();
-        long time = 6000;
 
         server.overworld().getGameRules().set(GameRules.ADVANCE_TIME, !value, server);
         server.overworld().getGameRules().set(GameRules.ADVANCE_WEATHER, !value, server);
         server.overworld().getGameRules().set(GameRules.SPAWN_MOBS, !value, server);
 
         if (value) {
-            for (ServerLevel serverLevel : source.getServer().getAllLevels()) {
-                serverLevel.setDayTime(time);
-            }
+            var clockManager = server.clockManager();
+            var overworldClock = server.registryAccess().get(WorldClocks.OVERWORLD);
+            overworldClock.ifPresent(clock -> clockManager.setTotalTicks(clock, 6000L));
         }
 
         return 1;

common/src/main/java/com/sunekaer/toolkit/commands/inventory/CopyCommand.java

@@ -12,13 +12,14 @@
 import com.sunekaer.toolkit.utils.CommandUtils;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import net.minecraft.commands.arguments.item.ItemInput;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.component.TypedDataComponent;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.*;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -28,9 +29,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class CopyCommand {
@@ -229,13 +232,27 @@ enum OutputType {
     }
 
     public static String getNbtFromItemStack(ItemStack stack, HolderLookup.Provider lookup, boolean removeName) {
-        Holder<Item> itemHolder = stack.getItemHolder();
+        Holder<Item> itemHolder = stack.typeHolder();
+        String itemName = itemHolder.getRegisteredName();
+
+        var ops = lookup.createSerializationContext(NbtOps.INSTANCE);
+        DataComponentPatch patch = stack.getComponentsPatch();
+        String componentStr = patch.entrySet().stream().flatMap(entry -> {
+            DataComponentType<?> type = entry.getKey();
+            Identifier id = BuiltInRegistries.DATA_COMPONENT_TYPE.getKey(type);
+            if (id == null) return Stream.empty();
+            Optional<?> value = entry.getValue();
+            if (value.isPresent()) {
+                TypedDataComponent<?> typed = TypedDataComponent.createUnchecked(type, value.get());
+                return typed.encodeValue(ops).result().stream()
+                        .map(tag -> id + "=" + tag);
+            } else {
+                return Stream.of("!" + id);
+            }
+        }).collect(Collectors.joining(","));
 
-        var value = new ItemInput(itemHolder, stack.getComponentsPatch()).serialize(lookup);
+        var value = componentStr.isEmpty() ? itemName : itemName + "[" + componentStr + "]";
         if (removeName) {
-            var itemName = itemHolder.unwrapKey().map(ResourceKey::identifier)
-                    .orElse(Identifier.withDefaultNamespace("air")).toString();
-
             if (value.startsWith(itemName)) {
                 value = value.substring(itemName.length());
             }