diff --git a/build.gradle b/build.gradle index 796647f..247f926 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ clean.doLast { shadowJar { relocate('org.apache.maven', 'com.willfp.talismans.eco.shaded.maven') relocate('org.bstats', 'com.willfp.talismans.eco.shaded.bstats') - relocate('com.willfp.eco.', 'com.willfp.talismans.eco.') // Dot is to prevent plugin being shaded into itself + relocate('com.willfp.eco.util', 'com.willfp.talismans.eco.util') // Dot is to prevent plugin being shaded into itself archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" } diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 24c5be8..d4a6364 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -3,7 +3,7 @@ version rootProject.version dependencies { compileOnly project(":eco-core:core-proxy") - compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' compileOnly 'commons-io:commons-io:2.8.0' compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT' compileOnly 'net.ess3:EssentialsX:2.18.1' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java index ca31db5..266933f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java @@ -1,13 +1,13 @@ package com.willfp.talismans.talismans; +import com.willfp.eco.common.recipes.lookup.RecipePartUtils; +import com.willfp.eco.common.recipes.parts.ComplexRecipePart; import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import com.willfp.eco.util.recipes.EcoShapedRecipe; -import com.willfp.eco.util.recipes.lookup.RecipePartUtils; -import com.willfp.eco.util.recipes.parts.ComplexRecipePart; +import com.willfp.eco.util.recipe.EcoShapedRecipe; import com.willfp.talismans.config.TalismansConfigs; import com.willfp.talismans.config.configs.TalismanConfig; import com.willfp.talismans.display.TalismanDisplay;