bump: minecraft 1.21

.gitignore

@@ -42,3 +42,6 @@ replay_*.log
 output/
 logs/
 .vim/
+
+# yarn
+remappedSrc

build.gradle

@@ -12,6 +12,7 @@ base {
 }
 
 repositories {
+    mavenCentral()
     maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     maven { url "https://jitpack.io" }
@@ -59,7 +60,6 @@ dependencies {
     modImplementation include("me.lucko:fabric-permissions-api:${project.fabric_permissions_version}")
     modImplementation include("net.kyori:adventure-platform-fabric:${project.adventure_platform_fabric_version}")
     include(implementation "net.kyori:adventure-text-minimessage:${project.adventure_api_version}")
-    include(implementation "net.kyori:adventure-text-serializer-plain:${project.adventure_api_version}")
 
     modImplementation include("eu.pb4:sgui:${project.sgui_version}")
 

gradle.properties

@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx4G
+# gradle
+org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
 # mod properties
@@ -7,16 +8,16 @@ maven_group=io.github.sakurawald
 archives_base_name=fuji
 
 # fabric deps
-minecraft_version=1.20.6
+minecraft_version=1.21
 loader_version=0.15.11
-yarn_mappings=1.20.6+build.1
+yarn_mappings=1.21+build.2
 
 # mod deps
-fabric_api_version=0.98.0+1.20.6
-carpet_core_version=1.20.6-1.4.141+v240429
-sgui_version=1.5.1+1.20.5
-adventure_api_version=4.15.0
-adventure_platform_fabric_version=5.13.0
+fabric_api_version=0.100.1+1.21
+carpet_core_version=1.21-1.4.147+v240613
+sgui_version=1.6.0+1.21
+adventure_api_version=4.17.0
+adventure_platform_fabric_version=5.14.0-SNAPSHOT
 
 # common deps
 fabric_permissions_version=0.2-SNAPSHOT

src/main/java/io/github/sakurawald/Fuji.java

@@ -24,6 +24,8 @@
 // TODO: kit module -> spec-command
 // TODO: luckperms context calculate module
 
+// TODO: remove tick chunk cache module
+
 public class Fuji implements ModInitializer {
     public static final String MOD_ID = "fuji";
     public static final Logger LOGGER = LogUtil.createLogger("Fuji");

src/main/java/io/github/sakurawald/config/model/ConfigModel.java

@@ -2,7 +2,7 @@
 
 
 import com.mojang.authlib.properties.Property;
-import io.github.sakurawald.config.serializer.Comment;
+import io.github.sakurawald.config.annotation.Comment;
 import io.github.sakurawald.module.initializer.command_alias.CommandAliasEntry;
 
 import java.util.ArrayList;

src/main/java/io/github/sakurawald/module/initializer/head/api/Category.java

@@ -3,7 +3,6 @@
 import io.github.sakurawald.util.MessageUtil;
 import java.util.UUID;
 
-import net.minecraft.component.DataComponentType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;

src/main/java/io/github/sakurawald/module/initializer/skin/SkinRestorer.java

@@ -11,16 +11,7 @@
 import lombok.Getter;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.packet.s2c.play.EntitiesDestroyS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntityStatusEffectS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.ExperienceBarUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlayerRemoveS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
-import net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
+import net.minecraft.network.packet.s2c.play.*;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.NotNull;
@@ -84,7 +75,7 @@ public static CompletableFuture<Pair<Collection<ServerPlayerEntity>, Collection<
                     observer1.networkHandler.sendPacket(new PlayerListS2CPacket(PlayerListS2CPacket.Action.ADD_PLAYER, player)); // refresh the player information
                     if (player != observer1 && observer1.canSee(player)) {
                         observer1.networkHandler.sendPacket(new EntitiesDestroyS2CPacket(player.getId()));
-                        observer1.networkHandler.sendPacket(new EntitySpawnS2CPacket(player));
+                        observer1.networkHandler.sendPacket(new EntitySpawnS2CPacket(player, 0, player.getBlockPos()));
                         observer1.networkHandler.sendPacket(new EntityPositionS2CPacket(player));
                         observer1.networkHandler.sendPacket(new EntityTrackerUpdateS2CPacket(player.getId(), player.getDataTracker().getChangedEntries()));
                     } else if (player == observer1) {

src/main/java/io/github/sakurawald/module/initializer/teleport_warmup/Position.java

@@ -50,7 +50,7 @@ public double distanceToSqr(Position position) {
     }
 
     public void teleport(ServerPlayerEntity player) {
-        RegistryKey<World> worldKey = RegistryKey.of(RegistryKeys.WORLD, new Identifier(this.level));
+        RegistryKey<World> worldKey = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(this.level));
         ServerWorld serverLevel = Fuji.SERVER.getWorld(worldKey);
         if (serverLevel == null) {
             MessageUtil.sendMessage(player, "level.no_exists", this.level);

src/main/java/io/github/sakurawald/module/initializer/top_chunks/TopChunksModule.java

@@ -54,7 +54,7 @@ public void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher, C
                 }
 
                 /* block-entity in this world */
-                ThreadedAnvilChunkStorageMixin threadedAnvilChunkStorage = (ThreadedAnvilChunkStorageMixin) world.getChunkManager().threadedAnvilChunkStorage;
+                ThreadedAnvilChunkStorageMixin threadedAnvilChunkStorage = (ThreadedAnvilChunkStorageMixin) world.getChunkManager().chunkLoadingManager;
                 Iterable<ChunkHolder> chunkHolders = threadedAnvilChunkStorage.$getChunks();
                 for (ChunkHolder chunkHolder : chunkHolders) {
                     WorldChunk worldChunk = chunkHolder.getWorldChunk();

src/main/java/io/github/sakurawald/module/initializer/works/WorksModule.java

@@ -141,7 +141,7 @@ private boolean hasPermission(ServerPlayerEntity player, Work work) {
                     .setCallback((index, clickType, actionType) -> {
                         /* left click -> visit */
                         if (clickType.isLeft) {
-                            RegistryKey<World> worldKey = RegistryKey.of(RegistryKeys.WORLD, new Identifier(work.level));
+                            RegistryKey<World> worldKey = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(work.level));
                             ServerWorld level = Fuji.SERVER.getWorld(worldKey);
                             //noinspection DataFlowIssue
                             player.teleport(level, work.x, work.y, work.z, work.yaw, work.pitch);

src/main/java/io/github/sakurawald/module/initializer/works/work_type/ProductionWork.java

@@ -192,7 +192,7 @@ public int resolveHoppers(ServerPlayerEntity player) {
         int hopperBlockCount = 0;
         int minecartHopperCount = 0;
         ServerWorld world = player.getServerWorld();
-        ThreadedAnvilChunkStorageMixin threadedAnvilChunkStorage = (ThreadedAnvilChunkStorageMixin) world.getChunkManager().threadedAnvilChunkStorage;
+        ThreadedAnvilChunkStorageMixin threadedAnvilChunkStorage = (ThreadedAnvilChunkStorageMixin) world.getChunkManager().chunkLoadingManager;
         Iterable<ChunkHolder> chunkHolders = threadedAnvilChunkStorage.$getChunks();
         for (ChunkHolder chunkHolder : chunkHolders) {
             WorldChunk worldChunk = chunkHolder.getWorldChunk();

src/main/java/io/github/sakurawald/module/mixin/main_stats/ServerPlayNetworkHandlerMixin.java

@@ -2,6 +2,7 @@
 
 
 import io.github.sakurawald.module.initializer.main_stats.MainStats;
+import net.minecraft.network.DisconnectionInfo;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -18,7 +19,7 @@ public class ServerPlayNetworkHandlerMixin {
     public ServerPlayerEntity player;
 
     @Inject(at = @At("HEAD"), method = "onDisconnected")
-    private void $disconnect(Text reason, CallbackInfo info) {
+    private void $disconnect(DisconnectionInfo disconnectionInfo, CallbackInfo ci) {
         String uuid = player.getUuid().toString();
         MainStats.uuid2stats.remove(uuid);
     }

src/main/java/io/github/sakurawald/module/mixin/op_protect/ServerPlayNetworkHandlerMixin.java

@@ -2,6 +2,7 @@
 
 
 import io.github.sakurawald.Fuji;
+import net.minecraft.network.DisconnectionInfo;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -19,7 +20,7 @@ public class ServerPlayNetworkHandlerMixin {
     public ServerPlayerEntity player;
 
     @Inject(at = @At(value = "HEAD"), method = "onDisconnected")
-    private void $onDisconnected(Text reason, CallbackInfo info) {
+    private void $onDisconnected(DisconnectionInfo disconnectionInfo, CallbackInfo ci) {
         if (Fuji.SERVER.getPlayerManager().isOperator(player.getGameProfile())) {
             Fuji.LOGGER.info("op protect -> deop " + player.getGameProfile().getName());
             Fuji.SERVER.getPlayerManager().removeFromOperators(player.getGameProfile());

src/main/java/io/github/sakurawald/module/mixin/tick_chunk_cache/ChunkMapMixin.java

@@ -4,7 +4,7 @@
 import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ChunkLevelType;
-import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.server.world.ServerChunkLoadingManager;
 import net.minecraft.util.math.ChunkPos;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -14,7 +14,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ThreadedAnvilChunkStorage.class)
+@Mixin(ServerChunkLoadingManager.class)
 public class ChunkMapMixin implements ITickableChunkSource {
 
     @Shadow

src/main/java/io/github/sakurawald/module/mixin/top_chunks/ThreadedAnvilChunkStorageMixin.java

@@ -1,11 +1,11 @@
 package io.github.sakurawald.module.mixin.top_chunks;
 
 import net.minecraft.server.world.ChunkHolder;
-import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.server.world.ServerChunkLoadingManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(ThreadedAnvilChunkStorage.class)
+@Mixin(ServerChunkLoadingManager.class)
 public interface ThreadedAnvilChunkStorageMixin {
     @Invoker("entryIterator")
     Iterable<ChunkHolder> $getChunks();

src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.22",
-    "minecraft": "~1.20.1",
+    "minecraft": "~1.21",
     "java": ">=17",
     "fabric-api": "*"
   }

src/main/resources/fuji.mixins.json

@@ -27,6 +27,7 @@
     "main_stats.PlayerListMixin",
     "main_stats.ServerPlayNetworkHandlerMixin",
     "motd.ServerStatusPacketListenerImplMixin",
+    "multi_obsidian_platform.EndPortalBlockMixin",
     "multi_obsidian_platform.EntityMixin",
     "newbie_welcome.PlayerListMixin",
     "op_protect.ServerPlayNetworkHandlerMixin",