Merge branch 'master' into minion_helper_2

# Conflicts:
#	build.gradle.kts
#	src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java

28 files changed, 613 insertions, 543 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 6e88fb3b..deb740f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,9 +18,9 @@
  */
 
 
-import java.io.ByteArrayOutputStream
-import java.nio.charset.StandardCharsets
-import java.util.*
+import neubs.NEUBuildFlags
+import neubs.applyPublishingInformation
+import neubs.setVersionFromEnvironment
 
 plugins {
 		idea
@@ -28,42 +28,18 @@ plugins {
 		id("gg.essential.loom") version "0.10.0.+"
 		id("dev.architectury.architectury-pack200") version "0.1.3"
 		id("com.github.johnrengelman.shadow") version "7.1.2"
+		id("io.github.juuxel.loom-quiltflower") version "1.7.3"
+		`maven-publish`
 }
 
 
+apply<NEUBuildFlags>()
+
 // Build metadata
 
 group = "io.github.moulberry"
-val baseVersion = "2.1"
-
-
-val buildExtra = mutableListOf<String>()
-val buildVersion = properties["BUILD_VERSION"] as? String
-if (buildVersion != null) buildExtra.add(buildVersion)
-if (properties["CI"] as? String == "true") buildExtra.add("ci")
-
-val stdout = ByteArrayOutputStream()
-val execResult = exec {
-		commandLine("git", "describe", "--always", "--first-parent", "--abbrev=7")
-		standardOutput = stdout
-		isIgnoreExitValue = true
-}
-if (execResult.exitValue == 0) {
-		buildExtra.add(String(stdout.toByteArray()).trim())
-}
-
-val gitDiffStdout = ByteArrayOutputStream()
-val gitDiffResult = exec {
-		commandLine("git", "status", "--porcelain")
-		standardOutput = gitDiffStdout
-		isIgnoreExitValue = true
-}
-if (gitDiffStdout.toByteArray().isNotEmpty()) {
-		buildExtra.add("dirty")
-}
-
-version = baseVersion + (if (buildExtra.isEmpty()) "" else buildExtra.joinToString(prefix = "+", separator = "."))
 
+setVersionFromEnvironment("2.1")
 
 // Minecraft configuration:
 loom {
@@ -103,6 +79,17 @@ val shadowImplementation by configurations.creating {
 		configurations.implementation.get().extendsFrom(this)
 }
 
+val shadowApi by configurations.creating {
+		configurations.implementation.get().extendsFrom(this)
+}
+
+val devEnv by configurations.creating {
+		configurations.runtimeClasspath.get().extendsFrom(this)
+		isCanBeResolved = false
+		isCanBeConsumed = false
+		isVisible = false
+}
+
 dependencies {
 		minecraft("com.mojang:minecraft:1.8.9")
 		mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
@@ -112,17 +99,18 @@ dependencies {
 				isTransitive = false // Dependencies of mixin are already bundled by minecraft
 		}
 		annotationProcessor("org.spongepowered:mixin:0.8.4-SNAPSHOT")
-		shadowImplementation("info.bliki.wiki:bliki-core:3.1.0")
+		shadowApi("info.bliki.wiki:bliki-core:3.1.0")
 		testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
 		testAnnotationProcessor("org.spongepowered:mixin:0.8.4-SNAPSHOT")
 		//	modImplementation("io.github.notenoughupdates:MoulConfig:0.0.1")
 
-		modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0")
+		devEnv("me.djtheredstoner:DevAuth-forge-legacy:1.1.0")
 }
 
 
 
 java {
+		withSourcesJar()
 		toolchain.languageVersion.set(JavaLanguageVersion.of(8))
 }
 
@@ -159,7 +147,7 @@ val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
 
 tasks.shadowJar {
 		archiveClassifier.set("dep-dev")
-		configurations = listOf(shadowImplementation)
+		configurations = listOf(shadowImplementation, shadowApi)
 		exclude("**/module-info.class", "LICENSE.txt")
 		dependencies {
 				exclude {
@@ -172,23 +160,9 @@ tasks.shadowJar {
 
 tasks.assemble.get().dependsOn(remapJar)
 
-val generateBuildFlags by tasks.creating {
-		outputs.upToDateWhen { false }
-		val t = layout.buildDirectory.file("buildflags.properties")
-		outputs.file(t)
-		val props = project.properties.filter { (name, value) -> name.startsWith("neu.buildflags.") }
-		doLast {
-				val p = Properties()
-				p.putAll(props)
-				t.get().asFile.writer(StandardCharsets.UTF_8).use {
-						p.store(it, "Store build time configuration for NEU")
-				}
-		}
-}
-
 tasks.processResources {
-		from(generateBuildFlags)
-		filesMatching("mcmod.info") {
+		from(tasks["generateBuildFlags"])
+		filesMatching(listOf("mcmod.info", "fabric.mod.json", "META-INF/mods.toml")) {
 				expand(
 						"version" to project.version, "mcversion" to "1.8.9"
 				)
@@ -198,3 +172,9 @@ tasks.processResources {
 sourceSets.main {
 		output.setResourcesDir(file("$buildDir/classes/java/main"))
 }
+
+applyPublishingInformation(
+		"deobf" to tasks.jar,
+		"all" to tasks.remapJar,
+		"sources" to tasks["sourcesJar"],
+)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..5afecadc
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+		`kotlin-dsl`
+}
+
+repositories {
+		mavenCentral()
+}
diff --git a/buildSrc/src/main/kotlin/neubs/buildflags.kt b/buildSrc/src/main/kotlin/neubs/buildflags.kt
new file mode 100644
index 00000000..6b7ab489
--- /dev/null
+++ b/buildSrc/src/main/kotlin/neubs/buildflags.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package neubs
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.the
+import java.nio.charset.StandardCharsets
+import java.util.*
+
+const val NEU_BUILDFLAGS_PREFIX = "neu.buildflags."
+
+class NEUBuildFlags : Plugin<Project> {
+    override fun apply(target: Project) {
+        val props =
+            target.properties.filterKeys { it.startsWith(NEU_BUILDFLAGS_PREFIX) }.mapValues { it.value as String }
+        target.extensions.add("buildflags", Extension(props))
+        target.tasks.create("generateBuildFlags") {
+            outputs.upToDateWhen { false }
+            val t = target.layout.buildDirectory.file("buildflags.properties")
+            outputs.file(t)
+            doLast {
+                val p = Properties()
+                p.putAll(props)
+                t.get().asFile.writer(StandardCharsets.UTF_8).use {
+                    p.store(it, "Store build time configuration for NEU")
+                }
+            }
+
+        }
+    }
+
+    class Extension(val props: Map<String, String>) {
+        fun bool(name: String) = props["$NEU_BUILDFLAGS_PREFIX$name"] == "true"
+    }
+}
+
+val Project.buildFlags: NEUBuildFlags.Extension
+    get() = the<NEUBuildFlags.Extension>()
diff --git a/buildSrc/src/main/kotlin/neubs/publishing.kt b/buildSrc/src/main/kotlin/neubs/publishing.kt
new file mode 100644
index 00000000..4f9979a1
--- /dev/null
+++ b/buildSrc/src/main/kotlin/neubs/publishing.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package neubs
+
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.get
+
+fun Project.applyPublishingInformation(
+    vararg artifacts: Pair<String, Any>
+) {
+    this.configure<PublishingExtension> {
+        publications {
+            create<MavenPublication>("maven") {
+                for((name, source) in artifacts) {
+                    artifact(source) {
+                        classifier = name
+                    }
+                }
+                pom {
+                    name.set("NotEnoughUpdates")
+                    description.set("A feature rich 1.8.9 Minecraft forge mod for Hypixel Skyblock")
+                    licenses {
+                        license {
+                            name.set("GNU Lesser General Public License")
+                            url.set("https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/COPYING.LESSER")
+                        }
+                    }
+                    developers {
+                        developer {
+                            name.set("Moulberry")
+                        }
+                        developer {
+                            name.set("The NotEnoughUpdates Contributors and Maintainers")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/buildSrc/src/main/kotlin/neubs/versioning.kt b/buildSrc/src/main/kotlin/neubs/versioning.kt
new file mode 100644
index 00000000..254e0012
--- /dev/null
+++ b/buildSrc/src/main/kotlin/neubs/versioning.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package neubs
+
+import org.gradle.api.Project
+import java.io.ByteArrayOutputStream
+
+fun Project.setVersionFromEnvironment(baseVersion: String) {
+    val buildExtra = mutableListOf<String>()
+    val buildVersion = properties["BUILD_VERSION"] as? String
+    if (buildVersion != null) buildExtra.add(buildVersion)
+    if (System.getenv("CI") == "true") buildExtra.add("ci")
+
+    val stdout = ByteArrayOutputStream()
+    val execResult = exec {
+        commandLine("git", "describe", "--always", "--first-parent", "--abbrev=7")
+        standardOutput = stdout
+        isIgnoreExitValue = true
+    }
+    if (execResult.exitValue == 0) {
+        buildExtra.add(String(stdout.toByteArray()).trim())
+    }
+
+    val gitDiffStdout = ByteArrayOutputStream()
+    val gitDiffResult = exec {
+        commandLine("git", "status", "--porcelain")
+        standardOutput = gitDiffStdout
+        isIgnoreExitValue = true
+    }
+    if (gitDiffStdout.toByteArray().isNotEmpty()) {
+        buildExtra.add("dirty")
+    }
+
+    version = baseVersion + (if (buildExtra.isEmpty()) "" else buildExtra.joinToString(prefix = "+", separator = "."))
+
+}
+
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 00000000..6166e3d7
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,4 @@
+jdk:
+  - openjdk17
+env:
+  CI: true
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index f67c1f43..301aec26 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -35,8 +35,11 @@ import io.github.moulberry.notenoughupdates.listener.ItemTooltipRngListener;
 import io.github.moulberry.notenoughupdates.listener.NEUEventListener;
 import io.github.moulberry.notenoughupdates.listener.OldAnimationChecker;
 import io.github.moulberry.notenoughupdates.listener.RenderListener;
+import io.github.moulberry.notenoughupdates.miscfeatures.AbiphoneWarning;
+import io.github.moulberry.notenoughupdates.miscfeatures.AntiCoopAdd;
+import io.github.moulberry.notenoughupdates.miscfeatures.AuctionBINWarning;
 import io.github.moulberry.notenoughupdates.miscfeatures.AuctionProfit;
-import io.github.moulberry.notenoughupdates.miscfeatures.BazaarSacksProfit;
+import io.github.moulberry.notenoughupdates.miscfeatures.BetterContainers;
 import io.github.moulberry.notenoughupdates.miscfeatures.CrystalOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.CrystalWishingCompassSolver;
 import io.github.moulberry.notenoughupdates.miscfeatures.CustomItemEffects;
@@ -115,7 +118,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Set;
 
-@Mod(modid = NotEnoughUpdates.MODID, version = NotEnoughUpdates.VERSION, clientSideOnly = true)
+@Mod(
+	modid = NotEnoughUpdates.MODID, version = NotEnoughUpdates.VERSION, clientSideOnly = true, useMetadata = true,
+	guiFactory = "io.github.moulberry.notenoughupdates.core.config.MoulConfigGuiForgeInterop")
 public class NotEnoughUpdates {
 	public static final String MODID = "notenoughupdates";
 	public static final String VERSION = "2.1.0-REL";
@@ -299,7 +304,10 @@ public class NotEnoughUpdates {
 		MinecraftForge.EVENT_BUS.register(new SignCalculator());
 		MinecraftForge.EVENT_BUS.register(TrophyRewardOverlay.getInstance());
 		MinecraftForge.EVENT_BUS.register(PowerStoneStatsDisplay.getInstance());
-		MinecraftForge.EVENT_BUS.register(BazaarSacksProfit.getInstance());
+		MinecraftForge.EVENT_BUS.register(new AntiCoopAdd());
+		MinecraftForge.EVENT_BUS.register(AbiphoneWarning.getInstance());
+		MinecraftForge.EVENT_BUS.register(new BetterContainers());
+		MinecraftForge.EVENT_BUS.register(AuctionBINWarning.getInstance());
 		MinecraftForge.EVENT_BUS.register(MinionHelperManager.getInstance());
 		MinecraftForge.EVENT_BUS.register(navigation);
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/MoulConfigGuiForgeInterop.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/MoulConfigGuiForgeInterop.java
new file mode 100644
index 00000000..40887e54
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/MoulConfigGuiForgeInterop.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.core.config;
+
+import io.github.moulberry.notenoughupdates.core.GuiScreenElementWrapper;
+import io.github.moulberry.notenoughupdates.options.NEUConfigEditor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.client.IModGuiFactory;
+import org.lwjgl.input.Keyboard;
+
+import java.io.IOException;
+import java.util.Set;
+
+public class MoulConfigGuiForgeInterop implements IModGuiFactory {
+	@Override
+	public void initialize(Minecraft minecraft) {}
+
+	@Override
+	public Class<? extends GuiScreen> mainConfigGuiClass() {
+		return WrappedMoulConfig.class;
+	}
+
+	@Override
+	public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
+		return null;
+	}
+
+	@Override
+	public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement runtimeOptionCategoryElement) {
+		return null;
+	}
+
+	public static class WrappedMoulConfig extends GuiScreenElementWrapper {
+
+		private final GuiScreen parent;
+
+		public WrappedMoulConfig(GuiScreen parent) {
+			super(NEUConfigEditor.editor);
+			this.parent = parent;
+		}
+
+		@Override
+		public void handleKeyboardInput() throws IOException {
+			if (Keyboard.getEventKeyState() && Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
+				Minecraft.getMinecraft().displayGuiScreen(parent);
+				return;
+			}
+			super.handleKeyboardInput();
+		}
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/events/SlotClickEvent.java b/src/main/java/io/github/moulberry/notenoughupdates/events/SlotClickEvent.java
new file mode 100644
index 00000000..13c31b54
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/events/SlotClickEvent.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.events;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Slot;
+import net.minecraftforge.fml.common.eventhandler.Cancelable;
+
+@Cancelable
+public class SlotClickEvent extends NEUEvent {
+	public final GuiContainer guiContainer;
+	public final Slot slot;
+	public final int slotId;
+	public int clickedButton;
+	public int clickType;
+	public boolean usePickblockInstead = false;
+
+	public SlotClickEvent(GuiContainer guiContainer, Slot slot, int slotId, int clickedButton, int clickType) {
+		this.guiContainer = guiContainer;
+		this.slot = slot;
+		this.slotId = slotId;
+		this.clickedButton = clickedButton;
+		this.clickType = clickType;
+	}
+
+	public void usePickblockInstead() {
+		usePickblockInstead = true;
+	}
+
+	@Override
+	public void setCanceled(boolean cancel) {
+		super.setCanceled(cancel);
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AbiphoneWarning.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AbiphoneWarning.java
index 254c891a..67ac4f4c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AbiphoneWarning.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AbiphoneWarning.java
@@ -23,6 +23,7 @@ import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.GuiElement;
 import io.github.moulberry.notenoughupdates.core.util.render.RenderUtils;
 import io.github.moulberry.notenoughupdates.core.util.render.TextRenderUtils;
+import io.github.moulberry.notenoughupdates.events.SlotClickEvent;
 import io.github.moulberry.notenoughupdates.util.ItemUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
@@ -33,6 +34,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -68,29 +70,28 @@ public class AbiphoneWarning extends GuiElement {
 		return shouldPerformCheck() && showWarning;
 	}
 
-	public boolean onMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) {
-		if (!shouldPerformCheck()) return false;
-		if (!NotEnoughUpdates.INSTANCE.config.misc.abiphoneWarning) return false;
-		if (slotId == -999) return false;
-		if (clickedButton == 0) return false;
+	@SubscribeEvent
+	public void onMouseClick(SlotClickEvent event) {
+		if (!shouldPerformCheck()) return;
+		if (!NotEnoughUpdates.INSTANCE.config.misc.abiphoneWarning) return;
+		if (event.slotId == -999) return;
+		if (event.clickedButton == 0) return;
 
 		GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen;
 
-		ItemStack clickedContact = chest.inventorySlots.getSlot(slotId).getStack();
-		if (clickedContact == null) return false;
+		ItemStack clickedContact = chest.inventorySlots.getSlot(event.slotId).getStack();
+		if (clickedContact == null) return;
 
 		List<String> list = ItemUtils.getLore(clickedContact);
-		if (list.isEmpty()) return false;
+		if (list.isEmpty()) return;
 
 		String last = list.get(list.size() - 1);
 		if (last.contains("Right-click to remove contact!")) {
 			showWarning = true;
 			contactName = clickedContact.getDisplayName();
-			contactSlot = slotId;
-			return true;
+			contactSlot = event.slotId;
+			event.setCanceled(true);
 		}
-
-		return false;
 	}
 
 	public void overrideIsMouseOverSlot(Slot slot, int mouseX, int mouseY, CallbackInfoReturnable<Boolean> cir) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java
index 25aaaa0a..70ac4489 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AntiCoopAdd.java
@@ -20,43 +20,43 @@
 package io.github.moulberry.notenoughupdates.miscfeatures;
 
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.events.SlotClickEvent;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.event.HoverEvent;
 import net.minecraft.init.Items;
-import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class AntiCoopAdd {
 
-	public static boolean onMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) {
-		if (!NotEnoughUpdates.INSTANCE.config.misc.coopWarning) return false;
-		if (slotId == -999) return false;
-		if (!Utils.getOpenChestName().contains("Profile")) return false;
+	@SubscribeEvent
+	public vo