Introduction of new Alchemy skill!

2025-06-27 03:04:44 +02:00 · 2013-11-15 18:21:00 -05:00
parent 9afa8efd7d
commit 8f83e328b0
32 changed files with 2194 additions and 21 deletions
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@ -48,6 +48,30 @@ Skills:
            MaxBonusLevel: 500
            DamageThreshold: 14.0
    #
+    #  Settings for Alchemy
+    ###
+    Alchemy:
+        Catalysis:
+            # UnlockLevel: Alchemy level when the Catalysis ability unlocks
+            # MaxBonusLevel: Maximum bonus level of Catalysis, when a player reaches this level his brewing speed will be <MaxSpeed>
+            # MinSpeed: Minimum brewing speed allowed when at <UnlockLevel> or lower
+            # MaxSpeed: Maximum brewing speed allowed when at <MaxBonusLevel> or higher
+            UnlockLevel: 100
+            MaxBonusLevel: 1000
+            MinSpeed: 1.0
+            MaxSpeed: 4.0
+            
+        # Rank_Levels: Alchemy level where rank gets unlocked
+        Rank_Levels:
+            Rank_1: 0
+            Rank_2: 125
+            Rank_3: 250
+            Rank_4: 375
+            Rank_5: 500
+            Rank_6: 625
+            Rank_7: 750
+            Rank_8: 875
+    #
    #  Settings for Archery
    ###
    Archery:
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@ -251,6 +251,12 @@ Skills:
        Prevent_Dodge_Lightning: false
        Prevent_XP_After_Teleport: true
        Level_Cap: 0
+    Alchemy:
+        # Allow Hoppers to transfer ingredients and brew Rank 1 Alchemy potions
+        Enabled_for_Hoppers: true
+        # Prevent Hoppers from transferring ingredients into Brewing Stands
+        Prevent_Hopper_Transfer: false
+        Level_Cap: 0
    Archery:
        Enabled_For_PVP: true
        Enabled_For_PVE: true
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@ -52,6 +52,7 @@ Experience_Formula:
        Axes: 1.0
        Repair: 1.0
        Fishing: 1.0
+        Alchemy: 1.0

 #
 #  Settings for XP conversion with '/mcconvert experience'
@ -73,6 +74,8 @@ Experience:

        # FeatherFall_Multiplier: Multiply Acrobatics XP by this value when wearing boots with the Feather Fall enchant
        FeatherFall_Multiplier: 2.0
+    Alchemy:
+        Potion: 120
    Fishing:
        Base: 800
        Shake: 50
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@ -32,6 +32,19 @@ Acrobatics.Roll.Text=**Rolled**
 Acrobatics.SkillName=ACROBATICS
 Acrobatics.Skillup=[[YELLOW]]Acrobatics skill increased by {0}. Total ({1})

+#ALCHEMY
+Alchemy.Effect.0=Catalysis
+Alchemy.Effect.1=Increases potion brewing speed
+Alchemy.Effect.2=Concoctions
+Alchemy.Effect.3=Brew potions with more ingredients
+Alchemy.Listener=Alchemy:
+Alchemy.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (CATALYSIS)
+Alchemy.Catalysis.Speed=[[RED]]Brewing Speed: [[YELLOW]]{0}
+Alchemy.Concoctions.Rank=[[RED]]Concoctions Rank: [[YELLOW]]{0}
+Alchemy.Concoctions.Ingredients=[[RED]]Ingredients [[[YELLOW]]{0}[[RED]]]: [[YELLOW]]{1}
+Alchemy.SkillName=ALCHEMY
+Alchemy.Skillup=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
+
 #ARCHERY
 Archery.Combat.DazeChance=[[RED]]Chance to Daze: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance to Retrieve Arrows: [[YELLOW]]{0}
@ -408,7 +421,7 @@ Combat.TouchedFuzzy=[[DARK_RED]]Touched Fuzzy. Felt Dizzy.

 #COMMANDS
 ##generic
-mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,
+mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]EasyMFnE [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,
 Commands.addlevels.AwardAll.1=[[GREEN]]You were awarded {0} levels in all skills!
 Commands.addlevels.AwardAll.2=[[RED]]All skills have been modified for {0}.
 Commands.addlevels.AwardSkill.1=[[GREEN]]You were awarded {0} levels in {1}!
@ -611,6 +624,7 @@ Party.ItemShare.Category.Misc=Misc

 ##xp
 Commands.XPGain.Acrobatics=Falling
+Commands.XPGain.Alchemy=Brewing Potions
 Commands.XPGain.Archery=Attacking Monsters
 Commands.XPGain.Axes=Attacking Monsters
 Commands.XPGain.Child=Gains levels from Parent Skills
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@ -11,7 +11,7 @@ description: >
  in order to evaluate and balance the mechanics of mcMMO in every update.

 author: nossr50
-authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1, Riking]
+authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1, Riking, EasyMFnE]
 website: http://dev.bukkit.org/server-mods/mcmmo/

 main: com.gmail.nossr50.mcMMO
@ -89,6 +89,8 @@ commands:
        description: Detailed mcMMO skill info
    smelting:
        description: Detailed mcMMO skill info
+    alchemy:
+        description: Detailed mcMMO skill info
    adminchat:
        aliases: [ac, a]
        description: Toggle Admin chat or send admin chat messages
