Merge remote-tracking branch 'origin/1.20.6' into 1.20.6

.gitignore

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "fuji-fabric.wiki"]
+	path = fuji-fabric.wiki
+	url = https://github.com/sakurawald/fuji-fabric.wiki.git

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" }
@@ -52,19 +53,18 @@ dependencies {
 
     implementation group: 'com.google.code.gson', name: 'gson', version: "${project.gson_version}"
 
-    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")))
-
     modImplementation("carpet:fabric-carpet:${project.carpet_core_version}")
 
     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}")
 
     implementation "me.lucko:spark-api:${project.spark_version}"
 
+    include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")))
     include(implementation "org.apache.commons:commons-compress:${project.apache_commons_compression_version}")
     include(implementation "commons-io:commons-io:${project.apache_commons_io_version}")
     include(implementation "org.quartz-scheduler:quartz:${project.quartz_version}")
@@ -118,14 +118,14 @@ publishing {
     }
 }
 
-// build.gradle
+// modrinth
 modrinth {
     token = "$System.env.modrinth_token"
     projectId = "1TowMm2v"
     versionNumber = "$mod_version"
     versionType = "release"
     uploadFile = remapJar
-    gameVersions = ['1.20.6']
+    gameVersions = ['1.21']
     loaders = ["fabric"]
     dependencies {
         required.project "fabric-api"
@@ -134,15 +134,14 @@ modrinth {
     }
     syncBodyFrom = rootProject.file("README.md").text
 }
-
-// replace readme
 tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
-tasks.register('replaceReadme') {
-    // todo
-}
-tasks.modrinthSyncBody.dependsOn(tasks.replaceReadme)
-
 
+// test framework
 test {
     useJUnitPlatform()
-}
+
+    filter {
+        includeTestsMatching 'ModuleDocumentationGeneratorTest.buildModuleDocumentation'
+    }
+}
+tasks.modrinthSyncBody.dependsOn(tasks.test)

gradle.properties

@@ -1,8 +1,9 @@
-org.gradle.jvmargs=-Xmx4G
+# gradle
+org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
 # mod properties
-mod_version=1.2.0
+mod_version=1.2.4
 maven_group=io.github.sakurawald
 archives_base_name=fuji
 
@@ -14,9 +15,9 @@ yarn_mappings=1.20.6+build.1
 # 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
+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

@@ -8,25 +8,37 @@
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.MinecraftServer;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 
 import java.nio.file.Path;
 
+// TODO: placeholder module (placeholder api)
+
+// TODO: specific command module
+// TODO: add native shell support specific command
+// TODO: kit module -> spec-command
 
-// TODO: /spawn module
 // TODO: custom tab list
 // TODO: player nickname / prefix / suffix
-// TODO: backup module
-// TODO: warmup module
-// TODO: placeholder module
+
+// TODO: command warmup module
+// TODO: /spawn module
 // TODO: /tppos module
-// TODO: playtime(every/for) rewards and rank like module
-// TODO: kit module -> spec-command
-// TODO: luckperms context calculate module
+// TODO: playtime(every/for) rewards module
+// TODO: rank module
+
+// TODO: a light-weight way to implement chat module
+
+// TODO: revert some custom events
+
+// TODO: delete ./github images
+
+// TODO: remove fabric-api dep
 
 public class Fuji implements ModInitializer {
     public static final String MOD_ID = "fuji";
-    public static final Logger LOGGER = LogUtil.createLogger("Fuji");
+    public static final Logger LOGGER = LogUtil.createLogger(StringUtils.capitalize(MOD_ID));
     public static final Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve(MOD_ID).toAbsolutePath();
     public static MinecraftServer SERVER;
 

src/main/java/io/github/sakurawald/common/event/PostPlayerConnectEvent.java

@@ -0,0 +1,27 @@
+package io.github.sakurawald.common.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.DisconnectionInfo;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+public interface PostPlayerConnectEvent {
+    Event<PostPlayerConnectEvent> EVENT = EventFactory.createArrayBacked(PostPlayerConnectEvent.class,
+            (listeners) -> (connection, player, commonListenerCookie) -> {
+                for (PostPlayerConnectEvent listener : listeners) {
+                    ActionResult result = listener.interact(connection, player, commonListenerCookie);
+
+                    if (result != ActionResult.PASS) {
+                        return result;
+                    }
+                }
+
+                return ActionResult.PASS;
+            });
+
+    ActionResult interact(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData commonListenerCookie);
+}

src/main/java/io/github/sakurawald/common/event/PreCommandExecuteEvent.java

@@ -0,0 +1,24 @@
+package io.github.sakurawald.common.event;
+
+import com.mojang.brigadier.ParseResults;
+import com.mojang.brigadier.context.CommandContext;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.util.ActionResult;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+public interface PreCommandExecuteEvent {
+    Event<PreCommandExecuteEvent> EVENT = EventFactory.createArrayBacked(PreCommandExecuteEvent.class,
+            (listeners) -> (parseResults, string) -> {
+                for (PreCommandExecuteEvent listener : listeners) {
+                    ActionResult result = listener.interact(parseResults, string);
+                    if (result != ActionResult.PASS) {
+                        return result;
+                    }
+                }
+                return  ActionResult.PASS;
+            });
+
+    ActionResult interact(ParseResults<ServerCommandSource> parseResults, String string);
+}

src/main/java/io/github/sakurawald/common/event/PrePlayerDeathEvent.java

@@ -0,0 +1,23 @@
+package io.github.sakurawald.common.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+
+public interface PrePlayerDeathEvent {
+    Event<PrePlayerDeathEvent> EVENT = EventFactory.createArrayBacked(PrePlayerDeathEvent.class,
+            (listeners) -> (player, damageSource) -> {
+                for (PrePlayerDeathEvent listener : listeners) {
+                    ActionResult result = listener.interact(player, damageSource);
+                    if (result != ActionResult.PASS) {
+                        return result;
+                    }
+                }
+
+                return ActionResult.PASS;
+            });
+
+    ActionResult interact(ServerPlayerEntity player, DamageSource damageSource);
+}

src/main/java/io/github/sakurawald/common/event/PrePlayerDisconnectEvent.java

@@ -0,0 +1,27 @@
+package io.github.sakurawald.common.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.entity.passive.SheepEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.DisconnectionInfo;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+
+public interface PrePlayerDisconnectEvent {
+
+    Event<PrePlayerDisconnectEvent> EVENT = EventFactory.createArrayBacked(PrePlayerDisconnectEvent.class,
+        (listeners) -> (player, disconnectionInfo) -> {
+            for (PrePlayerDisconnectEvent listener : listeners) {
+                ActionResult result = listener.interact(player, disconnectionInfo);
+
+                if(result != ActionResult.PASS) {
+                    return result;
+                }
+            }
+
+        return ActionResult.PASS;
+    });
+
+    ActionResult interact(ServerPlayerEntity player, DisconnectionInfo disconnectionInfo);
+}

src/main/java/io/github/sakurawald/module/initializer/seen/GameProfileCacheEx.java → src/main/java/io/github/sakurawald/common/structure/GameProfileCacheEx.java

@@ -1,4 +1,4 @@
-package io.github.sakurawald.module.initializer.seen;
+package io.github.sakurawald.common.structure;
 
 import java.util.Collection;
 

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

@@ -1,4 +1,4 @@
-package io.github.sakurawald.module.initializer.teleport_warmup;
+package io.github.sakurawald.common.structure;
 
 import io.github.sakurawald.Fuji;
 import io.github.sakurawald.util.MessageUtil;
@@ -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/config/annotation/Comment.java → src/main/java/io/github/sakurawald/config/annotation/Documentation.java

@@ -3,7 +3,7 @@
 import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Comment {
+@Target({ElementType.TYPE, ElementType.FIELD})
+public @interface Documentation {
     String value();
 }