Skip to content

Commit c8c2897

Browse files
committed
Fixed protocol codec list.
1 parent 0d15b19 commit c8c2897

1 file changed

Lines changed: 74 additions & 55 deletions

File tree

src/main/java/oxy/geyser/reversion/DuplicatedProtocolInfo.java

Lines changed: 74 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package oxy.geyser.reversion;
22

3-
import com.github.blackjack200.ouranos.data.bedrock.GlobalItemDataHandlers;
43
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
54
import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
65
import org.cloudburstmc.protocol.bedrock.codec.v361.Bedrock_v361;
@@ -31,6 +30,7 @@
3130
import org.cloudburstmc.protocol.bedrock.codec.v568.Bedrock_v568;
3231
import org.cloudburstmc.protocol.bedrock.codec.v575.Bedrock_v575;
3332
import org.cloudburstmc.protocol.bedrock.codec.v582.Bedrock_v582;
33+
import org.cloudburstmc.protocol.bedrock.codec.v589.Bedrock_v589;
3434
import org.cloudburstmc.protocol.bedrock.codec.v594.Bedrock_v594;
3535
import org.cloudburstmc.protocol.bedrock.codec.v618.Bedrock_v618;
3636
import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
@@ -71,66 +71,85 @@ public static BedrockCodec getPacketCodec(int protocolVersion) {
7171
return null;
7272
}
7373

