Bug修复

Author: Inf1nlty

src/generated/resources/assets/ifw/lang/en_us.json

@@ -368,5 +368,7 @@
   "persistent_eff.ifw.fear_of_undead": "FearOfUndead",
   "persistent_eff.ifw.fear_of_wolves": "FearOfWolves",
   "persistent_eff.ifw.none": "Empty",
-  "tooltip.infinity.gem.xp": "+%s Experience Value"
+  "tooltip.infinity.gem.xp": "+%s Experience Value",
+  "item.ifw.placeBucketAsSource": "Ctrl:Consume 100 EXP to place as source",
+  "item.ifw.chanceOfBucketMelting": "%d%% Chance of melting"
 }

src/generated/resources/assets/ifw/lang/zh_cn.json

@@ -242,6 +242,8 @@
   "item.ifw.obsidian_shard": "黑曜石碎片",
   "item.ifw.onion": "洋葱",
   "item.ifw.orange": "橘子",
+  "item.ifw.placeBucketAsSource": "Ctrl: 消耗100XP放置无限源",
+  "item.ifw.chanceOfBucketMelting": "有%d%%的几率融毁",
   "item.ifw.porridge": "燕麦粥",
   "item.ifw.powder_snow_adamantium_bucket": "艾德曼细雪桶",
   "item.ifw.powder_snow_ancient_metal_bucket": "远古金属细雪桶",

src/main/java/huix/infinity/common/world/item/IFWBucketItem.java

@@ -4,11 +4,13 @@
 import huix.infinity.extension.func.BucketPickupExtension;
 import huix.infinity.util.BucketHelper;
 import huix.infinity.util.WorldHelper;
+import net.minecraft.ChatFormatting;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -21,6 +23,7 @@
 import net.minecraft.world.item.BucketItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ItemUtils;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -38,6 +41,7 @@
 
 import javax.annotation.Nullable;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Optional;
 
 public class IFWBucketItem extends BucketItem {
@@ -190,7 +194,13 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotI
         }
     }
 
-
+    @Override
+    public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
+        {
+            tooltipComponents.add(Component.translatable("item.ifw.placeBucketAsSource", this.content).withStyle(ChatFormatting.BLUE));
+        }
+        super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
+    }
     public IFWTier tier() {
         return this.tier;
     }

src/main/java/huix/infinity/common/world/item/SwordWeapon.java

@@ -55,19 +55,19 @@ public static ItemAttributeModifiers createAttributes(IFWTier tier, int damage,
 
     public static ItemAttributeModifiers createAttributes(IFWTier tier, float damage, float speed) {
         return ItemAttributeModifiers.builder()
-            .add(
-                Attributes.ATTACK_DAMAGE,
-                new AttributeModifier(
-                    BASE_ATTACK_DAMAGE_ID, damage + tier.getAttackDamageBonus(), AttributeModifier.Operation.ADD_VALUE
-                ),
-                EquipmentSlotGroup.MAINHAND
-            )
-            .add(
-                Attributes.ATTACK_SPEED,
-                new AttributeModifier(BASE_ATTACK_SPEED_ID, speed, AttributeModifier.Operation.ADD_VALUE),
-                EquipmentSlotGroup.MAINHAND
-            )
-            .build();
+                .add(
+                        Attributes.ATTACK_DAMAGE,
+                        new AttributeModifier(
+                                BASE_ATTACK_DAMAGE_ID, damage + tier.getAttackDamageBonus(), AttributeModifier.Operation.ADD_VALUE
+                        ),
+                        EquipmentSlotGroup.MAINHAND
+                )
+                .add(
+                        Attributes.ATTACK_SPEED,
+                        new AttributeModifier(BASE_ATTACK_SPEED_ID, speed, AttributeModifier.Operation.ADD_VALUE),
+                        EquipmentSlotGroup.MAINHAND
+                )
+                .build();
     }
 
     @Override
@@ -85,8 +85,8 @@ public boolean canPerformAction(ItemStack stack, net.neoforged.neoforge.common.I
         return net.neoforged.neoforge.common.ItemAbilities.DEFAULT_SWORD_ACTIONS.contains(itemAbility);
     }
 
-//    @Override
-//    public float getReachBonus() {
-//        return 0.75F;
-//    }
+    @Override
+    public float getReachBonus() {
+        return 0.75F;
+    }
 }

src/main/java/huix/infinity/mixin/world/food/FoodDataMixin.java

@@ -334,14 +334,22 @@ private void clearTickTimer() {
     }
 
     @Unique
-    public float getWetnessAndMalnourishmentHungerMultiplier(Player player) {
+    private float getWetnessAndMalnourishmentHungerMultiplier(Player player) {
         Level level = player.level();
         float rain_factor = level.isRaining() ? (level.isThundering() ? 0.5F : 0.25F) : 0.0F;
-        float immersion_factor = level.getBlockState(player.getOnPos().above(1)).getFluidState().is(Tags.Fluids.WATER) ? 0.5F
-                : (level.getBlockState(player.getOnPos()).getFluidState().is(Tags.Fluids.WATER) ? 0.25F : 0.0F);
+        float immersion_factor = 0.0F;
+        if (!player.isPassenger() && player.isInWater()) {
+            immersion_factor = 0.5F;
+        } else if (!player.isPassenger()) {
+            if (level.getBlockState(player.getOnPos()).getFluidState().is(Tags.Fluids.WATER)) {
+                immersion_factor = 0.25F;
+            }
+        }
+
         float wetness_factor = Math.max(rain_factor, immersion_factor);
 
-        if (level.isRaining() && !level.isThundering() && immersion_factor == 0.25F) wetness_factor += 0.125F;
+        if (level.isRaining() && !level.isThundering() && immersion_factor == 0.25F)
+            wetness_factor += 0.125F;
 
         if (level.getBiome(player.getOnPos()).is(Tags.Biomes.IS_COLD))
             wetness_factor *= 2.0F;