From 0a3e96b390792510aae57edb56cbe39595b0309a Mon Sep 17 00:00:00 2001 From: jani270 <69345714+jani270@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:03:44 +0200 Subject: Better Mayors Items/Data v1.1 (#1274) * fix: Forge Times for new items * feat: Gleaming Crystal Reforge Stone Data * feat: Titanium/Mithril Equipment in museum data * feat: Giant Fishing Rod DH Chance --- constants/museum.json | 13 +++++++--- constants/reforgestones.json | 54 +++++++++++++++++++++++++++++++++++++++++ items/AMBER_NECKLACE.json | 2 +- items/AMETHYST_GAUNTLET.json | 6 ++--- items/DIVAN_POWDER_COATING.json | 4 +-- items/GIANT_FISHING_ROD.json | 11 +++------ items/JADE_BELT.json | 6 ++--- items/MITHRIL_BELT.json | 2 +- items/MITHRIL_CLOAK.json | 2 +- items/MITHRIL_GAUNTLET.json | 2 +- items/MITHRIL_NECKLACE.json | 2 +- items/POTATO_BASKET.json | 6 ++--- items/SAPPHIRE_CLOAK.json | 2 +- items/TITANIUM_BELT.json | 6 ++--- items/TITANIUM_CLOAK.json | 6 ++--- items/TITANIUM_GAUNTLET.json | 6 ++--- items/TITANIUM_NECKLACE.json | 4 +-- 17 files changed, 95 insertions(+), 39 deletions(-) diff --git a/constants/museum.json b/constants/museum.json index 375d5dba..bc81d1ce 100644 --- a/constants/museum.json +++ b/constants/museum.json @@ -241,7 +241,9 @@ "CRIMSON", "FERVOR", "TERROR", - "HOLLOW" + "HOLLOW", + "MITHRIL", + "TITANIUM" ], "rarities": [ "ENCHANTED_JACK_O_LANTERN", @@ -763,7 +765,9 @@ "RABBIT": "RABBIT_HELMET", "SEYMOUR": "VELVET_TOP_HAT", "LOTUS": "LOTUS_NECKLACE", - "FISHERMAN": "PRISMARINE_NECKLACE" + "FISHERMAN": "PRISMARINE_NECKLACE", + "MITHRIL": "MITHRIL_NECKLACE", + "TITANIUM": "TITANIUM_NECKLACE" }, "children": { "GLACIAL_SCYTHE": "FROZEN_SCYTHE", @@ -852,12 +856,13 @@ "INFINI_VACUUM_HOOVERIUS":"INFINI_VACUUM", "GLACITE_CHISEL": "REINFORCED_CHISEL", "PERFECT_CHISEL": "GLACITE_CHISEL", - "CROWN_OF_AVARICE": "CROWN_OF_GREED" + "CROWN_OF_AVARICE": "CROWN_OF_GREED", + "TITANIUM_NECKLACE": "MITHRIL_NECKLACE" }, "max_values": { "total": 354, "weapons": 128, - "armor": 113, + "armor": 115, "rarities": 115, "special": 48 } diff --git a/constants/reforgestones.json b/constants/reforgestones.json index 98234bf2..3357ba4f 100644 --- a/constants/reforgestones.json +++ b/constants/reforgestones.json @@ -1214,6 +1214,60 @@ } } }, + "GLEAMING_CRYSTAL": { + "internalName": "GLEAMING_CRYSTAL", + "reforgeName": "Lustrous", + "reforgeType": "blacksmith/reforge_stone", + "itemTypes": "PICKAXE", + "requiredRarities": [ + "COMMON", + "UNCOMMON", + "RARE", + "EPIC", + "LEGENDARY", + "MYTHIC", + "DIVINE" + ], + "reforgeCosts": { + "COMMON": 20000, + "UNCOMMON": 40000, + "RARE": 80000, + "EPIC": 150000, + "LEGENDARY": 300000, + "MYTHIC": 600000, + "DIVINE": 800000 + }, + "reforgeStats": { + "COMMON": { + "mining_speed": 5, + "mining_fortune": 5 + }, + "UNCOMMON": { + "mining_speed": 10, + "mining_fortune": 7 + }, + "RARE": { + "mining_speed": 15, + "mining_fortune": 9 + }, + "EPIC": { + "mining_speed": 20, + "mining_fortune": 12 + }, + "LEGENDARY": { + "mining_speed": 25, + "mining_fortune": 16 + }, + "MYTHIC": { + "mining_speed": 30, + "mining_fortune": 20 + }, + "DIVINE": { + "mining_speed": 35, + "mining_fortune": 25 + } + } + }, "GOLDEN_BALL": { "internalName": "GOLDEN_BALL", "reforgeName": "Bountiful", diff --git a/items/AMBER_NECKLACE.json b/items/AMBER_NECKLACE.json index b82f2f9e..8e9b1b1c 100644 --- a/items/AMBER_NECKLACE.json +++ b/items/AMBER_NECKLACE.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "AMBER_NECKLACE", - "duration": 64800 + "duration": 86400 } ] } \ No newline at end of file diff --git a/items/AMETHYST_GAUNTLET.json b/items/AMETHYST_GAUNTLET.json index 33763662..6bb342b5 100644 --- a/items/AMETHYST_GAUNTLET.json +++ b/items/AMETHYST_GAUNTLET.json @@ -26,12 +26,12 @@ { "type": "forge", "inputs": [ - "FLAWLESS_AMETHYST_GEM:2.0", - "GLOSSY_GEMSTONE:32.0" + "GLOSSY_GEMSTONE:32.0", + "FLAWLESS_AMETHYST_GEM:2.0" ], "count": 1.0, "overrideOutputId": "AMETHYST_GAUNTLET", - "duration": 64800 + "duration": 86400 } ] } \ No newline at end of file diff --git a/items/DIVAN_POWDER_COATING.json b/items/DIVAN_POWDER_COATING.json index 56224228..28c71b7b 100644 --- a/items/DIVAN_POWDER_COATING.json +++ b/items/DIVAN_POWDER_COATING.json @@ -29,13 +29,13 @@ { "type": "forge", "inputs": [ - "ENCHANTED_GOLD_BLOCK:16.0", "REFINED_MINERAL:32.0", "GLOSSY_GEMSTONE:32.0", + "ENCHANTED_GOLD_BLOCK:16.0", "DIVAN_FRAGMENT:5.0" ], "count": 1.0, - "duration": 97200, + "duration": 129600, "overrideOutputId": "DIVAN_POWDER_COATING" } ] diff --git a/items/GIANT_FISHING_ROD.json b/items/GIANT_FISHING_ROD.json index 65a731a6..6edb0ab6 100644 --- a/items/GIANT_FISHING_ROD.json +++ b/items/GIANT_FISHING_ROD.json @@ -1,18 +1,15 @@ { "itemid": "minecraft:fishing_rod", - "displayname": "§f§f§6Giant Fishing Rod", - "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+20\",1:\"§7Strength: §c+10\",2:\"§7Fishing Speed: §a+20\",3:\" §8[§8α§8]\",4:\"\",5:\"§7§7When fishing a sea creature,\",6:\"§7you have a §a50% §7chance to\",7:\"§7fish it twice.\",8:\"\",9:\"§7Purchased by: §c[§fYOUTUBE§c] Nullzee§f\",10:\"§7Purchased for: §6§k666,666,666 §6 coins\",11:\"\",12:\"§8Auction #§k1\",13:\"§8Bid #§k1\",14:\"§8July 2022\",15:\"\",16:\"§7§8This item can be reforged!\",17:\"§6§lLEGENDARY FISHING ROD\"],Name:\"§f§f§6Giant Fishing Rod\"},ExtraAttributes:{date:1658888352113L,edition:134,id:\"GIANT_FISHING_ROD\",recipient_name:\"§b[MVP§c+§b] 3o23§f\",player:\"§b[MVP§c+§b] 3o23§f\"}}", + "displayname": "§6Giant Fishing Rod", + "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+20\",1:\"§7Strength: §c+10\",2:\"§7Double Hook Chance: §a+50%\",3:\"§7Fishing Speed: §a+20\",4:\" §8[§8α§8]\",5:\"\",6:\"§7Purchased by: §c[§fYOUTUBE§c] Nullzee§f\",7:\"§7Purchased for: §6§k666,666,666 §6 coins\",8:\"\",9:\"§8Auction #§k1\",10:\"§8Bid #§k1\",11:\"§8July 2022\",12:\"\",13:\"§7§8This item can be reforged!\",14:\"§6§lLEGENDARY FISHING ROD\"],Name:\"§6Giant Fishing Rod\"},ExtraAttributes:{date:1658888352113L,edition:134,id:\"GIANT_FISHING_ROD\",recipient_name:\"§b[MVP§c+§b] 3o23§f\",player:\"§b[MVP§c+§b] 3o23§f\"}}", "damage": 0, "lore": [ "§7Damage: §c+20", "§7Strength: §c+10", + "§7Double Hook Chance: §a+50%", "§7Fishing Speed: §a+20", " §8[§8α§8]", "", - "§7§7When fishing a sea creature,", - "§7you have a §a50% §7chance to", - "§7fish it twice.", - "", "§7Purchased by: §c[§fYOUTUBE§c] Nullzee§f", "§7Purchased for: §6§k666,666,666 §6 coins", "", @@ -26,7 +23,7 @@ "internalname": "GIANT_FISHING_ROD", "crafttext": "", "clickcommand": "", - "modver": "", + "modver": "2.3.0", "infoType": "WIKI_URL", "info": [ "https://hypixel-skyblock.fandom.com/wiki/Giant_Fishing_Rod", diff --git a/items/JADE_BELT.json b/items/JADE_BELT.json index e1db430e..61949295 100644 --- a/items/JADE_BELT.json +++ b/items/JADE_BELT.json @@ -26,12 +26,12 @@ { "type": "forge", "inputs": [ - "FLAWLESS_JADE_GEM:2.0", - "GLOSSY_GEMSTONE:32.0" + "GLOSSY_GEMSTONE:32.0", + "FLAWLESS_JADE_GEM:2.0" ], "count": 1.0, "overrideOutputId": "JADE_BELT", - "duration": 64800 + "duration": 86400 } ] } \ No newline at end of file diff --git a/items/MITHRIL_BELT.json b/items/MITHRIL_BELT.json index 23e9cd71..39ffec36 100644 --- a/items/MITHRIL_BELT.json +++ b/items/MITHRIL_BELT.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "MITHRIL_BELT", - "duration": 2700 + "duration": 3600 } ] } \ No newline at end of file diff --git a/items/MITHRIL_CLOAK.json b/items/MITHRIL_CLOAK.json index 96ed1c80..40f39dff 100644 --- a/items/MITHRIL_CLOAK.json +++ b/items/MITHRIL_CLOAK.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "MITHRIL_CLOAK", - "duration": 2700 + "duration": 3600 } ] } \ No newline at end of file diff --git a/items/MITHRIL_GAUNTLET.json b/items/MITHRIL_GAUNTLET.json index 00b3ac7a..4d97954d 100644 --- a/items/MITHRIL_GAUNTLET.json +++ b/items/MITHRIL_GAUNTLET.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "MITHRIL_GAUNTLET", - "duration": 2700 + "duration": 3600 } ] } \ No newline at end of file diff --git a/items/MITHRIL_NECKLACE.json b/items/MITHRIL_NECKLACE.json index 9408d6ab..78207783 100644 --- a/items/MITHRIL_NECKLACE.json +++ b/items/MITHRIL_NECKLACE.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "MITHRIL_NECKLACE", - "duration": 2700 + "duration": 3600 } ] } \ No newline at end of file diff --git a/items/POTATO_BASKET.json b/items/POTATO_BASKET.json index c26be7c9..eb21aec2 100644 --- a/items/POTATO_BASKET.json +++ b/items/POTATO_BASKET.json @@ -1,10 +1,10 @@ { "internalname": "POTATO_BASKET", "itemid": "minecraft:skull", - "displayname": "§5Basket of Hope from the Great Potato War", + "displayname": "§cBasket of Hope from the Great Potato War", "clickcommand": "", "damage": 3, - "nbttag": "{HideFlags:254,SkullOwner:{Id:\"2d325605-66a1-342d-9fba-ea0601b6996b\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjhlNjBlYmQ4MGI2MDYzYTk2ZTlhYWY4NGYwMzgyNTcwNThlNzYyZjFiZWMzYmY1YzBmNjI1MWU2NWQ1YzVlZSJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Leaderboard Position: §e#§k169\",1:\"§7Awarded to: §kIRONM00N\",2:\"\",3:\"§7§d§oThe greatest victory is that\",4:\"§d§owhich requires no battle.\",5:\"§8- Sun Tzu, The Art of War\",6:\"\",7:\"§5§lEPIC MEMENTO\"],Name:\"§5Basket of Hope from the Great Potato War\"},ExtraAttributes:{basket_edition:169,id:\"POTATO_BASKET\",basket_player_name:\"§b[MVP§9+§b] Shifty76\"}}", + "nbttag": "{HideFlags:254,SkullOwner:{Id:\"2d325605-66a1-342d-9fba-ea0601b6996b\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjhlNjBlYmQ4MGI2MDYzYTk2ZTlhYWY4NGYwMzgyNTcwNThlNzYyZjFiZWMzYmY1YzBmNjI1MWU2NWQ1YzVlZSJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Leaderboard Position: §e#§k169\",1:\"§7Awarded to: §kIRONM00N\",2:\"\",3:\"§7§d§oThe greatest victory is that\",4:\"§d§owhich requires no battle.\",5:\"§8- Sun Tzu, The Art of War\",6:\"\",7:\"§c§lEPIC MEMENTO\"],Name:\"§cBasket of Hope from the Great Potato War\"},ExtraAttributes:{basket_edition:169,id:\"POTATO_BASKET\",basket_player_name:\"§b[MVP§9+§b] Shifty76\"}}", "modver": "2.3.0", "lore": [ "§7Leaderboard Position: §e#§k169", @@ -14,7 +14,7 @@ "§d§owhich requires no battle.", "§8- Sun Tzu, The Art of War", "", - "§5§lEPIC MEMENTO" + "§c§lEPIC MEMENTO" ], "crafttext": "", "infoType": "WIKI_URL", diff --git a/items/SAPPHIRE_CLOAK.json b/items/SAPPHIRE_CLOAK.json index cb6119bd..d6d6f8be 100644 --- a/items/SAPPHIRE_CLOAK.json +++ b/items/SAPPHIRE_CLOAK.json @@ -31,7 +31,7 @@ ], "count": 1.0, "overrideOutputId": "SAPPHIRE_CLOAK", - "duration": 64800 + "duration": 86400 } ] } \ No newline at end of file diff --git a/items/TITANIUM_BELT.json b/items/TITANIUM_BELT.json index ed0dd25b..2db6adb4 100644 --- a/items/TITANIUM_BELT.json +++ b/items/TITANIUM_BELT.json @@ -28,12 +28,12 @@ "type": "forge", "inputs": [ "REFINED_TITANIUM:1.0", - "MITHRIL_BELT:1.0", - "REFINED_MINERAL:16.0" + "REFINED_MINERAL:16.0", + "MITHRIL_BELT:1.0" ], "count": 1.0, "overrideOutputId": "TITANIUM_BELT", - "duration": 12150 + "duration": 16200 } ] } \ No newline at end of file diff --git a/items/TITANIUM_CLOAK.json b/items/TITANIUM_CLOAK.json index e66caa10..94d0d78c 100644 --- a/items/TITANIUM_CLOAK.json +++ b/items/TITANIUM_CLOAK.json @@ -28,12 +28,12 @@ "type": "forge", "inputs": [ "MITHRIL_CLOAK:1.0", - "REFINED_MINERAL:16.0", - "REFINED_TITANIUM:1.0" + "REFINED_TITANIUM:1.0", + "REFINED_MINERAL:16.0" ], "count": 1.0, "overrideOutputId": "TITANIUM_CLOAK", - "duration": 12150 + "duration": 16200 } ] } \ No newline at end of file diff --git a/items/TITANIUM_GAUNTLET.json b/items/TITANIUM_GAUNTLET.json index 64461c99..5008c7fe 100644 --- a/items/TITANIUM_GAUNTLET.json +++ b/items/TITANIUM_GAUNTLET.json @@ -28,12 +28,12 @@ "type": "forge", "inputs": [ "REFINED_MINERAL:16.0", - "REFINED_TITANIUM:1.0", - "MITHRIL_GAUNTLET:1.0" + "MITHRIL_GAUNTLET:1.0", + "REFINED_TITANIUM:1.0" ], "count": 1.0, "overrideOutputId": "TITANIUM_GAUNTLET", - "duration": 12150 + "duration": 16200 } ] } \ No newline at end of file diff --git a/items/TITANIUM_NECKLACE.json b/items/TITANIUM_NECKLACE.json index 7a396744..c1d2d293 100644 --- a/items/TITANIUM_NECKLACE.json +++ b/items/TITANIUM_NECKLACE.json @@ -27,13 +27,13 @@ { "type": "forge", "inputs": [ - "MITHRIL_NECKLACE:1.0", "REFINED_TITANIUM:1.0", + "MITHRIL_NECKLACE:1.0", "REFINED_MINERAL:16.0" ], "count": 1.0, "overrideOutputId": "TITANIUM_NECKLACE", - "duration": 12150 + "duration": 16200 } ] } \ No newline at end of file -- cgit