Merge branch 'Xiao-MoMi:dev' into dev

bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/worldedit/FastAsyncWorldEditDelegate.java

@@ -64,7 +64,7 @@ public class FastAsyncWorldEditDelegate extends AbstractDelegateExtent {
             @Subscribe
             @SuppressWarnings("unused")
             public void onEditSessionEvent(EditSessionEvent event) {
-                if (event.getStage() == EditSession.Stage.BEFORE_HISTORY || event.getStage() == EditSession.Stage.BEFORE_CHANGE) {
+                if (event.getStage() == EditSession.Stage.BEFORE_CHANGE) {
                     event.setExtent(new FastAsyncWorldEditDelegate(event));
                 }
             }

bukkit/loader/src/main/resources/commands.yml

@@ -168,6 +168,13 @@ debug_target_block:
     - /craftengine debug target-block
     - /ce debug target-block
 
+debug_is_section_injected:
+  enable: true
+  permission: ce.command.debug.is_section_injected
+  usage:
+    - /craftengine debug is-section-injected
+    - /ce debug is-section-injected
+
 debug_test:
   enable: true
   permission: ce.command.debug.test

bukkit/loader/src/main/resources/translations/en.yml

@@ -222,6 +222,8 @@ warning.config.block.behavior.leaves.missing_distance: "<yellow>Issue found in f
 warning.config.block.behavior.sapling.missing_stage: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'stage' property for 'sapling_block' behavior.</yellow>"
 warning.config.block.behavior.sapling.missing_feature: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'feature' argument for 'sapling_block' behavior.</yellow>"
 warning.config.block.behavior.strippable.missing_stripped: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'stripped' argument for 'strippable_block' behavior.</yellow>"
+warning.config.block.event.condition.missing_type: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'type' argument for event condition.</yellow>"
+warning.config.block.event.condition.invalid_type: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is using an invalid 'type' argument for event condition.</yellow>"
 warning.config.model.generation.missing_parent: "<yellow>Issue found in file <arg:0> - The config '<arg:1>' is missing the required 'parent' argument in 'generation' section.</yellow>"
 warning.config.model.generation.conflict: "<yellow>Issue found in file <arg:0> - Failed to generate model for '<arg:1>' as two or more configurations attempt to generate different json models with the same path: '<arg:2>'.</yellow>"
 warning.config.model.generation.texture.invalid: "<yellow>Issue found in file <arg:0> - The config '<arg:1>' has a texture '<arg:2>' with path '<arg:3>' that contains illegal characters. Please read https://minecraft.wiki/w/Resource_location#Legal_characters.</yellow>"

bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitCommandManager.java

@@ -46,6 +46,7 @@ public class BukkitCommandManager extends AbstractCommandManager<CommandSender>
                 new DebugSetBlockCommand(this, plugin),
                 new DebugSpawnFurnitureCommand(this, plugin),
                 new DebugTargetBlockCommand(this, plugin),
+                new DebugIsSectionInjectedCommand(this, plugin),
                 new TotemAnimationCommand(this, plugin),
                 new EnableResourceCommand(this, plugin),
                 new DisableResourceCommand(this, plugin),

bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugIsSectionInjectedCommand.java

@@ -0,0 +1,50 @@
+package net.momirealms.craftengine.bukkit.plugin.command.feature;
+
+import net.kyori.adventure.text.Component;
+import net.momirealms.craftengine.bukkit.nms.FastNMS;
+import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
+import net.momirealms.craftengine.bukkit.plugin.injector.BukkitInjector;
+import net.momirealms.craftengine.core.plugin.CraftEngine;
+import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager;
+import net.momirealms.craftengine.core.plugin.command.sender.Sender;
+import net.momirealms.craftengine.core.plugin.context.ContextHolder;
+import net.momirealms.craftengine.core.plugin.context.PlayerOptionalContext;
+import net.momirealms.craftengine.core.util.AdventureHelper;
+import net.momirealms.craftengine.core.world.chunk.CESection;
+import org.bukkit.Chunk;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.parser.standard.StringParser;
+
+public class DebugIsSectionInjectedCommand extends BukkitCommandFeature<CommandSender> {
+
+    public DebugIsSectionInjectedCommand(CraftEngineCommandManager<CommandSender> commandManager, CraftEngine plugin) {
+        super(commandManager, plugin);
+    }
+
+    @Override
+    public Command.Builder<? extends CommandSender> assembleCommand(org.incendo.cloud.CommandManager<CommandSender> manager, Command.Builder<CommandSender> builder) {
+        return builder
+                .senderType(Player.class)
+                .handler(context -> {
+                    Player player = context.sender();
+                    Chunk chunk = player.getChunk();
+                    Object worldServer = FastNMS.INSTANCE.field$CraftChunk$worldServer(chunk);
+                    Object chunkSource = FastNMS.INSTANCE.method$ServerLevel$getChunkSource(worldServer);
+                    Object levelChunk = FastNMS.INSTANCE.method$ServerChunkCache$getChunkAtIfLoadedMainThread(chunkSource, chunk.getX(), chunk.getZ());
+                    Object[] sections = FastNMS.INSTANCE.method$ChunkAccess$getSections(levelChunk);
+                    int i = 0;
+                    Sender sender = plugin().senderFactory().wrap(player);
+                    for (Object section : sections) {
+                        sender.sendMessage(Component.text("Section #" + i + ": " + BukkitInjector.isSectionInjected(section)));
+                        i++;
+                    }
+                });
+    }
+
+    @Override
+    public String getFeatureID() {
+        return "debug_is_section_injected";
+    }
+}

bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BukkitInjector.java

@@ -391,7 +391,7 @@ public class BukkitInjector {
     public synchronized static void injectLevelChunkSection(Object targetSection, CESection ceSection, CEWorld ceWorld, CEChunk chunk, SectionPos pos) {
         try {
             Object container = FastNMS.INSTANCE.field$LevelChunkSection$states(targetSection);
-            if (!clazz$InjectedPalettedContainer.isInstance(container)) {
+            if (!(container instanceof InjectedPalettedContainerHolder)) {
                 InjectedPalettedContainerHolder injectedObject;
                 if (Config.fastPaletteInjection()) {
                     injectedObject = FastNMS.INSTANCE.createInjectedPalettedContainerHolder(container);
@@ -411,6 +411,11 @@ public class BukkitInjector {
         }
     }
 
+    public static boolean isSectionInjected(Object section) {
+        Object container = FastNMS.INSTANCE.field$LevelChunkSection$states(section);
+        return container instanceof InjectedPalettedContainerHolder;
+    }
+
     public synchronized static void uninjectLevelChunkSection(Object section) {
         try {
             Object states = FastNMS.INSTANCE.field$LevelChunkSection$states(section);
@@ -707,6 +712,8 @@ public class BukkitInjector {
                     ImmutableBlockState immutableBlockState = BukkitBlockManager.instance().getImmutableBlockStateUnsafe(stateId);
                     ImmutableBlockState previousImmutableBlockState = section.setBlockState(x, y, z, immutableBlockState);
                     // 如果之前的自定义块(空气)和当前自定义块不同
+                    System.out.println("1:" + immutableBlockState);
+                    System.out.println("2:" + previousImmutableBlockState);
                     if (previousImmutableBlockState != immutableBlockState) {
                         holder.ceChunk().setDirty(true);
                         if (Config.enableLightSystem() && !immutableBlockState.isEmpty()) {

core/src/main/java/net/momirealms/craftengine/core/plugin/event/BlockEventConditions.java

@@ -14,18 +14,18 @@ import java.util.Map;
 public class BlockEventConditions {
 
     public static Condition<PlayerBlockActionContext> fromMap(Map<String, Object> map) {
-        String type = ResourceConfigUtils.requireNonEmptyStringOrThrow(map.get("type"), "TODO I18N");
+        String type = ResourceConfigUtils.requireNonEmptyStringOrThrow(map.get("type"), "warning.config.block.event.condition.missing_type");
         Key key = Key.withDefaultNamespace(type, Key.DEFAULT_NAMESPACE);
         if (key.value().charAt(0) == '!') {
             Factory<Condition<PlayerBlockActionContext>> factory = BuiltInRegistries.PLAYER_BLOCK_CONDITION_FACTORY.getValue(new Key(key.namespace(), key.value().substring(1)));
             if (factory == null) {
-                throw new LocalizedResourceConfigException("TODO I18N", type);
+                throw new LocalizedResourceConfigException("warning.config.block.event.condition.invalid_type", type);
             }
             return new InvertedCondition<>(factory.create(map));
         } else {
             Factory<Condition<PlayerBlockActionContext>> factory = BuiltInRegistries.PLAYER_BLOCK_CONDITION_FACTORY.getValue(key);
             if (factory == null) {
-                throw new LocalizedResourceConfigException("TODO I18N", type);
+                throw new LocalizedResourceConfigException("warning.config.block.event.condition.invalid_type", type);
             }
             return factory.create(map);
         }

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=0.0.53-beta.3
+project_version=0.0.53-beta.4
 config_version=31
 lang_version=12
 project_group=net.momirealms

server-mod/v1_21_5/src/main/java/net/momirealms/craftengine/mod/CraftEnginePlugin.java

@@ -1,5 +1,6 @@
 package net.momirealms.craftengine.mod;
 
+import net.minecraft.world.level.chunk.LevelChunkSection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.tree.ClassNode;