Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed 1.20 bugs

Browse Source
This commit is contained in:
Auxilor
2023-06-13 15:28:12 +02:00
parent b6f2b9d4ea
commit f840a55734
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eco-api/src/main/java/com/willfp/eco/core/Prerequisite.java
View File

@@ -37,11 +37,19 @@ public class Prerequisite {
"Requires server to have ProtocolLib" "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. * Requires the server to be running 1.19.4.
*/ */
public static final Prerequisite HAS_1_19_4 = new Prerequisite( 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+" "Requires server to be running 1.19.4+"
); );
@@ -49,7 +57,7 @@ public class Prerequisite {
* Requires the server to be running 1.19. * Requires the server to be running 1.19.
*/ */
public static final Prerequisite HAS_1_19 = new Prerequisite( 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+" "Requires server to be running 1.19+"
); );

4
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoRepresenter.kt
View File

@@ -1,12 +1,12 @@
package com.willfp.eco.internal.config package com.willfp.eco.internal.config
import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.config.interfaces.Config
import org.yaml.snakeyaml.DumperOptions
import org.yaml.snakeyaml.nodes.Node import org.yaml.snakeyaml.nodes.Node
import org.yaml.snakeyaml.representer.Represent import org.yaml.snakeyaml.representer.Represent
import org.yaml.snakeyaml.representer.Representer import org.yaml.snakeyaml.representer.Representer
@Suppress("DEPRECATION") class EcoRepresenter : Representer(DumperOptions()) {
class EcoRepresenter : Representer() {
init { init {
multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!) multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!)
} }