Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-26 00:00:28 +01:00
Code Issues Releases Aktivität

Add potions, including splash.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Myles 2016-03-04 01:01:04 +00:00
Ursprung a42b113618
Commit 0aa190353e
1 geänderte Dateien mit 181 neuen und 76 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

249
src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java
Datei anzeigen

@ -1,18 +1,16 @@
package us.myles.ViaVersion.slot; package us.myles.ViaVersion.slot;
import io.netty.buffer.ByteBuf;
import org.bukkit.Material;
import org.spacehq.opennbt.tag.builtin.CompoundTag;
import org.spacehq.opennbt.tag.builtin.StringTag;
import us.myles.ViaVersion.CancelException;
import us.myles.ViaVersion.util.PacketUtil;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.bukkit.Material;
import org.spacehq.opennbt.tag.builtin.CompoundTag;
import org.spacehq.opennbt.tag.builtin.StringTag;
import io.netty.buffer.ByteBuf;
import us.myles.ViaVersion.CancelException;
import us.myles.ViaVersion.util.PacketUtil;
public class ItemSlotRewriter { public class ItemSlotRewriter {
public static void rewrite1_9To1_8(ByteBuf input, ByteBuf output) throws CancelException { public static void rewrite1_9To1_8(ByteBuf input, ByteBuf output) throws CancelException {
@ -48,12 +46,40 @@ public class ItemSlotRewriter {
CompoundTag entityTag = tag.get("EntityTag"); CompoundTag entityTag = tag.get("EntityTag");
if (entityTag.get("id") instanceof StringTag) { if (entityTag.get("id") instanceof StringTag) {
StringTag id = entityTag.get("id"); StringTag id = entityTag.get("id");
if (ENTTIY_NAME_TO_ID.containsKey(id.getValue()))
data = ENTTIY_NAME_TO_ID.get(id.getValue()); data = ENTTIY_NAME_TO_ID.get(id.getValue());
} }
} }
item.tag = null; item.tag = null;
item.data = (short) data; item.data = (short) data;
} }
if (item.id == Material.POTION.getId()) {
CompoundTag tag = item.tag;
int data = 0;
if (tag != null && tag.get("Potion") instanceof StringTag) {
StringTag potion = tag.get("Potion");
String potionName = potion.getValue().replace("minecraft:", "");
if (POTION_NAME_TO_ID.containsKey(potionName)) {
data = POTION_NAME_TO_ID.get(potionName);
}
}
item.tag = null;
item.data = (short) data;
}
if (item.id == 438) {
CompoundTag tag = item.tag;
int data = 0;
item.id = (short) Material.POTION.getId();
if (tag != null && tag.get("Potion") instanceof StringTag) {
StringTag potion = tag.get("Potion");
String potionName = potion.getValue().replace("minecraft:", "");
if (POTION_NAME_TO_ID.containsKey(potionName)) {
data = POTION_NAME_TO_ID.get(potionName) + 8192;
}
}
item.tag = null;
item.data = (short) data;
}
} }
} }
@ -65,9 +91,28 @@ public class ItemSlotRewriter {
tag = new CompoundTag("tag"); tag = new CompoundTag("tag");
} }
CompoundTag entityTag = new CompoundTag("EntityTag"); CompoundTag entityTag = new CompoundTag("EntityTag");
if (ENTTIY_ID_TO_NAME.containsKey(Integer.valueOf(item.data))) {
StringTag id = new StringTag("id", ENTTIY_ID_TO_NAME.get(Integer.valueOf(item.data))); StringTag id = new StringTag("id", ENTTIY_ID_TO_NAME.get(Integer.valueOf(item.data)));
entityTag.put(id); entityTag.put(id);
tag.put(entityTag); tag.put(entityTag);
}
item.tag = tag;
item.data = 0;
}
if (item.id == Material.POTION.getId()) {
CompoundTag tag = item.tag;
if (tag == null) {
tag = new CompoundTag("tag");
}
if(item.data >= 16384){
item.id = 438; // splash id
item.data = (short) (item.data - 8192);
}
if (POTION_ID_TO_NAME.containsKey(Integer.valueOf(item.data))) {
String name = POTION_ID_TO_NAME.get(Integer.valueOf(item.data));
StringTag potion = new StringTag("Potion", "minecraft:" + name);
tag.put(potion);
}
item.tag = tag; item.tag = tag;
item.data = 0; item.data = 0;
} }
@ -119,73 +164,133 @@ public class ItemSlotRewriter {
private static Map<String, Integer> ENTTIY_NAME_TO_ID = new HashMap<>(); private static Map<String, Integer> ENTTIY_NAME_TO_ID = new HashMap<>();
private static Map<Integer, String> ENTTIY_ID_TO_NAME = new HashMap<>(); private static Map<Integer, String> ENTTIY_ID_TO_NAME = new HashMap<>();
private static Map<String, Integer> POTION_NAME_TO_ID = new HashMap<>();
private static Map<Integer, String> POTION_ID_TO_NAME = new HashMap<>();
static { static {
register(1, "Item"); /* Entities */
register(2, "XPOrb"); registerEntity(1, "Item");
register(7, "ThrownEgg"); registerEntity(2, "XPOrb");
register(8, "LeashKnot"); registerEntity(7, "ThrownEgg");
register(9, "Painting"); registerEntity(8, "LeashKnot");
register(10, "Arrow"); registerEntity(9, "Painting");
register(11, "Snowball"); registerEntity(10, "Arrow");
register(12, "Fireball"); registerEntity(11, "Snowball");
register(13, "SmallFireball"); registerEntity(12, "Fireball");
register(14, "ThrownEnderpearl"); registerEntity(13, "SmallFireball");
register(15, "EyeOfEnderSignal"); registerEntity(14, "ThrownEnderpearl");
register(16, "ThrownPotion"); registerEntity(15, "EyeOfEnderSignal");
register(17, "ThrownExpBottle"); registerEntity(16, "ThrownPotion");
register(18, "ItemFrame"); registerEntity(17, "ThrownExpBottle");
register(19, "WitherSkull"); registerEntity(18, "ItemFrame");
register(20, "PrimedTnt"); registerEntity(19, "WitherSkull");
register(21, "FallingSand"); registerEntity(20, "PrimedTnt");
register(22, "FireworksRocketEntity"); registerEntity(21, "FallingSand");
register(30, "ArmorStand"); registerEntity(22, "FireworksRocketEntity");
register(40, "MinecartCommandBlock"); registerEntity(30, "ArmorStand");
register(41, "Boat"); registerEntity(40, "MinecartCommandBlock");
register(42, "MinecartRideable"); registerEntity(41, "Boat");
register(43, "MinecartChest"); registerEntity(42, "MinecartRideable");
register(44, "MinecartFurnace"); registerEntity(43, "MinecartChest");
register(45, "MinecartTNT"); registerEntity(44, "MinecartFurnace");
register(46, "MinecartHopper"); registerEntity(45, "MinecartTNT");
register(47, "MinecartSpawner"); registerEntity(46, "MinecartHopper");
register(48, "Mob"); registerEntity(47, "MinecartSpawner");
register(49, "Monster"); registerEntity(48, "Mob");
register(50, "Creeper"); registerEntity(49, "Monster");
register(51, "Skeleton"); registerEntity(50, "Creeper");
register(52, "Spider"); registerEntity(51, "Skeleton");
register(53, "Giant"); registerEntity(52, "Spider");
register(54, "Zombie"); registerEntity(53, "Giant");
register(55, "Slime"); registerEntity(54, "Zombie");
register(56, "Ghast"); registerEntity(55, "Slime");
register(57, "PigZombie"); registerEntity(56, "Ghast");
register(58, "Enderman"); registerEntity(57, "PigZombie");
register(59, "CaveSpider"); registerEntity(58, "Enderman");
register(60, "Silverfish"); registerEntity(59, "CaveSpider");
register(61, "Blaze"); registerEntity(60, "Silverfish");
register(62, "LavaSlime"); registerEntity(61, "Blaze");
register(63, "EnderDragon"); registerEntity(62, "LavaSlime");
register(64, "WitherBoss"); registerEntity(63, "EnderDragon");
register(65, "Bat"); registerEntity(64, "WitherBoss");
register(66, "Witch"); registerEntity(65, "Bat");
register(67, "Endermite"); registerEntity(66, "Witch");
register(68, "Guardian"); registerEntity(67, "Endermite");
register(90, "Pig"); registerEntity(68, "Guardian");
register(91, "Sheep"); registerEntity(90, "Pig");
register(92, "Cow"); registerEntity(91, "Sheep");
register(93, "Chicken"); registerEntity(92, "Cow");
register(94, "Squid"); registerEntity(93, "Chicken");
register(95, "Wolf"); registerEntity(94, "Squid");
register(96, "MushroomCow"); registerEntity(95, "Wolf");
register(97, "SnowMan"); registerEntity(96, "MushroomCow");
register(98, "Ozelot"); registerEntity(97, "SnowMan");
register(99, "VillagerGolem"); registerEntity(98, "Ozelot");
register(100, "EntityHorse"); registerEntity(99, "VillagerGolem");
register(101, "Rabbit"); registerEntity(100, "EntityHorse");
register(120, "Villager"); registerEntity(101, "Rabbit");
register(200, "EnderCrystal"); registerEntity(120, "Villager");
registerEntity(200, "EnderCrystal");
/* Potions */
registerPotion(0, "water");
registerPotion(64, "mundane");
registerPotion(32, "thick");
registerPotion(16, "awkward");
registerPotion(8198, "night_vision");
registerPotion(8262, "long_night_vision");
registerPotion(8206, "invisibility");
registerPotion(8270, "long_invisibility");
registerPotion(8203, "leaping");
registerPotion(8267, "long_leaping");
registerPotion(8235, "strong_leaping");
registerPotion(8195, "fire_resistance");
registerPotion(8259, "long_fire_resistance");
registerPotion(8194, "swiftness");
registerPotion(8258, "long_swiftness");
registerPotion(8226, "strong_swiftness");
registerPotion(8202, "slowness");
registerPotion(8266, "long_slowness");
registerPotion(8205, "water_breathing");
registerPotion(8269, "long_water_breathing");
registerPotion(8197, "healing");
registerPotion(8229, "strong_healing");
registerPotion(8204, "harming");
registerPotion(8236, "strong_harming");
registerPotion(8196, "poison");
registerPotion(8260, "long_poison");
registerPotion(8228, "strong_poison");
registerPotion(8193, "regeneration");
registerPotion(8257, "long_regeneration");
registerPotion(8225, "strong_regeneration");
registerPotion(8201, "strength");
registerPotion(8265, "long_strength");
registerPotion(8233, "strong_strength");
registerPotion(8200, "weakness");
registerPotion(8264, "long_weakness");
} }
private static void register(Integer id, String name) { private static void registerEntity(Integer id, String name) {
ENTTIY_ID_TO_NAME.put(id, name); ENTTIY_ID_TO_NAME.put(id, name);
ENTTIY_NAME_TO_ID.put(name, id); ENTTIY_NAME_TO_ID.put(name, id);
} }
private static void registerPotion(Integer id, String name) {
POTION_ID_TO_NAME.put(id, name);
POTION_NAME_TO_ID.put(name, id);
}
} }