From 04ce564c92f54645dbdc34efa650ba528e16bcf2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 23:33:27 +0100 Subject: [PATCH] fixed aoe tools in bastion chests not having their aoes properly --- .../loot_tables/chests/bastion_bridge.json | 141 +++++++++++------- .../chests/bastion_hoglin_stable.json | 141 +++++++++++------- .../loot_tables/chests/bastion_other.json | 141 +++++++++++------- .../loot_tables/chests/bastion_treasure.json | 115 +++++++------- 4 files changed, 328 insertions(+), 210 deletions(-) diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json index 908d62f07..5e70329c4 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json @@ -5,106 +5,80 @@ "name": "loot_pool", "rolls": 2, "entries": [ - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 20 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_pickaxe", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_sword", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_knife", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 5, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_mining_hammer", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_shovel", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_spade", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -115,73 +89,106 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_wire_cutter", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_wrench", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_crowbar", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_screwdriver", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_saw", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", - "name": "minecraft:crossbow", - "weight": 5, + "name": "gtceu:damascus_steel_axe", + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }