Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +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

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

@ -21,7 +21,6 @@ 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,
@ -33,9 +32,8 @@ public enum ThePotionRings {
), ),
//Slowness //Slowness
HASTE( HASTE(
Effects.HASTE.getName(),
14270531, 14270531,
MobEffects.HASTE, Effects.DIG_SPEED, // todo: wrong
0, 0,
1, 1,
10, 10,
@ -45,9 +43,8 @@ public enum ThePotionRings {
), ),
//Mining Fatigue //Mining Fatigue
STRENGTH( STRENGTH(
MobEffects.STRENGTH.getName(),
9643043, 9643043,
MobEffects.STRENGTH, Effects.DAMAGE_BOOST, // TODO: wrong?
0, 0,
1, 1,
10, 10,
@ -58,9 +55,8 @@ public enum ThePotionRings {
//Health (Not Happening) //Health (Not Happening)
//Damage //Damage
JUMP_BOOST( JUMP_BOOST(
MobEffects.JUMP_BOOST.getName(),
7889559, 7889559,
MobEffects.JUMP_BOOST, Effects.JUMP,
0, 0,
1, 1,
10, 10,
@ -70,9 +66,8 @@ public enum ThePotionRings {
), ),
//Nausea //Nausea
REGEN( REGEN(
MobEffects.REGENERATION.getName(),
13458603, 13458603,
MobEffects.REGENERATION, Effects.REGENERATION,
0, 0,
1, 1,
50, 50,
@ -81,9 +76,8 @@ public enum ThePotionRings {
new ItemStack(Items.GHAST_TEAR) new ItemStack(Items.GHAST_TEAR)
), ),
RESISTANCE( RESISTANCE(
MobEffects.RESISTANCE.getName(),
10044730, 10044730,
MobEffects.RESISTANCE, Effects.DAMAGE_RESISTANCE,
0, 0,
1, 1,
10, 10,
@ -92,9 +86,8 @@ public enum ThePotionRings {
new ItemStack(Items.SLIME_BALL) new ItemStack(Items.SLIME_BALL)
), ),
FIRE_RESISTANCE( FIRE_RESISTANCE(
MobEffects.FIRE_RESISTANCE.getName(),
14981690, 14981690,
MobEffects.FIRE_RESISTANCE, Effects.FIRE_RESISTANCE,
0, 0,
0, 0,
10, 10,
@ -103,20 +96,18 @@ public enum ThePotionRings {
new ItemStack(Items.MAGMA_CREAM) new ItemStack(Items.MAGMA_CREAM)
), ),
WATER_BREATHING( WATER_BREATHING(
MobEffects.WATER_BREATHING.getName(),
3035801, 3035801,
MobEffects.WATER_BREATHING, Effects.WATER_BREATHING,
0, 0,
0, 0,
10, 10,
false, false,
Rarity.RARE, Rarity.RARE,
new ItemStack(Items.FISH, 1, 3) new ItemStack(Items.TROPICAL_FISH)
), ),
INVISIBILITY( INVISIBILITY(
MobEffects.INVISIBILITY.getName(),
8356754, 8356754,
MobEffects.INVISIBILITY, Effects.INVISIBILITY,
0, 0,
0, 0,
10, 10,
@ -126,9 +117,8 @@ public enum ThePotionRings {
), ),
//Blindness //Blindness
NIGHT_VISION( NIGHT_VISION(
MobEffects.NIGHT_VISION.getName(),
2039713, 2039713,
MobEffects.NIGHT_VISION, Effects.NIGHT_VISION,
0, 0,
0, 0,
300, 300,
@ -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;