Skip to content

Commit 12cde18

Browse files
Use ViaBackwardsPlatform#getLogger for protocol logger creation (#1078)
1 parent b8adbde commit 12cde18

File tree

7 files changed

+43
-5
lines changed

7 files changed

+43
-5
lines changed

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

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

2020
import com.viaversion.viabackwards.api.data.BackwardsMappingData;
2121
import com.viaversion.viabackwards.api.rewriters.text.TranslatableRewriter;
22+
import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
2223
import com.viaversion.viaversion.api.Via;
2324
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
2425
import com.viaversion.viaversion.api.protocol.Protocol;
2526
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
2627
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
28+
import com.viaversion.viaversion.util.ProtocolLogger;
2729
import org.checkerframework.checker.nullness.qual.Nullable;
2830

2931
public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM extends ClientboundPacketType, SM extends ServerboundPacketType, SU extends ServerboundPacketType>
@@ -54,6 +56,11 @@ protected void registerPackets() {
5456
}
5557
}
5658

59+
@Override
60+
protected ProtocolLogger createLogger() {
61+
return new BackwardsProtocolLogger(getClass());
62+
}
63+
5764
@Override
5865
public boolean hasMappingDataToLoad() {
5966
// Manually load them later, since they depend on VV's mappings

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

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

7777
public interface ViaBackwardsPlatform {
7878

79-
String MINIMUM_VV_VERSION = "5.4.0";
79+
String MINIMUM_VV_VERSION = "5.5.0";
8080

8181
/**
8282
* Initialize ViaBackwards.

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/Protocol1_13To1_12_2.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.NoteBlockStorage;
3333
import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.PlayerPositionStorage1_13;
3434
import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.TabCompleteStorage;
35+
import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
3536
import com.viaversion.viaversion.api.Via;
3637
import com.viaversion.viaversion.api.connection.UserConnection;
3738
import com.viaversion.viaversion.api.minecraft.ClientWorld;
@@ -53,7 +54,7 @@
5354
public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_13, ClientboundPackets1_12_1, ServerboundPackets1_13, ServerboundPackets1_12_1> {
5455

5556
public static final BackwardsMappingData1_13 MAPPINGS = new BackwardsMappingData1_13();
56-
public static final ProtocolLogger LOGGER = new ProtocolLogger(Protocol1_13To1_12_2.class);
57+
public static final ProtocolLogger LOGGER = new BackwardsProtocolLogger(Protocol1_13To1_12_2.class);
5758
private final EntityPacketRewriter1_13 entityRewriter = new EntityPacketRewriter1_13(this);
5859
private final BlockItemPacketRewriter1_13 blockItemPackets = new BlockItemPacketRewriter1_13(this);
5960
private final JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON) {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/Protocol1_16_2To1_16_1.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.CommandRewriter1_16_2;
2626
import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.EntityPacketRewriter1_16_2;
2727
import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.storage.BiomeStorage;
28+
import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
2829
import com.viaversion.viaversion.api.connection.UserConnection;
2930
import com.viaversion.viaversion.api.minecraft.RegistryType;
3031
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
@@ -46,7 +47,7 @@
4647
public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets1_16_2, ClientboundPackets1_16, ServerboundPackets1_16_2, ServerboundPackets1_16> {
4748

4849
public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.16.2", "1.16", Protocol1_16_1To1_16_2.class);
49-
public static final ProtocolLogger LOGGER = new ProtocolLogger(Protocol1_16_2To1_16_1.class);
50+
public static final ProtocolLogger LOGGER = new BackwardsProtocolLogger(Protocol1_16_2To1_16_1.class);
5051
private final EntityPacketRewriter1_16_2 entityRewriter = new EntityPacketRewriter1_16_2(this);
5152
private final BlockItemPacketRewriter1_16_2 blockItemPackets = new BlockItemPacketRewriter1_16_2(this);
5253
private final ParticleRewriter<ClientboundPackets1_16_2> particleRewriter = new ParticleRewriter<>(this);
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
3+
* Copyright (C) 2016-2025 ViaVersion and contributors
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
package com.viaversion.viabackwards.utils;
19+
20+
import com.viaversion.viabackwards.ViaBackwards;
21+
import com.viaversion.viaversion.api.protocol.Protocol;
22+
import com.viaversion.viaversion.util.ProtocolLogger;
23+
24+
public final class BackwardsProtocolLogger extends ProtocolLogger {
25+
26+
public BackwardsProtocolLogger(final Class<? extends Protocol> protocol) {
27+
super(ViaBackwards.getPlatform().getLogger(), protocol);
28+
}
29+
}

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.4.2-SNAPSHOT"
6+
viaver = "5.5.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.0.4-SNAPSHOT,)"
50+
"version": "[5.5.0-SNAPSHOT,)"
5151
}
5252
]
5353
},

0 commit comments

Comments
 (0)