Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exilepearl 1.20 #311

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Exilepearl 1.20 #311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457a080
1.20.4
MrJeremyFisher Feb 22, 2024
682a18c
proxy method properly
okx-code Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugins/exilepearl-paper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
12 changes: 12 additions & 0 deletions plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -562,6 +569,11 @@ public String getName() {
return plugin.getName();
}

@Override
public @NotNull LifecycleEventManager<Plugin> getLifecycleManager() {
throw new UnsupportedOperationException();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plugin.getLifecycleManager?

}

@Override
public PluginLoader getPluginLoader() {
return plugin.getPluginLoader();
Expand Down
2 changes: 1 addition & 1 deletion plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ final class PearlBoundaryTask extends ExilePearlTask implements BorderHandler {
public static final LinkedHashSet<Material> 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}
));
Expand Down
2 changes: 1 addition & 1 deletion plugins/exilepearl-paper/src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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