Skip to content

Commit fe9ca49

Browse files
kennytvkennytv
committed
Update mcstructs
1 parent e1837dc commit fe9ca49

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

‎api/src/main/java/com/viaversion/viaversion/util/GsonUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.google.gson.Gson;
2626
import com.google.gson.GsonBuilder;
2727
import com.google.gson.JsonElement;
28+
import com.viaversion.viaversion.libs.mcstructs.text.utils.JsonUtils;
2829
import java.util.Comparator;
29-
import net.lenni0451.mcstructs.text.utils.JsonUtils;
3030
import org.checkerframework.checker.nullness.qual.Nullable;
3131

3232
public final class GsonUtil {

‎build-logic/src/main/kotlin/via.shadow-conventions.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ publishing {
4444
fun ShadowJar.configureRelocations() {
4545
relocate("com.google.gson", "com.viaversion.viaversion.libs.gson")
4646
relocate("it.unimi.dsi.fastutil", "com.viaversion.viaversion.libs.fastutil")
47-
relocate("net.lenni0451.mcstructs", "com.viaversion.viaversion.libs.mcstructs")
4847
relocate("org.yaml.snakeyaml", "com.viaversion.viaversion.libs.snakeyaml")
4948
}
5049

‎common/src/main/java/com/viaversion/viaversion/protocols/template/Protocol1_98To1_99.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected void onMappingDataLoaded() {
144144
public void init(final UserConnection connection) {
145145
// Register the entity tracker - used for entity id/entity data rewriting AND for tracking world data sent to the client (then used for chunk data rewriting)
146146
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_4.PLAYER));
147-
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_5, SerializerVersion.V1_21_5));
147+
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_6, SerializerVersion.V1_21_6));
148148
}
149149

150150
// Overriding these methods is important as they are relied on various rewriter classes

‎common/src/main/java/com/viaversion/viaversion/protocols/v1_19to1_19_1/Protocol1_19To1_19_1.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
import com.viaversion.viaversion.api.protocol.packet.State;
3636
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
3737
import com.viaversion.viaversion.api.type.Types;
38+
import com.viaversion.viaversion.libs.mcstructs.text.Style;
39+
import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
40+
import com.viaversion.viaversion.libs.mcstructs.text.TextFormatting;
41+
import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
3842
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
3943
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
4044
import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19;
@@ -55,10 +59,6 @@
5559
import java.util.List;
5660
import java.util.Map;
5761
import java.util.UUID;
58-
import net.lenni0451.mcstructs.text.Style;
59-
import net.lenni0451.mcstructs.text.TextComponent;
60-
import net.lenni0451.mcstructs.text.TextFormatting;
61-
import net.lenni0451.mcstructs.text.components.TranslationComponent;
6262
import org.checkerframework.checker.nullness.qual.Nullable;
6363

6464
public final class Protocol1_19To1_19_1 extends AbstractProtocol<ClientboundPackets1_19, ClientboundPackets1_19_1, ServerboundPackets1_19, ServerboundPackets1_19_1> {

‎common/src/main/java/com/viaversion/viaversion/protocols/v1_21_5to1_21_6/Protocol1_21_5To1_21_6.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected void onMappingDataLoaded() {
173173
@Override
174174
public void init(final UserConnection connection) {
175175
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_6.PLAYER));
176-
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_5, SerializerVersion.V1_21_5));
176+
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_5, SerializerVersion.V1_21_6));
177177
connection.put(new SneakStorage());
178178
}
179179

