Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-03-30 08:15:46 +02:00
Code Issues Projects Releases Wiki Activity

Gotta catch them all

Browse Source
This commit is contained in:
Matsv 2016-08-10 21:33:32 +02:00
parent 85de7c35ea
commit 9c6cd22817
1 changed files with 127 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_10/MetadataRewriter.java
View File

@ -1,6 +1,7 @@
package us.myles.ViaVersion.protocols.protocolsnapshotto1_10; package us.myles.ViaVersion.protocols.protocolsnapshotto1_10;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import us.myles.ViaVersion.api.ViaVersion;
import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType; import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
@ -10,135 +11,155 @@ import java.util.List;
public class MetadataRewriter { public class MetadataRewriter {
public static int rewriteEntityType(int currentType, List<Metadata> metadata) { public static int rewriteEntityType(int currentType, List<Metadata> metadata) {
if (currentType == 68) { try {
// ElderGuardian - 4 if (currentType == 68) {
Optional<Metadata> options = getById(metadata, 12); // ElderGuardian - 4
if (options.isPresent()) { Optional<Metadata> options = getById(metadata, 12);
if ((((byte) options.get().getValue()) & 0x04) == 0x04) { if (options.isPresent()) {
return 4; if ((((byte) options.get().getValue()) & 0x04) == 0x04) {
return 4;
}
} }
} }
} if (currentType == 51) {
if (currentType == 51) { // WitherSkeleton - 5
// WitherSkeleton - 5 // Stray - 6
// Stray - 6 Optional<Metadata> options = getById(metadata, 12);
Optional<Metadata> options = getById(metadata, 12); if (options.isPresent()) {
if (options.isPresent()) { if (((int) options.get().getValue()) == 1) {
if (((int) options.get().getValue()) == 1) { return 5;
return 5; }
} if (((int) options.get().getValue()) == 2) {
if (((int) options.get().getValue()) == 2) { return 6;
return 6; }
} }
} }
} if (currentType == 54) {
if (currentType == 54) { // ZombieVillager - 27
// ZombieVillager - 27 // Husk - 23
// Husk - 23 Optional<Metadata> options = getById(metadata, 13);
Optional<Metadata> options = getById(metadata, 13); if (options.isPresent()) {
if (options.isPresent()) { int value = (int) options.get().getValue();
int value = (int) options.get().getValue(); if (value > 0 && value < 6) {
if (value > 0 && value < 6) { metadata.add(new Metadata(16, NewType.VarInt.getTypeID(), Type.VAR_INT, value - 1)); // Add profession type to new metadata
metadata.add(new Metadata(16, NewType.VarInt.getTypeID(), Type.VAR_INT, value - 1)); // Add profession type to new metadata return 27;
return 27; }
} if (value == 6) {
if (value == 6) { return 23;
return 23; }
} }
} }
} if (currentType == 100) {
if (currentType == 100) { // SkeletonHorse - 28
// SkeletonHorse - 28 // ZombieHorse - 29
// ZombieHorse - 29 // Donkey - 31
// Donkey - 31 // Mule - 32
// Mule - 32 Optional<Metadata> options = getById(metadata, 14);
Optional<Metadata> options = getById(metadata, 14); if (options.isPresent()) {
if (options.isPresent()) { if (((int) options.get().getValue()) == 0) {
if (((int) options.get().getValue()) == 0) { return currentType;
return currentType; }
} if (((int) options.get().getValue()) == 1) {
if (((int) options.get().getValue()) == 1) { return 31;
return 31; }
} if (((int) options.get().getValue()) == 2) {
if (((int) options.get().getValue()) == 2) { return 32;
return 32; }
} if (((int) options.get().getValue()) == 3) {
if (((int) options.get().getValue()) == 3) { return 29;
return 29; }
} if (((int) options.get().getValue()) == 4) {
if (((int) options.get().getValue()) == 4) { return 28;
return 28; }
} }
} }
return currentType;
} catch (Exception e) {
;
if (!ViaVersion.getConfig().isSuppressMetadataErrors() || ViaVersion.getInstance().isDebug()) {
System.out.println("An error occurred with entity type rewriter");
System.out.println("Metadata: " + metadata);
e.printStackTrace();
}
} }
return currentType; return currentType;
} }
public static void handleMetadata(int type, List<Metadata> metadatas) { public static void handleMetadata(int type, List<Metadata> metadatas) {
for (Metadata metadata : new ArrayList<>(metadatas)) { for (Metadata metadata : new ArrayList<>(metadatas)) {
if (type == 4 || type == 68) { // Guardians try {
int oldid = metadata.getId(); if (type == 4 || type == 68) { // Guardians
if (oldid == 12) { int oldid = metadata.getId();
metadata.setType(Type.BOOLEAN); if (oldid == 12) {
metadata.setTypeID(NewType.Boolean.getTypeID()); metadata.setType(Type.BOOLEAN);
boolean val = (((byte) metadata.getValue()) & 0x02) == 0x02; metadata.setTypeID(NewType.Boolean.getTypeID());
metadata.setValue(val); boolean val = (((byte) metadata.getValue()) & 0x02) == 0x02;
} metadata.setValue(val);
}
if (type == 51 || type == 5 || type == 6) { // Skeletons
int oldid = metadata.getId();
if (oldid == 12) {
metadatas.remove(metadata);
}
if (oldid == 13) {
metadata.setId(12);
}
}
if (type == 54 || type == 27) { // Zombie | Zombie Villager
if (type == 54 && metadata.getId() == 14) {
metadatas.remove(metadata);
} else {
if (metadata.getId() == 15) {
metadata.setId(14);
} else {
if (metadata.getId() == 14) {
metadata.setId(15);
}
} }
} }
} if (type == 51 || type == 5 || type == 6) { // Skeletons
if (type == 100 || type == 31 || type == 32 || type == 29 || type == 28) { // Horses int oldid = metadata.getId();
// Remap metadata id if (oldid == 12) {
int oldid = metadata.getId();
if (oldid == 14) { // Type
metadatas.remove(metadata);
}
if (oldid == 16) { // Owner
metadata.setId(14);
}
if (oldid == 17) { // Armor
metadata.setId(16);
}
// Process per type
if (type == 100) {
// Normal Horse
} else {
// Remove 15, 16
if (metadata.getId() == 15 || metadata.getId() == 16) {
metadatas.remove(metadata); metadatas.remove(metadata);
} }
if (oldid == 13) {
metadata.setId(12);
}
} }
if (type == 31 || type == 32) { if (type == 54 || type == 27) { // Zombie | Zombie Villager
// Chested Horse if (type == 54 && metadata.getId() == 14) {
if (metadata.getId() == 13) { metadatas.remove(metadata);
if ((((byte) metadata.getValue()) & 0x08) == 0x08) { } else {
metadatas.add(new Metadata(15, NewType.Boolean.getTypeID(), Type.BOOLEAN, true)); if (metadata.getId() == 15) {
metadata.setId(14);
} else { } else {
metadatas.add(new Metadata(15, NewType.Boolean.getTypeID(), Type.BOOLEAN, false)); if (metadata.getId() == 14) {
metadata.setId(15);
}
} }
} }
} }
if (type == 100 || type == 31 || type == 32 || type == 29 || type == 28) { // Horses
// Remap metadata id
int oldid = metadata.getId();
if (oldid == 14) { // Type
metadatas.remove(metadata);
}
if (oldid == 16) { // Owner
metadata.setId(14);
}
if (oldid == 17) { // Armor
metadata.setId(16);
}
// Process per type
if (type == 100) {
// Normal Horse
} else {
// Remove 15, 16
if (metadata.getId() == 15 || metadata.getId() == 16) {
metadatas.remove(metadata);
}
}
if (type == 31 || type == 32) {
// Chested Horse
if (metadata.getId() == 13) {
if ((((byte) metadata.getValue()) & 0x08) == 0x08) {
metadatas.add(new Metadata(15, NewType.Boolean.getTypeID(), Type.BOOLEAN, true));
} else {
metadatas.add(new Metadata(15, NewType.Boolean.getTypeID(), Type.BOOLEAN, false));
}
}
}
}
} catch (Exception e) {
;
metadatas.remove(metadata);
if (!ViaVersion.getConfig().isSuppressMetadataErrors() || ViaVersion.getInstance().isDebug()) {
System.out.println("An error occurred with entity metadata handler");
System.out.println("Metadata: " + metadata);
e.printStackTrace();
}
} }
} }
} }