Merge pull request #485 from MuteTiefling/tag-fix

Misc Fixes
EnigmaticaModpacks · Jul 12, 2023 · fe01d8c · fe01d8c
2 parents 1af56d8 + 5d7b8b4
commit fe01d8c
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 43 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -8,6 +8,11 @@
 
 -   Fiery Metal and Liquid Blaze Burners may now be used for PNC heat [\#467](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/467) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Added Conversion between Limestone from Quark and Create [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Added more recipes for Potions of Grievous Wounds [\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Witches had their health reduced[\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Skeletons have had their health reduced. They may also spawn as melee variants now instead of only using bows [\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Named Miniboss mobs will now drop affix loot [\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Crimson Berries, Nightshade Berres, Sweetberries, Glowberries, Blueberries, and Torchberry Plants may now be purchased from the Market [\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ### 🐛 Fixed Bugs
 
@@ -18,6 +23,7 @@
 -   Budding Dimensional Crystals now spawn in place of Ametrine in Viscal Isles [\#479](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/479) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Fix out of control CNB sporeling spawns [\#483](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/483) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Implement Apotheosis workaround for CNB Sporelings [\#484](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/484) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Fix Hemp not planting on Farming for Blockheads' Farmland [\#485](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/485) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ---
 

diff --git a/kubejs/assets/enigmatica/lang/en_us.json b/kubejs/assets/enigmatica/lang/en_us.json
@@ -4,6 +4,12 @@
     "block.minecraft.stonecutter": "Stonecutter",
     "container.stonecutter": "Stonecutter",
     "entity.minecraft.villager.beekeeper": "Beekeeper",
+
+    "miniboss.enigmatica.witch_solitary_witch": "Solitary Witch",
+    "miniboss.enigmatica.wither_skeleton_withered_knight": "Withered Knight",
+    "miniboss.enigmatica.stray_hoarfrost_knight": "Hoarfrost Knight",
+    "miniboss.enigmatica.skeleton_forsaken_knight": "Forsaken Knight",
+
     "advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",
     "advancements.enigmatica.husbandry.tame_all_animals.description": "Tame every animal there is to tame!",
 

diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json
@@ -7,7 +7,15 @@
         "defaultCategory": "farmingforblockheads:seeds"
     },
     "customEntries": [
+        { "output": "byg:blueberries" },
+        { "output": "byg:crimson_berries" },
+        { "output": "byg:nightshade_berries" },
         { "output": "farmersdelight:cabbage_seeds" },
+        { "output": "minecraft:sweet_berries" },
+        { "output": "sushigocrafting:sesame_seeds" },
+        { "output": "sushigocrafting:wasabi_seeds" },
+        { "output": "sushigocrafting:soy_seeds" },
+        { "output": "sushigocrafting:cucumber_seeds" },
         { "output": "thermal:amaranth_seeds" },
         { "output": "thermal:barley_seeds" },
         { "output": "thermal:bell_pepper_seeds" },
@@ -22,9 +30,6 @@
         { "output": "thermal:spinach_seeds" },
         { "output": "thermal:strawberry_seeds" },
         { "output": "thermal:tea_seeds" },
-        { "output": "sushigocrafting:sesame_seeds" },
-        { "output": "sushigocrafting:wasabi_seeds" },
-        { "output": "sushigocrafting:soy_seeds" },
-        { "output": "sushigocrafting:cucumber_seeds" }
+        { "output": "twilightforest:torchberry_plant" }
     ]
 }
diff --git a/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/skeleton.js b/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/skeleton.js
@@ -240,6 +240,68 @@ ServerEvents.highPriorityData((event) => {
                 }
             ],
             tags: ['miniboss/skeleton_bow']
