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

Compare commits

..

27 Commits

Author SHA1 Message Date
Auxilor
e1c70dd4b4 libreforge-updater 2022-08-20 09:58:58 +02:00
Auxilor
ec3a4215b7 libreforge-updater 2022-08-17 14:21:02 +02:00
Auxilor
4f80c3b5f3 libreforge-updater 2022-08-17 12:08:50 +02:00
Auxilor
55efb74fb4 libreforge-updater 2022-08-16 18:44:50 +02:00
Auxilor
d4efad6cd7 libreforge-updater 2022-08-14 17:29:22 +02:00
Auxilor
4fc10862f6 libreforge-updater 2022-08-13 11:56:10 +02:00
Auxilor
c0b96e58ff libreforge-updater 2022-08-05 18:42:27 +01:00
Auxilor
1bdf9b9f4c libreforge-updater 2022-08-05 18:40:57 +01:00
Auxilor
9baaf37108 libreforge-updater 2022-08-04 13:04:31 +01:00
Auxilor
8b89c16754 lang 2022-08-04 12:39:29 +01:00
Auxilor
8ee6b64dec lang 2022-08-04 12:36:42 +01:00
Auxilor
507e476de0 lang 2022-08-04 12:29:26 +01:00
Auxilor
e4bdc914d6 libreforge-updater 2022-08-04 12:27:32 +01:00
Auxilor
89c11c5d03 libreforge-updater 2022-08-04 12:25:20 +01:00
Auxilor
ace9174713 libreforge-updater 2022-08-02 16:27:39 +01:00
Auxilor
11b755c03e libreforge-updater 2022-08-02 16:22:17 +01:00
Auxilor
e502281fac libreforge-updater 2022-08-02 16:18:20 +01:00
Auxilor
7f5b2e28d4 libreforge-updater 2022-08-01 11:20:25 +01:00
Auxilor
0c77fae5c0 libreforge-updater 2022-07-29 17:51:47 +01:00
Auxilor
67c67fe494 libreforge-updater 2022-07-27 20:18:29 +01:00
Auxilor
91cd161e0f libreforge-updater 2022-07-25 17:54:45 +01:00
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
5 changed files with 13 additions and 12 deletions

View File

@@ -44,8 +44,8 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:6.36.0'
implementation 'com.willfp:libreforge:3.76.2'
compileOnly 'com.willfp:eco:6.38.0'
implementation 'com.willfp:libreforge:3.86.0'
implementation 'org.joml:joml:1.10.4'
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.reforges.Reforges
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.DiscoverRecipeListener
import com.willfp.reforges.util.ReforgeEnableListeners
import com.willfp.reforges.util.ReforgeLookup
import org.bukkit.event.Listener
class ReforgesPlugin : LibReforgePlugin() {
@@ -64,7 +64,7 @@ class ReforgesPlugin : LibReforgePlugin() {
}
override fun getMinimumEcoVersion(): String {
return "6.35.1"
return "6.38.0"
}
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.DisplayModule
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.fast
import com.willfp.eco.util.SkullUtils
@@ -24,6 +25,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
override fun display(
itemStack: ItemStack,
player: Player?,
props: DisplayProperties,
vararg args: Any
) {
val targets = ReforgeTargets.getForItem(itemStack)
@@ -44,9 +46,8 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
if (reforge == null && stone == null) {
if (plugin.configYml.getBool("reforge.show-reforgable")) {
if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
val inventory = player.openInventory.topInventory
if (inventory.contents.contains(itemStack) && inventory.holder == null) {
if (plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
if (props.inGui) {
return
}
}

View File

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

View File

@@ -1,4 +1,4 @@
#libreforge-updater
#Sat Jul 23 17:44:02 BST 2022
version=5.27.2
#Sat Aug 20 09:58:58 CEST 2022
version=5.37.0
plugin-name=Reforges