Merge remote-tracking branch 'origin/1.16' into 1.18

common/src/main/java/org/embeddedt/modernfix/chunk/SafeBlockGetter.java

@@ -0,0 +1,68 @@
+package org.embeddedt.modernfix.chunk;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
+import org.jetbrains.annotations.Nullable;
+
+public class SafeBlockGetter implements BlockGetter {
+    private final ServerLevel wrapped;
+    private final Thread mainThread;
+
+    public SafeBlockGetter(ServerLevel wrapped) {
+        this.wrapped = wrapped;
+        this.mainThread = Thread.currentThread();
+    }
+
+    public boolean shouldUse() {
+        return Thread.currentThread() != this.mainThread;
+    }
+
+    @Nullable
+    private BlockGetter getChunkSafe(BlockPos pos) {
+        // can safely call getChunkForLighting off-thread
+        BlockGetter access = this.wrapped.getChunkSource().getChunkForLighting(pos.getX() >> 4, pos.getZ() >> 4);
+        if(!(access instanceof ChunkAccess))
+            return null;
+        ChunkAccess chunk = (ChunkAccess)access;
+        if(!chunk.getStatus().isOrAfter(ChunkStatus.FULL))
+            return null;
+        return chunk;
+    }
+
+    @Override
+    public int getMaxBuildHeight() {
+        return this.wrapped.getMaxBuildHeight();
+    }
+
+    @Override
+    public int getMaxLightLevel() {
+        return this.wrapped.getMaxLightLevel();
+    }
+
+    @Nullable
+    @Override
+    public BlockEntity getBlockEntity(BlockPos pos) {
+        BlockGetter g = getChunkSafe(pos);
+        return g == null ? null : g.getBlockEntity(pos);
+    }
+
+    @Override
+    public BlockState getBlockState(BlockPos pos) {
+        BlockGetter g = getChunkSafe(pos);
+        return g == null ? Blocks.AIR.defaultBlockState() : g.getBlockState(pos);
+    }
+
+    @Override
+    public FluidState getFluidState(BlockPos pos) {
+        BlockGetter g = getChunkSafe(pos);
+        return g == null ? Fluids.EMPTY.defaultFluidState() : g.getFluidState(pos);
+    }
+}

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/BlockStateBaseMixin.java

@@ -0,0 +1,22 @@
+package org.embeddedt.modernfix.common.mixin.bugfix.chunk_deadlock;
+
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import org.embeddedt.modernfix.chunk.SafeBlockGetter;
+import org.embeddedt.modernfix.duck.ISafeBlockGetter;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(value = BlockBehaviour.BlockStateBase.class, priority = 100)
+public class BlockStateBaseMixin {
+    @ModifyVariable(method = "getOffset", at = @At("HEAD"), argsOnly = true, index = 1)
+    private BlockGetter useSafeGetter(BlockGetter g) {
+        if(g instanceof ISafeBlockGetter) {
+            SafeBlockGetter replacement = ((ISafeBlockGetter) g).mfix$getSafeBlockGetter();
+            if(replacement.shouldUse())
+                return replacement;
+        }
+        return g;
+    }
+}

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerLevelMixin.java

@@ -0,0 +1,18 @@
+package org.embeddedt.modernfix.common.mixin.bugfix.chunk_deadlock;
+
+import net.minecraft.server.level.ServerLevel;
+import org.embeddedt.modernfix.chunk.SafeBlockGetter;
+import org.embeddedt.modernfix.duck.ISafeBlockGetter;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(ServerLevel.class)
+public class ServerLevelMixin implements ISafeBlockGetter {
+    @Unique
+    private final SafeBlockGetter mfix$safeBlockGetter = new SafeBlockGetter((ServerLevel)(Object)this);
+
+    @Override
+    public SafeBlockGetter mfix$getSafeBlockGetter() {
+        return mfix$safeBlockGetter;
+    }
+}

common/src/main/java/org/embeddedt/modernfix/duck/ISafeBlockGetter.java

@@ -0,0 +1,7 @@
+package org.embeddedt.modernfix.duck;
+
+import org.embeddedt.modernfix.chunk.SafeBlockGetter;
+
+public interface ISafeBlockGetter {
+    SafeBlockGetter mfix$getSafeBlockGetter();
+}

common/src/main/resources/assets/modernfix/lang/zh_cn.json

@@ -4,10 +4,11 @@
   "modernfix.jei_load": "正在加载JEI，这可能会花费一段时间。",
   "modernfix.no_lazydfu": "未安装DFU载入优化。如果Minecraft需要从旧版本更新游戏数据，可能会出现极大的延迟。",
   "modernfix.no_ferritecore": "未安装铁氧体磁芯。内存占用将会非常高。",
+  "modernfix.connectedness_dynresoruces": "Connectedness模组（用于提供连接纹理）和现代化修复的动态资源（dynamic resources）功能不兼容。请删除Connectedness模组，或在现代化修复配置中禁用动态资源功能。",
   "modernfix.perf_mod_warning": "推荐安装这些模组，但你也可以在现代化修复的配置中禁用此警告。",
   "modernfix.config": "现代化修复Mixin配置",
   "modernfix.config.done_restart": "完成（生效需重启）",
-  "modernfix.message.reload_config": "在游戏外编辑完配置文件后，使用§b/mfrc§r命令使其生效。",
+  "modernfix.message.reload_config": "检测到模组配置文件的更改。为了避免加载尚未保存完毕的文件，重载过程必须通过使用§b/mfrc§r命令来触发。",
   "modernfix.option.on": "开启",
   "modernfix.option.off": "关闭",
   "modernfix.option.disabled": "已禁用",