From c0ee8ae35e5cb99896f273382cd3f73caaca549b Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sat, 19 Jun 2021 22:02:27 -0700 Subject: [PATCH] Rename package from `io.papermc.paper.world.gen` to `io.papermc.paper.world.generation` (#5894) --- patches/api/Add-Feature-Stage-API.patch | 8 ++++---- patches/server/Add-Feature-Generation-API.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/api/Add-Feature-Stage-API.patch b/patches/api/Add-Feature-Stage-API.patch index 946abdb3b2..bb506d7b79 100644 --- a/patches/api/Add-Feature-Stage-API.patch +++ b/patches/api/Add-Feature-Stage-API.patch @@ -4,13 +4,13 @@ Date: Sat, 19 Jun 2021 20:15:29 -0700 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 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 --- /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 @@ -+package io.papermc.paper.world.gen; ++package io.papermc.paper.world.generation; + +import org.bukkit.World; +import org.bukkit.block.data.BlockData; @@ -296,7 +296,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * @param world ProtoWorld to generate decorations with. + */ + @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. + } + // Paper end diff --git a/patches/server/Add-Feature-Generation-API.patch b/patches/server/Add-Feature-Generation-API.patch index 1e548af505..3fb9bdaba9 100644 --- a/patches/server/Add-Feature-Generation-API.patch +++ b/patches/server/Add-Feature-Generation-API.patch @@ -4,13 +4,13 @@ Date: Sat, 19 Jun 2021 20:15:59 -0700 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 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 --- /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 @@ -+package io.papermc.paper.world.gen; ++package io.papermc.paper.world.generation; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.WorldGenRegion; @@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } + + // 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); + protoWorld.clearReference(); // make sure people dont try to use the ProtoWorld after we're done with it. + // Paper end