+        },
+        {
+            name: 'skeleton_sword',
+            weight: 100,
+            quality: 2.5,
+            mainhands: [
+                {
+                    stack: { item: 'twilightforest:knightmetal_sword', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                },
+                {
+                    stack: { item: 'naturesaura:infused_iron_sword', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                },
+                {
+                    stack: { item: 'ae2:fluix_sword', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                },
+                {
+                    stack: { item: 'ae2:certus_quartz_sword', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                },
+                {
+                    stack: { item: 'twilightforest:steeleaf_sword', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            offhands: all_shield_designs,
+            helmets: [
+                {
+                    stack: { item: 'immersiveengineering:armor_steel_head', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            chestplates: [
+                {
+                    stack: { item: 'immersiveengineering:armor_steel_chest', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            leggings: [
+                {
+                    stack: { item: 'immersiveengineering:armor_steel_legs', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            boots: [
+                {
+                    stack: { item: 'immersiveengineering:armor_steel_feet', nbt: default_nbt },
+                    weight: 100,
+                    drop_chance: 0.085
+                }
+            ],
+            tags: ['miniboss/skeleton_sword']
         }
     ];
 

diff --git a/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/witch.js b/kubejs/server_scripts/base/recipes/apotheosis/miniboss_gear/witch.js
@@ -26,28 +26,20 @@ ServerEvents.highPriorityData((event) => {
                 }
             ],
             chestplates: [
-                {
-                    stack: {
-                        item: 'hexerei:witch_chestplate',
-                        nbt: Object.assign(reactive.life_link, enchant_glint.blank, enchantments.reactive_3)
-                    },
-                    weight: 33,
-                    drop_chance: 0.0
-                },
                 {
                     stack: {
                         item: 'hexerei:witch_chestplate',
                         nbt: Object.assign(reactive.bounce_lightning, enchant_glint.blank, enchantments.reactive_1)
                     },
-                    weight: 33,
+                    weight: 30,
                     drop_chance: 0.0
                 },
                 {
                     stack: {
                         item: 'hexerei:witch_chestplate',
                         nbt: Object.assign(reactive.bounce_poison, enchant_glint.blank, enchantments.reactive_1)
                     },
-                    weight: 33,
+                    weight: 70,
                     drop_chance: 0.0
                 }
             ],

diff --git a/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js b/kubejs/server_scripts/base/recipes/apotheosis/minibosses/minecraft.js
@@ -19,7 +19,7 @@ ServerEvents.highPriorityData((event) => {
             entities: ['minecraft:skeleton'],
             valid_gear_sets: ['#miniboss/skeleton_siege_breaker'],
             dimensions: [],
-            affixed: false,
+            affixed: true,
             nbt: {},
             stats: {
                 enchant_chance: 0.5,
@@ -31,7 +31,7 @@ ServerEvents.highPriorityData((event) => {
         {
             id: 'skeleton_bow',
             chance: 1.0,
-            weight: 80,
+            weight: 40,
             quality: 0,
             entities: ['minecraft:skeleton'],
             valid_gear_sets: ['#miniboss/skeleton_bow'],
@@ -42,25 +42,42 @@ ServerEvents.highPriorityData((event) => {
                 enchant_chance: 0.5,
                 enchantment_levels: [15, 15, 15, 15],
                 effects: [{ effect: 'minecraft:speed', amplifier: 1, chance: 1.0 }],
+                attribute_modifiers: []
+            }
+        },
+        {
+            id: 'skeleton_sword',
+            chance: 1.0,
+            weight: 40,
+            quality: 0,
+            entities: ['minecraft:skeleton'],
+            valid_gear_sets: ['#miniboss/skeleton_sword'],
+            dimensions: [],
+            affixed: false,
+            nbt: {},
+            stats: {
+                enchant_chance: 1.0,
+                enchantment_levels: [15, 15, 15, 15],
+                effects: [{ effect: 'minecraft:strength', amplifier: 0, chance: 1.0 }],
                 attribute_modifiers: [
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 40, steps: 10, step: 2 }
+                        value: 20
                     }
                 ]
             }
         },
         {
             id: 'skeleton_forsaken_knight',
-            name: 'Forsaken Knight',
+            name: 'miniboss.enigmatica.skeleton_forsaken_knight',
             chance: 1.0,
             weight: 15,
             quality: 0,
             entities: ['minecraft:skeleton'],
             valid_gear_sets: ['#miniboss/skeleton_forsaken_knight'],
             dimensions: [],
-            affixed: false,
+            affixed: true,
             nbt: {},
             stats: {
                 enchant_chance: 1.0,
@@ -73,7 +90,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 40, steps: 10, step: 2 }
+                        value: 40
                     }
                 ]
             }
@@ -121,21 +138,21 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 200, steps: 1, step: 0 }
+                        value: 200
                     }
                 ]
             }
         },
         {
-            id: 'witch',
-            name: null,
+            id: 'witch_solitary_witch',
+            name: 'miniboss.enigmatica.solitary_witch',
             chance: 1.0,
             weight: 100,
             quality: 0,
             entities: ['minecraft:witch'],
             valid_gear_sets: ['#miniboss/witch'],
             dimensions: [],
-            affixed: false,
+            affixed: true,
             nbt: {},
             stats: {
                 enchant_chance: 1.0,
@@ -145,7 +162,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 30, steps: 1, step: 0 }
+                        value: 24
                     }
                 ]
             }
@@ -169,7 +186,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 30, steps: 1, step: 0 }
+                        value: 30
                     }
                 ]
             }
@@ -259,7 +276,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 30, steps: 1, step: 0 }
+                        value: 30
                     }
                 ]
             }
@@ -283,21 +300,21 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 50, steps: 1, step: 0 }
+                        value: 50
                     }
                 ]
             }
         },
         {
             id: 'wither_skeleton_withered_knight',
-            name: 'Withered Knight',
+            name: 'miniboss.enigmatica.wither_skeleton_withered_knight',
             chance: 1.0,
             weight: 15,
             quality: 0,
             entities: ['minecraft:wither_skeleton'],
             valid_gear_sets: ['#miniboss/wither_skeleton_withered_knight'],
             dimensions: [],
-            affixed: false,
+            affixed: true,
             nbt: {},
             stats: {
                 enchant_chance: 1.0,
@@ -311,7 +328,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 75, steps: 1, step: 0 }
+                        value: 75
                     }
                 ]
             }
