From f840a55734cc5d4e4f4efd9dbbb93b827ce29511 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 13 Jun 2023 15:28:12 +0200 Subject: [PATCH] Fixed 1.20 bugs --- .../main/java/com/willfp/eco/core/Prerequisite.java | 12 ++++++++++-- .../com/willfp/eco/internal/config/EcoRepresenter.kt | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java b/eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java index 5babac6d..667d1f9e 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java +++ b/eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java @@ -37,11 +37,19 @@ public class Prerequisite { "Requires server to have ProtocolLib" ); + /** + * Requires the server to be running 1.20. + */ + public static final Prerequisite HAS_1_20 = new Prerequisite( + () -> ProxyConstants.NMS_VERSION.contains("20"), + "Requires server to be running 1.20+" + ); + /** * Requires the server to be running 1.19.4. */ public static final Prerequisite HAS_1_19_4 = new Prerequisite( - () -> ProxyConstants.NMS_VERSION.contains("19_R3"), + () -> ProxyConstants.NMS_VERSION.contains("19_R3") || HAS_1_20.isMet(), "Requires server to be running 1.19.4+" ); @@ -49,7 +57,7 @@ public class Prerequisite { * Requires the server to be running 1.19. */ public static final Prerequisite HAS_1_19 = new Prerequisite( - () -> ProxyConstants.NMS_VERSION.contains("19"), + () -> ProxyConstants.NMS_VERSION.contains("19") || HAS_1_20.isMet(), "Requires server to be running 1.19+" ); diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoRepresenter.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoRepresenter.kt index f7a02179..61d516d7 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoRepresenter.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoRepresenter.kt @@ -1,12 +1,12 @@ package com.willfp.eco.internal.config import com.willfp.eco.core.config.interfaces.Config +import org.yaml.snakeyaml.DumperOptions import org.yaml.snakeyaml.nodes.Node import org.yaml.snakeyaml.representer.Represent import org.yaml.snakeyaml.representer.Representer -@Suppress("DEPRECATION") -class EcoRepresenter : Representer() { +class EcoRepresenter : Representer(DumperOptions()) { init { multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!) }