EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 06:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Added POTION_OF_OOZING & POTION_OF_INFESTATION to alchemy

Browse Source 
Added the new 1.21 potions to alchemy
Added all new potion effect types
This commit is contained in:
rasmus123d 2024-08-14 16:11:46 +02:00
parent 13dd8dad2a
commit 8143bd6124
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/resources/potions.yml
View File

@ -19,6 +19,8 @@ Concoctions:
- WATER_LILY
- PUFFERFISH
- DRAGON_BREATH
- STONE
- SLIME_BLOCK
Tier_Two_Ingredients:
- CARROT
- SLIME_BALL
@ -79,6 +81,8 @@ Potions:
BLAZE_POWDER: POTION_OF_MUNDANE
REDSTONE: POTION_OF_MUNDANE
RABBIT_FOOT: POTION_OF_MUNDANE
STONE: POTION_OF_MUNDANE
SLIME_BLOCK: POTION_OF_MUNDANE
POTION_OF_WATER_UNCRAFTABLE:
Material: POTION
PotionData:
@ -96,6 +100,8 @@ Potions:
BLAZE_POWDER: POTION_OF_MUNDANE
REDSTONE: POTION_OF_MUNDANE
RABBIT_FOOT: POTION_OF_MUNDANE
STONE: POTION_OF_MUNDANE
SLIME_BLOCK: POTION_OF_MUNDANE
POTION_OF_MUNDANE:
Material: POTION
PotionData:
@ -135,6 +141,8 @@ Potions:
GHAST_TEAR: POTION_OF_REGENERATION
TURTLE_HELMET: POTION_OF_TURTLE_MASTER
RABBIT_FOOT: POTION_OF_LEAPING
STONE: POTION_OF_INFESTATION
SLIME_BLOCK: POTION_OF_OOZING
POTION_OF_NIGHT_VISION:
Material: POTION
PotionData:
@ -421,6 +429,18 @@ Potions:
Extended: true
Children:
GUNPOWDER: SPLASH_POTION_OF_SLOW_FALLING_EXTENDED
POTION_OF_INFESTATION:
Material: POTION
PotionData:
PotionType: INFESTED
Children:
GUNPOWDER: SPLASH_POTION_OF_INFESTATION
POTION_OF_OOZING:
Material: POTION
PotionData:
PotionType: OOZING
Children:
GUNPOWDER: SPLASH_POTION_OF_OOZING
POTION_OF_ABSORPTION:
Name: Potion Of Absorption
Material: POTION
@ -704,6 +724,8 @@ Potions:
SPIDER_EYE: SPLASH_POTION_OF_MUNDANE
REDSTONE: SPLASH_POTION_OF_MUNDANE
MAGMA_CREAM: SPLASH_POTION_OF_MUNDANE
STONE: SPLASH_POTION_OF_MUNDANE
SLIME_BLOCK: SPLASH_POTION_OF_MUNDANE
SPLASH_POTION_OF_MUNDANE:
Material: SPLASH_POTION
PotionData:
@ -743,6 +765,8 @@ Potions:
SPIDER_EYE: SPLASH_POTION_OF_POISON
INK_SAC: SPLASH_POTION_OF_BLINDNESS
PUFFERFISH: SPLASH_POTION_OF_WATER_BREATHING
STONE: SPLASH_POTION_OF_INFESTATION
SLIME_BLOCK: SPLASH_POTION_OF_OOZING
SPLASH_POTION_OF_NIGHT_VISION:
Material: SPLASH_POTION
PotionData:
@ -1029,6 +1053,18 @@ Potions:
Extended: true
Children:
DRAGON_BREATH: LINGERING_POTION_OF_SLOW_FALLING_EXTENDED
SPLASH_POTION_OF_INFESTATION:
Material: SPLASH_POTION
PotionData:
PotionType: INFESTED
Children:
DRAGON_BREATH: LINGERING_POTION_OF_INFESTATION
SPLASH_POTION_OF_OOZING:
Material: SPLASH_POTION
PotionData:
PotionType: OOZING
Children:
DRAGON_BREATH: LINGERING_POTION_OF_OOZING
SPLASH_POTION_OF_ABSORPTION:
Name: Splash Potion Of Absorption
Material: SPLASH_POTION
@ -1309,6 +1345,8 @@ Potions:
SUGAR: LINGERING_POTION_OF_MUNDANE
SPIDER_EYE: LINGERING_POTION_OF_MUNDANE
MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE
STONE: LINGERING_POTION_OF_MUNDANE
SLIME_BLOCK: LINGERING_POTION_OF_MUNDANE
LINGERING_POTION_OF_MUNDANE:
Material: LINGERING_POTION
PotionData:
@ -1343,6 +1381,8 @@ Potions:
ROTTEN_FLESH: LINGERING_POTION_OF_HUNGER
MAGMA_CREAM: LINGERING_POTION_OF_FIRE_RESISTANCE
PUFFERFISH: LINGERING_POTION_OF_WATER_BREATHING
STONE: LINGERING_POTION_OF_INFESTATION
SLIME_BLOCK: LINGERING_POTION_OF_OOZING
LINGERING_POTION_OF_NIGHT_VISION:
Material: LINGERING_POTION
PotionData:
@ -1576,6 +1616,14 @@ Potions:
PotionData:
PotionType: SLOW_FALLING
Extended: true
LINGERING_POTION_OF_INFESTATION:
Material: LINGERING_POTION
PotionData:
PotionType: INFESTED
LINGERING_POTION_OF_OOZING:
Material: LINGERING_POTION
PotionData:
PotionType: OOZING
LINGERING_POTION_OF_ABSORPTION:
Name: Lingering Potion Of Absorption
Material: LINGERING_POTION

