Merge pull request #6 from Adr-hyng/tacos_fish_compatibility_update

Tacos fish compatibility update
Adr-hyng · Sep 15, 2024 · c548014 · c548014
2 parents 34d1d50 + f14d06e
commit c548014
Show file tree

Hide file tree

Showing 65 changed files with 4,125 additions and 1,049 deletions.
diff --git a/BP/entities/coelacanth.json b/BP/entities/coelacanth.json
diff --git a/BP/entities/fishing_hook.json b/BP/entities/fishing_hook.json
@@ -178,30 +178,41 @@
               }
             },
             {
-              "filters": {
-                "test": "has_biome_tag",
-                "value": "mangrove_swamp"
-              },
+              "filters": [
+                {
+                  "any_of": [
+                    {
+                      "test": "has_biome_tag",
+                      "value": "mangrove_swamp"
+                    }, 
+                    {
+                      "test": "is_biome",
+                      "value": "swamp"
+                    }
+                  ]
+                }
+              ],
+
               "set_property": {
                 "yn:current_biome_bit": 11
               }
             },
             {
               "filters": {
-                "test": "is_biome",
-                "value": "swamp"
+                "test": "has_biome_tag",
+                "value": "lush_caves"
               },
               "set_property": {
-                "yn:current_biome_bit": 11
+                "yn:current_biome_bit": 12
               }
             },
             {
               "filters": {
-                "test": "has_biome_tag",
-                "value": "lush_caves"
+                "test": "is_biome",
+                "value": "taiga"
               },
               "set_property": {
-                "yn:current_biome_bit": 12
+                "yn:current_biome_bit": 13
               }
             }
           ]

