Skip to content

Commit 5433070

Browse files
kennytvkennytv
committed
23w40a
1 parent f923648 commit 5433070

File tree

26 files changed

+381
-55
lines changed

26 files changed

+381
-55
lines changed

‎common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_3To1_19_4;
5252
import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20;
5353
import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1;
54+
import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.Protocol1_20_2To1_20_3;
5455
import com.viaversion.viabackwards.protocol.protocol1_20to1_20_2.Protocol1_20To1_20_2;
5556
import com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4;
5657
import com.viaversion.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
@@ -66,7 +67,7 @@
6667

6768
public interface ViaBackwardsPlatform {
6869

69-
String MINIMUM_VV_VERSION = "4.8.1";
70+
String MINIMUM_VV_VERSION = "4.9.0";
7071

7172
/**
7273
* Initialize ViaBackwards.
@@ -133,6 +134,7 @@ default void init(File dataFolder) {
133134

134135
protocolManager.registerProtocol(new Protocol1_19_4To1_20(), ProtocolVersion.v1_19_4, ProtocolVersion.v1_20);
135136
protocolManager.registerProtocol(new Protocol1_20To1_20_2(), ProtocolVersion.v1_20, ProtocolVersion.v1_20_2);
137+
protocolManager.registerProtocol(new Protocol1_20_2To1_20_3(), ProtocolVersion.v1_20_2, ProtocolVersion.v1_20_3);
136138
}
137139

138140
/**

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void register() {
228228
public void register() {
229229
map(Type.POSITION); // 0 - Position
230230
map(Type.UNSIGNED_BYTE); // 1 - Action
231-
map(Type.NBT); // 2 - NBT
231+
map(Type.NAMED_COMPOUND_TAG); // 2 - NBT
232232

233233
handler(wrapper -> {
234234
// Remove on shulkerbox decleration
@@ -237,7 +237,7 @@ public void register() {
237237
}
238238
// Handler Spawners
239239
if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
240-
CompoundTag tag = wrapper.get(Type.NBT, 0);
240+
CompoundTag tag = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
241241
EntityIdRewriter.toClientSpawner(tag, true);
242242
}
243243
});

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void register() {
193193
public void register() {
194194
map(Type.POSITION); // 0 - Position
195195
map(Type.UNSIGNED_BYTE); // 1 - Action
196-
map(Type.NBT); // 2 - NBT
196+
map(Type.NAMED_COMPOUND_TAG); // 2 - NBT
197197

198198
handler(wrapper -> {
199199
// Remove bed color

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ else if (blockId >= 483 && blockId <= 498)
147147
public void register() {
148148
map(Type.POSITION); // 0 - Position
149149
map(Type.UNSIGNED_BYTE); // 1 - Action
150-
map(Type.NBT); // 2 - NBT Data
150+
map(Type.NAMED_COMPOUND_TAG); // 2 - NBT Data
151151

152152
handler(wrapper -> {
153153
BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
@@ -157,11 +157,11 @@ public void register() {
157157
wrapper.cancel();
158158
}
159159

160-
wrapper.set(Type.NBT, 0,
160+
wrapper.set(Type.NAMED_COMPOUND_TAG, 0,
161161
provider.transform(
162162
wrapper.user(),
163163
wrapper.get(Type.POSITION, 0),
164-
wrapper.get(Type.NBT, 0)
164+
wrapper.get(Type.NAMED_COMPOUND_TAG, 0)
165165
));
166166
});
167167
}
@@ -980,7 +980,7 @@ private static void flowerPotSpecialTreatment(UserConnection user, int blockStat
980980
PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_ENTITY_DATA, user);
981981
wrapper.write(Type.POSITION, position);
982982
wrapper.write(Type.UNSIGNED_BYTE, (short) 5);
983-
wrapper.write(Type.NBT, nbt);
983+
wrapper.write(Type.NAMED_COMPOUND_TAG, nbt);
984984
wrapper.scheduleSend(Protocol1_12_2To1_13.class);
985985

986986
}

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void register() {
237237
protocol.registerClientbound(ClientboundPackets1_16.BLOCK_ENTITY_DATA, wrapper -> {
238238
wrapper.passthrough(Type.POSITION1_14); // Position
239239
wrapper.passthrough(Type.UNSIGNED_BYTE); // Action
240-
CompoundTag tag = wrapper.passthrough(Type.NBT);
240+
CompoundTag tag = wrapper.passthrough(Type.NAMED_COMPOUND_TAG);
241241
handleBlockEntity(tag);
242242
});
243243

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void register() {
151151
map(Type.UNSIGNED_BYTE); // Gamemode
152152
map(Type.BYTE, Type.NOTHING); // Previous gamemode
153153
map(Type.STRING_ARRAY, Type.NOTHING); // World list
154-
map(Type.NBT, Type.NOTHING); // whatever this is
154+
map(Type.NAMED_COMPOUND_TAG, Type.NOTHING); // whatever this is
155155
map(dimensionTransformer); // Dimension Type
156156
handler(wrapper -> {
157157
WorldNameTracker worldNameTracker = wrapper.user().get(WorldNameTracker.class);

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void register() {
105105
map(Type.POSITION1_14);
106106
map(Type.UNSIGNED_BYTE);
107107
handler(wrapper -> {
108-
handleBlockEntity(wrapper.passthrough(Type.NBT));
108+
handleBlockEntity(wrapper.passthrough(Type.NAMED_COMPOUND_TAG));
109109
});
110110
}
111111
});

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void register() {
7272
map(Type.BYTE); // Previous Gamemode
7373
map(Type.STRING_ARRAY); // World List
7474
handler(wrapper -> {
75-
CompoundTag registry = wrapper.read(Type.NBT);
75+
CompoundTag registry = wrapper.read(Type.NAMED_COMPOUND_TAG);
7676
if (wrapper.user().getProtocolInfo().getProtocolVersion() <= ProtocolVersion.v1_15_2.getVersion()) {
7777
// Store biomes for <1.16 client handling
7878
CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
@@ -91,9 +91,9 @@ public void register() {
9191
}
9292

9393
// Just screw the registry and write the defaults for 1.16 and 1.16.1 clients
94-
wrapper.write(Type.NBT, EntityPackets.DIMENSIONS_TAG);
94+
wrapper.write(Type.NAMED_COMPOUND_TAG, EntityPackets.DIMENSIONS_TAG);
9595

96-
CompoundTag dimensionData = wrapper.read(Type.NBT);
96+
CompoundTag dimensionData = wrapper.read(Type.NAMED_COMPOUND_TAG);
9797
wrapper.write(Type.STRING, getDimensionFromData(dimensionData));
9898
});
9999
map(Type.STRING); // Dimension
@@ -108,7 +108,7 @@ public void register() {
108108
});
109109

110110
protocol.registerClientbound(ClientboundPackets1_16_2.RESPAWN, wrapper -> {
111-
CompoundTag dimensionData = wrapper.read(Type.NBT);
111+
CompoundTag dimensionData = wrapper.read(Type.NAMED_COMPOUND_TAG);
112112
wrapper.write(Type.STRING, getDimensionFromData(dimensionData));
113113
});
114114
}

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public void register() {
7171
map(Type.UNSIGNED_BYTE); // Gamemode
7272
map(Type.BYTE); // Previous Gamemode
7373
map(Type.STRING_ARRAY); // Worlds
74-
map(Type.NBT); // Dimension registry
75-
map(Type.NBT); // Current dimension data
74+
map(Type.NAMED_COMPOUND_TAG); // Dimension registry
75+
map(Type.NAMED_COMPOUND_TAG); // Current dimension data
7676
map(Type.STRING); // World
7777
handler(wrapper -> {
7878
byte previousGamemode = wrapper.get(Type.BYTE, 0);
@@ -83,7 +83,7 @@ public void register() {
8383
handler(getTrackerHandler(Entity1_17Types.PLAYER, Type.INT));
8484
handler(worldDataTrackerHandler(1));
8585
handler(wrapper -> {
86-
CompoundTag registry = wrapper.get(Type.NBT, 0);
86+
CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
8787
CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
8888
ListTag biomes = biomeRegistry.get("value");
8989
for (Tag biome : biomes) {
@@ -101,18 +101,18 @@ public void register() {
101101
reduceExtendedHeight(dimensionCompound, false);
102102
}
103103

104-
reduceExtendedHeight(wrapper.get(Type.NBT, 1), true);
104+
reduceExtendedHeight(wrapper.get(Type.NAMED_COMPOUND_TAG, 1), true);
105105
});
106106
}
107107
});
108108

109109
protocol.registerClientbound(ClientboundPackets1_17.RESPAWN, new PacketHandlers() {
110110
@Override
111111
public void register() {
112-
map(Type.NBT); // Dimension data
112+
map(Type.NAMED_COMPOUND_TAG); // Dimension data
113113
map(Type.STRING); // World
114114
handler(worldDataTrackerHandler(0));
115-
handler(wrapper -> reduceExtendedHeight(wrapper.get(Type.NBT, 0), true));
115+
handler(wrapper -> reduceExtendedHeight(wrapper.get(Type.NAMED_COMPOUND_TAG, 0), true));
116116
}
117117
});
118118

‎common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void register() {
131131
map(Type.POSITION1_14);
132132
handler(wrapper -> {
133133
final int id = wrapper.read(Type.VAR_INT);
134-
final CompoundTag tag = wrapper.read(Type.NBT);
134+
final CompoundTag tag = wrapper.read(Type.NAMED_COMPOUND_TAG);
135135

136136
final int mappedId = BlockEntityIds.mappedId(id);
137137
if (mappedId == -1) {
@@ -162,7 +162,7 @@ public void register() {
162162

163163
handleSpawner(id, newTag);
164164
wrapper.write(Type.UNSIGNED_BYTE, (short) mappedId);
165-
wrapper.write(Type.NBT, newTag);
165+
wrapper.write(Type.NAMED_COMPOUND_TAG, newTag);
166166
});
167167
}
168168
});

0 commit comments

Comments
 (0)