26
src/util/java/mcMMO/PotionConfigGenerator.java
View File

@ -104,6 +104,8 @@ public class PotionConfigGenerator {
case WEAKNESS :
case TURTLE_MASTER:
case SLOW_FALLING:
case INFESTED:
case OOZING:
return type.name();
default :
return "";
@ -310,6 +312,24 @@ public class PotionConfigGenerator {
return "CONDUIT_POWER";
case 30:
return "DOLPHINS_GRACE";
case 31:
return "BAD_OMEN";
case 32:
return "HERO_OF_THE_VILLAGE";
case 33:
return "DARKNESS";
case 34:
return "TRIAL_OMEN";
case 35:
return "RAID_OMEN";
case 36:
return "WIND_CHARGED";
case 37:
return "WEAVING";
case 38:
return "OOZING";
case 39:
return "INFESTED";
default :
return "UNKNOWN_EFFECT_TYPE_" + type.getId();
}
@ -362,6 +382,8 @@ public class PotionConfigGenerator {
children.put(new Ingredient(Material.MAGMA_CREAM), new WriteablePotion(current.mat, PotionType.MUNDANE));
children.put(new Ingredient(Material.GLISTERING_MELON_SLICE), new WriteablePotion(current.mat, PotionType.MUNDANE));
children.put(new Ingredient(Material.GHAST_TEAR), new WriteablePotion(current.mat, PotionType.MUNDANE));
children.put(new Ingredient(Material.STONE), new WriteablePotion(current.mat, PotionType.MUNDANE));
children.put(new Ingredient(Material.SLIME_BLOCK), new WriteablePotion(current.mat, PotionType.MUNDANE));
return;
case AWKWARD :
assert(!current.data.isExtended());
@ -377,6 +399,8 @@ public class PotionConfigGenerator {
children.put(new Ingredient(Material.BLAZE_POWDER), new WriteablePotion(current.mat, PotionType.STRENGTH));
children.put(new Ingredient(Material.TURTLE_HELMET), new WriteablePotion(current.mat, PotionType.TURTLE_MASTER));
children.put(new Ingredient(Material.PHANTOM_MEMBRANE), new WriteablePotion(current.mat, PotionType.SLOW_FALLING));
children.put(new Ingredient(Material.STONE), new WriteablePotion(current.mat, PotionType.INFESTATION));
children.put(new Ingredient(Material.SLIME_BLOCK), new WriteablePotion(current.mat, PotionType.OOZING));
// mcMMO custom potions
double mod = 1;
if (current.mat == Material.SPLASH_POTION) {
@ -503,6 +527,8 @@ public class PotionConfigGenerator {
children.put(new Ingredient(Material.REDSTONE), new WriteablePotion(current.mat, new PotionData(current.data.getType(), true, false)));
}
return;
case INFESTATION :
case OOZING :
case LUCK :
case MUNDANE :
case THICK :