添加方块位移需求 并修复multiplier异常问题

Author: cneicy

README.md

@@ -29,6 +29,7 @@
 ⚙️ **高级配置**
 - 配方成功率 (`0.0~1.0`)
 - 方块保留几率 (`0.0~1.0`)
+- 方块位移以及根据位移多出需求的量生成相应额外量的产物
 - 检测半径动态调整
 - 失败/成功音效定制化
 - NBT模糊匹配 (`fuzzyNBT`)
@@ -67,6 +68,8 @@ val builder = FallingAlchemy.addConversion(
     successChance as double,         // 成功率（可选，默认1.0）
     keepBlockChance as double,       // 方块保留率（可选，默认0.0）
     priority as int,                 // 优先级（可选，默认0）
+    displacement as double,          // 最小位移要求
+    additionalProducts as boolean,   // 是否根据额外位移生成额外产物
     successSound as string,          // 成功音效（可选）
     successVolume as float,          // 成功音量（0.1-2.0）
     successPitch as float,           // 成功音高（0.5-2.0）
@@ -147,6 +150,8 @@ val builder = FallingAlchemy.addConversion(
     0.75,
     0.2,
     10,
+    8,
+    true,
     "minecraft:entity.endermen.teleport", 1.0, 1.2,
     "minecraft:block.glass.break", 0.8, 0.9
 );

src/main/java/work/crash/fallingalchemy/handler/FallingBlockHandler.java

@@ -15,31 +15,31 @@
 import work.crash.fallingalchemy.item.ConsumedItem;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static work.crash.fallingalchemy.Tags.MOD_ID;
+import static work.crash.fallingalchemy.utils.Math.*;
 
 @Mod.EventBusSubscriber(modid = MOD_ID)
 public class FallingBlockHandler {
 
     private static final List<WeakReference<EntityFallingBlock>> trackedBlocks = new ArrayList<>();
+    private final Dictionary<EntityFallingBlock, BlockPos> blockPosition = new Hashtable<>();
 
     @SubscribeEvent
-    public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
+    public void onEntityJoinWorld(EntityJoinWorldEvent event) {
         if (event.getEntity() instanceof EntityFallingBlock block) {
             Block blockType = block.getBlock().getBlock();
             if (FallingAlchemyTweaker.RULES.containsKey(blockType)) {
                 trackedBlocks.add(new WeakReference<>(block));
+                blockPosition.put(block, block.getPosition());
             }
         }
     }
 
     @SubscribeEvent
-    public static void onWorldTick(TickEvent.WorldTickEvent event) {
+    public void onWorldTick(TickEvent.WorldTickEvent event) {
         if (event.phase == TickEvent.Phase.END && !event.world.isRemote) {
             Iterator<WeakReference<EntityFallingBlock>> iterator = trackedBlocks.iterator();
 
@@ -48,15 +48,15 @@ public static void onWorldTick(TickEvent.WorldTickEvent event) {
                 if (block == null || block.isDead) {
                     BlockPos pos = new BlockPos(block.posX, block.posY, block.posZ);
                     if (event.world.getBlockState(pos).getBlock() == block.getBlock().getBlock()) {
-                        processConversion(event.world, pos, block.getBlock().getBlock());
+                        processConversion(event.world, blockPosition.get(block), pos, block.getBlock().getBlock());
                     }
                     iterator.remove();
                 }
             }
         }
     }
 
-    private static void processConversion(World world, BlockPos pos, Block triggerBlock) {
+    private void processConversion(World world, BlockPos oriPos, BlockPos pos, Block triggerBlock) {
         List<FallingAlchemyTweaker.ConversionRule> rules = FallingAlchemyTweaker.RULES.getOrDefault(triggerBlock, Collections.emptyList());
 
         List<FallingAlchemyTweaker.ConversionRule> sortedRules = rules.stream().sorted(FallingAlchemyTweaker.ConversionRule::compareTo).collect(Collectors.toList());
@@ -84,6 +84,15 @@ private static void processConversion(World world, BlockPos pos, Block triggerBl
             }
 
             if (multiplier <= 0) continue;
+            // 避免无消耗物时multiplier异常
+            if (rule.consumedItems.isEmpty()) {
+                multiplier = 1;
+            }
+
+            // 计算位移是否满足要求
+            if (positionDistance(oriPos, pos) < rule.displacement) {
+                continue;
+            }
 
             // 扣除每个消耗品
             for (ConsumedItem consumed : rule.consumedItems) {
@@ -116,14 +125,19 @@ private static void processConversion(World world, BlockPos pos, Block triggerBl
             int finalMultiplier = multiplier;
             rule.outputs.forEach(output -> {
                 ItemStack spawnedStack = output.copy();
-                spawnedStack.setCount(spawnedStack.getCount() * finalMultiplier);
-
+                //
+                if (rule.displacement > 0 && positionDistance(oriPos, pos) > rule.displacement && rule.additionalProducts) {
+                    spawnedStack.setCount((int) ((positionDistance(oriPos, pos) - rule.displacement) + (spawnedStack.getCount() * finalMultiplier)));
+                } else {
+                    spawnedStack.setCount(spawnedStack.getCount() * finalMultiplier);
+                }
                 EntityItem newItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.2, pos.getZ() + 0.5, spawnedStack);
                 newItem.setDefaultPickupDelay();
                 newItem.motionY = 0.1;
                 world.spawnEntity(newItem);
             });
             rule.playSuccessSound(world, pos);
+            // 是否消耗方块
             if (world.rand.nextFloat() >= rule.keepBlockChance) {
                 world.setBlockToAir(pos);
             }

src/main/java/work/crash/fallingalchemy/modsupport/FallingAlchemyTweaker.java

@@ -51,7 +51,9 @@ public static ConversionBuilder addConversion(
             @Optional double successChance,
             @Optional double keepBlockChance,
             @Optional int priority,
-            @Optional String successSound,  // 新增音效参数
+            @Optional double displacement,
+            @Optional boolean additionalProducts,
+            @Optional String successSound,
             @Optional float successVolume,
             @Optional float successPitch,
             @Optional String failureSound,
@@ -77,7 +79,6 @@ public static ConversionBuilder addConversion(
 
         float success = (float) MathHelper.clamp(successChance, 0.0, 1.0);
         float keep = (float) MathHelper.clamp(keepBlockChance, 0.0, 1.0);
-        int finalPriority = priority;
 
         SoundEvent successSd = parseSound(successSound);
         SoundEvent failureSd = parseSound(failureSound);
@@ -90,10 +91,12 @@ public static ConversionBuilder addConversion(
                 block,
                 Arrays.asList(consumedItems),
                 (float) radius,
+                (float) displacement,
+                additionalProducts,
                 mcOutputs,
                 success,
                 keep,
-                finalPriority,
+                priority,
                 successSd, sVol, sPitch,
                 failureSd, fVol, fPitch
         );
@@ -111,6 +114,8 @@ public static class ConversionRule implements Comparable<ConversionRule> {
         final Block triggerBlock;
         public final float radius;
         public final List<ConsumedItem> consumedItems; // 使用List存储多个消耗条件
+        public final float displacement;
+        public final boolean additionalProducts;
         public final float successChance;
         public final float keepBlockChance;
         public final List<ItemStack> outputs;
@@ -124,13 +129,15 @@ public static class ConversionRule implements Comparable<ConversionRule> {
         float failurePitch;
 
         public ConversionRule(Block trigger, List<ConsumedItem> consumedItems, float radius,
-                              List<ItemStack> output, float success, float keep, int priority,
+                              float displacement, boolean additionalProducts, List<ItemStack> output, float success, float keep, int priority,
                               SoundEvent successSound, float successVolume, float successPitch,
                               SoundEvent failureSound, float failureVolume, float failurePitch) {
             this.triggerBlock = trigger;
             this.consumedItems = consumedItems;
             this.radius = radius;
             this.outputs = output;
+            this.displacement = displacement;
+            this.additionalProducts = additionalProducts;
             this.successChance = success;
             this.keepBlockChance = keep;
             this.priority = priority;

src/main/java/work/crash/fallingalchemy/utils/Math.java

@@ -0,0 +1,13 @@
+package work.crash.fallingalchemy.utils;
+
+import net.minecraft.util.math.BlockPos;
+
+public class Math {
+    public static double positionDistance(BlockPos pos1, BlockPos pos2) {
+        double dx = pos2.getX() - pos1.getX();
+        double dy = pos2.getY() - pos1.getY();
+        double dz = pos2.getZ() - pos1.getZ();
+
+        return java.lang.Math.sqrt(dx*dx + dy*dy + dz*dz);
+    }
+}