‎common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
import com.viaversion.nbt.tag.StringTag;
2424
import com.viaversion.nbt.tag.Tag;
2525
import com.viaversion.viaversion.api.Via;
26+
import com.viaversion.viaversion.libs.mcstructs.text.Style;
27+
import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
28+
import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
29+
import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
30+
import com.viaversion.viaversion.libs.mcstructs.text.events.hover.HoverEvent;
31+
import com.viaversion.viaversion.libs.mcstructs.text.events.hover.impl.EntityHoverEvent;
32+
import com.viaversion.viaversion.libs.mcstructs.text.events.hover.impl.ItemHoverEvent;
33+
import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
34+
import com.viaversion.viaversion.libs.mcstructs.text.stringformat.StringFormat;
35+
import com.viaversion.viaversion.libs.mcstructs.text.stringformat.handling.ColorHandling;
36+
import com.viaversion.viaversion.libs.mcstructs.text.stringformat.handling.DeserializerUnknownHandling;
37+
import com.viaversion.viaversion.libs.mcstructs.text.utils.TextUtils;
2638
import java.nio.charset.StandardCharsets;
2739
import java.util.logging.Level;
28-
import net.lenni0451.mcstructs.text.Style;
29-
import net.lenni0451.mcstructs.text.TextComponent;
30-
import net.lenni0451.mcstructs.text.components.StringComponent;
31-
import net.lenni0451.mcstructs.text.components.TranslationComponent;
32-
import net.lenni0451.mcstructs.text.events.hover.HoverEvent;
33-
import net.lenni0451.mcstructs.text.events.hover.impl.EntityHoverEvent;
34-
import net.lenni0451.mcstructs.text.events.hover.impl.ItemHoverEvent;
35-
import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer;
36-
import net.lenni0451.mcstructs.text.stringformat.StringFormat;
37-
import net.lenni0451.mcstructs.text.stringformat.handling.ColorHandling;
38-
import net.lenni0451.mcstructs.text.stringformat.handling.DeserializerUnknownHandling;
39-
import net.lenni0451.mcstructs.text.utils.TextUtils;
4040
import org.checkerframework.checker.nullness.qual.Nullable;
4141

4242
/**

‎common/src/main/java/com/viaversion/viaversion/util/SerializerVersion.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
import com.google.gson.JsonElement;
2121
import com.viaversion.nbt.tag.Tag;
22+
import com.viaversion.viaversion.libs.mcstructs.snbt.SNbt;
23+
import com.viaversion.viaversion.libs.mcstructs.snbt.exceptions.SNbtDeserializeException;
24+
import com.viaversion.viaversion.libs.mcstructs.snbt.exceptions.SNbtSerializeException;
25+
import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
26+
import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentCodec;
27+
import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
2228
import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
23-
import net.lenni0451.mcstructs.snbt.SNbt;
24-
import net.lenni0451.mcstructs.snbt.exceptions.SNbtDeserializeException;
25-
import net.lenni0451.mcstructs.snbt.exceptions.SNbtSerializeException;
26-
import net.lenni0451.mcstructs.text.TextComponent;
27-
import net.lenni0451.mcstructs.text.serializer.TextComponentCodec;
28-
import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer;
2929

3030
/**
3131
* Wrapper enum to unify text component and string nbt serialization functions across different versions.
@@ -50,7 +50,8 @@ public enum SerializerVersion {
5050
V1_20_3(TextComponentCodec.V1_20_3, SNbt.V1_14),
5151
V1_20_5(TextComponentCodec.V1_20_5, SNbt.V1_14),
5252
V1_21_4(TextComponentCodec.V1_21_4, SNbt.V1_14),
53-
V1_21_5(TextComponentCodec.V1_21_5, null/*Currently not needed and also not implemented 100% in MCStructs*/);
53+
V1_21_5(TextComponentCodec.V1_21_5, null/*Currently not needed and also not implemented 100% in MCStructs*/),
54+
V1_21_6(TextComponentCodec.V1_21_6, null);
5455

5556
final TextComponentSerializer jsonSerializer;
5657
final SNbt<? extends Tag> sNbt;

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata.format.version = "1.1"
55
gson = "2.12.1"
66
fastutil = "8.5.15"
77
vianbt = "5.1.0"
8-
mcstructs = "5-3.1.0-SNAPSHOT"
8+
mcstructs = "5-3.1.1-SNAPSHOT"
99

1010
# Common provided
1111
netty = "4.0.20.Final"

0 commit comments

Comments
 (0)