@ -139,6 +141,7 @@ permissions:
        description: Implies all mcmmo.ability permissions.
        children:
            mcmmo.ability.acrobatics.all: true
+            mcmmo.ability.alchemy.all: true
            mcmmo.ability.archery.all: true
            mcmmo.ability.axes.all: true
            mcmmo.ability.excavation.all: true
@ -168,6 +171,20 @@ permissions:
        description: Allows access to the Graceful Roll ability
    mcmmo.ability.acrobatics.roll:
        description: Allows access to the Roll ability
+    mcmmo.ability.alchemy.*:
+        default: false
+        description: Allows access to all Alchemy abilities
+        children:
+            mcmmo.ability.alchemy.all: true
+    mcmmo.ability.alchemy.all:
+        description: Allows access to all Alchemy abilities
+        children:
+            mcmmo.ability.alchemy.catalysis: true
+            mcmmo.ability.alchemy.concoctions: true
+    mcmmo.ability.alchemy.catalysis:
+        description: Allows access to the Catalysis ability
+    mcmmo.ability.alchemy.concoctions:
+        description: Allows access to the Concoctions ability
    mcmmo.ability.archery.*:
        default: false
        description: Allows access to all Archery abilities
@ -626,6 +643,7 @@ permissions:
        description: Implies all default mcmmo.commands permissions.
        children:
            mcmmo.commands.acrobatics: true
+            mcmmo.commands.alchemy: true
            mcmmo.commands.archery: true
            mcmmo.commands.axes: true
            mcmmo.commands.excavation: true
@ -695,6 +713,8 @@ permissions:
        description: Allows access to the addxp command
    mcmmo.commands.addxp.others:
        description: Allows access to the addxp command for other players
+    mcmmo.commands.alchemy:
+        description: Allows access to the alchemy command
    mcmmo.commands.archery:
        description: Allows access to the archery command
    mcmmo.commands.axes:
@ -833,6 +853,7 @@ permissions:
        children:
            mcmmo.commands.mctop: true
            mcmmo.commands.mctop.acrobatics: true
+            mcmmo.commands.mctop.alchemy: true
            mcmmo.commands.mctop.archery: true
            mcmmo.commands.mctop.axes: true
            mcmmo.commands.mctop.excavation: true
@ -849,6 +870,8 @@ permissions:
        description: Allows access to the mctop command
    mcmmo.commands.mctop.acrobatics:
        description: Allows access to the mctop command for acrobatics
+    mcmmo.commands.mctop.alchemy:
+        description: Allows access to the mctop command for alchemy
    mcmmo.commands.mctop.archery:
        description: Allows access to the mctop command for archery
    mcmmo.commands.mctop.axes:
@ -1001,6 +1024,7 @@ permissions:
        children:
            mcmmo.commands.skillreset: true
            mcmmo.commands.skillreset.acrobatics: true
+            mcmmo.commands.skillreset.alchemy: true
            mcmmo.commands.skillreset.archery: true
            mcmmo.commands.skillreset.axes: true
            mcmmo.commands.skillreset.excavation: true
@ -1018,6 +1042,8 @@ permissions:
        description: Allows access to the skillreset command
    mcmmo.commands.skillreset.acrobatics:
        description: Allows access to the skillreset command for acrobatics
+    mcmmo.commands.skillreset.alchemy:
+        description: Allows access to the skillreset command for alchemy
    mcmmo.commands.skillreset.archery:
        description: Allows access to the skillreset command for archery
    mcmmo.commands.skillreset.axes:
@ -1040,6 +1066,7 @@ permissions:
        children:
            mcmmo.commands.skillreset.others: true
            mcmmo.commands.skillreset.others.acrobatics: true
+            mcmmo.commands.skillreset.others.alchemy: true
            mcmmo.commands.skillreset.others.archery: true
            mcmmo.commands.skillreset.others.axes: true
            mcmmo.commands.skillreset.others.excavation: true
@ -1056,6 +1083,8 @@ permissions:
        description: Allows access to the skillreset command for other players
    mcmmo.commands.skillreset.others.acrobatics:
        description: Allows access to the skillreset command for acrobatics for other players
+    mcmmo.commands.skillreset.others.alchemy:
+        description: Allows access to the skillreset command for alchemy for other players
    mcmmo.commands.skillreset.others.archery:
        description: Allows access to the skillreset command for archery for other players
    mcmmo.commands.skillreset.others.axes:
@ -1246,6 +1275,7 @@ permissions:
        description: Gives all abilities & skills a 33.3% better chance to activate.
        children:
            mcmmo.perks.lucky.acrobatics: true
+            mcmmo.perks.lucky.alchemy: true
            mcmmo.perks.lucky.archery: true
            mcmmo.perks.lucky.axes: true
            mcmmo.perks.lucky.excavation: true
@ -1261,6 +1291,9 @@ permissions:
    mcmmo.perks.lucky.acrobatics:
        default: false
        description: Gives Acrobatics abilities & skills a 33.3% better chance to activate.
+    mcmmo.perks.lucky.alchemy:
+        default: false
+        description: Gives Alchemy abilities & skills a 33.3% better chance to activate.
    mcmmo.perks.lucky.archery:
        default: false
        description: Gives Archery abilities & skills a 33.3% better chance to activate.
@ -1326,6 +1359,7 @@ permissions:
        description: Mulitplies incoming XP by 2.5
        children:
            mcmmo.perks.xp.150percentboost.acrobatics: true
