Repo-Mirror/Reforges
9
0
Fork 0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-28 03:19:29 +00:00
Code Issues Releases 1 Activity

Updated to libreforge 0.2.1

Browse Source
This commit is contained in:
Auxilor
2021-11-19 18:08:39 +00:00
parent 91c22640fe
commit f315251c5c
7 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -43,7 +43,7 @@ allprojects {
dependencies {
compileOnly 'com.willfp:eco:6.13.8'
implementation 'com.willfp:libreforge:0.1.2'
implementation 'com.willfp:libreforge:0.2.1'
compileOnly 'org.jetbrains:annotations:23.0.0'

6
eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java
View File

@@ -5,9 +5,9 @@ import com.willfp.eco.core.command.impl.PluginCommand;
import com.willfp.eco.core.display.DisplayModule;
import com.willfp.eco.core.integrations.IntegrationLoader;
import com.willfp.eco.core.items.Items;
import com.willfp.libreforge.api.LibReforge;
import com.willfp.libreforge.api.LibReforgeUtils;
import com.willfp.libreforge.api.effects.ConfiguredEffect;
import com.willfp.libreforge.LibReforge;
import com.willfp.libreforge.LibReforgeUtils;
import com.willfp.libreforge.effects.ConfiguredEffect;
import com.willfp.reforges.commands.CommandReforge;
import com.willfp.reforges.commands.CommandReforges;
import com.willfp.reforges.config.ReforgesJson;

4
eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeEnableListeners.java
View File

@@ -3,8 +3,8 @@ package com.willfp.reforges.reforges.util;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.core.events.ArmorChangeEvent;
import com.willfp.libreforge.api.LibReforgeUtils;
import com.willfp.libreforge.api.effects.ConfiguredEffect;
import com.willfp.libreforge.LibReforgeUtils;
import com.willfp.libreforge.effects.ConfiguredEffect;
import com.willfp.reforges.reforges.Reforge;
import com.willfp.reforges.reforges.Reforges;
import com.willfp.reforges.reforges.meta.ReforgeTarget;

2
eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java
View File

@@ -1,7 +1,7 @@
package com.willfp.reforges.reforges.util;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.libreforge.api.LibReforge;
import com.willfp.libreforge.LibReforge;
import com.willfp.reforges.ReforgesPlugin;
import com.willfp.reforges.reforges.Reforge;
import com.willfp.reforges.reforges.meta.ReforgeTarget;

6
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
View File

@@ -69,7 +69,11 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
val stoneTexture = SkullUtils.getSkullTexture(stoneMeta)
if (stoneTexture != null) {
SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture)
try {
SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture)
} catch (e: StringIndexOutOfBoundsException) {
// Do nothing
}
}
}
itemStack.itemMeta = meta

24
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt
View File

@@ -6,16 +6,14 @@ import com.willfp.eco.core.items.CustomItem
import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.builder.ItemStackBuilder
import com.willfp.eco.core.recipe.Recipes
import com.willfp.libreforge.api.conditions.Conditions
import com.willfp.libreforge.api.conditions.ConfiguredCondition
import com.willfp.libreforge.api.effects.ConfiguredEffect
import com.willfp.libreforge.api.effects.Effects
import com.willfp.libreforge.api.provider.Holder
import com.willfp.libreforge.Holder
import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.effects.Effects
import com.willfp.reforges.ReforgesPlugin
import com.willfp.reforges.reforges.meta.ReforgeTarget
import com.willfp.reforges.reforges.util.ReforgeUtils
import org.bukkit.inventory.ItemStack
import java.util.Objects
import java.util.*
@Suppress("DEPRECATION")
class Reforge(
@@ -30,15 +28,13 @@ class Reforge(
val targets = config.getStrings("targets").map { ReforgeTarget.getByName(it) }.toSet()
override val effects = config.getSubsections("effects").map {
val effect = Effects.getByID(it.getString("id")) ?: return@map null
ConfiguredEffect(effect, it)
}.filterNotNull().toSet()
override val effects = config.getSubsections("effects").mapNotNull {
Effects.compile(it, "Reforge ID $id")
}.toSet()
override val conditions = config.getSubsections("conditions").map {
val condition = Conditions.getByID(it.getString("id")) ?: return@map null
ConfiguredCondition(condition, it)
}.filterNotNull().toSet()
override val conditions = config.getSubsections("conditions").mapNotNull {
Conditions.compile(it, "Reforge ID $id")
}.toSet()
val requiresStone = config.getBool("stone.enabled")

8
eco-core/core-plugin/src/main/resources/reforges.json
View File

@@ -20,8 +20,12 @@
"effects": [
{
"id": "damage_multiplier",
"multiplier": 3,
"chance": 2
"args": {
"multiplier": 3
},
"triggers": [
"melee_attack"
]
}
],
"conditions": []