9
0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-22 00:19:23 +00:00

Compare commits

..

7 Commits

Author SHA1 Message Date
Auxilor
0ae01af7cf libreforge-updater 2022-07-25 17:03:41 +01:00
Auxilor
7dd0f35f1f Fixed migration 2022-07-24 22:51:14 +01:00
Auxilor
e4afc37f45 libreforge-updater 2022-07-24 22:49:58 +01:00
Auxilor
b74a7f1085 libreforge-updater 2022-07-24 21:52:02 +01:00
Auxilor
94d2ab4593 Updated to 5.27.3 2022-07-24 15:44:27 +01:00
Auxilor
9fce6a6d74 Updated eco, fixed display 2022-07-24 15:44:19 +01:00
Auxilor
a84231c13b libreforge-updater 2022-07-23 17:44:02 +01:00
5 changed files with 13 additions and 12 deletions

View File

@@ -44,8 +44,8 @@ allprojects {
} }
dependencies { dependencies {
compileOnly 'com.willfp:eco:6.36.0' compileOnly 'com.willfp:eco:6.38.0'
implementation 'com.willfp:libreforge:3.76.1' implementation 'com.willfp:libreforge:3.78.0'
implementation 'org.joml:joml:1.10.4' implementation 'org.joml:joml:1.10.4'
compileOnly 'org.jetbrains:annotations:23.0.0' compileOnly 'org.jetbrains:annotations:23.0.0'

View File

@@ -13,10 +13,10 @@ import com.willfp.reforges.display.ReforgesDisplay
import com.willfp.reforges.integrations.talismans.TalismansIntegration import com.willfp.reforges.integrations.talismans.TalismansIntegration
import com.willfp.reforges.reforges.Reforges import com.willfp.reforges.reforges.Reforges
import com.willfp.reforges.reforges.util.ReforgeArgParser import com.willfp.reforges.reforges.util.ReforgeArgParser
import com.willfp.reforges.util.ReforgeEnableListeners
import com.willfp.reforges.util.ReforgeLookup
import com.willfp.reforges.util.AntiPlaceListener import com.willfp.reforges.util.AntiPlaceListener
import com.willfp.reforges.util.DiscoverRecipeListener import com.willfp.reforges.util.DiscoverRecipeListener
import com.willfp.reforges.util.ReforgeEnableListeners
import com.willfp.reforges.util.ReforgeLookup
import org.bukkit.event.Listener import org.bukkit.event.Listener
class ReforgesPlugin : LibReforgePlugin() { class ReforgesPlugin : LibReforgePlugin() {
@@ -64,7 +64,7 @@ class ReforgesPlugin : LibReforgePlugin() {
} }
override fun getMinimumEcoVersion(): String { override fun getMinimumEcoVersion(): String {
return "6.35.1" return "6.38.0"
} }
companion object { companion object {

View File

@@ -3,6 +3,7 @@ package com.willfp.reforges.display
import com.willfp.eco.core.display.Display import com.willfp.eco.core.display.Display
import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayModule
import com.willfp.eco.core.display.DisplayPriority import com.willfp.eco.core.display.DisplayPriority
import com.willfp.eco.core.display.DisplayProperties
import com.willfp.eco.core.fast.FastItemStack import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.core.fast.fast import com.willfp.eco.core.fast.fast
import com.willfp.eco.util.SkullUtils import com.willfp.eco.util.SkullUtils
@@ -24,6 +25,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
override fun display( override fun display(
itemStack: ItemStack, itemStack: ItemStack,
player: Player?, player: Player?,
props: DisplayProperties,
vararg args: Any vararg args: Any
) { ) {
val targets = ReforgeTargets.getForItem(itemStack) val targets = ReforgeTargets.getForItem(itemStack)
@@ -44,9 +46,8 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
if (reforge == null && stone == null) { if (reforge == null && stone == null) {
if (plugin.configYml.getBool("reforge.show-reforgable")) { if (plugin.configYml.getBool("reforge.show-reforgable")) {
if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) { if (plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
val inventory = player.openInventory.topInventory if (props.inGui) {
if (inventory.contents.contains(itemStack) && inventory.holder == null) {
return return
} }
} }

View File

@@ -40,8 +40,8 @@ class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener {
refresh() refresh()
val player = event.player val player = event.player
for (value in values()) { for (value in values()) {
for ((effect) in value.effects) { for (effect in value.effects) {
effect.disableForPlayer(player) effect.disableFor(player)
} }
} }
} }

View File

@@ -1,4 +1,4 @@
#libreforge-updater #libreforge-updater
#Fri Jul 22 14:22:10 BST 2022 #Mon Jul 25 17:03:41 BST 2022
version=5.27.1 version=5.29.0
plugin-name=Reforges plugin-name=Reforges