From 64db8dc9cfb9c1f23117b7c0d1e4f8b1935b5917 Mon Sep 17 00:00:00 2001
From: Wyvest <45589059+Wyvest@users.noreply.github.com>
Date: Sat, 5 Mar 2022 21:49:47 +0700
Subject: [PATCH] THING THING THING

---
 build.gradle                                  | 19 ++++++--------
 .../net/wyvest/hytilities/Hytilities.java     |  4 +--
 ...CoreTweaker.java => FMLLoadingPlugin.java} | 25 +++++++++++++++++--
 .../triggers/AutoChatReportConfirm.java       |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)
 rename src/main/java/net/wyvest/hytilities/forge/{HytilsWCoreTweaker.java => FMLLoadingPlugin.java} (72%)

diff --git a/build.gradle b/build.gradle
index 03879391..998631c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
     id "java"
 }
 
-version = "1.4.0"
+version = "1.4.1"
 group = modGroup
 archivesBaseName = "Hytilities-Reborn"
 
@@ -39,8 +39,8 @@ minecraft {
     mappings = "stable_22"
     makeObfSourceJar = false
 
-    clientJvmArgs += '-Dfml.coreMods.load=net.wyvest.hytilities.forge.HytilsWCoreTweaker'
-    clientRunArgs += "--tweakClass gg.essential.loader.stage0.EssentialSetupTweaker"
+    clientJvmArgs += '-Dfml.coreMods.load=net.wyvest.hytilities.forge.FMLLoadingPlugin'
+    clientRunArgs += "--tweakClass cc.woverflow.wcore.tweaker.OneCoreTweaker"
     clientRunArgs += "--mixin mixins.hytilities.json"
 }
 
@@ -56,16 +56,13 @@ repositories {
 }
 
 dependencies {
-    include ('gg.essential:loader-launchwrapper:1.1.3') {
-        transitive = false
-    }
-    compileOnly 'gg.essential:essential-1.8.9-forge:1788'
+    compileOnly 'gg.essential:essential-1.8.9-forge:1933'
     compileOnly annotationProcessor ('org.spongepowered:mixin:0.8.5-SNAPSHOT')
     annotationProcessor("com.google.code.gson:gson:2.2.4")
     annotationProcessor("com.google.guava:guava:21.0")
     annotationProcessor("org.ow2.asm:asm-tree:6.2")
-    compileOnly 'cc.woverflow:w-core:1.1.3'
-    include ('cc.woverflow:w-core-tweaker:1.0.2') {
+    compileOnly 'cc.woverflow:onecore:1.3.3'
+    include ('cc.woverflow:onecore-tweaker:1.3.0') {
         transitive = false
     }
 }
@@ -74,8 +71,8 @@ jar {
     manifest.attributes(
             "ModSide": "CLIENT",
             "FMLCorePluginContainsFMLMod": "No",
-            "FMLCorePlugin": "net.wyvest.hytilities.forge.HytilsWCoreTweaker",
-            "TweakClass": "gg.essential.loader.stage0.EssentialSetupTweaker",
+            "FMLCorePlugin": "net.wyvest.hytilities.forge.FMLLoadingPlugin",
+            "TweakClass": "cc.woverflow.wcore.tweaker.OneCoreTweaker",
             "TweakOrder": "0",
             "FMLAT": "hytilities_at.cfg",
             "MixinConfigs": "mixins.hytilities.json"
diff --git a/src/main/java/net/wyvest/hytilities/Hytilities.java b/src/main/java/net/wyvest/hytilities/Hytilities.java
index edca6dc3..99d63e97 100644
--- a/src/main/java/net/wyvest/hytilities/Hytilities.java
+++ b/src/main/java/net/wyvest/hytilities/Hytilities.java
@@ -18,7 +18,7 @@
 
 package net.wyvest.hytilities;
 
-import cc.woverflow.wcore.utils.Updater;
+import cc.woverflow.onecore.utils.Updater;
 import gg.essential.api.EssentialAPI;
 import gg.essential.universal.ChatColor;
 import net.minecraft.client.Minecraft;
@@ -77,7 +77,7 @@ public class Hytilities {
 
     public static final String MOD_ID = "hytilities-reborn";
     public static final String MOD_NAME = "Hytilities Reborn";
-    public static final String VERSION = "1.4.0";
+    public static final String VERSION = "1.4.1";
 
     @Mod.Instance(MOD_ID)
     public static Hytilities INSTANCE;
diff --git a/src/main/java/net/wyvest/hytilities/forge/HytilsWCoreTweaker.java b/src/main/java/net/wyvest/hytilities/forge/FMLLoadingPlugin.java
similarity index 72%
rename from src/main/java/net/wyvest/hytilities/forge/HytilsWCoreTweaker.java
rename to src/main/java/net/wyvest/hytilities/forge/FMLLoadingPlugin.java
index fdfafb4d..a3802540 100644
--- a/src/main/java/net/wyvest/hytilities/forge/HytilsWCoreTweaker.java
+++ b/src/main/java/net/wyvest/hytilities/forge/FMLLoadingPlugin.java
@@ -18,14 +18,35 @@
 
 package net.wyvest.hytilities.forge;
 
-import cc.woverflow.wcore.tweaker.WCoreTweaker;
 import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 
+import java.util.Map;
+
 @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion)
-public class HytilsWCoreTweaker extends WCoreTweaker {
+public class FMLLoadingPlugin implements IFMLLoadingPlugin {
     @Override
     public String[] getASMTransformerClass() {
         return new String[]{ClassTransformer.class.getName()};
     }
+
+    @Override
+    public String getModContainerClass() {
+        return null;
+    }
+
+    @Override
+    public String getSetupClass() {
+        return null;
+    }
+
+    @Override
+    public void injectData(Map<String, Object> data) {
+
+    }
+
+    @Override
+    public String getAccessTransformerClass() {
+        return null;
+    }
 }
diff --git a/src/main/java/net/wyvest/hytilities/handlers/chat/modules/triggers/AutoChatReportConfirm.java b/src/main/java/net/wyvest/hytilities/handlers/chat/modules/triggers/AutoChatReportConfirm.java
index 89bd9d54..aad61ece 100644
--- a/src/main/java/net/wyvest/hytilities/handlers/chat/modules/triggers/AutoChatReportConfirm.java
+++ b/src/main/java/net/wyvest/hytilities/handlers/chat/modules/triggers/AutoChatReportConfirm.java
@@ -38,7 +38,7 @@ public int getPriority() {
     public void onMessageReceived(@NotNull ClientChatReceivedEvent event) {
         if (event.message.getUnformattedText().equals("Please type /report confirm to log your report for staff review.")) {
             event.setCanceled(true);
-            Multithreading.schedule(() -> Minecraft.getMinecraft().thePlayer.sendChatMessage("/report confirm"), 2, TimeUnit.SECONDS);
+            Multithreading.schedule(() -> Minecraft.getMinecraft().thePlayer.sendChatMessage("/report confirm"), 1, TimeUnit.SECONDS);
         }
     }