diff --git a/BP/functions/AnglersDesire/reload.mcfunction b/BP/functions/AnglersDesire/reload.mcfunction
@@ -1 +1 @@
-execute as @s[hasitem={item=minecraft:fishing_rod}] run scriptevent yn:anglers dev_helper reload
+scriptevent yn:anglers dev_helper update
diff --git a/BP/functions/AnglersDesire/reload_hook.mcfunction b/BP/functions/AnglersDesire/reload_hook.mcfunction
@@ -0,0 +1 @@
+execute as @s[hasitem={item=minecraft:fishing_rod}] run scriptevent yn:anglers dev_helper reload
diff --git a/BP/functions/AnglersDesire/update.mcfunction b/BP/functions/AnglersDesire/update.mcfunction
diff --git a/BP/loot_tables/gameplay/mystery_bottle.json b/BP/loot_tables/gameplay/mystery_bottle.json
@@ -5,7 +5,7 @@
       "entries": [
         {
           "type": "item",
-          "name": "minecraft:map",
+          "name": "minecraft:filled_map",
           "weight": 1,
           "functions": [
             {
@@ -16,7 +16,7 @@
         },
         {
           "type": "item",
-          "name": "minecraft:map",
+          "name": "minecraft:filled_map",
           "weight": 3,
           "functions": [
             {

diff --git a/BP/manifest.json b/BP/manifest.json
@@ -1,13 +1,13 @@
 {
     "format_version": 2,
     "header": {
-        "name": "Angler's Desire BP §8(1.1.0) [DEBUG]",
+        "name": "Angler's Desire BP §8(1.0.2)",
         "description": "Adding immersion to vanilla fishing mechanics in Minecraft \n @Made By: https://twitter.com/h_YanG_0A",
         "uuid": "f36713ae-a50d-4eae-ab09-14bef4e580ec",
         "version": [
             1,
-            1,
-            0
+            0,
+            2
         ],
         "min_engine_version": [
             1,
@@ -33,8 +33,8 @@
             "uuid": "02a44d23-5962-4bb5-8a78-ef87d1eb0726",
             "version": [
                 1,
-                1,
-                0
+                0,
+                2
             ],
             "entry": "scripts/main.js"
         }
@@ -55,8 +55,8 @@
             "uuid": "54ee84f3-7b81-421c-8602-2d399940fd59",
             "version": [
                 1,
-                1,
-                0
+                0,
+                2
             ]
         }
     ],

diff --git a/BP/scripts/fishing_system/configuration/server_configuration.js b/BP/scripts/fishing_system/configuration/server_configuration.js
@@ -25,12 +25,12 @@ export const serverConfiguration = {
   /**
    * Enables debug messages to content logs.
    */
-  debug: new FormBuilder("Debug Mode").createToggle(true),
+  debug: new FormBuilder("Debug Mode").createToggle(false),
 };
 
 export let serverConfigurationCopy = cloneConfiguration(serverConfiguration);
 export let setServerConfiguration = (newServerConfig) => serverConfigurationCopy = newServerConfig;
 export let resetServerConfiguration = () => serverConfigurationCopy = cloneConfiguration(serverConfiguration);
 
 // version (do not change)
-export const VERSION = "1.1.0";
+export const VERSION = "1.0.2";
diff --git a/BP/scripts/fishing_system/events/on_hook_item.js b/BP/scripts/fishing_system/events/on_hook_item.js
@@ -17,7 +17,7 @@ export function onHookedItem(fisher) {
             const hookLandedVector = fisher.fishingHook.stablizedLocation;
             const isDeeplySubmerged = fisher.fishingHook.isDeeplySubmerged;
             const enchantmentLevel = fisher.fishingRod.getLuckOfSea()?.level ?? 0;
-            const drops = player.dimension.spawnLoot(LootTable[fisher.currentBiomeLootTable[fisher.currentBiome]](enchantmentLevel, isDeeplySubmerged, fisher.fishingRod.upgrade), hookLandedVector);
+            const drops = player.dimension.spawnLoot(LootTable[fisher.currentBiomeLootTable[fisher.currentBiome]](enchantmentLevel, isDeeplySubmerged, fisher), hookLandedVector);
             fisher.setEntityCaughtByHook(drops[0]);
             fisher.reelHook();
             localFishersCache.set(player.id, fisher);

diff --git a/BP/scripts/fishing_system/loot_tables/biomes/DefaultCatch.js b/BP/scripts/fishing_system/loot_tables/biomes/DefaultCatch.js
@@ -1,6 +1,5 @@
 import { MinecraftItemTypes } from "vanilla-types/index";
 import { ParentCatchLoot } from "../biome_catch_helper";
-import { MyCustomItemTypes } from "fishing_system/items/custom_items";
 export class DefaultCatch extends ParentCatchLoot {
     static Loot(modifier, fisher, entityLoots, RAIN_INCREASE = 150) {
         const upgrade = fisher.fishingRod.upgrade;
@@ -78,14 +77,6 @@ export class DefaultCatch extends ParentCatchLoot {
                     "rolls": 1,
                     "weight": treasureWeight,
                     "entries": [
-                        {
-                            "item": MyCustomItemTypes.MysteryBottle,
-                            "weight": 5
-                        },
-                        {
-                            "item": MinecraftItemTypes.NautilusShell,
-                            "weight": 5
-                        },
                         {
                             "item": MinecraftItemTypes.Waterlily,
                             "weight": 5

diff --git a/BP/scripts/fishing_system/loot_tables/compatible_loot_manager.js b/BP/scripts/fishing_system/loot_tables/compatible_loot_manager.js
@@ -1,14 +1,11 @@
 import { ItemTypes } from "@minecraft/server";
+import { TacosFishEntityTypes } from "fishing_system/entities/compatibility/tacos_fish_mobs";
 class CompatibilityLootManager {
     static get TacosFish() {
-        return ItemTypes.get('taco:catfish');
+        return ItemTypes.get(TacosFishEntityTypes.Bass);
     }
 }
 export class CompatibleAddonHandler {
-    static getAll() {
-        const allAvailableCompatibleAddons = Object.getOwnPropertyNames(CompatibilityLootManager).filter((prop) => !(['length', 'name', 'prototype'].includes(prop)));
-        return allAvailableCompatibleAddons;
-    }
     static isInstalled(addonCompatibilityName) {
         return CompatibilityLootManager[addonCompatibilityName] !== undefined;
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		execute as @s[hasitem={item=minecraft:fishing_rod}] run scriptevent yn:anglers dev_helper reload
		scriptevent yn:anglers dev_helper update
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		execute as @s[hasitem={item=minecraft:fishing_rod}] run scriptevent yn:anglers dev_helper reload