Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity

1.18 Release

Browse Source
This commit is contained in:
Nassim Jahnke 2021-11-30 09:58:25 +01:00 committed by MiniDigger | Martin
parent 754dfd1eb2
commit 971ca7e4d1
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,5 +1,5 @@
group=io.papermc.paper
version=1.18-rc3-R0.1-SNAPSHOT
version=1.18-R0.1-SNAPSHOT
mcVersion=1.18-rc3

69
patches/server/0815-1.18-Release.patch Normal file
View File

@ -0,0 +1,69 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
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)))));