From 7200304700f9d3cfd08091a0966b85db3fbc255f Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Wed, 1 Sep 2021 23:43:54 +0900
Subject: [PATCH] 1.18-exp4 stuff (#2642)

* 1.18-exp4 stuff

* largeCopperOre -> largeCopperOreBlob

* deltaX/deltaZ

* Update mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update and rename StructurePieceWithDimensions.mapping to ShiftableStructurePiece.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
---
 .../structure/ShiftableStructurePiece.mapping | 22 +++++++++++++++++++
 .../StructurePieceWithDimensions.mapping      | 17 --------------
 .../gen/feature/DefaultBiomeFeatures.mapping  |  3 +++
 .../gen/feature/StructureFeature.mapping      |  6 +++++
 4 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 mappings/net/minecraft/structure/ShiftableStructurePiece.mapping
 delete mode 100644 mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping

diff --git a/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping b/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping
new file mode 100644
index 0000000000..7016592a1c
--- /dev/null
+++ b/mappings/net/minecraft/structure/ShiftableStructurePiece.mapping
@@ -0,0 +1,22 @@
+CLASS net/minecraft/class_3418 net/minecraft/structure/ShiftableStructurePiece
+	FIELD field_15241 hPos I
+	FIELD field_15242 depth I
+	FIELD field_15243 height I
+	FIELD field_15244 width I
+	METHOD <init> (Lnet/minecraft/class_3773;IIIIIILnet/minecraft/class_2350;)V
+		ARG 1 type
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
+		ARG 5 width
+		ARG 6 height
+		ARG 7 depth
+		ARG 8 orientation
+	METHOD method_14839 adjustToAverageHeight (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;I)Z
+		ARG 1 world
+		ARG 2 boundingBox
+		ARG 3 deltaY
+	METHOD method_37865 adjustToMinHeight (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;I)Z
+		ARG 1 world
+		ARG 2 boundingBox
+		ARG 3 deltaY
diff --git a/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping b/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping
deleted file mode 100644
index eeffd77ebb..0000000000
--- a/mappings/net/minecraft/structure/StructurePieceWithDimensions.mapping
+++ /dev/null
@@ -1,17 +0,0 @@
-CLASS net/minecraft/class_3418 net/minecraft/structure/StructurePieceWithDimensions
-	FIELD field_15241 hPos I
-	FIELD field_15242 depth I
-	FIELD field_15243 height I
-	FIELD field_15244 width I
-	METHOD <init> (Lnet/minecraft/class_3773;IIIIIILnet/minecraft/class_2350;)V
-		ARG 1 type
-		ARG 2 x
-		ARG 3 y
-		ARG 4 z
-		ARG 5 width
-		ARG 6 height
-		ARG 7 depth
-		ARG 8 orientation
-	METHOD method_14839 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;I)Z
-		ARG 1 world
-		ARG 2 boundingBox
diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
index 8263c8ed62..db259f9f2b 100644
--- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
+++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
@@ -89,6 +89,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
 		ARG 0 builder
 	METHOD method_17006 addDefaultOres (Lnet/minecraft/class_5485$class_5495;Z)V
 		ARG 0 builder
+		ARG 1 largeCopperOreBlob
 	METHOD method_17007 addExtraGoldOre (Lnet/minecraft/class_5485$class_5495;)V
 		ARG 0 builder
 	METHOD method_17008 addEmeraldOre (Lnet/minecraft/class_5485$class_5495;)V
@@ -179,3 +180,5 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
 		ARG 0 builder
 	METHOD method_37794 addMeadowFlowers (Lnet/minecraft/class_5485$class_5495;)V
 		ARG 0 builder
+	METHOD method_37868 addDefaultOres (Lnet/minecraft/class_5485$class_5495;)V
+		ARG 0 builder
diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping
index 0993c9de6a..37144bda00 100644
--- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping
+++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping
@@ -94,6 +94,12 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 	METHOD method_28664 init ()V
 	METHOD method_28665 getCodec ()Lcom/mojang/serialization/Codec;
 	METHOD method_36420 getUndergroundWaterCreatureSpawns ()Lnet/minecraft/class_6012;
+	METHOD method_37864 getLowestCornerInGroundHeight (Lnet/minecraft/class_2794;IILnet/minecraft/class_1923;Lnet/minecraft/class_5539;)I
+		ARG 0 generator
+		ARG 1 deltaX
+		ARG 2 deltaZ
+		ARG 3 chunkPos
+		ARG 4 world
 	CLASS class_3774 StructureStartFactory
 		METHOD create (Lnet/minecraft/class_3195;Lnet/minecraft/class_1923;IJ)Lnet/minecraft/class_3449;
 			ARG 1 feature