trueog/AntiPieRay-OG
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate hideStateTypes from hideMaterials #10

Merged
SKBotNL merged 1 commits from main into main 2026-05-26 10:31:51 -04:00
Conversation 0 Commits 1 Files Changed 2
+10 -39
2 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/kotlin/net/trueog/antipierayog/AntiPieRay.kt
+8 -38
View File
@@ -3,8 +3,8 @@ package net.trueog.antipierayog
import com.github.retrooper.packetevents.PacketEvents
import com.github.retrooper.packetevents.event.PacketListenerPriority
import com.github.retrooper.packetevents.protocol.world.states.type.StateType
import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder
import io.github.retrooper.packetevents.util.SpigotConversionUtil
import java.util.*
import org.bukkit.Bukkit
import org.bukkit.Material
@@ -14,7 +14,6 @@ class AntiPieRay : JavaPlugin() {
companion object {
lateinit var plugin: AntiPieRay
lateinit var blockEntityHider: BlockEntityHider
val hideStateTypes: MutableSet<StateType> = Collections.newSetFromMap(IdentityHashMap())
val hideMaterials: MutableSet<Material> =
Collections.newSetFromMap<Material>(IdentityHashMap()).apply {
addAll(
@@ -53,47 +52,18 @@ class AntiPieRay : JavaPlugin() {
)
)
}
val hideStateTypes: MutableSet<StateType> = Collections.newSetFromMap(IdentityHashMap(hideMaterials.size))
}
override fun onLoad() {
PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this))
PacketEvents.getAPI().load()
// Has to be here otherwise the plugin doesn't load
hideStateTypes.addAll(
listOf(
// <editor-fold desc="Block entities">
StateTypes.CHEST,
StateTypes.TRAPPED_CHEST,
StateTypes.SHULKER_BOX,
StateTypes.WHITE_SHULKER_BOX,
StateTypes.ORANGE_SHULKER_BOX,
StateTypes.MAGENTA_SHULKER_BOX,
StateTypes.LIGHT_BLUE_SHULKER_BOX,
StateTypes.YELLOW_SHULKER_BOX,
StateTypes.LIME_SHULKER_BOX,
StateTypes.PINK_SHULKER_BOX,
StateTypes.GRAY_SHULKER_BOX,
StateTypes.LIGHT_GRAY_SHULKER_BOX,
StateTypes.CYAN_SHULKER_BOX,
StateTypes.PURPLE_SHULKER_BOX,
StateTypes.BLUE_SHULKER_BOX,
StateTypes.BROWN_SHULKER_BOX,
StateTypes.GREEN_SHULKER_BOX,
StateTypes.RED_SHULKER_BOX,
StateTypes.BLACK_SHULKER_BOX,
StateTypes.CAMPFIRE,
StateTypes.SOUL_CAMPFIRE,
StateTypes.BEACON,
StateTypes.ENCHANTING_TABLE,
StateTypes.DRAGON_HEAD,
StateTypes.DRAGON_WALL_HEAD,
StateTypes.CONDUIT,
StateTypes.BELL,
StateTypes.ENDER_CHEST,
StateTypes.SPAWNER,
// </editor-fold>
)
)
// Convert all the hidden materials to a PacketEvents StateType
hideMaterials.forEach {
SpigotConversionUtil.fromBukkitItemMaterial(it).placedType?.let { element -> hideStateTypes.add(element) }
}
PacketEvents.getAPI().eventManager.registerListener(ChunkDataPacketListener(), PacketListenerPriority.NORMAL)
PacketEvents.getAPI().eventManager.registerListener(BlockChangePacketListener(), PacketListenerPriority.NORMAL)
PacketEvents.getAPI()
src/main/kotlin/net/trueog/antipierayog/BlockEntityHider.kt
+2 -1
View File
@@ -93,7 +93,8 @@ class BlockEntityHider {
get() {
val craftWorld = (world as CraftWorld).handle
val serverChunkCache = (craftWorld as ServerLevel).getChunkSource()
val chunk = serverChunkCache.getChunkAtIfLoadedMainThread(this.x shr 4, this.z shr 4) ?: return Material.AIR
val chunk =
serverChunkCache.getChunkAtIfLoadedMainThread(this.x shr 4, this.z shr 4) ?: return Material.AIR
val blockState = chunk.getBlockState(BlockPos(this.x, this.y, this.z))
return blockState.bukkitMaterial
}