Skip to content

Commit 3609a03

Browse files
committed
fix vorpal
1 parent 0839a3f commit 3609a03

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

Diff for: src/main/kotlin/dev/sterner/common/components/VoidBoundRevelationComponent.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ class VoidBoundRevelationComponent(private val player: Player) : AutoSyncedCompo
2828
sync()
2929
}
3030

31+
fun isTearKnowledgeComplete(): Boolean {
32+
return hasWellKnowledge && hasEndKnowledge && hasNetherKnowledge
33+
}
34+
35+
fun addThought(thought: Component, durationTicks: Int, delayTicks: Int) {
36+
val data = ThoughtData(durationTicks, delayTicks)
37+
thoughtsQueue[thought] = data
38+
sync()
39+
}
40+
3141
override fun tick() {
3242
// Ensure the queue does not exceed 16 elements
3343
while (thoughtsQueue.size > 16) {
@@ -115,16 +125,6 @@ class VoidBoundRevelationComponent(private val player: Player) : AutoSyncedCompo
115125
sync()
116126
}
117127

118-
fun isTearKnowledgeComplete(): Boolean {
119-
return hasWellKnowledge && hasEndKnowledge && hasNetherKnowledge
120-
}
121-
122-
fun addThought(thought: Component, durationTicks: Int, delayTicks: Int) {
123-
val data = ThoughtData(durationTicks, delayTicks)
124-
thoughtsQueue[thought] = data
125-
sync()
126-
}
127-
128128
private fun sync(){
129129
VoidBoundComponentRegistry.VOID_BOUND_REVELATION_COMPONENT.sync(player)
130130
}

Diff for: src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumTerraformer.kt

-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ class IchoriumTerraformer(tier: Tier, attackDamageModifier: Float, attackSpeedMo
3636
return true
3737
}
3838

39-
override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
40-
println(VoidBoundApi.getActiveAbility(player.mainHandItem))
41-
return super.use(level, player, usedHand)
42-
}
43-
4439
override fun getDefaultAttributeModifiers(equipmentSlot: EquipmentSlot): Multimap<Attribute, AttributeModifier> {
4540

4641
val attributeBuilder = ImmutableMultimap.Builder<Attribute, AttributeModifier>()

Diff for: src/main/kotlin/dev/sterner/common/item/tool/ichor/IchoriumVorpal.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ class IchoriumVorpal(tier: Tier, attackDamageModifier: Int, attackSpeedModifier:
6969
)
7070
}
7171
}
72+
return InteractionResult.SUCCESS
7273
}
7374

74-
return InteractionResult.SUCCESS
75+
return InteractionResult.PASS
7576
}
7677

7778

0 commit comments

Comments
 (0)