UD-260309

Author: Altnoir

gradle.properties

@@ -27,7 +27,7 @@ flywheel_version=1.0.4
 mod_id=mia
 mod_name=Memento In Abyss
 mod_license=MIT
-mod_version=0.1.0-alpha.23
+mod_version=0.1.0-alpha.25
 mod_group_id=com.altnoir.mia
 mod_authors=Altnoir, lonelyicer, zljtt, zhaijineet
 mod_description=Memento In Abyss.

src/generated/resources/assets/mia/models/item/blaze_reap.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "mia:item/blaze_reap"
+  }
+}

src/generated/resources/assets/mia/models/item/debug_attribute_tool.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "mia:item/debug_attribute_tool"
+  }
+}

src/generated/resources/assets/mia/models/item/peace_phobia.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "mia:item/peace_phobia"
+  }
+}

src/main/java/com/altnoir/mia/MiaItemGroups.java

@@ -204,14 +204,16 @@ public class MiaItemGroups {
                         output.accept(MiaItems.HEALTH_JUNKIE);
                         output.accept(MiaItems.ARTIFACT_HASTE);
                         output.accept(MiaItems.HOOK);
-                        output.accept(MiaItems.DEBUG_ATTRIBUTE_TOOL);
 
                         // Weapons
                         output.accept(MiaItems.GROW_SWORD);
                         output.accept(MiaItems.BLAZE_REAP);
 
                         // Misc
                         output.accept(MiaItems.PEACE_PHOBIA);
+
+                        // DEV
+                        output.accept(MiaItems.DEBUG_ATTRIBUTE_TOOL);
                     }).build()
     );
 

src/main/java/com/altnoir/mia/client/MiaClientEvents.java

@@ -5,6 +5,7 @@
 import com.altnoir.mia.client.gui.screens.inventory.tooltip.ClientArtifactBundleTooltip;
 import com.altnoir.mia.client.handler.HookHandler;
 import com.altnoir.mia.client.renderer.TheAbyssDimEffects;
+import com.altnoir.mia.client.renderer.TheAbyssFogRenderer;
 import com.altnoir.mia.common.component.ArtifactBundleInventoryComponent;
 import com.altnoir.mia.compat.Mods;
 import com.altnoir.mia.compat.ponder.MiaPonder;