@@ -335,21 +352,21 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 75, steps: 1, step: 0 }
+                        value: 75
                     }
                 ]
             }
         },
         {
             id: 'stray_hoarfrost_knight',
-            name: 'Hoarfrost Knight',
+            name: 'miniboss.enigmatica.stray_hoarfrost_knight',
             chance: 1.0,
             weight: 15,
             quality: 0,
             entities: ['minecraft:stray'],
             valid_gear_sets: ['#miniboss/stray_hoarfrost_knight'],
             dimensions: [],
-            affixed: false,
+            affixed: true,
             nbt: {},
             stats: {
                 enchant_chance: 1.0,
@@ -362,7 +379,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 75, steps: 1, step: 0 }
+                        value: 75
                     }
                 ]
             }
@@ -382,13 +399,7 @@ ServerEvents.highPriorityData((event) => {
                 enchant_chance: 1.0,
                 enchantment_levels: [25, 20, 25, 20],
                 effects: [{ effect: 'minecraft:speed', amplifier: 1, chance: 0.6 }],
-                attribute_modifiers: [
-                    {
-                        attribute: 'minecraft:generic.max_health',
-                        operation: 'ADDITION',
-                        value: { min: 50, steps: 1, step: 0 }
-                    }
-                ]
+                attribute_modifiers: []
             }
         },
         {
@@ -410,7 +421,7 @@ ServerEvents.highPriorityData((event) => {
                     {
                         attribute: 'minecraft:generic.max_health',
                         operation: 'ADDITION',
-                        value: { min: 40, steps: 1, step: 0 }
+                        value: 40
                     }
                 ]
             }

diff --git a/kubejs/server_scripts/base/tags/blocks/byg/farmland.js b/kubejs/server_scripts/base/tags/blocks/byg/farmland.js
@@ -0,0 +1,3 @@
+ServerEvents.tags('block', (event) => {
+    event.get('byg:farmland').add([/farmingforblockheads:fertilized_farmland/]);
+});
diff --git a/kubejs/server_scripts/base/tags/blocks/minecraft/dirt.js b/kubejs/server_scripts/base/tags/blocks/minecraft/dirt.js
@@ -0,0 +1,3 @@
+ServerEvents.tags('block', (event) => {
+    event.get('minecraft:dirt').remove([/farmingforblockheads:fertilized_farmland/]);
+});