From 4d4e7399394fa6fc5b797fe5a4c566b715a1e7f7 Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Tue, 25 Jul 2023 03:08:22 +0200 Subject: [PATCH 1/3] Friendly names in CI, Update Blossom. (#562) --- .github/workflows/gradle.yml | 9 ++++++--- settings.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fb127966..d1b99009 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,8 +9,10 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -18,7 +20,8 @@ jobs: java-version: 11 - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v3 + - name: Upload Artifacts + uses: actions/upload-artifact@v3 with: name: artifact path: build/libs diff --git a/settings.gradle.kts b/settings.gradle.kts index 69e747f3..3d4d4dfa 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { pluginManagement { plugins { - id("net.kyori.blossom") version "1.2.0" + id("net.kyori.blossom") version "1.3.1" id("com.github.johnrengelman.shadow") version "8.1.1" } } From 43e2b242c48f77145c7ceb7a98296272a5545c31 Mon Sep 17 00:00:00 2001 From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 14 Aug 2023 02:02:52 +0200 Subject: [PATCH 2/3] Fix 1.19.4 -> 1.19.3 precipitation reading (#578) --- .../packets/EntityPackets1_19_4.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java index 9db1c37b..1e697efd 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java @@ -28,11 +28,7 @@ import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_19_3; import com.viaversion.viaversion.api.type.types.version.Types1_19_4; import com.viaversion.viaversion.libs.gson.JsonElement; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.*; import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; @@ -72,7 +68,7 @@ public final class EntityPackets1_19_4 extends EntityRewriter Date: Mon, 14 Aug 2023 02:04:02 +0200 Subject: [PATCH 3/3] Remove unused chat-types setting from config.yml (#579) --- .../viaversion/viabackwards/ViaBackwardsConfig.java | 9 --------- .../viabackwards/api/ViaBackwardsConfig.java | 4 ---- .../main/resources/assets/viabackwards/config.yml | 12 +----------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java b/common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java index eeeb7d92..c2a98864 100644 --- a/common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java +++ b/common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java @@ -21,10 +21,8 @@ import com.viaversion.viaversion.util.Config; import java.io.File; import java.net.URL; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; public class ViaBackwardsConfig extends Config implements com.viaversion.viabackwards.api.ViaBackwardsConfig { @@ -34,7 +32,6 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback private boolean alwaysShowOriginalMobName; private boolean fix1_13FormattedInventoryTitles; private boolean handlePingsAsInvAcknowledgements; - private Map chatTypeFormats; public ViaBackwardsConfig(File configFile) { super(configFile); @@ -53,7 +50,6 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback fix1_13FormattedInventoryTitles = getBoolean("fix-formatted-inventory-titles", true); alwaysShowOriginalMobName = getBoolean("always-show-original-mob-name", true); handlePingsAsInvAcknowledgements = getBoolean("handle-pings-as-inv-acknowledgements", false); - chatTypeFormats = get("chat-types-1_19_1", Map.class, new HashMap()); } @Override @@ -86,11 +82,6 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback return handlePingsAsInvAcknowledgements || Boolean.getBoolean("com.viaversion.handlePingsAsInvAcknowledgements"); } - @Override - public @Nullable String chatTypeFormat(final String translationKey) { - return chatTypeFormats.get(translationKey); - } - @Override public URL getDefaultConfigURL() { return getClass().getClassLoader().getResource("assets/viabackwards/config.yml"); diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java index fcb56f6f..9e10f3ee 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java @@ -17,8 +17,6 @@ */ package com.viaversion.viabackwards.api; -import org.checkerframework.checker.nullness.qual.Nullable; - public interface ViaBackwardsConfig { /** @@ -52,6 +50,4 @@ public interface ViaBackwardsConfig { boolean alwaysShowOriginalMobName(); boolean handlePingsAsInvAcknowledgements(); - - @Nullable String chatTypeFormat(String translationKey); } diff --git a/common/src/main/resources/assets/viabackwards/config.yml b/common/src/main/resources/assets/viabackwards/config.yml index 285b4144..b9ce0f60 100644 --- a/common/src/main/resources/assets/viabackwards/config.yml +++ b/common/src/main/resources/assets/viabackwards/config.yml @@ -19,14 +19,4 @@ fix-formatted-inventory-titles: true # # Sends inventory acknowledgement packets to act as a replacement for ping packets for sub 1.17 clients. # This only takes effect for ids in the short range. Useful for anticheat compatibility. -handle-pings-as-inv-acknowledgements: false -# -# 1.19.1 chat type formats. -chat-types-1_19_1: - "chat.type.text": "<%s> %s" - "chat.type.announcement": "[%s] %s" - "commands.message.display.incoming": "%s whispers to you: %s" - "commands.message.display.outgoing": "You whisper to %s: %s" - "chat.type.team.text": "%s <%s> %s" - "chat.type.team.sent": "-> %s <%s> %s" - "chat.type.emote": "* %s %s" \ No newline at end of file +handle-pings-as-inv-acknowledgements: false \ No newline at end of file