Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

fix: rings

Browse source
This commit is contained in:
Michael Hillcox 2021-11-21 20:02:08 +00:00
parent 3980b8dc46
commit b3a00f8d4e
1 changed files with 82 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java
View file

@ -21,120 +21,110 @@ import net.minecraft.potion.Effects;
public enum ThePotionRings { public enum ThePotionRings {
SPEED( SPEED(
Effects.MOVEMENT_SPEED.getDescriptionId(), 8171462,
8171462, Effects.MOVEMENT_SPEED,
Effects.MOVEMENT_SPEED, 0,
0, 1,
1, 10,
10, false,
false, Rarity.UNCOMMON,
Rarity.UNCOMMON, new ItemStack(Items.SUGAR)
new ItemStack(Items.SUGAR)
), ),
//Slowness //Slowness
HASTE( HASTE(
Effects.HASTE.getName(), 14270531,
14270531, Effects.DIG_SPEED, // todo: wrong
MobEffects.HASTE, 0,
0, 1,
1, 10,
10, false,
false, Rarity.EPIC,
Rarity.EPIC, new ItemStack(Items.REPEATER)
new ItemStack(Items.REPEATER)
), ),
//Mining Fatigue //Mining Fatigue
STRENGTH( STRENGTH(
MobEffects.STRENGTH.getName(), 9643043,
9643043, Effects.DAMAGE_BOOST, // TODO: wrong?
MobEffects.STRENGTH, 0,
0, 1,
1, 10,
10, false,
false, Rarity.RARE,
Rarity.RARE, new ItemStack(Items.BLAZE_POWDER)
new ItemStack(Items.BLAZE_POWDER)
), ),
//Health (Not Happening) //Health (Not Happening)
//Damage //Damage
JUMP_BOOST( JUMP_BOOST(
MobEffects.JUMP_BOOST.getName(), 7889559,
7889559, Effects.JUMP,
MobEffects.JUMP_BOOST, 0,
0, 1,
1, 10,
10, false,
false, Rarity.RARE,
Rarity.RARE, new ItemStack(Blocks.PISTON)
new ItemStack(Blocks.PISTON)
), ),
//Nausea //Nausea
REGEN( REGEN(
MobEffects.REGENERATION.getName(), 13458603,
13458603, Effects.REGENERATION,
MobEffects.REGENERATION, 0,
0, 1,
1, 50,
50, true,
true, Rarity.RARE,
Rarity.RARE, new ItemStack(Items.GHAST_TEAR)
new ItemStack(Items.GHAST_TEAR)
), ),
RESISTANCE( RESISTANCE(
MobEffects.RESISTANCE.getName(), 10044730,
10044730, Effects.DAMAGE_RESISTANCE,
MobEffects.RESISTANCE, 0,
0, 1,
1, 10,
10, false,
false, Rarity.EPIC,
Rarity.EPIC, new ItemStack(Items.SLIME_BALL)
new ItemStack(Items.SLIME_BALL)
), ),
FIRE_RESISTANCE( FIRE_RESISTANCE(
MobEffects.FIRE_RESISTANCE.getName(), 14981690,
14981690, Effects.FIRE_RESISTANCE,
MobEffects.FIRE_RESISTANCE, 0,
0, 0,
0, 10,
10, false,
false, Rarity.UNCOMMON,
Rarity.UNCOMMON, new ItemStack(Items.MAGMA_CREAM)
new ItemStack(Items.MAGMA_CREAM)
), ),
WATER_BREATHING( WATER_BREATHING(
MobEffects.WATER_BREATHING.getName(), 3035801,
3035801, Effects.WATER_BREATHING,
MobEffects.WATER_BREATHING, 0,
0, 0,
0, 10,
10, false,
false, Rarity.RARE,
Rarity.RARE, new ItemStack(Items.TROPICAL_FISH)
new ItemStack(Items.FISH, 1, 3)
), ),
INVISIBILITY( INVISIBILITY(
MobEffects.INVISIBILITY.getName(), 8356754,
8356754, Effects.INVISIBILITY,
MobEffects.INVISIBILITY, 0,
0, 0,
0, 10,
10, false,
false, Rarity.EPIC,
Rarity.EPIC, new ItemStack(Items.FERMENTED_SPIDER_EYE)
new ItemStack(Items.FERMENTED_SPIDER_EYE)
), ),
//Blindness //Blindness
NIGHT_VISION( NIGHT_VISION(
MobEffects.NIGHT_VISION.getName(), 2039713,
2039713, Effects.NIGHT_VISION,
MobEffects.NIGHT_VISION, 0,
0, 0,
0, 300,
300, false,
false, Rarity.RARE,
Rarity.RARE, new ItemStack(Items.GOLDEN_CARROT)
new ItemStack(Items.GOLDEN_CARROT)
); );
//Hunger //Hunger
//Weakness //Weakness
@ -153,8 +143,8 @@ public enum ThePotionRings {
public final boolean needsWaitBeforeActivating; public final boolean needsWaitBeforeActivating;
public final ItemStack craftingItem; public final ItemStack craftingItem;
ThePotionRings(String name, int color, Effect effect, int normalAmplifier, int advancedAmplifier, int activeTime, boolean needsWaitBeforeActivating, Rarity rarity, ItemStack craftingItem) { ThePotionRings(int color, Effect effect, int normalAmplifier, int advancedAmplifier, int activeTime, boolean needsWaitBeforeActivating, Rarity rarity, ItemStack craftingItem) {
this.name = name; this.name = effect.getDisplayName().getString();
this.color = color; this.color = color;
this.rarity = rarity; this.rarity = rarity;
this.effect = effect; this.effect = effect;