Skip to content

Commit c644458

Browse files
committed
typo
1 parent 5fca34f commit c644458

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/guide/button/ItemButton.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ import io.github.pylonmc.pylon.core.i18n.PylonArgument
88
import io.github.pylonmc.pylon.core.item.PylonItem
99
import io.github.pylonmc.pylon.core.item.builder.ItemStackBuilder
1010
import io.github.pylonmc.pylon.core.item.research.Research.Companion.canUse
11-
import io.github.pylonmc.pylon.core.item.research.Research.Companion.hasResearchFor
11+
import io.github.pylonmc.pylon.core.item.research.Research.Companion.canCraft
1212
import io.github.pylonmc.pylon.core.item.research.Research.Companion.research
1313
import io.github.pylonmc.pylon.core.item.research.Research.Companion.researchPoints
14-
import io.github.pylonmc.pylon.core.item.research.Research.Companion.researches
1514
import io.github.pylonmc.pylon.core.registry.PylonRegistry
1615
import io.papermc.paper.datacomponent.DataComponentTypes
1716
import io.papermc.paper.datacomponent.item.ItemLore
1817
import net.kyori.adventure.text.Component
1918
import net.kyori.adventure.text.TranslatableComponent
20-
import org.bukkit.Bukkit
2119
import org.bukkit.Material
2220
import org.bukkit.NamespacedKey
2321
import org.bukkit.entity.Player
@@ -62,7 +60,7 @@ class ItemButton(val stack: ItemStack) : AbstractItem() {
6260
builder.set(DataComponentTypes.ITEM_MODEL, Material.STRUCTURE_VOID.key)
6361
}
6462

65-
if (!player.hasResearchFor(item)) {
63+
if (!player.canCraft(item)) {
6664
builder.set(DataComponentTypes.ITEM_MODEL, Material.BARRIER.key)
6765
.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, false)
6866
.lore(Component.translatable("pylon.pyloncore.guide.button.item.not-researched"))

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/item/research/Research.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ data class Research(
113113
@JvmStatic
114114
@JvmOverloads
115115
@JvmName("canPlayerCraft")
116-
fun Player.hasResearchFor(item: PylonItem, sendMessage: Boolean = false): Boolean {
116+
fun Player.canCraft(item: PylonItem, sendMessage: Boolean = false): Boolean {
117117
if (!PylonConfig.researchesEnabled || this.hasPermission(item.researchBypassPermission)) return true
118118

119119
val research = item.research ?: return true
@@ -149,7 +149,7 @@ data class Research(
149149
@JvmOverloads
150150
@JvmName("canPlayerPickup")
151151
fun Player.canPickup(item: PylonItem, sendMessage: Boolean = false): Boolean
152-
= hasResearchFor(item, sendMessage)
152+
= canCraft(item, sendMessage)
153153

154154
@JvmStatic
155155
@JvmOverloads
@@ -167,7 +167,7 @@ data class Research(
167167
return false
168168
}
169169

170-
return hasResearchFor(item, sendMessage)
170+
return canCraft(item, sendMessage)
171171
}
172172

173173
@JvmStatic
@@ -194,7 +194,7 @@ data class Research(
194194

195195
val canCraft = event.recipe.getOutputItems().all {
196196
val item = PylonItem.fromStack(it)
197-
item == null || event.player.hasResearchFor(item, true)
197+
item == null || event.player.canCraft(item, true)
198198
}
199199

200200
if (!canCraft) {

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/recipe/RecipeListener.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package io.github.pylonmc.pylon.core.recipe
22

3-
import io.github.pylonmc.pylon.core.event.PrePylonCraftEvent
43
import io.github.pylonmc.pylon.core.item.PylonItem
54
import io.github.pylonmc.pylon.core.item.base.VanillaCraftingItem
65
import io.github.pylonmc.pylon.core.item.base.VanillaSmithingMaterial
76
import io.github.pylonmc.pylon.core.item.base.VanillaSmithingTemplate
8-
import io.github.pylonmc.pylon.core.item.research.Research.Companion.hasResearchFor
7+
import io.github.pylonmc.pylon.core.item.research.Research.Companion.canCraft
98
import io.github.pylonmc.pylon.core.util.isPylonAndIsNot
109
import org.bukkit.Keyed
1110
import org.bukkit.entity.Player
@@ -33,7 +32,7 @@ internal object PylonRecipeListener : Listener {
3332
// Prevent crafting of unresearched items
3433
val pylonItemResult = PylonItem.fromStack(recipe.result)
3534
val anyViewerDoesNotHaveResearch = pylonItemResult != null && e.viewers.none {
36-
it is Player && it.hasResearchFor(pylonItemResult, true)
35+
it is Player && it.canCraft(pylonItemResult, true)
3736
}
3837
if (anyViewerDoesNotHaveResearch) {
3938
inventory.result = null
@@ -67,7 +66,7 @@ internal object PylonRecipeListener : Listener {
6766
// Prevent crafting of unresearched items
6867
val pylonItemResult = PylonItem.fromStack(recipe.result)
6968
val anyViewerDoesNotHaveResearch = pylonItemResult != null && e.viewers.none {
70-
it is Player && it.hasResearchFor(pylonItemResult, true)
69+
it is Player && it.canCraft(pylonItemResult, true)
7170
}
7271
if (anyViewerDoesNotHaveResearch) {
7372
inv.result = null

0 commit comments

Comments
 (0)