Skip to content

Commit 8ce26b1

Browse files
committed
Bump to 5.7.0-SNAPSHOT and update VV usage
1 parent 9a79f9e commit 8ce26b1

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
public interface ViaBackwardsPlatform {
8080

81-
String MINIMUM_VV_VERSION = "5.6.1";
81+
String MINIMUM_VV_VERSION = "5.7.0";
8282

8383
default void init(final File configFile) {
8484
init(new ViaBackwardsConfig(configFile, getLogger()));

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public Item handleItemToClient(UserConnection connection, Item item) {
508508
if (originalId == 362) { // base/colorless shulker box
509509
rawId = 0xe50000; // purple shulker box
510510
} else {
511-
if (!Via.getConfig().isSuppressConversionWarnings()) {
511+
if (Via.getConfig().logOtherConversionWarnings()) {
512512
protocol.getLogger().warning("Failed to get new item for " + originalId);
513513
}
514514

@@ -818,7 +818,7 @@ public Item handleItemToServer(UserConnection connection, Item item) {
818818
} else if (protocol.getMappingData().getItemMappings().inverse().getNewId(rawId & ~0xF) != -1) {
819819
rawId &= ~0xF; // Remove data
820820
} else {
821-
if (!Via.getConfig().isSuppressConversionWarnings()) {
821+
if (Via.getConfig().logOtherConversionWarnings()) {
822822
protocol.getLogger().warning("Failed to get old item for " + item.identifier());
823823
}
824824
rawId = 16; // Stone

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/PlayerPacketRewriter1_13.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void register() {
8181
} else {
8282
String oldChannel = ItemPacketRewriter1_13.getOldPluginChannelId(channel);
8383
if (oldChannel == null) {
84-
if (!Via.getConfig().isSuppressConversionWarnings()) {
84+
if (Via.getConfig().logOtherConversionWarnings()) {
8585
protocol.getLogger().warning("Ignoring clientbound plugin message with channel: " + channel);
8686
}
8787
wrapper.cancel();
@@ -96,7 +96,7 @@ public void register() {
9696
String rewritten = ItemPacketRewriter1_13.getOldPluginChannelId(s);
9797
if (rewritten != null) {
9898
rewrittenChannels.add(rewritten);
99-
} else if (!Via.getConfig().isSuppressConversionWarnings()) {
99+
} else if (Via.getConfig().logOtherConversionWarnings()) {
100100
protocol.getLogger().warning("Ignoring plugin channel in clientbound " + oldChannel + ": " + s);
101101
}
102102
}
@@ -367,7 +367,7 @@ public void register() {
367367
//Maybe older versions used this and we need to implement this? The issue is that we would have to save the command block types
368368
wrapper.setPacketType(ServerboundPackets1_13.SET_COMMAND_BLOCK);
369369
wrapper.cancel();
370-
if (!Via.getConfig().isSuppressConversionWarnings()) {
370+
if (Via.getConfig().logOtherConversionWarnings()) {
371371
protocol.getLogger().warning("Client send MC|AdvCmd custom payload to update command block, weird!");
372372
}
373373
} else if (type == 1) {
@@ -457,7 +457,7 @@ public void register() {
457457
default -> {
458458
String newChannel = ItemPacketRewriter1_13.getNewPluginChannelId(channel);
459459
if (newChannel == null) {
460-
if (!Via.getConfig().isSuppressConversionWarnings()) {
460+
if (Via.getConfig().logOtherConversionWarnings()) {
461461
protocol.getLogger().warning("Ignoring serverbound plugin message with channel: " + channel);
462462
}
463463
wrapper.cancel();
@@ -472,7 +472,7 @@ public void register() {
472472
String rewritten = ItemPacketRewriter1_13.getNewPluginChannelId(s);
473473
if (rewritten != null) {
474474
rewrittenChannels.add(rewritten);
475-
} else if (!Via.getConfig().isSuppressConversionWarnings()) {
475+
} else if (Via.getConfig().logOtherConversionWarnings()) {
476476
protocol.getLogger().warning("Ignoring plugin channel in serverbound " + Key.stripMinecraftNamespace(newChannel).toUpperCase(Locale.ROOT) + ": " + s);
477477
}
478478
}

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/data/BiomeMappings1_16_1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private static void add(final int id, final String biome) {
136136
public static int toLegacyBiome(String biome) {
137137
final int legacyBiome = MODERN_TO_LEGACY_ID.getInt(Key.stripMinecraftNamespace(biome));
138138
if (legacyBiome == -1) {
139-
if (!Via.getConfig().isSuppressConversionWarnings()) {
139+
if (Via.getConfig().logOtherConversionWarnings()) {
140140
Protocol1_16_2To1_16_1.LOGGER.warning("Biome with id " + biome + " has no legacy biome mapping (custom datapack?)");
141141
}
142142
return 1; // Plains

common/src/main/java/com/viaversion/viabackwards/protocol/v1_18_2to1_18/Protocol1_18_2To1_18.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void registerPackets() {
4343
final PacketHandler entityEffectIdHandler = wrapper -> {
4444
final int id = wrapper.read(Types.VAR_INT);
4545
if ((byte) id != id) {
46-
if (!Via.getConfig().isSuppressConversionWarnings()) {
46+
if (Via.getConfig().logOtherConversionWarnings()) {
4747
getLogger().warning("Cannot send entity effect id " + id + " to old client");
4848
}
4949
wrapper.cancel();

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
projectVersion=5.6.1-SNAPSHOT
1+
projectVersion=5.7.0-SNAPSHOT
22

33
# Smile emoji (note that modrinth may not have added the version on release yet)
44
mcVersions=1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
33
[versions]
44

55
# ViaVersion
6-
viaver = "5.6.1-SNAPSHOT"
6+
viaver = "5.7.0-SNAPSHOT"
77

88
# Common provided
99
netty = "4.0.20.Final"

sponge/src/main/resources/META-INF/sponge_plugins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
{
4949
"id": "viaversion",
50-
"version": "[5.6.0-SNAPSHOT,)"
50+
"version": "[5.7.0-SNAPSHOT,)"
5151
}
5252
]
5353
},

0 commit comments

Comments
 (0)