mirror of
https://github.com/Auxilor/Reforges.git
synced 2025-12-21 16:09:20 +00:00
Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1c70dd4b4 | ||
|
|
ec3a4215b7 | ||
|
|
4f80c3b5f3 | ||
|
|
55efb74fb4 | ||
|
|
d4efad6cd7 | ||
|
|
4fc10862f6 | ||
|
|
c0b96e58ff | ||
|
|
1bdf9b9f4c | ||
|
|
9baaf37108 | ||
|
|
8b89c16754 | ||
|
|
8ee6b64dec | ||
|
|
507e476de0 | ||
|
|
e4bdc914d6 | ||
|
|
89c11c5d03 | ||
|
|
ace9174713 | ||
|
|
11b755c03e | ||
|
|
e502281fac | ||
|
|
7f5b2e28d4 | ||
|
|
0c77fae5c0 | ||
|
|
67c67fe494 | ||
|
|
91cd161e0f | ||
|
|
0ae01af7cf | ||
|
|
7dd0f35f1f | ||
|
|
e4afc37f45 | ||
|
|
b74a7f1085 | ||
|
|
94d2ab4593 | ||
|
|
9fce6a6d74 | ||
|
|
a84231c13b | ||
|
|
c833cc9b67 | ||
|
|
2018f5c506 | ||
|
|
783b14d650 | ||
|
|
793075a70e | ||
|
|
f1f3d5b014 | ||
|
|
a0af472e17 | ||
|
|
060b981019 | ||
|
|
d559684d7b | ||
|
|
f40cd6f68f | ||
|
|
f185ab58ad | ||
|
|
bed87f4210 | ||
|
|
df9cecc2fd |
@@ -4,7 +4,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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 {
|
dependencies {
|
||||||
compileOnly 'com.willfp:eco:6.36.0'
|
compileOnly 'com.willfp:eco:6.38.0'
|
||||||
implementation 'com.willfp:libreforge:3.70.1'
|
implementation 'com.willfp:libreforge:3.86.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'
|
||||||
compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
|
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) {
|
tasks.withType(JavaCompile) {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#libreforge-updater
|
#libreforge-updater
|
||||||
#Sat Jun 25 22:23:55 BST 2022
|
#Sat Aug 20 09:58:58 CEST 2022
|
||||||
version=5.21.1
|
version=5.37.0
|
||||||
plugin-name=Reforges
|
plugin-name=Reforges
|
||||||
|
|||||||
Reference in New Issue
Block a user