From 78f399c08af2ab4756ffacc1048b5b04aec01896 Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Thu, 31 Jul 2025 13:12:18 +0200 Subject: [PATCH 1/8] added minions.json --- constants/minions.json | 468 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) create mode 100644 constants/minions.json diff --git a/constants/minions.json b/constants/minions.json new file mode 100644 index 0000000000..7c019714e2 --- /dev/null +++ b/constants/minions.json @@ -0,0 +1,468 @@ +{ + "LAPIS_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 3-6", + "drops": { + "INK_SACK-4": 4.5 + } + }, + "PIG_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "PORK": 1.0 + } + }, + "FLOWER_GENERATOR": { + "type": "OTHER", + "requiredactions": 2, + "drops": { + "RED_ROSE-2": 0.071428571, + "RED_ROSE-3": 0.071428571, + "RED_ROSE-1": 0.071428571, + "YELLOW_FLOWER": 0.071428571, + "DOUBLE_PLANT-1": 0.071428571, + "RED_ROSE-5": 0.071428571, + "RED_ROSE-8": 0.071428571, + "DOUBLE_PLANT-5": 0.071428571, + "RED_ROSE-7": 0.071428571, + "RED_ROSE": 0.071428571, + "RED_ROSE-4": 0.071428571, + "DOUBLE_PLANT-4": 0.071428571, + "DOUBLE_PLANT": 0.071428571, + "RED_ROSE-6": 0.071428571 + } + }, + "COCOA_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "INK_SACK-3": 3.0 + } + }, + "COBBLESTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "COBBLESTONE": 1.0 + } + }, + "ICE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "ICE": 1.0 + } + }, + "PUMPKIN_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "PUMPKIN": 1.0 + } + }, + "VOIDLING_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "OBSIDIAN": 1.0, + "QUARTZ": 1.0, + "ENDER_PEARL": 1.0 + } + }, + "SUGAR_CANE_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "SUGAR_CANE": 3.0 + } + }, + "FISHING_GENERATOR": { + "type": "FISHING", + "requiredactions": 1, + "drops": { + "RAW_FISH": 0.5, + "RAW_FISH-1": 0.25, + "RAW_FISH-3": 0.12, + "RAW_FISH-2": 0.04, + "PRISMARINE_SHARD": 0.03, + "PRISMARINE_CRYSTALS": 0.03, + "SPONGE": 0.03 + } + }, + "COAL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "COAL": 1.0 + } + }, + "SNOW_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SNOW_BALL": 4.0 + } + }, + "ZOMBIE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "ROTTEN_FLESH": 1.0, + "CARROT_ITEM": 0.01, + "POTATO_ITEM": 0.01, + "POISONOUS_POTATO": 0.02 + } + }, + "MELON_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 3-7", + "drops": { + "MELON": 5.0 + } + }, + "MITHRIL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "MITHRIL_ORE": 2.0 + } + }, + "ACACIA_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG_2": 4.0 + } + }, + "MAGMA_CUBE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 1-3", + "drops": { + "MAGMA_CREAM": 2.0 + } + }, + "GRAVEL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "GRAVEL": 1.0 + } + }, + "DARK_OAK_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG_2-1": 4.0 + } + }, + "SLIME_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SLIME_BALL": 2 + } + }, + "ENDER_STONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "ENDER_STONE": 1.0 + } + }, + "NETHER_WARTS_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "NETHER_STALK": 3 + } + }, + "GOLD_GENERATOR": { + "type": "MINING", + "requiressmelting": true, + "requiredactions": 2, + "drops": { + "GOLD_INGOT": 1.0 + } + }, + "BIRCH_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-2": 4.0 + } + }, + "CREEPER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SULPHUR": 1.0 + } + }, + "MYCELIUM_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "MYCEL": 1.0 + } + }, + "CHICKEN_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RAW_CHICKEN": 1.0, + "FEATHER": 1.0 + } + }, + "COW_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RAW_BEEF": 1.0, + "LEATHER": 1.0 + } + }, + "OAK_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG": 4.0 + } + }, + "HARD_STONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "HARD_STONE": 1.0 + } + }, + "SPIDER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "STRING": 1.0, + "SPIDER_EYE": 0.5 + } + }, + "TARANTULA_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 2-5 (String only)", + "drops": { + "STRING": 3.5, + "SPIDER_EYE": 1.0, + "IRON_INGOT": 0.2 + } + }, + "RED_SAND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SAND-1": 1.0 + } + }, + "SHEEP_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "MUTTON": 1.0, + "WOOL": 1.0 + } + }, + "SPRUCE_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-1": 4 + } + }, + "SKELETON_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "BONE": 1.0 + } + }, + "IRON_GENERATOR": { + "type": "MINING", + "requiressmelting": true, + "requiredactions": 2, + "drops": { + "IRON_INGOT": 1.0 + } + }, + "MUSHROOM_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RED_MUSHROOM": 0.5, + "BROWN_MUSHROOM": 0.5 + } + }, + "EMERALD_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "EMERALD": 1.0 + } + }, + "INFERNO_GENERATOR": { + "requiredactions": 2, + "type": "COMBAT", + "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool", + "drops": { + "CHILI_PEPPER": 0.07353, + "INFERNO_VERTEX": 0.001681, + "INFERNO_APEX": 0.000007639, + "REAPER_PEPPER": 0.00002183, + "GABAGOOL_THE_FISH": 0.000002546 + } + }, + "QUARTZ_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "QUARTZ": 1.0 + } + }, + "WHEAT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "WHEAT": 1.0, + "SEEDS": 0.5 + } + }, + "CARROT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "CARROT_ITEM": 3 + } + }, + "REDSTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 3-6", + "drops": { + "REDSTONE": 4.5 + } + }, + "JUNGLE_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-3": 4 + } + }, + "ENDERMAN_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "ENDER_PEARL": 1.0 + } + }, + "SAND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SAND": 1.0 + } + }, + "VAMPIRE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "HEMOVIBE": 1.0 + } + }, + "REVENANT_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 2-5 rotten flesh", + "drops": { + "ROTTEN_FLESH": 3.5, + "DIAMOND": 1.0 + } + }, + "CLAY_GENERATOR": { + "type": "FISHING", + "requiredactions": 2, + "drops": { + "CLAY_BALL": 4 + } + }, + "GLOWSTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "GLOWSTONE_DUST": 3 + } + }, + "GHAST_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "GHAST_TEAR": 1.0 + } + }, + "BLAZE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "BLAZE_ROD": 1.0 + } + }, + "CAVESPIDER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SPIDER_EYE": 1.0, + "STRING": 0.5 + } + }, + "CACTUS_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "CACTUS": 3.0 + } + }, + "DIAMOND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "DIAMOND": 1.0 + } + }, + "POTATO_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "POTATO_ITEM": 3 + } + }, + "RABBIT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RABBIT": 1.0, + "RABBIT_HIDE": 0.35, + "RABBIT_FOOT": 0.35 + } + }, + "OBSIDIAN_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "OBSIDIAN": 1.0 + } + } +} \ No newline at end of file From 99c20556f8e9b3d414dd458660588ee775259468 Mon Sep 17 00:00:00 2001 From: HacktheTime <131038646+HacktheTime@users.noreply.github.com> Date: Thu, 31 Jul 2025 13:18:25 +0200 Subject: [PATCH 2/8] changed flower minion type to foraging changed flower minion type from other to foraging --- constants/minions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/constants/minions.json b/constants/minions.json index 7c019714e2..325e3be35f 100644 --- a/constants/minions.json +++ b/constants/minions.json @@ -15,7 +15,7 @@ } }, "FLOWER_GENERATOR": { - "type": "OTHER", + "type": "FORAGING", "requiredactions": 2, "drops": { "RED_ROSE-2": 0.071428571, @@ -465,4 +465,4 @@ "OBSIDIAN": 1.0 } } -} \ No newline at end of file +} From 67de1a400d6d115e4b6d5a176e1703a12501cac4 Mon Sep 17 00:00:00 2001 From: HacktheTime <131038646+HacktheTime@users.noreply.github.com> Date: Thu, 31 Jul 2025 15:58:09 +0200 Subject: [PATCH 3/8] Update minions.json changed the type data to a list --- constants/minions.json | 183 +++++++++++++++++++++++++++-------------- 1 file changed, 121 insertions(+), 62 deletions(-) diff --git a/constants/minions.json b/constants/minions.json index 325e3be35f..bfd723cb69 100644 --- a/constants/minions.json +++ b/constants/minions.json @@ -1,5 +1,6 @@ -{ - "LAPIS_GENERATOR": { +[ + { + "type_id": "LAPIS_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 3-6", @@ -7,15 +8,17 @@ "INK_SACK-4": 4.5 } }, - "PIG_GENERATOR": { + { + "type_id": "PIG_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "PORK": 1.0 } }, - "FLOWER_GENERATOR": { - "type": "FORAGING", + { + "type_id": "FLOWER_GENERATOR", + "type": "OTHER", "requiredactions": 2, "drops": { "RED_ROSE-2": 0.071428571, @@ -34,35 +37,40 @@ "RED_ROSE-6": 0.071428571 } }, - "COCOA_GENERATOR": { + { + "type_id": "COCOA_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "INK_SACK-3": 3.0 } }, - "COBBLESTONE_GENERATOR": { + { + "type_id": "COBBLESTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "COBBLESTONE": 1.0 } }, - "ICE_GENERATOR": { + { + "type_id": "ICE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "ICE": 1.0 } }, - "PUMPKIN_GENERATOR": { + { + "type_id": "PUMPKIN_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "PUMPKIN": 1.0 } }, - "VOIDLING_GENERATOR": { + { + "type_id": "VOIDLING_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -71,14 +79,16 @@ "ENDER_PEARL": 1.0 } }, - "SUGAR_CANE_GENERATOR": { + { + "type_id": "SUGAR_CANE_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "SUGAR_CANE": 3.0 } }, - "FISHING_GENERATOR": { + { + "type_id": "FISHING_GENERATOR", "type": "FISHING", "requiredactions": 1, "drops": { @@ -91,21 +101,24 @@ "SPONGE": 0.03 } }, - "COAL_GENERATOR": { + { + "type_id": "COAL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "COAL": 1.0 } }, - "SNOW_GENERATOR": { + { + "type_id": "SNOW_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SNOW_BALL": 4.0 } }, - "ZOMBIE_GENERATOR": { + { + "type_id": "ZOMBIE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -115,7 +128,8 @@ "POISONOUS_POTATO": 0.02 } }, - "MELON_GENERATOR": { + { + "type_id": "MELON_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 3-7", @@ -123,21 +137,24 @@ "MELON": 5.0 } }, - "MITHRIL_GENERATOR": { + { + "type_id": "MITHRIL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "MITHRIL_ORE": 2.0 } }, - "ACACIA_GENERATOR": { + { + "type_id": "ACACIA_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG_2": 4.0 } }, - "MAGMA_CUBE_GENERATOR": { + { + "type_id": "MAGMA_CUBE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 1-3", @@ -145,35 +162,40 @@ "MAGMA_CREAM": 2.0 } }, - "GRAVEL_GENERATOR": { + { + "type_id": "GRAVEL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "GRAVEL": 1.0 } }, - "DARK_OAK_GENERATOR": { + { + "type_id": "DARK_OAK_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG_2-1": 4.0 } }, - "SLIME_GENERATOR": { + { + "type_id": "SLIME_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "SLIME_BALL": 2 } }, - "ENDER_STONE_GENERATOR": { + { + "type_id": "ENDER_STONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "ENDER_STONE": 1.0 } }, - "NETHER_WARTS_GENERATOR": { + { + "type_id": "NETHER_WARTS_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -181,7 +203,8 @@ "NETHER_STALK": 3 } }, - "GOLD_GENERATOR": { + { + "type_id": "GOLD_GENERATOR", "type": "MINING", "requiressmelting": true, "requiredactions": 2, @@ -189,28 +212,32 @@ "GOLD_INGOT": 1.0 } }, - "BIRCH_GENERATOR": { + { + "type_id": "BIRCH_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-2": 4.0 } }, - "CREEPER_GENERATOR": { + { + "type_id": "CREEPER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "SULPHUR": 1.0 } }, - "MYCELIUM_GENERATOR": { + { + "type_id": "MYCELIUM_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "MYCEL": 1.0 } }, - "CHICKEN_GENERATOR": { + { + "type_id": "CHICKEN_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -218,7 +245,8 @@ "FEATHER": 1.0 } }, - "COW_GENERATOR": { + { + "type_id": "COW_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -226,21 +254,24 @@ "LEATHER": 1.0 } }, - "OAK_GENERATOR": { + { + "type_id": "OAK_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG": 4.0 } }, - "HARD_STONE_GENERATOR": { + { + "type_id": "HARD_STONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "HARD_STONE": 1.0 } }, - "SPIDER_GENERATOR": { + { + "type_id": "SPIDER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -248,7 +279,8 @@ "SPIDER_EYE": 0.5 } }, - "TARANTULA_GENERATOR": { + { + "type_id": "TARANTULA_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 2-5 (String only)", @@ -258,14 +290,16 @@ "IRON_INGOT": 0.2 } }, - "RED_SAND_GENERATOR": { + { + "type_id": "RED_SAND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SAND-1": 1.0 } }, - "SHEEP_GENERATOR": { + { + "type_id": "SHEEP_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -273,21 +307,24 @@ "WOOL": 1.0 } }, - "SPRUCE_GENERATOR": { + { + "type_id": "SPRUCE_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-1": 4 } }, - "SKELETON_GENERATOR": { + { + "type_id": "SKELETON_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "BONE": 1.0 } }, - "IRON_GENERATOR": { + { + "type_id": "IRON_GENERATOR", "type": "MINING", "requiressmelting": true, "requiredactions": 2, @@ -295,7 +332,8 @@ "IRON_INGOT": 1.0 } }, - "MUSHROOM_GENERATOR": { + { + "type_id": "MUSHROOM_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -303,14 +341,16 @@ "BROWN_MUSHROOM": 0.5 } }, - "EMERALD_GENERATOR": { + { + "type_id": "EMERALD_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "EMERALD": 1.0 } }, - "INFERNO_GENERATOR": { + { + "type_id": "INFERNO_GENERATOR", "requiredactions": 2, "type": "COMBAT", "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool", @@ -322,14 +362,16 @@ "GABAGOOL_THE_FISH": 0.000002546 } }, - "QUARTZ_GENERATOR": { + { + "type_id": "QUARTZ_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "QUARTZ": 1.0 } }, - "WHEAT_GENERATOR": { + { + "type_id": "WHEAT_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -337,7 +379,8 @@ "SEEDS": 0.5 } }, - "CARROT_GENERATOR": { + { + "type_id": "CARROT_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -345,7 +388,8 @@ "CARROT_ITEM": 3 } }, - "REDSTONE_GENERATOR": { + { + "type_id": "REDSTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 3-6", @@ -353,35 +397,40 @@ "REDSTONE": 4.5 } }, - "JUNGLE_GENERATOR": { + { + "type_id": "JUNGLE_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-3": 4 } }, - "ENDERMAN_GENERATOR": { + { + "type_id": "ENDERMAN_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "ENDER_PEARL": 1.0 } }, - "SAND_GENERATOR": { + { + "type_id": "SAND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SAND": 1.0 } }, - "VAMPIRE_GENERATOR": { + { + "type_id": "VAMPIRE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "HEMOVIBE": 1.0 } }, - "REVENANT_GENERATOR": { + { + "type_id": "REVENANT_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 2-5 rotten flesh", @@ -390,14 +439,16 @@ "DIAMOND": 1.0 } }, - "CLAY_GENERATOR": { + { + "type_id": "CLAY_GENERATOR", "type": "FISHING", "requiredactions": 2, "drops": { "CLAY_BALL": 4 } }, - "GLOWSTONE_GENERATOR": { + { + "type_id": "GLOWSTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -405,21 +456,24 @@ "GLOWSTONE_DUST": 3 } }, - "GHAST_GENERATOR": { + { + "type_id": "GHAST_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "GHAST_TEAR": 1.0 } }, - "BLAZE_GENERATOR": { + { + "type_id": "BLAZE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "BLAZE_ROD": 1.0 } }, - "CAVESPIDER_GENERATOR": { + { + "type_id": "CAVESPIDER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -427,21 +481,24 @@ "STRING": 0.5 } }, - "CACTUS_GENERATOR": { + { + "type_id": "CACTUS_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "CACTUS": 3.0 } }, - "DIAMOND_GENERATOR": { + { + "type_id": "DIAMOND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "DIAMOND": 1.0 } }, - "POTATO_GENERATOR": { + { + "type_id": "POTATO_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -449,7 +506,8 @@ "POTATO_ITEM": 3 } }, - "RABBIT_GENERATOR": { + { + "type_id": "RABBIT_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -458,11 +516,12 @@ "RABBIT_FOOT": 0.35 } }, - "OBSIDIAN_GENERATOR": { + { + "type_id": "OBSIDIAN_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "OBSIDIAN": 1.0 } } -} +] From 06a0c829cfcb655dce04c56afd127a2972b8854b Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Thu, 31 Jul 2025 13:12:18 +0200 Subject: [PATCH 4/8] added minions.json --- constants/minions.json | 468 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) create mode 100644 constants/minions.json diff --git a/constants/minions.json b/constants/minions.json new file mode 100644 index 0000000000..7c019714e2 --- /dev/null +++ b/constants/minions.json @@ -0,0 +1,468 @@ +{ + "LAPIS_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 3-6", + "drops": { + "INK_SACK-4": 4.5 + } + }, + "PIG_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "PORK": 1.0 + } + }, + "FLOWER_GENERATOR": { + "type": "OTHER", + "requiredactions": 2, + "drops": { + "RED_ROSE-2": 0.071428571, + "RED_ROSE-3": 0.071428571, + "RED_ROSE-1": 0.071428571, + "YELLOW_FLOWER": 0.071428571, + "DOUBLE_PLANT-1": 0.071428571, + "RED_ROSE-5": 0.071428571, + "RED_ROSE-8": 0.071428571, + "DOUBLE_PLANT-5": 0.071428571, + "RED_ROSE-7": 0.071428571, + "RED_ROSE": 0.071428571, + "RED_ROSE-4": 0.071428571, + "DOUBLE_PLANT-4": 0.071428571, + "DOUBLE_PLANT": 0.071428571, + "RED_ROSE-6": 0.071428571 + } + }, + "COCOA_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "INK_SACK-3": 3.0 + } + }, + "COBBLESTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "COBBLESTONE": 1.0 + } + }, + "ICE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "ICE": 1.0 + } + }, + "PUMPKIN_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "PUMPKIN": 1.0 + } + }, + "VOIDLING_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "OBSIDIAN": 1.0, + "QUARTZ": 1.0, + "ENDER_PEARL": 1.0 + } + }, + "SUGAR_CANE_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "SUGAR_CANE": 3.0 + } + }, + "FISHING_GENERATOR": { + "type": "FISHING", + "requiredactions": 1, + "drops": { + "RAW_FISH": 0.5, + "RAW_FISH-1": 0.25, + "RAW_FISH-3": 0.12, + "RAW_FISH-2": 0.04, + "PRISMARINE_SHARD": 0.03, + "PRISMARINE_CRYSTALS": 0.03, + "SPONGE": 0.03 + } + }, + "COAL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "COAL": 1.0 + } + }, + "SNOW_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SNOW_BALL": 4.0 + } + }, + "ZOMBIE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "ROTTEN_FLESH": 1.0, + "CARROT_ITEM": 0.01, + "POTATO_ITEM": 0.01, + "POISONOUS_POTATO": 0.02 + } + }, + "MELON_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 3-7", + "drops": { + "MELON": 5.0 + } + }, + "MITHRIL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "MITHRIL_ORE": 2.0 + } + }, + "ACACIA_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG_2": 4.0 + } + }, + "MAGMA_CUBE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 1-3", + "drops": { + "MAGMA_CREAM": 2.0 + } + }, + "GRAVEL_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "GRAVEL": 1.0 + } + }, + "DARK_OAK_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG_2-1": 4.0 + } + }, + "SLIME_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SLIME_BALL": 2 + } + }, + "ENDER_STONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "ENDER_STONE": 1.0 + } + }, + "NETHER_WARTS_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "NETHER_STALK": 3 + } + }, + "GOLD_GENERATOR": { + "type": "MINING", + "requiressmelting": true, + "requiredactions": 2, + "drops": { + "GOLD_INGOT": 1.0 + } + }, + "BIRCH_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-2": 4.0 + } + }, + "CREEPER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SULPHUR": 1.0 + } + }, + "MYCELIUM_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "MYCEL": 1.0 + } + }, + "CHICKEN_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RAW_CHICKEN": 1.0, + "FEATHER": 1.0 + } + }, + "COW_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RAW_BEEF": 1.0, + "LEATHER": 1.0 + } + }, + "OAK_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG": 4.0 + } + }, + "HARD_STONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "HARD_STONE": 1.0 + } + }, + "SPIDER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "STRING": 1.0, + "SPIDER_EYE": 0.5 + } + }, + "TARANTULA_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 2-5 (String only)", + "drops": { + "STRING": 3.5, + "SPIDER_EYE": 1.0, + "IRON_INGOT": 0.2 + } + }, + "RED_SAND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SAND-1": 1.0 + } + }, + "SHEEP_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "MUTTON": 1.0, + "WOOL": 1.0 + } + }, + "SPRUCE_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-1": 4 + } + }, + "SKELETON_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "BONE": 1.0 + } + }, + "IRON_GENERATOR": { + "type": "MINING", + "requiressmelting": true, + "requiredactions": 2, + "drops": { + "IRON_INGOT": 1.0 + } + }, + "MUSHROOM_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RED_MUSHROOM": 0.5, + "BROWN_MUSHROOM": 0.5 + } + }, + "EMERALD_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "EMERALD": 1.0 + } + }, + "INFERNO_GENERATOR": { + "requiredactions": 2, + "type": "COMBAT", + "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool", + "drops": { + "CHILI_PEPPER": 0.07353, + "INFERNO_VERTEX": 0.001681, + "INFERNO_APEX": 0.000007639, + "REAPER_PEPPER": 0.00002183, + "GABAGOOL_THE_FISH": 0.000002546 + } + }, + "QUARTZ_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "QUARTZ": 1.0 + } + }, + "WHEAT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "WHEAT": 1.0, + "SEEDS": 0.5 + } + }, + "CARROT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "CARROT_ITEM": 3 + } + }, + "REDSTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 3-6", + "drops": { + "REDSTONE": 4.5 + } + }, + "JUNGLE_GENERATOR": { + "type": "FORAGING", + "requiredactions": 2, + "drops": { + "LOG-3": 4 + } + }, + "ENDERMAN_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "ENDER_PEARL": 1.0 + } + }, + "SAND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "SAND": 1.0 + } + }, + "VAMPIRE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "HEMOVIBE": 1.0 + } + }, + "REVENANT_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "//": "Wiki says 2-5 rotten flesh", + "drops": { + "ROTTEN_FLESH": 3.5, + "DIAMOND": 1.0 + } + }, + "CLAY_GENERATOR": { + "type": "FISHING", + "requiredactions": 2, + "drops": { + "CLAY_BALL": 4 + } + }, + "GLOWSTONE_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "GLOWSTONE_DUST": 3 + } + }, + "GHAST_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "GHAST_TEAR": 1.0 + } + }, + "BLAZE_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "BLAZE_ROD": 1.0 + } + }, + "CAVESPIDER_GENERATOR": { + "type": "COMBAT", + "requiredactions": 2, + "drops": { + "SPIDER_EYE": 1.0, + "STRING": 0.5 + } + }, + "CACTUS_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "CACTUS": 3.0 + } + }, + "DIAMOND_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "DIAMOND": 1.0 + } + }, + "POTATO_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "//": "Wiki says 2-4", + "drops": { + "POTATO_ITEM": 3 + } + }, + "RABBIT_GENERATOR": { + "type": "FARMING", + "requiredactions": 2, + "drops": { + "RABBIT": 1.0, + "RABBIT_HIDE": 0.35, + "RABBIT_FOOT": 0.35 + } + }, + "OBSIDIAN_GENERATOR": { + "type": "MINING", + "requiredactions": 2, + "drops": { + "OBSIDIAN": 1.0 + } + } +} \ No newline at end of file From 09a7c06a133b44f83ff7a57b1ec37d337d64a770 Mon Sep 17 00:00:00 2001 From: HacktheTime <131038646+HacktheTime@users.noreply.github.com> Date: Thu, 31 Jul 2025 13:18:25 +0200 Subject: [PATCH 5/8] changed flower minion type to foraging changed flower minion type from other to foraging --- constants/minions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/constants/minions.json b/constants/minions.json index 7c019714e2..325e3be35f 100644 --- a/constants/minions.json +++ b/constants/minions.json @@ -15,7 +15,7 @@ } }, "FLOWER_GENERATOR": { - "type": "OTHER", + "type": "FORAGING", "requiredactions": 2, "drops": { "RED_ROSE-2": 0.071428571, @@ -465,4 +465,4 @@ "OBSIDIAN": 1.0 } } -} \ No newline at end of file +} From 5ea9cce978a2dbc166980f60b1034795ebccb1c4 Mon Sep 17 00:00:00 2001 From: HacktheTime <131038646+HacktheTime@users.noreply.github.com> Date: Thu, 31 Jul 2025 15:58:09 +0200 Subject: [PATCH 6/8] Update minions.json changed the type data to a list --- constants/minions.json | 183 +++++++++++++++++++++++++++-------------- 1 file changed, 121 insertions(+), 62 deletions(-) diff --git a/constants/minions.json b/constants/minions.json index 325e3be35f..bfd723cb69 100644 --- a/constants/minions.json +++ b/constants/minions.json @@ -1,5 +1,6 @@ -{ - "LAPIS_GENERATOR": { +[ + { + "type_id": "LAPIS_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 3-6", @@ -7,15 +8,17 @@ "INK_SACK-4": 4.5 } }, - "PIG_GENERATOR": { + { + "type_id": "PIG_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "PORK": 1.0 } }, - "FLOWER_GENERATOR": { - "type": "FORAGING", + { + "type_id": "FLOWER_GENERATOR", + "type": "OTHER", "requiredactions": 2, "drops": { "RED_ROSE-2": 0.071428571, @@ -34,35 +37,40 @@ "RED_ROSE-6": 0.071428571 } }, - "COCOA_GENERATOR": { + { + "type_id": "COCOA_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "INK_SACK-3": 3.0 } }, - "COBBLESTONE_GENERATOR": { + { + "type_id": "COBBLESTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "COBBLESTONE": 1.0 } }, - "ICE_GENERATOR": { + { + "type_id": "ICE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "ICE": 1.0 } }, - "PUMPKIN_GENERATOR": { + { + "type_id": "PUMPKIN_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "PUMPKIN": 1.0 } }, - "VOIDLING_GENERATOR": { + { + "type_id": "VOIDLING_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -71,14 +79,16 @@ "ENDER_PEARL": 1.0 } }, - "SUGAR_CANE_GENERATOR": { + { + "type_id": "SUGAR_CANE_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "SUGAR_CANE": 3.0 } }, - "FISHING_GENERATOR": { + { + "type_id": "FISHING_GENERATOR", "type": "FISHING", "requiredactions": 1, "drops": { @@ -91,21 +101,24 @@ "SPONGE": 0.03 } }, - "COAL_GENERATOR": { + { + "type_id": "COAL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "COAL": 1.0 } }, - "SNOW_GENERATOR": { + { + "type_id": "SNOW_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SNOW_BALL": 4.0 } }, - "ZOMBIE_GENERATOR": { + { + "type_id": "ZOMBIE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -115,7 +128,8 @@ "POISONOUS_POTATO": 0.02 } }, - "MELON_GENERATOR": { + { + "type_id": "MELON_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 3-7", @@ -123,21 +137,24 @@ "MELON": 5.0 } }, - "MITHRIL_GENERATOR": { + { + "type_id": "MITHRIL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "MITHRIL_ORE": 2.0 } }, - "ACACIA_GENERATOR": { + { + "type_id": "ACACIA_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG_2": 4.0 } }, - "MAGMA_CUBE_GENERATOR": { + { + "type_id": "MAGMA_CUBE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 1-3", @@ -145,35 +162,40 @@ "MAGMA_CREAM": 2.0 } }, - "GRAVEL_GENERATOR": { + { + "type_id": "GRAVEL_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "GRAVEL": 1.0 } }, - "DARK_OAK_GENERATOR": { + { + "type_id": "DARK_OAK_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG_2-1": 4.0 } }, - "SLIME_GENERATOR": { + { + "type_id": "SLIME_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "SLIME_BALL": 2 } }, - "ENDER_STONE_GENERATOR": { + { + "type_id": "ENDER_STONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "ENDER_STONE": 1.0 } }, - "NETHER_WARTS_GENERATOR": { + { + "type_id": "NETHER_WARTS_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -181,7 +203,8 @@ "NETHER_STALK": 3 } }, - "GOLD_GENERATOR": { + { + "type_id": "GOLD_GENERATOR", "type": "MINING", "requiressmelting": true, "requiredactions": 2, @@ -189,28 +212,32 @@ "GOLD_INGOT": 1.0 } }, - "BIRCH_GENERATOR": { + { + "type_id": "BIRCH_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-2": 4.0 } }, - "CREEPER_GENERATOR": { + { + "type_id": "CREEPER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "SULPHUR": 1.0 } }, - "MYCELIUM_GENERATOR": { + { + "type_id": "MYCELIUM_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "MYCEL": 1.0 } }, - "CHICKEN_GENERATOR": { + { + "type_id": "CHICKEN_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -218,7 +245,8 @@ "FEATHER": 1.0 } }, - "COW_GENERATOR": { + { + "type_id": "COW_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -226,21 +254,24 @@ "LEATHER": 1.0 } }, - "OAK_GENERATOR": { + { + "type_id": "OAK_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG": 4.0 } }, - "HARD_STONE_GENERATOR": { + { + "type_id": "HARD_STONE_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "HARD_STONE": 1.0 } }, - "SPIDER_GENERATOR": { + { + "type_id": "SPIDER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -248,7 +279,8 @@ "SPIDER_EYE": 0.5 } }, - "TARANTULA_GENERATOR": { + { + "type_id": "TARANTULA_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 2-5 (String only)", @@ -258,14 +290,16 @@ "IRON_INGOT": 0.2 } }, - "RED_SAND_GENERATOR": { + { + "type_id": "RED_SAND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SAND-1": 1.0 } }, - "SHEEP_GENERATOR": { + { + "type_id": "SHEEP_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -273,21 +307,24 @@ "WOOL": 1.0 } }, - "SPRUCE_GENERATOR": { + { + "type_id": "SPRUCE_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-1": 4 } }, - "SKELETON_GENERATOR": { + { + "type_id": "SKELETON_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "BONE": 1.0 } }, - "IRON_GENERATOR": { + { + "type_id": "IRON_GENERATOR", "type": "MINING", "requiressmelting": true, "requiredactions": 2, @@ -295,7 +332,8 @@ "IRON_INGOT": 1.0 } }, - "MUSHROOM_GENERATOR": { + { + "type_id": "MUSHROOM_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -303,14 +341,16 @@ "BROWN_MUSHROOM": 0.5 } }, - "EMERALD_GENERATOR": { + { + "type_id": "EMERALD_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "EMERALD": 1.0 } }, - "INFERNO_GENERATOR": { + { + "type_id": "INFERNO_GENERATOR", "requiredactions": 2, "type": "COMBAT", "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool", @@ -322,14 +362,16 @@ "GABAGOOL_THE_FISH": 0.000002546 } }, - "QUARTZ_GENERATOR": { + { + "type_id": "QUARTZ_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "QUARTZ": 1.0 } }, - "WHEAT_GENERATOR": { + { + "type_id": "WHEAT_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -337,7 +379,8 @@ "SEEDS": 0.5 } }, - "CARROT_GENERATOR": { + { + "type_id": "CARROT_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -345,7 +388,8 @@ "CARROT_ITEM": 3 } }, - "REDSTONE_GENERATOR": { + { + "type_id": "REDSTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 3-6", @@ -353,35 +397,40 @@ "REDSTONE": 4.5 } }, - "JUNGLE_GENERATOR": { + { + "type_id": "JUNGLE_GENERATOR", "type": "FORAGING", "requiredactions": 2, "drops": { "LOG-3": 4 } }, - "ENDERMAN_GENERATOR": { + { + "type_id": "ENDERMAN_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "ENDER_PEARL": 1.0 } }, - "SAND_GENERATOR": { + { + "type_id": "SAND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "SAND": 1.0 } }, - "VAMPIRE_GENERATOR": { + { + "type_id": "VAMPIRE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "HEMOVIBE": 1.0 } }, - "REVENANT_GENERATOR": { + { + "type_id": "REVENANT_GENERATOR", "type": "COMBAT", "requiredactions": 2, "//": "Wiki says 2-5 rotten flesh", @@ -390,14 +439,16 @@ "DIAMOND": 1.0 } }, - "CLAY_GENERATOR": { + { + "type_id": "CLAY_GENERATOR", "type": "FISHING", "requiredactions": 2, "drops": { "CLAY_BALL": 4 } }, - "GLOWSTONE_GENERATOR": { + { + "type_id": "GLOWSTONE_GENERATOR", "type": "MINING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -405,21 +456,24 @@ "GLOWSTONE_DUST": 3 } }, - "GHAST_GENERATOR": { + { + "type_id": "GHAST_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "GHAST_TEAR": 1.0 } }, - "BLAZE_GENERATOR": { + { + "type_id": "BLAZE_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { "BLAZE_ROD": 1.0 } }, - "CAVESPIDER_GENERATOR": { + { + "type_id": "CAVESPIDER_GENERATOR", "type": "COMBAT", "requiredactions": 2, "drops": { @@ -427,21 +481,24 @@ "STRING": 0.5 } }, - "CACTUS_GENERATOR": { + { + "type_id": "CACTUS_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { "CACTUS": 3.0 } }, - "DIAMOND_GENERATOR": { + { + "type_id": "DIAMOND_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "DIAMOND": 1.0 } }, - "POTATO_GENERATOR": { + { + "type_id": "POTATO_GENERATOR", "type": "FARMING", "requiredactions": 2, "//": "Wiki says 2-4", @@ -449,7 +506,8 @@ "POTATO_ITEM": 3 } }, - "RABBIT_GENERATOR": { + { + "type_id": "RABBIT_GENERATOR", "type": "FARMING", "requiredactions": 2, "drops": { @@ -458,11 +516,12 @@ "RABBIT_FOOT": 0.35 } }, - "OBSIDIAN_GENERATOR": { + { + "type_id": "OBSIDIAN_GENERATOR", "type": "MINING", "requiredactions": 2, "drops": { "OBSIDIAN": 1.0 } } -} +] From add1c7b6efcaafd3ee2591518c30f5bdd47f51d4 Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Fri, 12 Sep 2025 17:26:43 +0200 Subject: [PATCH 7/8] modified requiredactions to required_actions for consistency purposes. --- constants/minions.json | 118 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/constants/minions.json b/constants/minions.json index bfd723cb69..c5b32a1e6e 100644 --- a/constants/minions.json +++ b/constants/minions.json @@ -2,7 +2,7 @@ { "type_id": "LAPIS_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 3-6", "drops": { "INK_SACK-4": 4.5 @@ -11,7 +11,7 @@ { "type_id": "PIG_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "PORK": 1.0 } @@ -19,7 +19,7 @@ { "type_id": "FLOWER_GENERATOR", "type": "OTHER", - "requiredactions": 2, + "required_actions": 2, "drops": { "RED_ROSE-2": 0.071428571, "RED_ROSE-3": 0.071428571, @@ -40,7 +40,7 @@ { "type_id": "COCOA_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "INK_SACK-3": 3.0 } @@ -48,7 +48,7 @@ { "type_id": "COBBLESTONE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "COBBLESTONE": 1.0 } @@ -56,7 +56,7 @@ { "type_id": "ICE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "ICE": 1.0 } @@ -64,7 +64,7 @@ { "type_id": "PUMPKIN_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "PUMPKIN": 1.0 } @@ -72,7 +72,7 @@ { "type_id": "VOIDLING_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "OBSIDIAN": 1.0, "QUARTZ": 1.0, @@ -82,7 +82,7 @@ { "type_id": "SUGAR_CANE_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "SUGAR_CANE": 3.0 } @@ -90,7 +90,7 @@ { "type_id": "FISHING_GENERATOR", "type": "FISHING", - "requiredactions": 1, + "required_actions": 1, "drops": { "RAW_FISH": 0.5, "RAW_FISH-1": 0.25, @@ -104,7 +104,7 @@ { "type_id": "COAL_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "COAL": 1.0 } @@ -112,7 +112,7 @@ { "type_id": "SNOW_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "SNOW_BALL": 4.0 } @@ -120,7 +120,7 @@ { "type_id": "ZOMBIE_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "ROTTEN_FLESH": 1.0, "CARROT_ITEM": 0.01, @@ -131,7 +131,7 @@ { "type_id": "MELON_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 3-7", "drops": { "MELON": 5.0 @@ -140,7 +140,7 @@ { "type_id": "MITHRIL_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "MITHRIL_ORE": 2.0 } @@ -148,7 +148,7 @@ { "type_id": "ACACIA_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG_2": 4.0 } @@ -156,7 +156,7 @@ { "type_id": "MAGMA_CUBE_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 1-3", "drops": { "MAGMA_CREAM": 2.0 @@ -165,7 +165,7 @@ { "type_id": "GRAVEL_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "GRAVEL": 1.0 } @@ -173,7 +173,7 @@ { "type_id": "DARK_OAK_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG_2-1": 4.0 } @@ -181,7 +181,7 @@ { "type_id": "SLIME_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "SLIME_BALL": 2 } @@ -189,7 +189,7 @@ { "type_id": "ENDER_STONE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "ENDER_STONE": 1.0 } @@ -197,7 +197,7 @@ { "type_id": "NETHER_WARTS_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-4", "drops": { "NETHER_STALK": 3 @@ -207,7 +207,7 @@ "type_id": "GOLD_GENERATOR", "type": "MINING", "requiressmelting": true, - "requiredactions": 2, + "required_actions": 2, "drops": { "GOLD_INGOT": 1.0 } @@ -215,7 +215,7 @@ { "type_id": "BIRCH_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG-2": 4.0 } @@ -223,7 +223,7 @@ { "type_id": "CREEPER_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "SULPHUR": 1.0 } @@ -231,7 +231,7 @@ { "type_id": "MYCELIUM_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "MYCEL": 1.0 } @@ -239,7 +239,7 @@ { "type_id": "CHICKEN_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "RAW_CHICKEN": 1.0, "FEATHER": 1.0 @@ -248,7 +248,7 @@ { "type_id": "COW_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "RAW_BEEF": 1.0, "LEATHER": 1.0 @@ -257,7 +257,7 @@ { "type_id": "OAK_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG": 4.0 } @@ -265,7 +265,7 @@ { "type_id": "HARD_STONE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "HARD_STONE": 1.0 } @@ -273,7 +273,7 @@ { "type_id": "SPIDER_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "STRING": 1.0, "SPIDER_EYE": 0.5 @@ -282,7 +282,7 @@ { "type_id": "TARANTULA_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-5 (String only)", "drops": { "STRING": 3.5, @@ -293,7 +293,7 @@ { "type_id": "RED_SAND_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "SAND-1": 1.0 } @@ -301,7 +301,7 @@ { "type_id": "SHEEP_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "MUTTON": 1.0, "WOOL": 1.0 @@ -310,7 +310,7 @@ { "type_id": "SPRUCE_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG-1": 4 } @@ -318,7 +318,7 @@ { "type_id": "SKELETON_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "BONE": 1.0 } @@ -327,7 +327,7 @@ "type_id": "IRON_GENERATOR", "type": "MINING", "requiressmelting": true, - "requiredactions": 2, + "required_actions": 2, "drops": { "IRON_INGOT": 1.0 } @@ -335,7 +335,7 @@ { "type_id": "MUSHROOM_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "RED_MUSHROOM": 0.5, "BROWN_MUSHROOM": 0.5 @@ -344,14 +344,14 @@ { "type_id": "EMERALD_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "EMERALD": 1.0 } }, { "type_id": "INFERNO_GENERATOR", - "requiredactions": 2, + "required_actions": 2, "type": "COMBAT", "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool", "drops": { @@ -365,7 +365,7 @@ { "type_id": "QUARTZ_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "QUARTZ": 1.0 } @@ -373,7 +373,7 @@ { "type_id": "WHEAT_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "WHEAT": 1.0, "SEEDS": 0.5 @@ -382,7 +382,7 @@ { "type_id": "CARROT_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-4", "drops": { "CARROT_ITEM": 3 @@ -391,7 +391,7 @@ { "type_id": "REDSTONE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 3-6", "drops": { "REDSTONE": 4.5 @@ -400,7 +400,7 @@ { "type_id": "JUNGLE_GENERATOR", "type": "FORAGING", - "requiredactions": 2, + "required_actions": 2, "drops": { "LOG-3": 4 } @@ -408,7 +408,7 @@ { "type_id": "ENDERMAN_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "ENDER_PEARL": 1.0 } @@ -416,7 +416,7 @@ { "type_id": "SAND_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "SAND": 1.0 } @@ -424,7 +424,7 @@ { "type_id": "VAMPIRE_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "HEMOVIBE": 1.0 } @@ -432,7 +432,7 @@ { "type_id": "REVENANT_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-5 rotten flesh", "drops": { "ROTTEN_FLESH": 3.5, @@ -442,7 +442,7 @@ { "type_id": "CLAY_GENERATOR", "type": "FISHING", - "requiredactions": 2, + "required_actions": 2, "drops": { "CLAY_BALL": 4 } @@ -450,7 +450,7 @@ { "type_id": "GLOWSTONE_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-4", "drops": { "GLOWSTONE_DUST": 3 @@ -459,7 +459,7 @@ { "type_id": "GHAST_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "GHAST_TEAR": 1.0 } @@ -467,7 +467,7 @@ { "type_id": "BLAZE_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "BLAZE_ROD": 1.0 } @@ -475,7 +475,7 @@ { "type_id": "CAVESPIDER_GENERATOR", "type": "COMBAT", - "requiredactions": 2, + "required_actions": 2, "drops": { "SPIDER_EYE": 1.0, "STRING": 0.5 @@ -484,7 +484,7 @@ { "type_id": "CACTUS_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "CACTUS": 3.0 } @@ -492,7 +492,7 @@ { "type_id": "DIAMOND_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "DIAMOND": 1.0 } @@ -500,7 +500,7 @@ { "type_id": "POTATO_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "//": "Wiki says 2-4", "drops": { "POTATO_ITEM": 3 @@ -509,7 +509,7 @@ { "type_id": "RABBIT_GENERATOR", "type": "FARMING", - "requiredactions": 2, + "required_actions": 2, "drops": { "RABBIT": 1.0, "RABBIT_HIDE": 0.35, @@ -519,7 +519,7 @@ { "type_id": "OBSIDIAN_GENERATOR", "type": "MINING", - "requiredactions": 2, + "required_actions": 2, "drops": { "OBSIDIAN": 1.0 } From 14cea552f743e9b3245cb183d2c17d1991b2eee2 Mon Sep 17 00:00:00 2001 From: HacktheTime <131038646+HacktheTime@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:02:11 +0100 Subject: [PATCH 8/8] added auto official changes merging added a workflow action that updates the repo automatically with changes of the main repo --- mergeUpstreamCommits.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 mergeUpstreamCommits.yml diff --git a/mergeUpstreamCommits.yml b/mergeUpstreamCommits.yml new file mode 100644 index 0000000000..515953537d --- /dev/null +++ b/mergeUpstreamCommits.yml @@ -0,0 +1,39 @@ +on: + schedule: + - cron: '0 7 * * *' + # scheduled at 07:00 every Monday and Thursday + + workflow_dispatch: # click the button on Github repo! + + +jobs: + sync_with_upstream: + runs-on: ubuntu-latest + name: Sync main with upstream latest + + steps: + # Step 1: run a standard checkout action, provided by github + - name: Checkout main + uses: actions/checkout@v2 + with: + ref: main + # submodules: 'recursive' ### may be needed in your situation + + # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch + - name: Pull (Fast-Forward) upstream changes + id: sync + uses: aormsby/Fork-Sync-With-Upstream-action@v2.1 + with: + upstream_repository: aormsby/hugo-deploy-to-pages + upstream_branch: main + target_branch: main + git_pull_args: --ff-only # optional arg use, defaults to simple 'pull' + + # Step 3: Display a message if 'sync' step had new commits (simple test) + - name: Check for new commits + if: steps.sync.outputs.has_new_commits + run: echo "There were new commits." + + # Step 4: Print a helpful timestamp for your records (not required, just nice) + - name: Timestamp + run: date