Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b46ac671 Update to Minecraft 1.18 CraftBukkit Changes: bc14cb64 Update to Minecraft 1.18 Spigot Changes: a5dea1cb Update to Minecraft 1.18
2024-12-27 23:10:16 +01:00 · 2021-11-30 17:23:56 +01:00 · 2021-11-30 17:23:56 +01:00 · fcd5f7c996
commit fcd5f7c996
parent 91b1d01dbd
6 changed files with 5 additions and 74 deletions
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
-    <version>1.18-rc3-R0.1-SNAPSHOT</version>
+-    <version>1.18-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
--- a/patches/server/1.18-Release.patch
+++ b/patches/server/1.18-Release.patch
@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Tue, 30 Nov 2021 09:57:30 +0100
-Subject: [PATCH] 1.18 Release
-
-
-diff --git a/src/main/java/net/minecraft/DetectedVersion.java b/src/main/java/net/minecraft/DetectedVersion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/DetectedVersion.java
-+++ b/src/main/java/net/minecraft/DetectedVersion.java
-@@ -0,0 +0,0 @@ public class DetectedVersion implements WorldVersion {
- 
-     private DetectedVersion() {
-         this.id = UUID.randomUUID().toString().replaceAll("-", "");
-        this.name = "1.18-rc3";
-        this.stable = false;
-        this.worldVersion = new DataVersion(2858, "main");
-+        this.name = "1.18"; // Paper - release day
-+        this.stable = true; // Paper - release day
-+        this.worldVersion = new DataVersion(2860, "main"); // Paper - release day
-         this.protocolVersion = SharedConstants.getProtocolVersion();
-         this.resourcePackVersion = 8;
-         this.dataPackVersion = 8;
-diff --git a/src/main/java/net/minecraft/SharedConstants.java b/src/main/java/net/minecraft/SharedConstants.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/SharedConstants.java
-+++ b/src/main/java/net/minecraft/SharedConstants.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.ChunkPos;
- public class SharedConstants {
-     /** @deprecated */
-     @Deprecated
-    public static final boolean SNAPSHOT = true;
-+    public static final boolean SNAPSHOT = false; // Paper - release day
-     /** @deprecated */
-     @Deprecated
-    public static final int WORLD_VERSION = 2858;
-+    public static final int WORLD_VERSION = 2860; // Paper - release day
-     /** @deprecated */
-     @Deprecated
-     public static final String SERIES = "main";
-     /** @deprecated */
-     @Deprecated
-    public static final String VERSION_STRING = "1.18-rc3";
-+    public static final String VERSION_STRING = "1.18"; // Paper - release day
-     /** @deprecated */
-     @Deprecated
-     public static final String RELEASE_TARGET = "1.18";
-@@ -0,0 +0,0 @@ public class SharedConstants {
-     }
- 
-     public static int getProtocolVersion() {
-        return 1073741883;
-+        return RELEASE_NETWORK_PROTOCOL_VERSION; // Paper - release day
-     }
- 
-     public static boolean debugVoidTerrain(ChunkPos chunkPos) {
-diff --git a/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java b/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java
-+++ b/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java
-@@ -0,0 +0,0 @@ public class OrePlacements {
-     public static final PlacedFeature ORE_ANDESITE_LOWER = PlacementUtils.register("ore_andesite_lower", OreFeatures.ORE_ANDESITE.placed(commonOrePlacement(2, HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(60)))));
-     public static final PlacedFeature ORE_TUFF = PlacementUtils.register("ore_tuff", OreFeatures.ORE_TUFF.placed(commonOrePlacement(2, HeightRangePlacement.uniform(VerticalAnchor.bottom(), VerticalAnchor.absolute(0)))));
-     public static final PlacedFeature ORE_COAL_UPPER = PlacementUtils.register("ore_coal_upper", OreFeatures.ORE_COAL.placed(commonOrePlacement(30, HeightRangePlacement.uniform(VerticalAnchor.absolute(136), VerticalAnchor.top()))));
-    public static final PlacedFeature ORE_COAL_LOWER = PlacementUtils.register("ore_coal_lower", OreFeatures.ORE_COAL_BURIED.placed(commonOrePlacement(20, HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(192)))));
-+    public static final PlacedFeature ORE_COAL_LOWER = PlacementUtils.register("ore_coal_lower", OreFeatures.ORE_COAL_BURIED.placed(commonOrePlacement(20, HeightRangePlacement.triangle(VerticalAnchor.absolute(0), VerticalAnchor.absolute(192))))); // Paper - rc4 patch
-     public static final PlacedFeature ORE_IRON_UPPER = PlacementUtils.register("ore_iron_upper", OreFeatures.ORE_IRON.placed(commonOrePlacement(90, HeightRangePlacement.triangle(VerticalAnchor.absolute(80), VerticalAnchor.absolute(384)))));
-     public static final PlacedFeature ORE_IRON_MIDDLE = PlacementUtils.register("ore_iron_middle", OreFeatures.ORE_IRON.placed(commonOrePlacement(10, HeightRangePlacement.triangle(VerticalAnchor.absolute(-24), VerticalAnchor.absolute(56)))));
-     public static final PlacedFeature ORE_IRON_SMALL = PlacementUtils.register("ore_iron_small", OreFeatures.ORE_IRON_SMALL.placed(commonOrePlacement(10, HeightRangePlacement.uniform(VerticalAnchor.bottom(), VerticalAnchor.absolute(72)))));
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@ -188,7 +188,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
-    <version>1.18-rc3-R0.1-SNAPSHOT</version>
+-    <version>1.18-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit ab6e73a20eca8ecd0fef8720edc81e746595dd98
+Subproject commit b46ac671a310f2cd48d532d583d79ef12d9d77f2
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 9fb3aa4c7ae8086c3c91122d716acc0464b2f300
+Subproject commit bc14cb649bc33d9e5a980303d365b7599a4d57f6
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit b11f318fd202a058333afbe406ebcce83037b562
+Subproject commit a5dea1cbca6d941f1980dcc92102af7081d0b0f5