+            mcmmo.perks.xp.150percentboost.alchemy: true
            mcmmo.perks.xp.150percentboost.archery: true
            mcmmo.perks.xp.150percentboost.axes: true
            mcmmo.perks.xp.150percentboost.excavation: true
@ -1341,6 +1375,9 @@ permissions:
    mcmmo.perks.xp.150percentboost.acrobatics:
        default: false
        description: Multiplies incoming Acrobatics XP by 2.5
+    mcmmo.perks.xp.150percentboost.alchemy:
+        default: false
+        description: Multiplies incoming Alchemy XP by 2.5
    mcmmo.perks.xp.150percentboost.archery:
        default: false
        description: Multiplies incoming Archery XP by 2.5
@ -1392,6 +1429,7 @@ permissions:
        description: Mulitplies incoming XP by 1.5
        children:
            mcmmo.perks.xp.50percentboost.acrobatics: true
+            mcmmo.perks.xp.50percentboost.alchemy: true
            mcmmo.perks.xp.50percentboost.archery: true
            mcmmo.perks.xp.50percentboost.axes: true
            mcmmo.perks.xp.50percentboost.excavation: true
@ -1407,6 +1445,9 @@ permissions:
    mcmmo.perks.xp.50percentboost.acrobatics:
        default: false
        description: Multiplies incoming Acrobatics XP by 1.5
+    mcmmo.perks.xp.50percentboost.alchemy:
+        default: false
+        description: Multiplies incoming Acrobatics XP by 1.5
    mcmmo.perks.xp.50percentboost.archery:
        default: false
        description: Multiplies incoming Archery XP by 1.5
@ -1458,6 +1499,7 @@ permissions:
        description: Doubles incoming XP
        children:
            mcmmo.perks.xp.double.acrobatics: true
+            mcmmo.perks.xp.double.alchemy: true
            mcmmo.perks.xp.double.archery: true
            mcmmo.perks.xp.double.axes: true
            mcmmo.perks.xp.double.excavation: true
@ -1473,6 +1515,9 @@ permissions:
    mcmmo.perks.xp.double.acrobatics:
        default: false
        description: Doubles incoming Acrobatics XP
+    mcmmo.perks.xp.double.alchemy:
+        default: false
+        description: Doubles incoming Alchemy XP
    mcmmo.perks.xp.double.archery:
        default: false
        description: Doubles incoming Archery XP
@ -1524,6 +1569,7 @@ permissions:
        description: Quadruples incoming XP
        children:
            mcmmo.perks.xp.quadruple.acrobatics: true
+            mcmmo.perks.xp.quadruple.alchemy: true
            mcmmo.perks.xp.quadruple.archery: true
            mcmmo.perks.xp.quadruple.axes: true
            mcmmo.perks.xp.quadruple.excavation: true
@ -1539,6 +1585,9 @@ permissions:
    mcmmo.perks.xp.quadruple.acrobatics:
        default: false
        description: Quadruples incoming Acrobatics XP
+    mcmmo.perks.xp.quadruple.alchemy:
+        default: false
+        description: Quadruples incoming Alchemy XP
    mcmmo.perks.xp.quadruple.archery:
        default: false
        description: Quadruples incoming Archery XP
@ -1590,6 +1639,7 @@ permissions:
        description: Triples incoming XP
        children:
            mcmmo.perks.xp.triple.acrobatics: true
+            mcmmo.perks.xp.triple.alchemy: true
            mcmmo.perks.xp.triple.archery: true
            mcmmo.perks.xp.triple.axes: true
            mcmmo.perks.xp.triple.excavation: true
@ -1605,6 +1655,9 @@ permissions:
    mcmmo.perks.xp.triple.acrobatics:
        default: false
        description: Triples incoming Acrobatics XP
+    mcmmo.perks.xp.triple.alchemy:
+        default: false
+        description: Triples incoming Acrobatics XP
    mcmmo.perks.xp.triple.archery:
        default: false
        description: Triples incoming Archery XP
@ -1656,6 +1709,7 @@ permissions:
        description: Implies all mcmmo.skills permissions.
        children:
            mcmmo.skills.acrobatics: true
+            mcmmo.skills.alchemy: true
            mcmmo.skills.archery: true
            mcmmo.skills.axes: true
            mcmmo.skills.excavation: true
@ -1673,6 +1727,11 @@ permissions:
        children:
            mcmmo.ability.acrobatics.all: true
            mcmmo.commands.acrobatics: true
+    mcmmo.skills.alchemy:
+        description: Allows access to the Alchemy skill
+        children:
+            mcmmo.ability.alchemy.all: true
+            mcmmo.commands.alchemy: true
    mcmmo.skills.archery:
        description: Allows access to the Archery skill
        children:
