Skip to content

Commit dcf050a

Browse files
committed
Remove unneeded optional item type from Types1_21_2
Was only used in food properties up until 1.21.2 (luckily)
1 parent 1f8d133 commit dcf050a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

api/src/main/java/com/viaversion/viaversion/api/minecraft/entitydata/types/EntityDataTypes1_21_2.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.viaversion.viaversion.api.minecraft.item.Item;
3030
import com.viaversion.viaversion.api.type.Type;
3131
import com.viaversion.viaversion.api.type.Types;
32-
import com.viaversion.viaversion.api.type.types.ArrayType;
3332
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
3433

3534
public final class EntityDataTypes1_21_2 extends AbstractEntityDataTypes {
@@ -66,7 +65,7 @@ public final class EntityDataTypes1_21_2 extends AbstractEntityDataTypes {
6665
public final EntityDataType vector3FType = add(29, Types.VECTOR3F);
6766
public final EntityDataType quaternionType = add(30, Types.QUATERNION);
6867

69-
public EntityDataTypes1_21_2(final Type<Item> itemType, final ParticleType particleType, final ArrayType<Particle> particlesType) {
68+
public EntityDataTypes1_21_2(final Type<Item> itemType, final ParticleType particleType, final Type<Particle[]> particlesType) {
7069
super(31);
7170
this.itemType = add(7, itemType);
7271
this.particleType = add(17, particleType);

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_21_2.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ public final class Types1_21_2 {
4343
public static final StructuredDataType STRUCTURED_DATA = new StructuredDataType();
4444
public static final Type<StructuredData<?>[]> STRUCTURED_DATA_ARRAY = new ArrayType<>(STRUCTURED_DATA);
4545
public static final ItemType1_20_5 ITEM = new ItemType1_20_5(STRUCTURED_DATA);
46-
public static final Type<Item> OPTIONAL_ITEM = ITEM.new OptionalItemType(); // Optional as in boolean prefixed, not via the amount
4746
public static final Type<Item[]> ITEM_ARRAY = new ArrayType<>(ITEM);
4847
public static final Type<Item> ITEM_COST = new ItemCostType1_20_5(STRUCTURED_DATA_ARRAY);
4948
public static final Type<Item> OPTIONAL_ITEM_COST = new ItemCostType1_20_5.OptionalItemCostType(ITEM_COST);
5049

5150
public static final ParticleType PARTICLE = new ParticleType();
52-
public static final ArrayType<Particle> PARTICLES = new ArrayType<>(PARTICLE);
51+
public static final Type<Particle[]> PARTICLES = new ArrayType<>(PARTICLE);
5352
public static final EntityDataTypes1_21_2 ENTITY_DATA_TYPES = new EntityDataTypes1_21_2(ITEM, PARTICLE, PARTICLES);
5453
public static final Type<EntityData> ENTITY_DATA = new EntityDataType(ENTITY_DATA_TYPES);
5554
public static final Type<List<EntityData>> ENTITY_DATA_LIST = new EntityDataListType(ENTITY_DATA);

0 commit comments

Comments
 (0)