Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

This fixes the effect command not accepting vanilla ids #558

Merged
merged 1 commit into from
Sep 1, 2017
Merged

This fixes the effect command not accepting vanilla ids #558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 36 additions & 30 deletions src/main/java/net/glowstone/constants/GlowPotionEffect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,28 @@
package net.glowstone.constants;

import static com.google.common.base.Preconditions.checkNotNull;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Color;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.Potion;
import org.bukkit.potion.PotionBrewer;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionEffectTypeWrapper;
import org.bukkit.potion.PotionType;
import org.bukkit.potion.*;

import java.util.*;
import java.util.stream.Collectors;

import static com.google.common.base.Preconditions.checkNotNull;

/**
* Definitions of potion effect types.
*/
public final class GlowPotionEffect extends PotionEffectType {

private static final List<String> VANILLA_IDS = new ArrayList<>();

private static final Map<String, PotionEffectType> BY_VANILLA_ID = new HashMap<>();

private final Impl impl;

static {
VANILLA_IDS.addAll(Arrays.stream(Impl.values()).map(Impl::getVanillaId).collect(Collectors.toSet()));
}

private GlowPotionEffect(Impl impl) {
super(impl.id);
this.impl = impl;
Expand All @@ -41,7 +34,9 @@ private GlowPotionEffect(Impl impl) {
public static void register() {
Potion.setPotionBrewer(new Brewer());
for (Impl impl : Impl.values()) {
registerPotionEffectType(new GlowPotionEffect(impl));
GlowPotionEffect effect = new GlowPotionEffect(impl);
BY_VANILLA_ID.put(impl.getVanillaId(), effect);
registerPotionEffectType(effect);
}
stopAcceptingRegistrations();
}
Expand All @@ -61,7 +56,7 @@ public static GlowPotionEffect getEffect(PotionEffectType type) {
return null;
}
}

/**
* Parses a PotionEffect id or name if possible.
*
Expand All @@ -72,26 +67,37 @@ public static PotionEffectType parsePotionEffectId(String effectName) {
try {
int effectId = Integer.parseInt(effectName);
PotionEffectType type = PotionEffectType.getById(effectId);

if (type == null) {
return null;
} else {
return type;
}
} catch (NumberFormatException exc) {
if (effectName.startsWith("minecraft:")) {
effectName = effectName.split(":")[1];
}
PotionEffectType type = PotionEffectType.getByName(effectName);

if (type == null) {
return null;
PotionEffectType type = GlowPotionEffect.getByVanillaId(effectName);

if (type == null) {
return null;
} else {
return type;
}
} else {
return type;
PotionEffectType type = PotionEffectType.getByName(effectName);

if (type == null) {
return null;
} else {
return type;
}
}
}
}


public static PotionEffectType getByVanillaId(String vanillaId) {
return BY_VANILLA_ID.get(vanillaId);
}

@Override
public String getName() {
return impl.name();
Expand All @@ -105,7 +111,7 @@ public String getName() {
public String getVanillaId() {
return impl.getVanillaId();
}

public static List<String> getVanillaIds() {
return VANILLA_IDS;
}
Expand Down Expand Up @@ -145,7 +151,7 @@ private enum Impl {
SPEED(1, false, 1.0, "minecraft:speed"),
SLOW(2, false, 0.5, "minecraft:slowness"),
FAST_DIGGING(3, false, 1.5, "minecraft:haste"),
SLOW_DIGGING(4, false, 0.5, "minecraft:mining_fatigue "),
SLOW_DIGGING(4, false, 0.5, "minecraft:mining_fatigue"),
INCREASE_DAMAGE(5, false, 1.0, "minecraft:strength"),
HEAL(6, true, 1.0, "minecraft:instant_heal"),
HARM(7, true, 0.5, "minecraft:instant_damage"),
Expand Down Expand Up @@ -181,7 +187,7 @@ private enum Impl {
this.modifier = modifier;
this.vanillaId = vanillaId;
}

public String getVanillaId() {
return vanillaId;
}
Expand Down