SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-1638 / SPIGOT-1673: Rework Potions API

Browse Source 
By: t00thpick1 <t00thpick1dirko@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2016-03-02 20:43:58 -05:00
parent d490a6e384
commit 104519f08f
20 changed files with 622 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
View File

@@ -5,48 +5,44 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import net.minecraft.server.ItemStack;
import net.minecraft.server.Items;
import net.minecraft.server.MobEffect;
import net.minecraft.server.MobEffectList;
import net.minecraft.server.PotionUtil;
import net.minecraft.server.PotionRegistry;
import org.bukkit.Color;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType;
import org.bukkit.potion.PotionBrewer;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffect;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
public class CraftPotionBrewer implements PotionBrewer {
private static final Map<Integer, Collection<PotionEffect>> cache = Maps.newHashMap();
private static final Map<PotionType, Collection<PotionEffect>> cache = Maps.newHashMap();
public Collection<PotionEffect> getEffectsFromDamage(int damage) {
public Collection<PotionEffect> getEffects(PotionType damage, boolean upgraded, boolean extended) {
if (cache.containsKey(damage))
return cache.get(damage);
List<?> mcEffects = PotionUtil.getEffects(new ItemStack(Items.POTION, 1, damage));
List<PotionEffect> effects = new ArrayList<PotionEffect>();
if (mcEffects == null)
return effects;
List<MobEffect> mcEffects = PotionRegistry.a(CraftPotionUtil.fromBukkit(new PotionData(damage, upgraded, extended))).a();
for (Object raw : mcEffects) {
if (raw == null || !(raw instanceof MobEffect))
continue;
MobEffect mcEffect = (MobEffect) raw;
PotionEffect effect = new PotionEffect(PotionEffectType.getById(MobEffectList.getId(mcEffect.getMobEffect())),
mcEffect.getDuration(), mcEffect.getAmplifier(), true, true, Color.fromRGB(mcEffect.getMobEffect().getColor()));
// Minecraft PotionBrewer applies duration modifiers automatically.
effects.add(effect);
ImmutableList.Builder<PotionEffect> builder = new ImmutableList.Builder<PotionEffect>();
for (MobEffect effect : mcEffects) {
builder.add(CraftPotionUtil.toBukkit(effect));
}
cache.put(damage, effects);
cache.put(damage, builder.build());
return effects;
return cache.get(damage);
}
@Override
public Collection<PotionEffect> getEffectsFromDamage(int damage) {
return new ArrayList<PotionEffect>();
}
@Override
public PotionEffect createEffect(PotionEffectType potion, int duration, int amplifier) {
return new PotionEffect(potion, potion.isInstant() ? 1 : (int) (duration * potion.getDurationModifier()),
amplifier);
return new PotionEffect(potion, potion.isInstant() ? 1 : (int) (duration * potion.getDurationModifier()), amplifier);
}
}

101
paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java Normal file
View File

@@ -0,0 +1,101 @@
package org.bukkit.craftbukkit.potion;
import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableBiMap;
import net.minecraft.server.MobEffect;
import net.minecraft.server.MobEffectList;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType;
import org.bukkit.potion.PotionData;
public class CraftPotionUtil {
private static final BiMap<PotionType, String> regular = ImmutableBiMap.<PotionType, String>builder()
.put(PotionType.UNCRAFTABLE, "minecraft:empty")
.put(PotionType.WATER, "minecraft:water")
.put(PotionType.MUNDANE, "minecraft:mundane")
.put(PotionType.THICK, "minecraft:thick")
.put(PotionType.AWKWARD, "minecraft:awkward")
.put(PotionType.NIGHT_VISION, "minecraft:night_vision")
.put(PotionType.INVISIBILITY, "minecraft:invisibility")
.put(PotionType.JUMP, "minecraft:leaping")
.put(PotionType.FIRE_RESISTANCE, "minecraft:fire_resistance")
.put(PotionType.SPEED, "minecraft:swiftness")
.put(PotionType.SLOWNESS, "minecraft:slowness")
.put(PotionType.WATER_BREATHING, "minecraft:water_breathing")
.put(PotionType.INSTANT_HEAL, "minecraft:healing")
.put(PotionType.INSTANT_DAMAGE, "minecraft:harming")
.put(PotionType.POISON, "minecraft:poison")
.put(PotionType.REGEN, "minecraft:regeneration")
.put(PotionType.STRENGTH, "minecraft:strength")
.put(PotionType.WEAKNESS, "minecraft:weakness")
.put(PotionType.LUCK, "minecraft:luck")
.build();
private static final BiMap<PotionType, String> upgradeable = ImmutableBiMap.<PotionType, String>builder()
.put(PotionType.JUMP, "minecraft:strong_leaping")
.put(PotionType.SPEED, "minecraft:strong_swiftness")
.put(PotionType.INSTANT_HEAL, "minecraft:strong_healing")
.put(PotionType.INSTANT_DAMAGE, "minecraft:strong_harming")
.put(PotionType.POISON, "minecraft:strong_poison")
.put(PotionType.REGEN, "minecraft:strong_regeneration")
.put(PotionType.STRENGTH, "minecraft:strong_strength")
.build();
private static final BiMap<PotionType, String> extendable = ImmutableBiMap.<PotionType, String>builder()
.put(PotionType.NIGHT_VISION, "minecraft:long_night_vision")
.put(PotionType.INVISIBILITY, "minecraft:long_invisibility")
.put(PotionType.JUMP, "minecraft:long_leaping")
.put(PotionType.FIRE_RESISTANCE, "minecraft:long_fire_resistance")
.put(PotionType.SPEED, "minecraft:long_swiftness")
.put(PotionType.SLOWNESS, "minecraft:long_slowness")
.put(PotionType.WATER_BREATHING, "minecraft:long_water_breathing")
.put(PotionType.POISON, "minecraft:long_poison")
.put(PotionType.REGEN, "minecraft:long_regeneration")
.put(PotionType.STRENGTH, "minecraft:long_strength")
.put(PotionType.WEAKNESS, "minecraft:long_weakness")
.build();
public static String fromBukkit(PotionData data) {
if (data.isUpgraded()) {
return upgradeable.get(data.getType());
}
if (data.isExtended()) {
return extendable.get(data.getType());
}
return regular.get(data.getType());
}
public static PotionData toBukkit(String type) {
PotionType potionType = null;
potionType = extendable.inverse().get(type);
if (potionType != null) {
return new PotionData(potionType, true, false);
}
potionType = upgradeable.inverse().get(type);
if (potionType != null) {
return new PotionData(potionType, false, true);
}
return new PotionData(regular.inverse().get(type), false, false);
}
public static MobEffect fromBukkit(PotionEffect effect) {
MobEffectList type = MobEffectList.fromId(effect.getType().getId());
return new MobEffect(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles());
}
public static PotionEffect toBukkit(MobEffect effect) {
PotionEffectType type = PotionEffectType.getById(MobEffectList.getId(effect.getMobEffect()));
int amp = effect.getAmplifier();
int duration = effect.getDuration();
boolean ambient = effect.isAmbient();
boolean particles = effect.isShowParticles();
return new PotionEffect(type, duration, amp, ambient, particles);
}
public static boolean equals(MobEffectList mobEffect, PotionEffectType type) {
PotionEffectType typeV = PotionEffectType.getById(MobEffectList.getId(mobEffect));
return typeV.equals(type);
}
}