CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mc/exilepearl-1.20' into mc/1.20

Browse Source
This commit is contained in:
okx-code
2024-02-23 01:45:22 +00:00
parent 86b3bd1b26 682a18c48b
commit c85c33c820
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/exilepearl-paper/build.gradle.kts
View File

@@ -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"))

12
plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/ExilePearlCore.java
View File

@@ -19,6 +19,8 @@ import com.devotedmc.ExilePearl.util.Clock;
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 @@ final class ExilePearlCore implements ExilePearlApi {
return plugin.getDescription();
}
@Override
public @NotNull PluginMeta getPluginMeta() {
return plugin.getDescription();
}
@Override
public Logger getLogger() {
return plugin.getLogger();
@@ -562,6 +569,11 @@ final class ExilePearlCore implements ExilePearlApi {
return plugin.getName();
}
@Override
public @NotNull LifecycleEventManager<Plugin> getLifecycleManager() {
return plugin.getLifecycleManager();
}
@Override
public PluginLoader getPluginLoader() {
return plugin.getPluginLoader();

2
plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/PearlBoundaryTask.java
View File

@@ -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}
));

2
plugins/exilepearl-paper/src/main/resources/plugin.yml
View File

@@ -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