3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-26 08:10:09 +01:00

move particle type

Dieser Commit ist enthalten in:
Marco Neuhaus 2019-11-11 12:29:51 +01:00
Ursprung dc54551d0c
Commit 000313ee9a
3 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import us.myles.ViaVersion.api.minecraft.metadata.MetaType; import us.myles.ViaVersion.api.minecraft.metadata.MetaType;
import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1; import us.myles.ViaVersion.api.type.types.version.Types1_14;
@RequiredArgsConstructor @RequiredArgsConstructor
@Getter @Getter
@ -24,7 +24,7 @@ public enum MetaType1_14 implements MetaType {
OptUUID(12, Type.OPTIONAL_UUID), OptUUID(12, Type.OPTIONAL_UUID),
BlockID(13, Type.VAR_INT), BlockID(13, Type.VAR_INT),
NBTTag(14, Type.NBT), NBTTag(14, Type.NBT),
PARTICLE(15, Type.PARTICLE_1_14), PARTICLE(15, Types1_14.PARTICLE),
VillagerData(16, Type.VILLAGER_DATA), VillagerData(16, Type.VILLAGER_DATA),
OptVarInt(17, Type.OPTIONAL_VAR_INT), OptVarInt(17, Type.OPTIONAL_VAR_INT),
Pose(18, Type.VAR_INT), Pose(18, Type.VAR_INT),

Datei anzeigen

@ -7,7 +7,6 @@ import us.myles.ViaVersion.api.minecraft.*;
import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.api.type.types.*; import us.myles.ViaVersion.api.type.types.*;
import us.myles.ViaVersion.api.type.types.minecraft.*; import us.myles.ViaVersion.api.type.types.minecraft.*;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.Particle;
import java.util.UUID; import java.util.UUID;
@ -77,8 +76,6 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
public static final Type<VillagerData> VILLAGER_DATA = new VillagerDataType(); public static final Type<VillagerData> VILLAGER_DATA = new VillagerDataType();
public static final Type<Particle> PARTICLE_1_14 = new Particle1_14Type();
/* 1.13 Flat Item (no data) */ /* 1.13 Flat Item (no data) */
public static final Type<Item> FLAT_ITEM = new FlatItemType(); public static final Type<Item> FLAT_ITEM = new FlatItemType();
public static final Type<Item> FLAT_VAR_INT_ITEM = new FlatVarIntItemType(); public static final Type<Item> FLAT_VAR_INT_ITEM = new FlatVarIntItemType();

Datei anzeigen

@ -2,6 +2,8 @@ package us.myles.ViaVersion.api.type.types.version;
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.api.type.types.minecraft.Particle1_14Type;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.Particle;
import java.util.List; import java.util.List;
@ -15,4 +17,9 @@ public class Types1_14 {
* Metadata type for 1.14 * Metadata type for 1.14
*/ */
public static final Type<Metadata> METADATA = new Metadata1_14Type(); public static final Type<Metadata> METADATA = new Metadata1_14Type();
/**
* Particle type for 1.14
*/
public static final Type<Particle> PARTICLE = new Particle1_14Type();
} }