Port to 1.21.2/3 complete.

Author: FlenarnDev

src/client/java/org/flenarn/render/entity/custom/WeepingFishingBobberEntityRenderer.java

@@ -7,12 +7,9 @@
 import net.minecraft.client.render.*;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.state.FishingBobberEntityState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.projectile.FishingBobberEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -57,8 +54,8 @@ public void render(WeepingFishingBobberEntityState weepingFishingBobberEntitySta
 
         int j = 16;
 
-        for (int k = 0; k < 6; ++k) {
-            renderFishingLine(f, g, h, vertexConsumer1, entry1, percentage(k, 16), percentage(k + 1, 16));
+        for (int k = 0; k <= 16; ++k) {
+            renderFishingLine(f, g, h, vertexConsumer1, entry1, percentage(k, j), percentage(k + 1, 16));
         }
 
         matrixStack.pop();
@@ -77,7 +74,7 @@ private Vec3d getHandPos(PlayerEntity player, float f, float tickDelta) {
             Vec3d vec3d = this.dispatcher.camera.getProjection().getPosition((float)i * 0.525F, -0.1F).multiply(m).rotateY(f * 0.5F).rotateX(-f * 0.7F);
             return player.getCameraPosVec(tickDelta).add(vec3d);
         } else {
-            float g = MathHelper.lerp(tickDelta, player.prevBodyYaw, player.bodyYaw) * ((float)Math.PI / 180F);
+            float g = MathHelper.lerp(tickDelta, player.prevBodyYaw, player.bodyYaw) * 0.017453292F;
             double d = MathHelper.sin(g);
             double e = MathHelper.cos(g);
             float h = player.getScale();
@@ -114,6 +111,20 @@ public WeepingFishingBobberEntityState createRenderState() {
         return new WeepingFishingBobberEntityState();
     }
 
+    public void updateRenderState(WeepingFishingBobberEntity weepingFishingBobberEntity, WeepingFishingBobberEntityState weepingFishingBobberEntityState, float f) {
+        super.updateRenderState(weepingFishingBobberEntity, weepingFishingBobberEntityState, f);
+        PlayerEntity playerEntity = weepingFishingBobberEntity.getPlayerOwner();
+        if (playerEntity == null) {
+            weepingFishingBobberEntityState.pos = Vec3d.ZERO;
+        } else {
+            float g = playerEntity.getHandSwingProgress(f);
+            float h = MathHelper.sin(MathHelper.sqrt(g) * 3.1415927F);
+            Vec3d vec3d = this.getHandPos(playerEntity, h, f);
+            Vec3d vec3d2 = weepingFishingBobberEntity.getLerpedPos(f).add(0.0, 0.25, 0.0);
+            weepingFishingBobberEntityState.pos = vec3d.subtract(vec3d2);
+        }
+    }
+
     protected boolean canBeCulled(WeepingFishingBobberEntity weepingFishingBobberEntity) {
         return false;
     }

src/main/generated/data/nether_additions/recipe/basalt_brick_slab.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_bricks"
-    }
+    "S": "nether_additions:basalt_bricks"
   },
   "pattern": [
     "SSS"

src/main/generated/data/nether_additions/recipe/basalt_brick_stairs.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_bricks"
-    }
+    "S": "nether_additions:basalt_bricks"
   },
   "pattern": [
     "  S",

src/main/generated/data/nether_additions/recipe/basalt_brick_wall.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_bricks"
-    }
+    "S": "nether_additions:basalt_bricks"
   },
   "pattern": [
     "SSS",

src/main/generated/data/nether_additions/recipe/basalt_bricks.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "minecraft:smooth_basalt"
-    }
+    "S": "minecraft:smooth_basalt"
   },
   "pattern": [
     "SS",

src/main/generated/data/nether_additions/recipe/basalt_tiles.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_bricks"
-    }
+    "S": "nether_additions:basalt_bricks"
   },
   "pattern": [
     "SS",

src/main/generated/data/nether_additions/recipe/basalt_tiles_slab.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_tiles"
-    }
+    "S": "nether_additions:basalt_tiles"
   },
   "pattern": [
     "SSS"

src/main/generated/data/nether_additions/recipe/chiseled_basalt.json

@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "S": {
-      "item": "nether_additions:basalt_brick_slab"
-    }
+    "S": "nether_additions:basalt_brick_slab"
   },
   "pattern": [
     "S",

src/main/generated/data/nether_additions/recipe/lithid_soup.json

@@ -2,18 +2,10 @@
   "type": "minecraft:crafting_shapeless",
   "category": "misc",
   "ingredients": [
-    {
-      "item": "nether_additions:pyrolithid"
-    },
-    {
-      "item": "minecraft:bowl"
-    },
-    {
-      "item": "minecraft:warped_fungus"
-    },
-    {
-      "item": "minecraft:nether_wart"
-    }
+    "nether_additions:pyrolithid",
+    "minecraft:bowl",
+    "minecraft:warped_fungus",
+    "minecraft:nether_wart"
   ],
   "result": {
     "count": 1,

src/main/generated/data/nether_additions/recipe/weeping_fishing_rod.json

@@ -2,15 +2,9 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "G": {
-      "item": "minecraft:gold_ingot"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    },
-    "W": {
-      "item": "minecraft:weeping_vines"
-    }
+    "G": "minecraft:gold_ingot",
+    "S": "minecraft:stick",
+    "W": "minecraft:weeping_vines"
   },
   "pattern": [
     "  G",