diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 07a7803f49..54e916367b 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 8a8fa2c76ecbd78b5bc57fe0be9abca5dc20ad86..0000000000000000000000000000000000000000 +index 236c9e76bbbb6db5eafd03b1468ecf9fac3416fc..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,262 +0,0 @@ @@ -110,7 +110,7 @@ index 8a8fa2c76ecbd78b5bc57fe0be9abca5dc20ad86..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.18-rc3-R0.1-SNAPSHOT +- 1.18-R0.1-SNAPSHOT - jar - - Spigot-API diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 261df75a33..f379395b01 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -178,7 +178,7 @@ index 0000000000000000000000000000000000000000..139f377673414e1d0213129549e94934 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index bfdc67dc0956979f0b54fb68c7f213676875f97d..0000000000000000000000000000000000000000 +index 1ab6e8bd68a3fff2ec8795da099e4f8cce8b62ca..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,540 +0,0 @@ @@ -188,7 +188,7 @@ index bfdc67dc0956979f0b54fb68c7f213676875f97d..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.18-rc3-R0.1-SNAPSHOT +- 1.18-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - diff --git a/patches/server/0815-1.18-Release.patch b/patches/server/0815-1.18-Release.patch deleted file mode 100644 index e0033a80ef..0000000000 --- a/patches/server/0815-1.18-Release.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -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 c79aabe7418b6ee6c18cda9b8f1d8d7d59c69796..5cbd77a095639af8b45e9ff13587edbf60d1b6c7 100644 ---- a/src/main/java/net/minecraft/DetectedVersion.java -+++ b/src/main/java/net/minecraft/DetectedVersion.java -@@ -29,9 +29,9 @@ 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 a0776c49497185e5c847d4f0397e8b4d2eb36d27..abbff23b37afab21c1217cd36bb1b704e9b44ae5 100644 ---- a/src/main/java/net/minecraft/SharedConstants.java -+++ b/src/main/java/net/minecraft/SharedConstants.java -@@ -11,16 +11,16 @@ 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"; -@@ -170,7 +170,7 @@ 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 0caccf465352719c23001247f930bf504a074c0e..b8e7713d3938ca1d1f294ca3884a629756ec4470 100644 ---- a/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java -+++ b/src/main/java/net/minecraft/data/worldgen/placement/OrePlacements.java -@@ -31,7 +31,7 @@ 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))))); diff --git a/work/Bukkit b/work/Bukkit index ab6e73a20e..b46ac671a3 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit ab6e73a20eca8ecd0fef8720edc81e746595dd98 +Subproject commit b46ac671a310f2cd48d532d583d79ef12d9d77f2 diff --git a/work/CraftBukkit b/work/CraftBukkit index 9fb3aa4c7a..bc14cb649b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 9fb3aa4c7ae8086c3c91122d716acc0464b2f300 +Subproject commit bc14cb649bc33d9e5a980303d365b7599a4d57f6 diff --git a/work/Spigot b/work/Spigot index b11f318fd2..a5dea1cbca 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit b11f318fd202a058333afbe406ebcce83037b562 +Subproject commit a5dea1cbca6d941f1980dcc92102af7081d0b0f5