Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-03 02:21:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finally fixed plexus-utils shading in

Browse Source
This commit is contained in:
Auxilor 2020-12-28 22:57:32 +00:00
parent e86c7d67fa
commit 6869f1f680
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -68,6 +68,10 @@ allprojects {
} }
} }
configurations.all {
exclude group:"org.codehaus.plexus", module: "plexus-utils"
}
compileJava.options.encoding = 'UTF-8' compileJava.options.encoding = 'UTF-8'
compileJava.dependsOn clean compileJava.dependsOn clean
} }
@ -106,3 +110,7 @@ publishing {
} }
} }
} }
configurations.all {
exclude group:"org.codehaus.plexus", module: "plexus-utils"
}

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View File

@ -14,7 +14,6 @@ import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import com.willfp.ecoenchants.enchantments.util.Watcher; import com.willfp.ecoenchants.enchantments.util.Watcher;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import org.apache.commons.lang.WordUtils; import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -39,7 +38,6 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@EqualsAndHashCode(callSuper = false)
@SuppressWarnings({"unchecked", "deprecation"}) @SuppressWarnings({"unchecked", "deprecation"})
public abstract class EcoEnchant extends Enchantment implements Listener, Registerable, Watcher { public abstract class EcoEnchant extends Enchantment implements Listener, Registerable, Watcher {
/** /**

2
eco-util/build.gradle
View File

@ -19,5 +19,5 @@ dependencies {
compileOnly 'com.github.angeschossen:LandsAPI:4.7.3' compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT' compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd' compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
compile fileTree(dir: '/../lib', include: ['*.jar']) compileOnly fileTree(dir: '/../lib', include: ['*.jar'])
} }

1
eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java
View File

@ -46,6 +46,7 @@ public class ConfigHandler extends PluginDependent {
try { try {
method.invoke(null); method.invoke(null);
} catch (IllegalAccessException | InvocationTargetException e) { } catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
throw new InvalidUpdateMethodException("Update method generated an exception."); throw new InvalidUpdateMethodException("Update method generated an exception.");
} }
} }