Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 15 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,25 @@
<dependency>
<groupId>com.bgsoftware</groupId>
<artifactId>WildStackerAPI</artifactId>
<version>2024.3</version>
<version>2025.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.bgsoftware</groupId>
<artifactId>WildToolsAPI</artifactId>
<version>2024.1</version>
<version>2025.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.bgsoftware</groupId>
<artifactId>SuperiorSkyblockAPI</artifactId>
<version>2023.3</version>
<version>2025.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.black_ixx</groupId>
<artifactId>playerpoints</artifactId>
<version>3.2.7</version>
<version>3.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -110,6 +110,12 @@
<version>0.5.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.github.rvskele</groupId>
<artifactId>PaperLib</artifactId>
<version>2.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
Expand Down Expand Up @@ -160,6 +166,10 @@
<pattern>com.tcoded.folialib</pattern>
<shadedPattern>mc.rellox.spawnermeta.lib.folialib</shadedPattern>
</relocation>
<relocation>
<pattern>io.github.rvskele.paperlib</pattern>
<shadedPattern>mc.rellox.spawnermeta.lib.paperlib</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>mc.rellox.spawnermeta.lib.bstats</shadedPattern>
Expand All @@ -169,4 +179,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.*;

import mc.rellox.spawnermeta.utility.adapter.Platform;
import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.block.Block;
Expand All @@ -13,9 +13,9 @@ public interface IMaterial {
static IMaterial empty = block -> true;
static IMaterial air = block -> {
Material type = block.getType();
return type.isAir() || (!Platform.ADAPTER.isSolid(block) && type != Material.WATER && type != Material.LAVA);
return type.isAir() || (!PaperLib.isSolid(block) && type != Material.WATER && type != Material.LAVA);
};
static IMaterial solid = Platform.ADAPTER::isSolid;
static IMaterial solid = PaperLib::isSolid;
static IMaterial water = block -> {
Material type = block.getType();
if(type == Material.WATER) return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import mc.rellox.spawnermeta.utility.adapter.Platform;
import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -705,7 +705,7 @@ public boolean allow(Block block) {

public boolean ignored(Block block) {
if(ignore_natural == true
&& Platform.ADAPTER.getState(block) instanceof CreatureSpawner spawner) {
&& PaperLib.getBlockState(block, false).getState() instanceof CreatureSpawner spawner) {
PersistentDataContainer data = spawner.getPersistentDataContainer();
if(data.has(DataManager.ownerKey()) == false) {
spawner.setSpawnCount(4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.List;
import java.util.stream.Stream;

import mc.rellox.spawnermeta.utility.adapter.Platform;
import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
Expand Down Expand Up @@ -263,7 +263,7 @@ public void update() {

@EventHandler(priority = EventPriority.HIGHEST)
private void onUnloadLink(ChunkUnloadEvent event) {
Stream.of(Platform.ADAPTER.getTileEntities(event.getChunk()))
Stream.of(PaperLib.getTileEntities(event.getChunk(), false).getTileEntities())
.filter(CreatureSpawner.class::isInstance)
.map(BlockState::getBlock)
.forEach(HookRegistry.WILD_STACKER::unlink);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mc/rellox/spawnermeta/events/EventRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.UUID;
import java.util.stream.Stream;

import mc.rellox.spawnermeta.utility.adapter.Platform;
import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Color;
Expand Down Expand Up @@ -1098,7 +1098,7 @@ public static int spawnersInChunk(Block block) {
}

public static int spawnersInChunk(Chunk chunk) {
BlockState[] bs = Platform.ADAPTER.getTileEntities(chunk);
BlockState[] bs = PaperLib.getTileEntities(chunk, false).getTileEntities();
return bs == null ? 0 : (int) Stream.of(bs)
.filter(s -> s instanceof CreatureSpawner)
.count();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import java.util.function.Predicate;
import java.util.stream.Stream;

import io.github.rvskele.paperlib.PaperLib;
import mc.rellox.spawnermeta.SpawnerMeta;
import mc.rellox.spawnermeta.utility.Utility;
import mc.rellox.spawnermeta.utility.adapter.Platform;
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.World;
Expand Down Expand Up @@ -48,7 +48,7 @@ public void load() {
}

public void load(Chunk chunk) {
BlockState[] tileEntities = Platform.ADAPTER.getTileEntities(chunk);
BlockState[] tileEntities = PaperLib.getTileEntities(chunk, false).getTileEntities();
for (BlockState state : tileEntities) {
if (state instanceof CreatureSpawner) {
Block block = state.getBlock();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiConsumer;

import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.World;
Expand Down Expand Up @@ -35,7 +36,6 @@
import mc.rellox.spawnermeta.hook.HookRegistry;
import mc.rellox.spawnermeta.spawner.type.SpawnerType;
import mc.rellox.spawnermeta.utility.Utility;
import mc.rellox.spawnermeta.utility.adapter.Platform;
import mc.rellox.spawnermeta.utility.reflect.Reflect.RF;
import mc.rellox.spawnermeta.utility.reflect.type.Invoker;
import mc.rellox.spawnermeta.version.Version;
Expand Down Expand Up @@ -230,7 +230,7 @@ public static class SpawnerMetaSpawnEvent extends SpawnerSpawnEvent {
public final ISpawner spawner;

public SpawnerMetaSpawnEvent(Entity spawnee, ISpawner spawner) {
super(spawnee, (CreatureSpawner) Platform.ADAPTER.getState(spawner.block()));
super(spawnee, (CreatureSpawner) PaperLib.getBlockState(spawner.block(), false).getState());
this.spawner = spawner;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mc/rellox/spawnermeta/utility/DataManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.List;
import java.util.UUID;

import mc.rellox.spawnermeta.utility.adapter.Platform;
import io.github.rvskele.paperlib.PaperLib;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -659,7 +659,7 @@ public static EntityType getEntity(ItemStack item) {
private static CreatureSpawner cast(Block block) {
try {
if(block.equals(last) == true) return spawner;
if(Platform.ADAPTER.getState(block) instanceof CreatureSpawner cs) {
if(PaperLib.getBlockState(block, false).getState() instanceof CreatureSpawner cs) {
last = block;
return spawner = cs;
}
Expand Down

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/java/mc/rellox/spawnermeta/utility/adapter/Platform.java

This file was deleted.

This file was deleted.