Fishing rod works in water now

Author: OroArmor

common/src/main/java/com/oroarmor/netherite_plus/entity/NetheriteFishingBobberEntity.java

@@ -67,9 +67,7 @@ private FishingBobberEntity.PositionType getPositionType(BlockPos pos) {
     }
 
     private FishingBobberEntity.PositionType getPositionType(BlockPos start, BlockPos end) {
-        return BlockPos.stream(start, end).map(this::getPositionType).reduce((positionType, positionType2) -> {
-            return positionType == positionType2 ? positionType : FishingBobberEntity.PositionType.INVALID;
-        }).orElse(FishingBobberEntity.PositionType.INVALID);
+        return BlockPos.stream(start, end).map(this::getPositionType).reduce((positionType, positionType2) -> positionType == positionType2 ? positionType : PositionType.INVALID).orElse(FishingBobberEntity.PositionType.INVALID);
     }
 
     @Override
@@ -122,6 +120,15 @@ private boolean removeIfInvalid(PlayerEntity playerEntity) {
 
     @Override
     public void tick() {
+        BlockPos blockPos = getBlockPos();
+        FluidState fluidState = world.getFluidState(blockPos);
+        if (fluidState.isIn(FluidTags.WATER)) {
+            System.out.println("super tick");
+            super.tick();
+            return;
+        }
+
+
         velocityRandom.setSeed(getUuid().getLeastSignificantBits() ^ world.getTime());
 
         if (!leftOwner) {
@@ -149,8 +156,6 @@ public void tick() {
             }
 
             float fluidHeight = 0.0F;
-            BlockPos blockPos = getBlockPos();
-            FluidState fluidState = world.getFluidState(blockPos);
             if (fluidState.isIn(FluidTags.LAVA)) {
                 fluidHeight = fluidState.getHeight(world, blockPos);
             }
@@ -316,6 +321,12 @@ private void tickFishingLogic() {
 
     @Override
     public int use(ItemStack usedItem) {
+        BlockPos blockPos = getBlockPos();
+        FluidState fluidState = world.getFluidState(blockPos);
+        if (fluidState.isIn(FluidTags.WATER)) {
+            return super.use(usedItem);
+        }
+
         PlayerEntity playerEntity = getPlayerOwner();
         if (!world.isClient && playerEntity != null) {
             int i = 0;
@@ -328,10 +339,8 @@ public int use(ItemStack usedItem) {
                 LootTable lootTable = world.getServer().getLootManager().getTable(LAVA_FISHING_LOOT_TABLE);
                 List<ItemStack> list = lootTable.generateLoot(builder.build(LootContextTypes.FISHING));
                 Criteria.FISHING_ROD_HOOKED.trigger((ServerPlayerEntity) playerEntity, usedItem, this, list);
-                Iterator<ItemStack> var7 = list.iterator();
 
-                while (var7.hasNext()) {
-                    ItemStack itemStack = var7.next();
+                for (ItemStack itemStack : list) {
                     ItemEntity itemEntity = new ItemEntity(world, getX(), getY(), getZ(), itemStack);
                     double d = playerEntity.getX() - getX();
                     double e = playerEntity.getY() - getY();
@@ -356,5 +365,4 @@ public int use(ItemStack usedItem) {
             return 0;
         }
     }
-
 }

fabric/src/main/java/com/oroarmor/netherite_plus/mixin/FishingBobberEntityMixin.java

@@ -0,0 +1,19 @@
+package com.oroarmor.netherite_plus.mixin;
+
+import com.oroarmor.netherite_plus.item.NetheritePlusItems;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.entity.projectile.FishingBobberEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+
+@Mixin(FishingBobberEntity.class)
+public class FishingBobberEntityMixin {
+    @Redirect(method = "removeIfInvalid", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    private Item setFishingRodToNetherite(ItemStack stack){
+        return stack.getItem() == NetheritePlusItems.NETHERITE_FISHING_ROD.get() ? Items.FISHING_ROD : stack.getItem();
+    }
+}

fabric/src/main/resources/netherite-plus-mod-fabric.mixins.json

@@ -4,6 +4,7 @@
   "package": "com.oroarmor.netherite_plus.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "FishingBobberEntityMixin",
     "ShulkerBoxBlockEntityMixin",
     "ShulkerBoxSlotMixin"
   ],