--- a/src/main/resources/potions.yml
+++ b/src/main/resources/potions.yml
@ -0,0 +1,752 @@
+#
+#  Settings for Concoctions
+#  Last updated on ${project.version}-b${BUILD_NUMBER}
+###
+Concoctions:
+    Tier_One_Ingredients:
+        - BLAZE_POWDER
+        - FERMENTED_SPIDER_EYE
+        - GHAST_TEAR
+        - GLOWSTONE_DUST
+        - GOLDEN_CARROT
+        - MAGMA_CREAM
+        - NETHER_STALK
+        - REDSTONE
+        - SPECKLED_MELON
+        - SPIDER_EYE
+        - SUGAR
+        - SULPHUR
+        - WATER_LILY                        # TODO: 'RAW_FISH:3' (Minecraft 1.7)
+    Tier_Two_Ingredients:
+        - CARROT_ITEM
+        - SLIME_BALL
+    Tier_Three_Ingredients:
+        - QUARTZ
+        - RED_MUSHROOM
+    Tier_Four_Ingredients:
+        - APPLE
+        - ROTTEN_FLESH
+    Tier_Five_Ingredients:
+        - BROWN_MUSHROOM
+        - 'INK_SACK:0'
+    Tier_Six_Ingredients:
+        - 'LONG_GRASS:2'
+    Tier_Seven_Ingredients:
+        - POISONOUS_POTATO
+    Tier_Eight_Ingredients:
+        - 'GOLDEN_APPLE:0'
+
+#
+# Settings for Potions
+#
+#   <data_value>:                       Data value used for identifying this potion
+#       Name: <name>                    Custom display name for this potion (optional)
+#       Lore: ["lore1","lore2"...]      Custom lore for this potion (section is optional)
+#       Children:                       The potential children of this potion (section is optional)
+#           <INGREDIENT>: <NEW_DV>      The ingredient used, and resultant potion's new data value
+#       Effects:                        List of strings for the potion's effects (section is optional)
+#           - "<POTION_EFFECT> [EFFECT_TIER] [DURATION_TICKS]"
+#
+#   DataValues - These potions follow the normal data value pattern except for bits 8-12:
+#       Bits 0-3: Liquid Color (http://minecraft.gamepedia.com/Data_values#Potions)
+#       Bit 4: (Unused)
+#       Bit 5: Power
+#       Bit 6: Extended
+#       Bit 7: (Unused)
+#       Bits 8-12: Custom Status Effect (http://minecraft.gamepedia.com/Data_values#Status_effects)
+#       Bit 13: Can become splash
+#       Bit 14: Splash
+#       Bit 15: (Unused)
+###
+Potions:
+
+    ### NON-EFFECT POTIONS #####################################################
+
+    0: # Water Bottle
+        Children:
+            BLAZE_POWDER: 8192          # Mundane Potion
+            FERMENTED_SPIDER_EYE: 4616  # Potion of Weakness
+            GHAST_TEAR: 8192            # Mundane Potion
+            GLOWSTONE_DUST: 32          # Thick Potion
+            MAGMA_CREAM: 8192           # Mundane Potion
+            NETHER_STALK: 16            # Awkward Potion
+            REDSTONE: 64                # Mundane Potion Extended
+            SPECKLED_MELON: 8192        # Mundane Potion
+            SPIDER_EYE: 8192            # Mundane Potion
+            SUGAR: 8192                 # Mundane Potion
+
+    16: # Awkward Potion
+        Children:
+            APPLE: 5376                 # Potion of Health Boost
+            BLAZE_POWDER: 1289          # Potion of Strength
+            BROWN_MUSHROOM: 2304        # Potion of Nausea
+            CARROT_ITEM: 768            # Potion of Haste
+            FERMENTED_SPIDER_EYE: 4616  # Potion of Weakness
+            GHAST_TEAR: 2561            # Potion of Regeneration
+            'GOLDEN_APPLE:0': 2816      # Potion of Resistance
+            GOLDEN_CARROT: 4102         # Potion of Night Vision
+            'INK_SACK:0': 3840          # Potion of Blindness
+            'LONG_GRASS:2': 5888        # Potion of Saturation
+            MAGMA_CREAM: 3075           # Potion of Fire Resistance
+            POISONOUS_POTATO: 5120      # Potion of Decay
+            QUARTZ: 5632                # Potion of Absorption
+            RED_MUSHROOM: 2048          # Potion of Leaping
+            ROTTEN_FLESH: 4352          # Potion of Hunger
+            SLIME_BALL: 1024            # Potion of Dullness
+            SPECKLED_MELON: 1541        # Potion of Healing
+            SPIDER_EYE: 4868            # Potion of Poison
+            SUGAR: 258                  # Potion of Swiftness
+            WATER_LILY: 3341            # Potion of Water Breathing (Minecraft 1.6)
+            # 'RAW_FISH:3': 3341          # TODO: Potion of Water Breathing (Minecraft 1.7)
+
+    32: # Thick Potion
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+
+    64: # Mundane Potion Extended
+        Children:
+            FERMENTED_SPIDER_EYE: 4680
+
+    8192: # Mundane Potion
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+            SULPHUR: 16384
+
+    ### DRINKABLE POTIONS ######################################################
+
+    258: # Potion of Swiftness
+        Effects: ["SPEED 0 3600"]        
+        Children:
+            FERMENTED_SPIDER_EYE: 522
+            GLOWSTONE_DUST: 290
+            REDSTONE: 322
+            SULPHUR: 16642
+    290: # Potion of Swiftness II
+        Effects: ["SPEED 1 1800"]        
+        Children:
+            FERMENTED_SPIDER_EYE: 586
+            REDSTONE: 322
+            SULPHUR: 16642
+    322: # Potion of Swiftness Extended
+        Effects: ["SPEED 0 9600"]        
+        Children:
+            FERMENTED_SPIDER_EYE: 522
+            GLOWSTONE_DUST: 290
+            SULPHUR: 16706
+
+    522: # Potion of Slowness
+        Effects: ["SLOW 0 1800"]        
+        Children:
+            REDSTONE: 586
+            SULPHUR: 16906
+    586: # Potion of Slowness Extended
+        Effects: ["SLOW 0 4800"]        
+        Children:
+            GLOWSTONE_DUST: 522
+            SULPHUR: 16970
+
+
+    768: # Potion of Haste
+        Effects: ["FAST_DIGGING 0 3600"]        
+        Children:
+            GLOWSTONE_DUST: 800
+            REDSTONE: 832
+            SULPHUR: 17152
+
+    800: # Potion of Haste II
+        Effects: ["FAST_DIGGING 1 1800"]
+        Children:
+            REDSTONE: 832
+            SULPHUR: 17184
+
+    832: # Potion of Haste Extended
+        Effects: ["FAST_DIGGING 0 9600"]        
+        Children:
+            GLOWSTONE_DUST: 800
+            SULPHUR: 17216
+
+    1024: # Potion of Dullness
+        Effects: ["SLOW_DIGGING 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 1056
+            REDSTONE: 1088
+            SULPHUR: 17408
+    1056: # Potion of Dullness II
+        Effects: ["SLOW_DIGGING 1 1800"]
+        Children:
+            REDSTONE: 1088
+            SULPHUR: 17408
+    1088: # Potion of Dullness Extended
+        Effects: ["SLOW_DIGGING 0 9600"]
+        Children:
+            GLOWSTONE_DUST: 1056
+            SULPHUR: 17472
+
+    1289: # Potion of Strength
+        Effects: ["INCREASE_DAMAGE 0 3600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+            GLOWSTONE_DUST: 1321
+            REDSTONE: 1353
+            SULPHUR: 17673
+    1321: # Potion of Strength II
+        Effects: ["INCREASE_DAMAGE 1 1800"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+            REDSTONE: 1353
+            SULPHUR: 17705
+    1353: # Potion of Strength Extended
+        Effects: ["INCREASE_DAMAGE 0 9600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4680
+            GLOWSTONE_DUST: 1321
+            SULPHUR: 17737
+
+    1541: # Potion of Healing
+        Effects: ["HEAL 0"]
+        Children:
+            FERMENTED_SPIDER_EYE: 1804
+            GLOWSTONE_DUST: 1573
+            SULPHUR: 17925
+    1573: # Potion of Healing II
+        Effects: ["HEAL 1"]
+        Children:
+            FERMENTED_SPIDER_EYE: 1836
+            REDSTONE: 1541
+            SULPHUR: 17957
+
+    1804: # Potion of Harming
+        Effects: ["HARM 0"]
+        Children:
+            GLOWSTONE_DUST: 1836
+            SULPHUR: 18188
+    1836: # Potion of Harming II
+        Effects: ["HARM 1"]
+        Children:
+            REDSTONE: 1804
+            SULPHUR: 18220
+
+    2048: # Potion of Leaping
+        Effects: ["JUMP 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 2080
+            REDSTONE: 2112
+            SULPHUR: 18432
+    2080: # Potion of Leaping II
+        Effects: ["JUMP 1 1800"]
+        Children:
+            REDSTONE: 2112
+            SULPHUR: 18464
+    2112: # Potion of Leaping Extended
+        Effects: ["JUMP 0 9600"]
+        Children:
+            GLOWSTONE_DUST: 2080
+            SULPHUR: 18496
+
+    2304: # Potion of Nausea
+        Effects: ["CONFUSION 0 450"]
+        Children:
+            REDSTONE: 2368
+            SULPHUR: 18688
+    2368: # Potion of Nausea Extended
+        Effects: ["CONFUSION 0 1200"]
+        Children:
+            GLOWSTONE_DUST: 2304
+            SULPHUR: 18752
+
+    2561: # Potion of Regeneration
+        Effects: ["REGENERATION 0 900"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+            GLOWSTONE_DUST: 2593
+            REDSTONE: 2625
+            SULPHUR: 18945
+    2593: # Potion of Regeneration II
+        Effects: ["REGENERATION 1 450"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4616
+            REDSTONE: 2625
+            SULPHUR: 18977
+    2625: # Potion of Regeneration Extended
+        Effects: ["REGENERATION 0 2400"]
+        Children:
+            FERMENTED_SPIDER_EYE: 4680
+            GLOWSTONE_DUST: 2593
+            SULPHUR: 19009
+
+    2816: # Potion of Resistance
+        Effects: ["DAMAGE_RESISTANCE 0 450"]
+        Children:
+            GLOWSTONE_DUST: 2848
+            REDSTONE: 2880
+            SULPHUR: 19200
+    2848: # Potion of Resistance II
+        Effects: ["DAMAGE_RESISTANCE 1 225"]
+        Children:
+            REDSTONE: 2880
+            SULPHUR: 19232
+    2880: # Potion of Resistance Extended
+        Effects: ["DAMAGE_RESISTANCE 0 1200"]
+        Children:
+            GLOWSTONE_DUST: 2848
+            SULPHUR: 19264
+
+    3075: # Potion of Fire Resistance
+        Effects: ["FIRE_RESISTANCE 0 3600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 522
+            REDSTONE: 3139
+            SULPHUR: 19459
+    3139: # Potion of Fire Resistance Extended
+        Effects: ["FIRE_RESISTANCE 0 9600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 586
+            GLOWSTONE_DUST: 3075
+            SULPHUR: 19523
+
+    3341: # Potion of Water Breathing
+        Effects: ["WATER_BREATHING 0 3600"]
+        Children:
+            REDSTONE: 3405
+            SULPHUR: 19725
+    3405: # Potion of Water Breathing Extended
+        Effects: ["WATER_BREATHING 0 9600"]
+        Children:
+            GLOWSTONE_DUST: 3341
+            SULPHUR: 19789
+
+    3598: # Potion of Invisibility
+        Effects: ["INVISIBILITY 0 3600"]
+        Children:
+            REDSTONE: 3662
+            SULPHUR: 19982
+    3662: # Potion of Invisibility Extended
+        Effects: ["INVISIBILITY 0 9600"]
+        Children:
+            GLOWSTONE_DUST: 3598
+            SULPHUR: 20046
+
+    3840: # Potion of Blindness
+        Effects: ["BLINDNESS 0 225"]
+        Children:
+            REDSTONE: 3904
+            SULPHUR: 20224
+    3904: # Potion of Blindness Extended
+        Effects: ["BLINDNESS 0 600"]
+        Children:
+            GLOWSTONE_DUST: 3840
+            SULPHUR: 20288
+
+    4102: # Potion of Night Vision
+        Effects: ["NIGHT_VISION 0 3600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 3598
+            REDSTONE: 4166
+            SULPHUR: 20486
+    4166: # Potion of Night Vision Extended
+        Effects: ["NIGHT_VISION 0 9600"]
+        Children:
+            FERMENTED_SPIDER_EYE: 3662
+            GLOWSTONE_DUST: 4102
+            SULPHUR: 20550
+
+    4352: # Potion of Hunger
+        Effects: ["HUNGER 0 900"]
+        Children:
+            GLOWSTONE_DUST: 4384
+            REDSTONE: 4416
+            SULPHUR: 20736
+    4284: # Potion of Hunger II
+        Effects: ["HUNGER 1 450"]
+        Children:
+            REDSTONE: 4416
+            SULPHUR: 20768
+    4416: # Potion of Hunger Extended
+        Effects: ["HUNGER 0 2400"]
+        Children:
+            GLOWSTONE_DUST: 4384
+            SULPHUR: 20800
+
+    4616: # Potion of Weakness
+        Effects: ["WEAKNESS 0 1800"]
+        Children:
+            REDSTONE: 4680
+            SULPHUR: 21000
+    4680: # Potion of Weakness Extended
+        Effects: ["WEAKNESS 0 4800"]
+        Children:
+            GLOWSTONE_DUST: 4616
+            SULPHUR: 21064
+
+    4868: # Potion of Poison
+        Effects: ["POISON 0 900"]
+        Children:
+            FERMENTED_SPIDER_EYE: 1804
+            GLOWSTONE_DUST: 4900
+            REDSTONE: 4932
+            SULPHUR: 21252
+    4900: # Potion of Poison II
+        Effects: ["POISON 1 450"]
+        Children:
+            FERMENTED_SPIDER_EYE: 1836
+            REDSTONE: 4932
+            SULPHUR: 21284
+    4932: # Potion of Poison Extended
+        Effects: ["POISON 0 2400"]
+        Children:
+            FERMENTED_SPIDER_EYE: 1804
+            GLOWSTONE_DUST: 4900
+            SULPHUR: 21284
+
+    5120: # Potion of Decay
+        Effects: ["WITHER 0 450"]
+        Children:
+            GLOWSTONE_DUST: 5152
+            REDSTONE: 5184
+            SULPHUR: 21504
+    5152: # Potion of Decay II
+        Effects: ["WITHER 1 225"]
+        Children:
+            REDSTONE: 5184
+            SULPHUR: 21536
+    5184: # Potion of Decay Extended
+        Effects: ["WITHER 0 1200"]
+        Children:
+            GLOWSTONE_DUST: 5152
+            SULPHUR: 21568
+
+    5376: # Potion of Health Boost
+        Effects: ["HEALTH_BOOST 0 1800"]
+        Children:
+            GLOWSTONE_DUST: 5408
+            REDSTONE: 5440
+            SULPHUR: 21760
+    5408: # Potion of Health Boost II
+        Effects: ["HEALTH_BOOST 1 900"]
+        Children:
+            REDSTONE: 5440
+            SULPHUR: 21792
+    5440: # Potion of Health Boost Extended
+        Effects: ["HEALTH_BOOST 0 4800"]
+        Children:
+            GLOWSTONE_DUST: 5408
+            SULPHUR: 21824
+
+    5632: # Potion of Absorption
+        Effects: ["ABSORPTION 0 1800"]
+        Children:
+            GLOWSTONE_DUST: 5664
+            REDSTONE: 5696
+            SULPHUR: 22016
+    5664: # Potion of Absorption II
+        Effects: ["ABSORPTION 1 900"]
+        Children:
+            REDSTONE: 5696
+            SULPHUR: 22048
+    5696: # Potion of Absorption Extended
+        Effects: ["ABSORPTION 0 4800"]
+        Children:
+            GLOWSTONE_DUST: 5664
+            SULPHUR: 22080
+
+    5888: # Potion of Saturation
+        Effects: ["SATURATION 0 8"]
+        Children:
+            GLOWSTONE_DUST: 5920
+            SULPHUR: 22272
+    5920: # Potion of Saturation II
+        Effects: ["SATURATION 1 8"]
+        Children:
+            REDSTONE: 5888
+            SULPHUR: 22304
+
+    ### SPLASH POTIONS #########################################################
+
+    16384: # Splash Mundane Potion
+        Children:
+            FERMENTED_SPIDER_EYE: 21000
+
+    16642: # Splash Potion of Swiftness
+        Effects: ["SPEED 0 2700"]
+        Children:
+            FERMENTED_SPIDER_EYE: 16906
+            GLOWSTONE_DUST: 16674
+            REDSTONE: 16706
+    16674: # Splash Potion of Swiftness II
+        Effects: ["SPEED 1 1350"]
+        Children:
+            FERMENTED_SPIDER_EYE: 16906
+            REDSTONE: 16706
+    16706: # Splash Potion of Swiftness Extended
+        Effects: ["SPEED 0 7200"]
+        Children:
+            FERMENTED_SPIDER_EYE: 16906
+            GLOWSTONE_DUST: 16674
+
+    16906: # Splash Potion of Slowness
+        Effects: ["SLOW 0 1350"]
+        Children:
+            REDSTONE: 16970
+    16970: # Splash Potion of Slowness Extended
+        Effects: ["SLOW 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 16906
+
+    17152: # Splash Potion of Haste
+        Effects: ["FAST_DIGGING 0 2700"]
+        Children:
+            GLOWSTONE_DUST: 17184
+            REDSTONE: 17216
+    17184: # Splash Potion of Haste II
+        Effects: ["FAST_DIGGING 1 1350"]
+        Children:
+            REDSTONE: 17216
+    17216: # Splash Potion of Haste Extended
+        Effects: ["FAST_DIGGING 0 7200"]
+        Children:
+            GLOWSTONE_DUST: 17184
+
+    17408: # Splash Potion of Dullness
+        Effects: ["SLOW_DIGGING 0 2700"]
+        Children:
+            GLOWSTONE_DUST: 17440
+            REDSTONE: 17472
+    17440: # Splash Potion of Dullness II
+        Effects: ["SLOW_DIGGING 1 1350"]
+        Children:
+            REDSTONE: 17472
+    17472: # Splash Potion of Dullness Extended
+        Effects: ["SLOW_DIGGING 0 7200"]
+        Children:
+            GLOWSTONE_DUST: 17440
+
+    17673: # Splash Potion of Strength
+        Effects: ["INCREASE_DAMAGE 0 2700"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21000
+            GLOWSTONE_DUST: 17705
+            REDSTONE: 17737
+    17705: # Splash Potion of Strength II
+        Effects: ["INCREASE_DAMAGE 1 1350"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21000
+            REDSTONE: 17737
+    17737: # Splash Potion of Strength Extended
+        Effects: ["INCREASE_DAMAGE 0 7200"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21064
+            GLOWSTONE_DUST: 17705
+
+    17925: # Splash Potion of Healing
+        Effects: ["HEAL 0"]
+        Children:
+            FERMENTED_SPIDER_EYE: 18188
+            GLOWSTONE_DUST: 17957
+    17957: # Splash Potion of Healing II
+        Effects: ["HEAL 1"]
+        Children:
+            FERMENTED_SPIDER_EYE: 18220
+            REDSTONE: 17925
+
+    18188: # Splash Potion of Harming
+        Effects: ["HARM 0"]
+        Children:
+            GLOWSTONE_DUST: 18220
+    18220: # Splash Potion of Harming II
+        Effects: ["HARM 1"]
+        Children:
+            REDSTONE: 18188
+
+    18432: # Splash Potion of Leaping
+        Effects: ["JUMP 0 2700"]
+        Children:
+            GLOWSTONE_DUST: 18464
+            REDSTONE: 18496
+    18464: # Splash Potion of Leaping II
+        Effects: ["JUMP 1 1350"]
+        Children:
+            REDSTONE: 18496
+    18496: # Splash Potion of Leaping Extended
+        Effects: ["JUMP 0 7200"]
+        Children:
+            GLOWSTONE_DUST: 18464
+
+    18688: # Splash Potion of Nausea
+        Effects: ["CONFUSION 0 338"]
+        Children:
+            REDSTONE: 18752
+    18752: # Splash Potion of Nausea Extended
+        Effects: ["CONFUSION 0 900"]
+        Children:
+            GLOWSTONE_DUST: 18688
+
+    18945: # Splash Potion of Regeneration
+        Effects: ["REGENERATION 0 675"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21000
+            GLOWSTONE_DUST: 18977
+            REDSTONE: 19009
+    18977: # Splash Potion of Regeneration II
+        Effects: ["REGENERATION 1 338"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21000
+            REDSTONE: 19009
+    19009: # Splash Potion of Regeneration Extended
+        Effects: ["REGENERATION 0 1800"]
+        Children:
+            FERMENTED_SPIDER_EYE: 21064
+            GLOWSTONE_DUST: 18977
+
+    19200: # Splash Potion of Resistance
+        Effects: ["DAMAGE_RESISTANCE 0 338"]
+        Children:
+            GLOWSTONE_DUST: 19232
+            REDSTONE: 19264
+    19232: # Splash Potion of Resistance II
+        Effects: ["DAMAGE_RESISTANCE 1 169"]
+        Children:
+            REDSTONE: 19264
+    19264: # Splash Potion of Resistance Extended
+        Effects: ["DAMAGE_RESISTANCE 0 900"]
+        Children:
+            GLOWSTONE_DUST: 19232
+
+    19459: # Splash Potion of Fire Resistance
+        Effects: ["FIRE_RESISTANCE 0 2700"]
+        Children:
+            FERMENTED_SPIDER_EYE: 16906
+            REDSTONE: 19523
+    19523: # Splash Potion of Fire Resistance Extended
+        Effects: ["FIRE_RESISTANCE 0 7200"]
+        Children:
+            FERMENTED_SPIDER_EYE: 16970
+            GLOWSTONE_DUST: 19459
+
+    19725: # Splash Potion of Water Breathing
+        Effects: ["WATER_BREATHING 0 2700"]
+        Children:
+            REDSTONE: 19789
+    19789: # Splash Potion of Water Breathing Extended
+        Effects: ["WATER_BREATHING 0 7200"]
+        Children:
+            GLOWSTONE_DUST: 19725
+
+    19982: # Splash Potion of Invisibility
+        Effects: ["INVISIBILITY 0 2700"]
+        Children:
+            REDSTONE: 20046
+    20046: # Splash Potion of Invisibility Extended
+        Effects: ["INVISIBILITY 0 7200"]
+        Children:
+            GLOWSTONE_DUST: 19982
+
+    20224: # Splash Potion of Blindness
+        Effects: ["BLINDNESS 0 169"]
+        Children:
+            REDSTONE: 20288
+    20288: # Splash Potion of Blindness Extended
+        Effects: ["BLINDNESS 0 450"]
+        Children:
+            GLOWSTONE_DUST: 20224
+
+    20486: # Splash Potion of Night Vision
+        Effects: ["NIGHT_VISION 0 2700"]
+        Children:
+            FERMENTED_SPIDER_EYE: 19982
+            REDSTONE: 20550
+    20550: # Splash Potion of Night Vision Extended
+        Effects: ["NIGHT_VISION 0 7200"]
+        Children:
+            FERMENTED_SPIDER_EYE: 20046
+            GLOWSTONE_DUST: 20486
+
+    20736: # Splash Potion of Hunger
+        Effects: ["HUNGER 0 675"]
+        Children:
+            GLOWSTONE_DUST: 20768
+            REDSTONE: 20800
+    20768: # Splash Potion of Hunger II
+        Effects: ["HUNGER 1 338"]
+        Children:
+            REDSTONE: 20800
+    20800: # Splash Potion of Hunger Extended
+        Effects: ["HUNGER 0 1800"]
+        Children:
+            GLOWSTONE_DUST: 20768
+
+    21000: # Splash Potion of Weakness
+        Effects: ["WEAKNESS 0 1350"]
+        Children:
+            REDSTONE: 21064
+    21064: # Splash Potion of Weakness Extended
+        Effects: ["WEAKNESS 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 21000
+
+    21252: # Splash Potion of Poison
+        Effects: ["POISON 0 675"]
+        Children:
+            FERMENTED_SPIDER_EYE: 18188
+            GLOWSTONE_DUST: 21284
+            REDSTONE: 21316
+    21284: # Splash Potion of Poison II
+        Effects: ["POISON 1 338"]
+        Children:
+            FERMENTED_SPIDER_EYE: 18220
+            REDSTONE: 21316
+    21316: # Splash Potion of Poison Extended
+        Effects: ["POISON 0 1800"]
+        Children:
+            FERMENTED_SPIDER_EYE: 18188
+            GLOWSTONE_DUST: 21284
+
+    21504: # Splash Potion of Decay
+        Effects: ["WITHER 0 338"]
+        Children:
+            GLOWSTONE_DUST: 21536
+            REDSTONE: 21568
+    21536: # Splash Potion of Decay II
+        Effects: ["WITHER 1 169"]
+        Children:
+            REDSTONE: 21568
+    21568: # Splash Potion of Decay Extended
+        Effects: ["WITHER 0 900"]
+        Children:
+            GLOWSTONE_DUST: 21536
+
+    21760: # Splash Potion of Health Boost
+        Effects: ["HEALTH_BOOST 0 1350"]
+        Children:
+            GLOWSTONE_DUST: 21792
+            REDSTONE: 5440
+    21792: # Splash Potion of Health Boost II
+        Effects: ["HEALTH_BOOST 1 675"]
+        Children:
+            REDSTONE: 21824
+    21824: # Splash Potion of Health Boost Extended
+        Effects: ["HEALTH_BOOST 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 21792
+
+    22016: # Splash Potion of Absorption
+        Effects: ["ABSORPTION 0 1350"]
+        Children:
+            GLOWSTONE_DUST: 22048
+            REDSTONE: 22080
+    22048: # Splash Potion of Absorption II
+        Effects: ["ABSORPTION 1 675"]
+        Children:
+            REDSTONE: 22080
+    22080: # Splash Potion of Absorption Extended
+        Effects: ["ABSORPTION 0 3600"]
+        Children:
+            GLOWSTONE_DUST: 22048
+
+    22272: # Splash Potion of Saturation
+        Effects: ["SATURATION 0 6"]
+        Children:
+            GLOWSTONE_DUST: 22304
+    22304: # Splash Potion of Saturation II
+        Effects: ["SATURATION 1 6"]
+        Children:
+            REDSTONE: 22272