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)))));