Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 09:08:01 +01:00
Code Issues Projects Releases Wiki Activity

Update to Minecraft 1.20.4 (#5592)

Browse Source
This commit is contained in:
Josh Roy 2023-12-16 10:14:37 -05:00 committed by GitHub
parent bb7b334ace
commit 84e9051f46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
View File

@ -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<BukkitVersion> 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<BukkitVersion> 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 @@ public final class VersionUtil {
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?";
}

16
Essentials/src/main/resources/items.json
View File

@ -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,10 +7808,6 @@
"wallgr": "granite_wall",
"wallgranite": "granite_wall",
"wallgstone": "granite_wall",
"grass": {
"material": "GRASS"
},
"minecraft:grass": "grass",
"grass_block": {
"material": "GRASS_BLOCK"
},
@ -25770,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"
},
@ -42252,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",

2
README.md
View File

@ -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

2
build-logic/src/main/kotlin/constants.kt
View File

@ -1 +1 @@
const val RUN_PAPER_MINECRAFT_VERSION = "1.20.2"
const val RUN_PAPER_MINECRAFT_VERSION = "1.20.4"

2
build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
View File

@ -10,7 +10,7 @@ plugins {
val baseExtension = extensions.create<EssentialsBaseExtension>("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"