From a1561ea1af4eb0d11b214d56108243bc7d8d9a5b Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Thu, 7 Dec 2023 19:50:19 -0500 Subject: [PATCH 1/3] Update to Minecraft 1.20.4 --- .../java/com/earth2me/essentials/utils/VersionUtil.java | 7 ++++--- README.md | 2 +- build-logic/src/main/kotlin/constants.kt | 2 +- .../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index ae23e0a56b9..0c61c1a864b 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -38,9 +38,9 @@ public final class VersionUtil { public static final BukkitVersion v1_19_R01 = BukkitVersion.fromString("1.19-R0.1-SNAPSHOT"); public static final BukkitVersion v1_19_4_R01 = BukkitVersion.fromString("1.19.4-R0.1-SNAPSHOT"); public static final BukkitVersion v1_20_1_R01 = BukkitVersion.fromString("1.20.1-R0.1-SNAPSHOT"); - public static final BukkitVersion v1_20_2_R01 = BukkitVersion.fromString("1.20.2-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_20_4_R01 = BukkitVersion.fromString("1.20.2-R0.1-SNAPSHOT"); - private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_2_R01); + private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_4_R01); public static final boolean PRE_FLATTENING = VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01); @@ -74,6 +74,7 @@ public final class VersionUtil { // Forge - Doesn't support Bukkit // The below translates to net.minecraftforge.common.MinecraftForge builder.put(dumb(new int[] {110, 101, 116, 46, 109, 105, 110, 101, 99, 114, 97, 102, 116, 102, 111, 114, 103, 101, 46, 99, 111, 109, 109, 111, 110, 46, 77, 105, 110, 101, 99, 114, 97, 102, 116, 70, 111, 114, 103, 101}, 40), SupportStatus.UNSTABLE); + builder.put("brand:Mohist", SupportStatus.UNSTABLE); // Fabric - Doesn't support Bukkit // The below translates to net.fabricmc.loader.launch.knot.KnotServer @@ -358,7 +359,7 @@ private static String dumb(final int[] clazz, final int len) { final String decode = String.valueOf(chars); - if (decode.length() != len) { + if (decode.charAt(0) != 'n' || decode.length() != len) { System.exit(1); return "why do hybrids try to bypass this?"; } diff --git a/README.md b/README.md index f80f662b8b4..6aef88946d2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ however, have some new requirements: * **EssentialsX requires CraftBukkit, Spigot or Paper to run.** Other server software may work, but these are not tested by the team and we may not be able to help with any issues that occur. * **EssentialsX currently supports Minecraft versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, - 1.16.5, 1.17.1, 1.18.2, 1.19.4, and 1.20.2.** + 1.16.5, 1.17.1, 1.18.2, 1.19.4, and 1.20.4.** * **EssentialsX currently requires Java 8 or higher.** We recommend using the latest Java version supported by your server software. * **EssentialsX requires [Vault](http://dev.bukkit.org/bukkit-plugins/vault/) to enable using chat prefix/suffixes and diff --git a/build-logic/src/main/kotlin/constants.kt b/build-logic/src/main/kotlin/constants.kt index fdcbb0bf839..f1398887ffd 100644 --- a/build-logic/src/main/kotlin/constants.kt +++ b/build-logic/src/main/kotlin/constants.kt @@ -1 +1 @@ -const val RUN_PAPER_MINECRAFT_VERSION = "1.20.2" +const val RUN_PAPER_MINECRAFT_VERSION = "1.20.4" diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts index 8d4e47b95f9..60ec45e20fe 100644 --- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts @@ -10,7 +10,7 @@ plugins { val baseExtension = extensions.create("essentials", project) val checkstyleVersion = "8.36.2" -val spigotVersion = "1.20.2-R0.1-SNAPSHOT" +val spigotVersion = "1.20.4-R0.1-SNAPSHOT" val junit5Version = "5.7.0" val mockitoVersion = "3.2.0" From 89224d645ab180e935f297274441c1d5de855737 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Thu, 7 Dec 2023 21:06:34 -0500 Subject: [PATCH 2/3] Reflect grass changes --- Essentials/src/main/resources/items.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Essentials/src/main/resources/items.json b/Essentials/src/main/resources/items.json index 30aeb2d41fe..8bce6f915a4 100644 --- a/Essentials/src/main/resources/items.json +++ b/Essentials/src/main/resources/items.json @@ -7808,10 +7808,14 @@ "wallgr": "granite_wall", "wallgranite": "granite_wall", "wallgstone": "granite_wall", - "grass": { - "material": "GRASS" + "short_grass": { + "material": "SHORT_GRASS", + "fallbacks": [ + "GRASS" + ] }, - "minecraft:grass": "grass", + "minecraft:short_grass": "short_grass", + "grass": "short_grass", "grass_block": { "material": "GRASS_BLOCK" }, From f2e8501fda656370459ee90e98ca5c858f506e67 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:53:18 -0500 Subject: [PATCH 3/3] reflect itemdb changes --- Essentials/src/main/resources/items.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Essentials/src/main/resources/items.json b/Essentials/src/main/resources/items.json index 8bce6f915a4..c8f74341c23 100644 --- a/Essentials/src/main/resources/items.json +++ b/Essentials/src/main/resources/items.json @@ -6172,7 +6172,7 @@ "begg": "dragon_egg", "bossegg": "dragon_egg", "degg": "dragon_egg", - "dragonegg": "dragon_egg", + "dragonegg": "ender_dragon_spawn_egg", "endegg": "dragon_egg", "enderdragonegg": "dragon_egg", "minecraft:dragon_egg": "dragon_egg", @@ -7808,14 +7808,6 @@ "wallgr": "granite_wall", "wallgranite": "granite_wall", "wallgstone": "granite_wall", - "short_grass": { - "material": "SHORT_GRASS", - "fallbacks": [ - "GRASS" - ] - }, - "minecraft:short_grass": "short_grass", - "grass": "short_grass", "grass_block": { "material": "GRASS_BLOCK" }, @@ -25774,6 +25766,14 @@ "minecraft:shield": "shield", "woodenshield": "shield", "woodshield": "shield", + "short_grass": { + "material": "SHORT_GRASS", + "fallbacks": [ + "GRASS" + ] + }, + "minecraft:short_grass": "short_grass", + "shortgrass": "short_grass", "shroomlight": { "material": "SHROOMLIGHT" }, @@ -42256,7 +42256,7 @@ "wither_skeletonsegg": "wither_skeleton_spawn_egg", "wither_skeletonspawn": "wither_skeleton_spawn_egg", "wither_skeletonspawnegg": "wither_skeleton_spawn_egg", - "withersegg": "wither_skeleton_spawn_egg", + "withersegg": "wither_spawn_egg", "witherskegg": "wither_skeleton_spawn_egg", "witherskeletonspawnegg": "wither_skeleton_spawn_egg", "withersksegg": "wither_skeleton_spawn_egg",