74-
public static void addPacketCodec(BedrockCodec packetCodec, int schemaId) {
74+
public static void addPacketCodec(BedrockCodec packetCodec) {
7575
BedrockCodecHelper helper = packetCodec.createHelper();
7676
helper.setEncodingSettings(EncodingSettings.builder().maxListSize(Integer.MAX_VALUE).maxByteArraySize(Integer.MAX_VALUE).maxNetworkNBTSize(Integer.MAX_VALUE).maxItemNBTSize(Integer.MAX_VALUE).maxStringLength(Integer.MAX_VALUE).build());
7777
PACKET_CODECS.add(packetCodec.toBuilder().helper(() -> helper).build());
78-
GlobalItemDataHandlers.SCHEMA_ID.put(packetCodec.getProtocolVersion(), schemaId);
79-
}
80-
81-
public static Set<BedrockCodec> getPacketCodecs() {
82-
return UNMODIFIABLE_PACKET_CODECS;
8378
}
8479

8580
static {
8681
UNMODIFIABLE_PACKET_CODECS = Collections.unmodifiableSet(PACKET_CODECS);
87-
addPacketCodec(Bedrock_v844.CODEC, 241);
88-
addPacketCodec(Bedrock_v827.CODEC, 241);
89-
addPacketCodec(Bedrock_v819.CODEC, 231);
90-
addPacketCodec(Bedrock_v818.CODEC, 231);
91-
addPacketCodec(Bedrock_v800.CODEC, 231);
92-
addPacketCodec(Bedrock_v786.CODEC, 231);
93-
addPacketCodec(Bedrock_v776.CODEC, 231);
94-
addPacketCodec(Bedrock_v766.CODEC, 231);
95-
addPacketCodec(Bedrock_v748.CODEC, 221);
96-
addPacketCodec(Bedrock_v729.CODEC, 211);
97-
addPacketCodec(Bedrock_v712.CODEC, 201);
98-
addPacketCodec(Bedrock_v686.CODEC, 201);
99-
addPacketCodec(Bedrock_v685.CODEC, 191);
100-
addPacketCodec(Bedrock_v671.CODEC, 181);
101-
addPacketCodec(Bedrock_v662.CODEC, 171);
102-
addPacketCodec(Bedrock_v649.CODEC, 161);
103-
addPacketCodec(Bedrock_v630.CODEC, 151);
104-
addPacketCodec(Bedrock_v622.CODEC, 141);
105-
addPacketCodec(Bedrock_v618.CODEC, 131);
106-
addPacketCodec(Bedrock_v594.CODEC, 121);
107-
addPacketCodec(Bedrock_v582.CODEC, 101);
108-
addPacketCodec(Bedrock_v575.CODEC, 91);
109-
addPacketCodec(Bedrock_v568.CODEC, 81);
110-
addPacketCodec(Bedrock_v567.CODEC, 81);
111-
addPacketCodec(Bedrock_v560.CODEC, 81);
112-
addPacketCodec(Bedrock_v557.CODEC, 81);
113-
addPacketCodec(Bedrock_v554.CODEC, 81);
114-
addPacketCodec(Bedrock_v545.CODEC, 71);
115-
addPacketCodec(Bedrock_v544.CODEC, 71);
116-
addPacketCodec(Bedrock_v534.CODEC, 71);
117-
addPacketCodec(Bedrock_v527.CODEC, 71);
118-
addPacketCodec(Bedrock_v503.CODEC, 71);
119-
addPacketCodec(Bedrock_v486.CODEC, 61);
120-
addPacketCodec(Bedrock_v475.CODEC, 51);
121-
addPacketCodec(Bedrock_v471.CODEC, 41);
122-
addPacketCodec(Bedrock_v465.CODEC, 31);
123-
addPacketCodec(Bedrock_v448.CODEC, 31);
124-
addPacketCodec(Bedrock_v440.CODEC, 31);
125-
addPacketCodec(Bedrock_v431.CODEC, 31);
126-
addPacketCodec(Bedrock_v428.CODEC, 31);
127-
addPacketCodec(Bedrock_v422.CODEC, 31);
128-
addPacketCodec(Bedrock_v419.CODEC, 21);
129-
addPacketCodec(Bedrock_v408.CODEC, 11);
130-
addPacketCodec(Bedrock_v407.CODEC, 11);
131-
addPacketCodec(Bedrock_v390.CODEC, 11);
132-
addPacketCodec(Bedrock_v389.CODEC, 11);
133-
addPacketCodec(Bedrock_v388.CODEC, 11);
134-
addPacketCodec(Bedrock_v361.CODEC, 11);
82+
83+
// 1.21-1.21.111
84+
addPacketCodec(Bedrock_v844.CODEC);
85+
addPacketCodec(Bedrock_v827.CODEC);
86+
addPacketCodec(Bedrock_v819.CODEC);
87+
addPacketCodec(Bedrock_v818.CODEC);
88+
addPacketCodec(Bedrock_v800.CODEC);
89+
addPacketCodec(Bedrock_v786.CODEC);
90+
addPacketCodec(Bedrock_v776.CODEC);
91+
addPacketCodec(Bedrock_v766.CODEC);
92+
addPacketCodec(Bedrock_v748.CODEC);
93+
addPacketCodec(Bedrock_v729.CODEC);
94+
addPacketCodec(Bedrock_v712.CODEC);
95+
addPacketCodec(Bedrock_v686.CODEC);
96+
addPacketCodec(Bedrock_v685.CODEC);
97+
98+
// 1.20.x
99+
addPacketCodec(Bedrock_v671.CODEC);
100+
addPacketCodec(Bedrock_v662.CODEC);
101+
addPacketCodec(Bedrock_v649.CODEC);
102+
addPacketCodec(Bedrock_v630.CODEC);
103+
addPacketCodec(Bedrock_v622.CODEC);
104+
addPacketCodec(Bedrock_v618.CODEC);
105+
addPacketCodec(Bedrock_v594.CODEC);
106+
addPacketCodec(Bedrock_v589.CODEC);
107+
108+
// 1.19.x
109+
addPacketCodec(Bedrock_v582.CODEC);
110+
addPacketCodec(Bedrock_v575.CODEC);
111+
addPacketCodec(Bedrock_v568.CODEC);
112+
addPacketCodec(Bedrock_v567.CODEC);
113+
114+
addPacketCodec(Bedrock_v560.CODEC);
115+
116+
addPacketCodec(Bedrock_v557.CODEC);
117+
addPacketCodec(Bedrock_v554.CODEC);
118+
119+
addPacketCodec(Bedrock_v545.CODEC);
120+
addPacketCodec(Bedrock_v544.CODEC);
121+
addPacketCodec(Bedrock_v534.CODEC);
122+
addPacketCodec(Bedrock_v527.CODEC);
123+
124+
// 1.18.x
125+
addPacketCodec(Bedrock_v503.CODEC);
126+
addPacketCodec(Bedrock_v486.CODEC);
127+
addPacketCodec(Bedrock_v475.CODEC);
128+
129+
// 1.17.x
130+
addPacketCodec(Bedrock_v471.CODEC);
131+
addPacketCodec(Bedrock_v465.CODEC);
132+
addPacketCodec(Bedrock_v448.CODEC);
133+
addPacketCodec(Bedrock_v440.CODEC);
134+
135+
// 1.16.x
136+
addPacketCodec(Bedrock_v431.CODEC);
137+
addPacketCodec(Bedrock_v428.CODEC);
138+
addPacketCodec(Bedrock_v422.CODEC);
139+
addPacketCodec(Bedrock_v419.CODEC);
140+
141+
//1.16.40 partially playable
142+
addPacketCodec(Bedrock_v408.CODEC);
143+
addPacketCodec(Bedrock_v407.CODEC);
144+
145+
// 1.14.x partially playable
146+
addPacketCodec(Bedrock_v390.CODEC);
147+
addPacketCodec(Bedrock_v389.CODEC);
148+
149+
// 1.13.0 partially playable
150+
addPacketCodec(Bedrock_v388.CODEC);
151+
152+
// 1.12.0 partially playable
153+
addPacketCodec(Bedrock_v361.CODEC);
135154
}
136155
}

0 commit comments

Comments
 (0)