@@ -56,6 +57,9 @@ public static void registerKeyBindings(RegisterKeyMappingsEvent event) {
     // 游戏事件-持续事件
     public static void onClientTick(ClientTickEvent.Post event) {
         final Minecraft MC = Minecraft.getInstance();
+        if (MC.level == null && MC.player == null) {
+            TheAbyssFogRenderer.clearCache();
+        }
         if (MC.level == null || MC.player == null) return;
 
         KeyArrowEvent.onClientTick();

src/main/java/com/altnoir/mia/client/renderer/TheAbyssFogRenderer.java

@@ -14,21 +14,27 @@
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class TheAbyssFogRenderer {
-    private static final Map<Long, Float> FOG_DENSITY_CACHE = new HashMap<>();
-
+    // 使用 LinkedHashMap 实现 LRU 缓存，自动移除最旧的条目
+    private static final Map<Long, Float> FOG_DENSITY_CACHE = new LinkedHashMap<Long, Float>(256, 0.75f, true) {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<Long, Float> eldest) {
+            return size() > 1024; // 增加缓存大小以减少频繁清理
+        }
+    };
     // 过渡控制变量
     private static final int TRANSITION_RANGE = 16; // 过渡范围
     private static float lastFogStart = 0;
     private static float lastFogEnd = 192;
     private static long lastUpdateTime = 0;
 
     // 性能保护变量
-    private static int samplesThisFrame = 0;
-    private static long lastFrameTime = 0;
-    private static final int MAX_SAMPLES_PER_FRAME = 8;
+    private static final ThreadLocal<Integer> samplesThisFrame = ThreadLocal.withInitial(() -> 0);
+    private static final ThreadLocal<Long> lastFrameTime = ThreadLocal.withInitial(() -> 0L);
+    private static final int MAX_SAMPLES_PER_FRAME = 16;
 
     public static boolean renderFog(Camera camera, FogRenderer.FogMode fogMode, float farPlaneDistance, float partialTick) {
         var player = camera.getEntity();
@@ -140,13 +146,15 @@ private static float getSmoothedBiomeFactor(Level level, double x, double y, dou
     private static float calculateBiomeBlendFactor(Level level, double x, double y, double z) {
         // 性能保护：每帧重置采样计数器
         long currentTime = System.currentTimeMillis();
-        if (currentTime != lastFrameTime) {
-            samplesThisFrame = 0;
-            lastFrameTime = currentTime;
+        if (currentTime != lastFrameTime.get()) {
+            samplesThisFrame.set(0);
+            lastFrameTime.set(currentTime);
         }
-        // 如果超过每帧最大采样次数，返回默认值
-        if (samplesThisFrame >= MAX_SAMPLES_PER_FRAME) {
-            return 0.5f; // 默认值
+        // 如果超过每帧最大采样次数，返回基于位置的默认值，而不是固定的0.5
+        if (samplesThisFrame.get() >= MAX_SAMPLES_PER_FRAME) {
+            // 基于位置计算一个伪随机但稳定的值，避免所有位置都返回相同值
+            long seed = (long) (x * 3129871) ^ (long) (z * 116129781L) ^ (long) y;
+            return 0.3f + (Math.abs(seed % 40) / 100.0f);
         }
 
         // 将世界坐标转换为区块坐标
@@ -161,7 +169,7 @@ private static float calculateBiomeBlendFactor(Level level, double x, double y,
         if (FOG_DENSITY_CACHE.containsKey(key)) {
             return FOG_DENSITY_CACHE.get(key);
         }
-        samplesThisFrame++; // 增加采样计数
+        samplesThisFrame.set(samplesThisFrame.get() + 1); // 增加采样计数
 
         // 采样3x3区块段
         int biomeFogCount = 0;
@@ -195,4 +203,9 @@ private static float calculateBiomeBlendFactor(Level level, double x, double y,
 
         return blendFactor;
     }
+
+    // 提供一个方法来清除缓存，可在游戏退出时调用
+    public static void clearCache() {
+        FOG_DENSITY_CACHE.clear();
+    }
 }

src/main/java/com/altnoir/mia/common/block/PedestalBlock.java

@@ -28,12 +28,17 @@
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
 
 public class PedestalBlock extends BaseEntityBlock implements SimpleWaterloggedBlock {
     public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
-    public static final VoxelShape SHAPE = Block.box(1, 0, 1, 15, 16, 15);
+    public static final VoxelShape SHAPE = Shapes.or(
+            Block.box(4.0, 6.0, 4.0, 12.0, 9.0, 12.0),
+            Block.box(5, 2, 5, 11, 6, 11),
+            Block.box(2, 0, 2, 14, 2, 14)
+    );
     public static final MapCodec<PedestalBlock> CODEC = simpleCodec(PedestalBlock::new);
 
     public PedestalBlock(Properties properties) {
@@ -102,7 +107,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
                 level.playSound(player, pos, SoundEvents.ITEM_PICKUP, SoundSource.BLOCKS, 0.5F, 1.0F);
                 return ItemInteractionResult.SUCCESS;
             }
-            if (blockEntity.tryInsertItem(stack.copy(), false)){
+            if (blockEntity.tryInsertItem(stack.copy(), false)) {
                 stack.setCount(0);
                 level.playSound(player, pos, SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, 0.5F, 1.0F);
                 return ItemInteractionResult.SUCCESS;

src/main/java/com/altnoir/mia/common/block/entity/renderer/PedestalRenderer.java

@@ -32,7 +32,7 @@ public void render(PedestalBlockEntity blockEntity, float partialTick, PoseStack
             var yOffset = (float) Math.sin(time * 0.1F) * 0.05F;
 
             poseStack.pushPose();
-            poseStack.translate(0.5F, 1.05F + yOffset, 0.5F);
+            poseStack.translate(0.5F, 0.875F + yOffset, 0.5F);
             poseStack.scale(0.5F, 0.5F, 0.5F);
 
             var inputAngle = time * 4 % 360;
@@ -53,7 +53,7 @@ public void render(PedestalBlockEntity blockEntity, float partialTick, PoseStack
         int count = nonEmptyStacks.size();
         if (count == 0) return;
 
-        var radius = 0.35F;
+        var radius = 0.45F;
         var yBase = 0.3F;
         var rotationSpeed = 2F;
 

src/main/java/com/altnoir/mia/common/item/DebugAttributeTool.java

@@ -77,4 +77,9 @@ private double getBaseAttributeValue(Player player, Holder<Attribute> attribute)
         }
         return 0.0;
     }
+
+    @Override
+    public boolean isFoil(ItemStack stack) {
+        return true;
+    }
 }