From 457a080a5a8d95c0b12a015684a540b1c24b65e5 Mon Sep 17 00:00:00 2001 From: MrJeremyFisher <63616270+MrJeremyFisher@users.noreply.github.com> Date: Thu, 22 Feb 2024 10:40:25 -0500 Subject: [PATCH 1/2] 1.20.4 --- plugins/exilepearl-paper/build.gradle.kts | 4 +++- .../devotedmc/ExilePearl/core/ExilePearlCore.java | 12 ++++++++++++ .../devotedmc/ExilePearl/core/PearlBoundaryTask.java | 2 +- .../exilepearl-paper/src/main/resources/plugin.yml | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/plugins/exilepearl-paper/build.gradle.kts b/plugins/exilepearl-paper/build.gradle.kts index 09bf2f5a5..2f90360b0 100644 --- a/plugins/exilepearl-paper/build.gradle.kts +++ b/plugins/exilepearl-paper/build.gradle.kts @@ -5,7 +5,9 @@ plugins { version = "2.1.5" dependencies { - paperDevBundle("1.18.2-R0.1-SNAPSHOT") + paperweight { + paperDevBundle("1.20.4-R0.1-SNAPSHOT") + } compileOnly(project(":plugins:civmodcore-paper")) compileOnly(project(":plugins:namelayer-paper")) diff --git a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java index 001b12e5e..4d0b66335 100644 --- a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java +++ b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java @@ -19,6 +19,8 @@ import com.devotedmc.ExilePearl.util.ExilePearlRunnable; import com.devotedmc.ExilePearl.util.NameLayerPermissions; import com.google.common.base.Preconditions; +import io.papermc.paper.plugin.configuration.PluginMeta; +import io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager; import isaac.bastion.Bastion; import isaac.bastion.BastionBlock; import isaac.bastion.manager.BastionBlockManager; @@ -552,6 +554,11 @@ public PluginDescriptionFile getDescription() { return plugin.getDescription(); } + @Override + public @NotNull PluginMeta getPluginMeta() { + return plugin.getDescription(); + } + @Override public Logger getLogger() { return plugin.getLogger(); @@ -562,6 +569,11 @@ public String getName() { return plugin.getName(); } + @Override + public @NotNull LifecycleEventManager getLifecycleManager() { + throw new UnsupportedOperationException(); + } + @Override public PluginLoader getPluginLoader() { return plugin.getPluginLoader(); diff --git a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java index f318c9b64..1c9274b70 100644 --- a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java +++ b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java @@ -55,7 +55,7 @@ final class PearlBoundaryTask extends ExilePearlTask implements BorderHandler { public static final LinkedHashSet safeOpenBlocks = new LinkedHashSet<>(Arrays.asList( new Material[] { Material.AIR, Material.WATER, Material.RAIL, Material.ACTIVATOR_RAIL, - Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.GRASS, Material.FERN, + Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.SHORT_GRASS, Material.FERN, Material.LARGE_FERN, Material.DEAD_BUSH, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.TORCH, Material.REDSTONE_WIRE, Material.WHEAT, Material.LADDER, Material.LEVER, Material.STONE_PRESSURE_PLATE} )); diff --git a/plugins/exilepearl-paper/src/main/resources/plugin.yml b/plugins/exilepearl-paper/src/main/resources/plugin.yml index 3b3db6599..b739150a4 100644 --- a/plugins/exilepearl-paper/src/main/resources/plugin.yml +++ b/plugins/exilepearl-paper/src/main/resources/plugin.yml @@ -9,4 +9,4 @@ commands: pp: description: Legacy prison pearl commands aliases: [pplocate, ppl, ppfree, ppf, ppbroadcast, ppb, ppconfirm, ppsilence] -api-version: 1.14 +api-version: 1.20 From 682a18c48b950401d95a0a627076da2223bf9cc7 Mon Sep 17 00:00:00 2001 From: okx-code Date: Fri, 23 Feb 2024 01:45:05 +0000 Subject: [PATCH 2/2] proxy method properly --- .../main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java index 4d0b66335..aabccee2b 100644 --- a/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java +++ b/plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java @@ -571,7 +571,7 @@ public String getName() { @Override public @NotNull LifecycleEventManager getLifecycleManager() { - throw new UnsupportedOperationException(); +return plugin.getLifecycleManager(); } @Override