9
0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-20 15:39:30 +00:00

Compare commits

...

74 Commits

Author SHA1 Message Date
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
Auxilor
a84231c13b libreforge-updater 2022-07-23 17:44:02 +01:00
Auxilor
c833cc9b67 libreforge-updater 2022-07-22 14:22:10 +01:00
Auxilor
2018f5c506 libreforge-updater 2022-07-21 20:15:20 +01:00
Auxilor
783b14d650 libreforge-updater 2022-07-20 00:11:25 +01:00
Auxilor
793075a70e libreforge-updater 2022-07-13 21:23:48 +01:00
Auxilor
f1f3d5b014 libreforge-updater 2022-07-12 14:59:51 +01:00
Auxilor
a0af472e17 libreforge-updater 2022-07-11 16:17:28 +01:00
Auxilor
060b981019 libreforge-updater 2022-07-09 12:11:45 +01:00
Auxilor
d559684d7b libreforge-updater 2022-07-05 18:33:18 +01:00
Auxilor
f40cd6f68f libreforge-updater 2022-07-04 18:46:16 +01:00
Auxilor
f185ab58ad libreforge-updater 2022-06-30 22:55:30 +01:00
Auxilor
bed87f4210 libreforge-updater 2022-06-30 22:35:30 +01:00
Auxilor
df9cecc2fd libreforge-updater 2022-06-26 13:02:05 +01:00
Auxilor
72d0e258f4 libreforge-updater 2022-06-25 22:23:55 +01:00
Auxilor
224c243449 libreforge-updater 2022-06-24 13:58:59 +01:00
Auxilor
b925a18ea0 libreforge-updater 2022-06-22 22:25:52 +01:00
Auxilor
801e61c66c libreforge-updater 2022-06-22 12:44:00 +01:00
Auxilor
0c58faf33e libreforge-updater 2022-06-21 08:28:24 +01:00
Auxilor
04cff9070b libreforge-updater 2022-06-20 21:38:28 +01:00
Auxilor
57aee104aa libreforge-updater 2022-06-20 14:18:01 +01:00
Auxilor
bbfeac1cde libreforge-updater 2022-06-19 12:19:03 +01:00
Auxilor
a5b9446afe libreforge-updater 2022-06-18 12:20:23 +01:00
Auxilor
a99e34014f libreforge-updater 2022-06-17 21:35:44 +01:00
Auxilor
3f9ddf08fb libreforge-updater 2022-06-17 15:27:11 +01:00
Auxilor
176b8cae9a libreforge-updater 2022-06-16 16:43:38 +01:00
Auxilor
3cca475d13 libreforge-updater 2022-06-15 15:13:07 +01:00
Auxilor
d4f2f1c7c8 libreforge-updater 2022-06-15 15:11:22 +01:00
Auxilor
87c6481701 libreforge-updater 2022-06-14 16:44:46 +01:00
Auxilor
b184c10f02 libreforge-updater 2022-06-14 09:10:06 +01:00
Auxilor
5428be88ea libreforge-updater 2022-06-13 11:45:21 +01:00
Auxilor
79b96193f1 Fixed softdepends 2022-06-12 19:13:28 +01:00
Auxilor
fc68463b5c Updated to 5.10.0 2022-06-11 11:17:06 +01:00
Auxilor
bc5b2dedd3 libreforge-updater 2022-06-11 11:13:58 +01:00
Auxilor
3128091722 libreforge-updater 2022-06-11 11:13:52 +01:00
Auxilor
0887d8af75 libreforge-updater 2022-06-08 21:06:44 +01:00
Auxilor
b879d87720 libreforge-updater 2022-06-06 13:30:11 +01:00
Auxilor
daf5e23b39 Fixed EcoBosses softdepend 2022-06-05 10:41:06 +01:00
Auxilor
850455e4c2 libreforge-updater 2022-06-04 13:45:01 +01:00
Auxilor
0e0e986906 libreforge-updater 2022-06-03 11:36:21 +01:00
Auxilor
3b2f77a83b libreforge-updater 2022-05-31 19:45:54 +01:00
Auxilor
5c429ee626 libreforge-updater 2022-05-30 17:05:26 +01:00
Auxilor
3749edc5c1 libreforge-updater 2022-05-30 11:11:27 +01:00
Auxilor
a0b3b62040 Updated libreforge 2022-05-28 18:23:00 +01:00
Auxilor
12b1b99466 Updated eco 2022-05-28 18:15:53 +01:00
Auxilor
b4c071fd53 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build.gradle
#	gradle.properties
2022-05-28 18:15:23 +01:00
Auxilor
93a8937222 libreforge-updater 2022-05-28 18:14:59 +01:00
Auxilor
a565e3d3e7 libreforge-updater 2022-05-27 19:25:44 +01:00
Auxilor
3c92da1998 libreforge-updater 2022-05-25 10:57:27 +01:00
Auxilor
87a240d5d3 libreforge-updater 2022-05-23 16:03:37 +01:00
Auxilor
22b0279057 libreforge-updater 2022-05-22 20:43:14 +01:00
6 changed files with 22 additions and 17 deletions

View File

@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
}
}
@@ -44,14 +44,14 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:6.35.1'
implementation 'com.willfp:libreforge:3.49.0'
compileOnly 'com.willfp:eco:6.38.0'
implementation 'com.willfp:libreforge:3.84.0'
implementation 'org.joml:joml:1.10.4'
compileOnly 'org.jetbrains:annotations:23.0.0'
compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
}
tasks.withType(JavaCompile) {

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

@@ -10,13 +10,17 @@ depend:
- ProtocolLib
softdepend:
- Vault
- EcoSkills
- Talismans
- AureliumSkills
- PlayerPoints
- Jobs
- EcoArmor
- TMMobcoins
- EcoEnchants
- EcoBosses
- Talismans
- EcoArmor
- EcoItems
- EcoSkills
- Boosters
commands:
reforges:

View File

@@ -1,4 +1,4 @@
#libreforge-updater
#Sun May 22 15:27:50 BST 2022
version=5.0.0
#Tue Aug 16 18:44:50 CEST 2022
version=5.35.0
plugin-name=Reforges