OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename package from io.papermc.paper.world.gen to io.papermc.paper.world.generation (#5894)

Browse source
This commit is contained in:
Jason Penilla 2021-06-19 22:02:27 -07:00
parent cba64693c4
commit c0ee8ae35e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
patches/api/Add-Feature-Stage-API.patch
View file

@ -4,13 +4,13 @@ Date: Sat, 19 Jun 2021 20:15:29 -0700
Subject: [PATCH] Add Feature Stage API Subject: [PATCH] Add Feature Stage API
diff --git a/src/main/java/io/papermc/paper/world/gen/ProtoWorld.java b/src/main/java/io/papermc/paper/world/gen/ProtoWorld.java diff --git a/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/world/gen/ProtoWorld.java +++ b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package io.papermc.paper.world.gen; +package io.papermc.paper.world.generation;
+ +
+import org.bukkit.World; +import org.bukkit.World;
+import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.BlockData;
@ -296,7 +296,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @param world ProtoWorld to generate decorations with. + * @param world ProtoWorld to generate decorations with.
+ */ + */
+ @SuppressWarnings("unused") + @SuppressWarnings("unused")
+ public void generateDecorations(@NotNull io.papermc.paper.world.gen.ProtoWorld world) { + public void generateDecorations(@NotNull io.papermc.paper.world.generation.ProtoWorld world) {
+ // Do nothing by default to maintain compatibility with existing generators. + // Do nothing by default to maintain compatibility with existing generators.
+ } + }
+ // Paper end + // Paper end

8
patches/server/Add-Feature-Generation-API.patch
View file

@ -4,13 +4,13 @@ Date: Sat, 19 Jun 2021 20:15:59 -0700
Subject: [PATCH] Add Feature Generation API Subject: [PATCH] Add Feature Generation API
diff --git a/src/main/java/io/papermc/paper/world/gen/CraftProtoWorld.java b/src/main/java/io/papermc/paper/world/gen/CraftProtoWorld.java diff --git a/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java b/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/world/gen/CraftProtoWorld.java +++ b/src/main/java/io/papermc/paper/world/generation/CraftProtoWorld.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package io.papermc.paper.world.gen; +package io.papermc.paper.world.generation;
+ +
+import net.minecraft.core.BlockPos; +import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.WorldGenRegion; +import net.minecraft.server.level.WorldGenRegion;
@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ +
+ // Paper start + // Paper start
+ io.papermc.paper.world.gen.CraftProtoWorld protoWorld = new io.papermc.paper.world.gen.CraftProtoWorld(region); + io.papermc.paper.world.generation.CraftProtoWorld protoWorld = new io.papermc.paper.world.generation.CraftProtoWorld(region);
+ generator.generateDecorations(protoWorld); + generator.generateDecorations(protoWorld);
+ protoWorld.clearReference(); // make sure people dont try to use the ProtoWorld after we're done with it. + protoWorld.clearReference(); // make sure people dont try to use the ProtoWorld after we're done with it.
+ // Paper end + // Paper end