diff --git a/build.gradle.kts b/build.gradle.kts
index 6a761bc..f84e8fc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,6 @@ val baseGroup: String by project
val mcVersion: String by project
val modid: String by project
val version: String by project
-val mixinGroup = "$baseGroup.$modid.mixin"
// Toolchains:
java {
@@ -31,9 +30,6 @@ loom {
launchConfigs {
"client" {
property("devauth.enabled", "true")
- property("mixin.debug", "true")
- property("asmhelper.verbose", "true")
- arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
}
}
runConfigs {
@@ -59,10 +55,6 @@ loom {
}
forge {
pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
- mixinConfig("mixins.$modid.json")
- }
- mixin {
- defaultRefmapName.set("mixins.$modid.refmap.json")
}
}
@@ -82,11 +74,6 @@ dependencies {
minecraft("com.mojang:minecraft:1.8.9")
mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
-
- shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
- isTransitive = false
- }
- annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.2.0")
}
@@ -101,10 +88,6 @@ tasks.withType(Jar::class) {
manifest.attributes.run {
this["FMLCorePluginContainsFMLMod"] = "true"
this["ForceLoadAsMod"] = "true"
-
- // If you don't want mixins, remove these lines
- this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
- this["MixinConfigs"] = "mixins.$modid.json"
}
}
@@ -120,9 +103,8 @@ tasks.processResources {
inputs.property("version", project.version)
inputs.property("mcversion", mcVersion)
inputs.property("modid", modid)
- inputs.property("mixinGroup", mixinGroup)
- filesMatching(listOf("mcmod.info", "mixins.$modid.json")) {
+ filesMatching("mcmod.info") {
expand(inputs.properties)
}
diff --git a/src/main/java/ca/tirelesstraveler/fancywarpmenu/data/skyblockconstants/SkyBlockConstants.java b/src/main/java/ca/tirelesstraveler/fancywarpmenu/data/skyblockconstants/SkyBlockConstants.java
index 94854b6..75c2517 100644
--- a/src/main/java/ca/tirelesstraveler/fancywarpmenu/data/skyblockconstants/SkyBlockConstants.java
+++ b/src/main/java/ca/tirelesstraveler/fancywarpmenu/data/skyblockconstants/SkyBlockConstants.java
@@ -22,8 +22,8 @@
package ca.tirelesstraveler.fancywarpmenu.data.skyblockconstants;
+import ca.tirelesstraveler.fancywarpmenu.data.skyblockconstants.menu.ItemMatchCondition;
import ca.tirelesstraveler.fancywarpmenu.data.skyblockconstants.menu.Menu;
-import ca.tirelesstraveler.fancywarpmenu.data.skyblockconstants.menu.matchconditions.MenuMatchCondition;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
@@ -34,11 +34,10 @@
@SuppressWarnings("unused")
public class SkyBlockConstants {
- private SkyBlockConstants() {
- }
+ public static final String WARP_COMMAND_BASE = "/warp";
- /** A map with SkyBlock menus as keys and lists of conditions used to identify them as values */
- private Map