Skip to content

Commit b0c53ff

Browse files
committed
Make helper method in Copyable static
1 parent d65b2ab commit b0c53ff

16 files changed

+17
-16
lines changed

api/src/main/java/com/viaversion/viaversion/api/minecraft/Particle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void write(final PacketWrapper wrapper) {
121121

122122
@Override
123123
public ParticleData<T> copy() {
124-
return new ParticleData<>(type, copy(value));
124+
return new ParticleData<>(type, Copyable.copy(value));
125125
}
126126

127127
@Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/FilledStructuredData.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package com.viaversion.viaversion.api.minecraft.data;
2424

2525
import com.google.common.base.Preconditions;
26+
import com.viaversion.viaversion.util.Copyable;
2627
import io.netty.buffer.ByteBuf;
2728
import java.util.Objects;
2829

@@ -61,7 +62,7 @@ public StructuredDataKey<T> key() {
6162

6263
@Override
6364
public StructuredData<T> copy() {
64-
return new FilledStructuredData<>(this.key, this.copy(this.value), this.id);
65+
return new FilledStructuredData<>(this.key, Copyable.copy(this.value), this.id);
6566
}
6667

6768
@Override

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AdventureModePredicate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public AdventureModePredicate rewrite(final Int2IntFunction blockIdRewriter) {
8080

8181
@Override
8282
public AdventureModePredicate copy() {
83-
return new AdventureModePredicate(copy(predicates), showInTooltip);
83+
return new AdventureModePredicate(Copyable.copy(predicates), showInTooltip);
8484
}
8585
}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_20_5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void write(final ByteBuf buffer, final AttributeModifiers1_20_5 value) {
4848

4949
@Override
5050
public AttributeModifiers1_20_5 copy() {
51-
return new AttributeModifiers1_20_5(copy(modifiers), showInTooltip);
51+
return new AttributeModifiers1_20_5(Copyable.copy(modifiers), showInTooltip);
5252
}
5353

5454
public record AttributeModifier(int attribute, ModifierData modifier, int slotType) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/AttributeModifiers1_21.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public AttributeModifiers1_21 rewrite(final Int2IntFunction rewriteFunction) {
7373

7474
@Override
7575
public AttributeModifiers1_21 copy() {
76-
return new AttributeModifiers1_21(copy(modifiers), showInTooltip);
76+
return new AttributeModifiers1_21(Copyable.copy(modifiers), showInTooltip);
7777
}
7878

7979
public record AttributeModifier(int attribute, ModifierData modifier, int slotType) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/BlockPredicate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ public BlockPredicate rewrite(final Int2IntFunction blockIdRewriter) {
107107

108108
@Override
109109
public BlockPredicate copy() {
110-
return new BlockPredicate(holderSet, copy(propertyMatchers), tag == null ? null : tag.copy());
110+
return new BlockPredicate(holderSet, Copyable.copy(propertyMatchers), tag == null ? null : tag.copy());
111111
}
112112
}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/Consumable1_21_2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@ public Consumable1_21_2 rewrite(final Int2IntFunction soundIdRewriteFunction) {
118118

119119
@Override
120120
public Consumable1_21_2 copy() {
121-
return new Consumable1_21_2(consumeSeconds, animationType, sound, hasConsumeParticles, copy(consumeEffects));
121+
return new Consumable1_21_2(consumeSeconds, animationType, sound, hasConsumeParticles, Copyable.copy(consumeEffects));
122122
}
123123
}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/CustomModelData1_21_4.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ public void write(final ByteBuf buffer, final CustomModelData1_21_4 value) {
5050

5151
@Override
5252
public CustomModelData1_21_4 copy() {
53-
return new CustomModelData1_21_4(copy(floats), copy(booleans), copy(strings), copy(colors));
53+
return new CustomModelData1_21_4(Copyable.copy(floats), Copyable.copy(booleans), Copyable.copy(strings), Copyable.copy(colors));
5454
}
5555
}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/DeathProtection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ public void write(final ByteBuf buffer, final DeathProtection value) {
4444

4545
@Override
4646
public DeathProtection copy() {
47-
return new DeathProtection(copy(deathEffects));
47+
return new DeathProtection(Copyable.copy(deathEffects));
4848
}
4949
}

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/FireworkExplosion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public void write(final ByteBuf buffer, final FireworkExplosion value) {
5353

5454
@Override
5555
public FireworkExplosion copy() {
56-
return new FireworkExplosion(shape, copy(colors), copy(fadeColors), hasTrail, hasTwinkle);
56+
return new FireworkExplosion(shape, Copyable.copy(colors), Copyable.copy(fadeColors), hasTrail, hasTwinkle);
5757
}
5858
}

0 commit comments

Comments
 (0)