From ada7fe088fa7d298427a7bcae8034fad9ba626c1 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Thu, 21 Mar 2024 21:38:43 +0700
Subject: [PATCH] fishing fixes

---
 CHANGELOG.md                                  |  1 +
 .../loot_tables/gameplay/fishing/fish.json    | 68 +++++++++++++++++++
 .../loot_tables/gameplay/fishing/junk.json    | 63 +++++++++++++++++
 .../gameplay/fishing/treasure.json            | 20 ++++++
 mods                                          |  2 +-
 5 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 kubejs/data/minecraft/loot_tables/gameplay/fishing/fish.json
 create mode 100644 kubejs/data/minecraft/loot_tables/gameplay/fishing/junk.json
 create mode 100644 kubejs/data/minecraft/loot_tables/gameplay/fishing/treasure.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a4dbd78..273b94169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix some bugs with LAN game (by removing SimpeLogin).
 - Removed fix for ftbteams from TFG-Core.
 - Removed fix for simplelogin from TFG-Core.
+- Fix for fishing machine from GTCEu (loot).
 ### Removed mods
 - CustomSkinLoader
 - SimpleLogin
diff --git a/kubejs/data/minecraft/loot_tables/gameplay/fishing/fish.json b/kubejs/data/minecraft/loot_tables/gameplay/fishing/fish.json
new file mode 100644
index 000000000..1ac585d1c
--- /dev/null
+++ b/kubejs/data/minecraft/loot_tables/gameplay/fishing/fish.json
@@ -0,0 +1,68 @@
+{
+  "type": "minecraft:fishing",
+  "pools": [
+    {
+      
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/cod",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/tropical_fish",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/calamari",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/shellfish",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/bluegill",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/crappie",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/lake_trout",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/largemouth_bass",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/rainbow_trout",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/salmon",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "tfc:food/smallmouth_bass",
+          "weight": 8
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecraft:gameplay/fishing/fish"
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/loot_tables/gameplay/fishing/junk.json b/kubejs/data/minecraft/loot_tables/gameplay/fishing/junk.json
new file mode 100644
index 000000000..5bd59f599
--- /dev/null
+++ b/kubejs/data/minecraft/loot_tables/gameplay/fishing/junk.json
@@ -0,0 +1,63 @@
+{
+  "type": "minecraft:fishing",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "tfc:plant/water_lily",
+          "weight": 17
+        },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "damage": {
+                "type": "minecraft:uniform",
+                "max": 0.9,
+                "min": 0.0
+              },
+              "function": "minecraft:set_damage"
+            }
+          ],
+          "name": "minecraft:leather_boots",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:leather",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bone",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:bowl",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:stick",
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tripwire_hook",
+          "weight": 10
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:rotten_flesh",
+          "weight": 10
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecraft:gameplay/fishing/junk"
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/loot_tables/gameplay/fishing/treasure.json b/kubejs/data/minecraft/loot_tables/gameplay/fishing/treasure.json
new file mode 100644
index 000000000..e4784a53c
--- /dev/null
+++ b/kubejs/data/minecraft/loot_tables/gameplay/fishing/treasure.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:fishing",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:name_tag"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:saddle"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecraft:gameplay/fishing/treasure"
+}
\ No newline at end of file
diff --git a/mods b/mods
index b68a365b5..618c0c0ab 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit b68a365b525f5f8184940903cc3b2c64d95f65d0
+Subproject commit 618c0c0abe1681ccce634f8b995cd9ddb5cfbda7