Skip to content

Commit 1fe63aa

Browse files
committed
chore: bump idofront, remove AxiomPaper hook
1 parent bace91d commit 1fe63aa

File tree

4 files changed

+5
-34
lines changed

4 files changed

+5
-34
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ dependencies {
3030

3131
// Other plugins
3232
compileOnly(libs.blocky)
33-
compileOnly(libs.minecraft.plugin.axiompaper)
3433
}
3534

3635
kotlin {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group=com.mineinabyss
2-
version=1.11
3-
idofrontVersion=0.25.24
2+
version=1.12
3+
idofrontVersion=0.26.0

gradle/libs.versions.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[versions]
2-
gearyPaper = "0.31.9"
3-
blocky = "0.10.16"
2+
gearyPaper = "0.32.1"
3+
blocky = "0.11.0"
44

55
[libraries]
66
geary-papermc = { module = "com.mineinabyss:geary-papermc", version.ref = "gearyPaper" }
77
blocky = { module = "com.mineinabyss:blocky", version.ref = "blocky" }
8-
minecraft-plugin-axiompaper = "com.moulberry:axiom:4.0.1"

src/main/kotlin/com/mineinabyss/bonfire/listeners/BonfireListener.kt

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ import com.mineinabyss.idofront.messaging.success
2929
import com.mineinabyss.idofront.nms.nbt.editOfflinePDC
3030
import com.mineinabyss.idofront.nms.nbt.getOfflinePDC
3131
import com.mineinabyss.idofront.plugin.Plugins
32-
import com.moulberry.axiom.event.AxiomManipulateEntityEvent
3332
import org.bukkit.Bukkit
34-
import org.bukkit.OfflinePlayer
3533
import org.bukkit.attribute.Attribute
3634
import org.bukkit.entity.ItemDisplay
3735
import org.bukkit.event.EventHandler
@@ -103,7 +101,7 @@ class BonfireListener : Listener {
103101
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
104102
fun BlockyFurnitureInteractEvent.onBonfireInteract() {
105103
if (!player.isSneaking || hand != EquipmentSlot.HAND || abs(0 - player.velocity.y) < 0.001) return
106-
if (player.fallDistance > (player.getAttribute(Attribute.GENERIC_SAFE_FALL_DISTANCE)?.value ?: 3.0)) return
104+
if (player.fallDistance > (player.getAttribute(Attribute.SAFE_FALL_DISTANCE)?.value ?: 3.0)) return
107105

108106
val gearyPlayer = player.toGeary()
109107
val gearyBonfire = baseEntity.toGearyOrNull() ?: return
@@ -205,29 +203,4 @@ class BonfireListener : Listener {
205203
}
206204
}
207205
}
208-
209-
init {
210-
if (Plugins.isEnabled("AxiomPaper")) {
211-
Bukkit.getPluginManager().registerEvents(object : Listener {
212-
213-
@EventHandler
214-
fun AxiomManipulateEntityEvent.manipulateBonfire() {
215-
val furniture = (entity as? ItemDisplay).takeUnless { entity.isDead } ?: return
216-
val bonfireData = furniture.toGearyOrNull()?.get<Bonfire>() ?: return
217-
218-
bonfireData.bonfirePlayers.map { it.toOfflinePlayer() to it.toPlayer() }.forEach { (offline, online) ->
219-
if (online != null) with(online.toGeary()) {
220-
get<BonfireRespawn>()?.copy(bonfireLocation = entity.location)?.let { setPersisting(it) }
221-
online.withGeary { encodeComponentsTo(online) }
222-
} else offline.editOfflinePDC {
223-
with(gearyPaper.worldManager.global) {
224-
decode<BonfireRespawn>()?.copy(bonfireLocation = entity.location)?.let { encode(it) }
225-
}
226-
}
227-
}
228-
BonfirePacketHelpers.sendAddonPacket(furniture)
229-
}
230-
}, bonfire.plugin)
231-
}
232-
}
233206
}

0 commit comments

Comments
 (0)