2.38

2.38

build.gradle

@@ -134,7 +134,7 @@ jar {
                 'tweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
                 'TweakOrder': 0,
                 'FMLCorePluginContainsFMLMod': 'true',
-                'FMLCorePlugin': 'com.mrzak34.thunderhack.Thunderhack',
+                'FMLCorePlugin': 'com.mrzak34.thunderhack.mixin.THLoader',
                 'ForceLoadAsMod': 'true',
                 'FMLAT': 'th_at.cfg',
         )

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 modGroup=com.mrzak34
-modVersion=2.36
+modVersion=2.38
 modBaseName=thunderhack
 forgeVersion=1.12.2-14.23.5.2768
 mcpVersion=stable_39

src/main/java/com/github/lunatrius/core/LunatriusCore.java

@@ -38,8 +38,5 @@ public void postInit(final FMLPostInitializationEvent event) {
         proxy.postInit(event);
     }
 
-    @Mod.EventHandler
-    public void processIMC(final FMLInterModComms.IMCEvent event) {
-        proxy.processIMC(event);
-    }
+
 }

src/main/java/com/github/lunatrius/core/proxy/CommonProxy.java

@@ -2,7 +2,6 @@
 
 import com.github.lunatrius.core.handler.ConfigurationHandler;
 import com.github.lunatrius.core.reference.Reference;
-import com.github.lunatrius.core.version.VersionChecker;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -13,31 +12,14 @@
 public abstract class CommonProxy {
     public void preInit(final FMLPreInitializationEvent event) {
         Reference.logger = event.getModLog();
-
-        FMLInterModComms.sendMessage(Reference.MODID, "checkUpdate", Reference.FORGE);
     }
 
     public void init(final FMLInitializationEvent event) {
     }
 
     public void postInit(final FMLPostInitializationEvent event) {
-        if (VersionChecker.isAllowedToCheck("Global") && ConfigurationHandler.VersionCheck.checkForUpdates) {
-            VersionChecker.startVersionCheck();
-        }
-    }
 
-    public void processIMC(final FMLInterModComms.IMCEvent event) {
-        for (final FMLInterModComms.IMCMessage message : event.getMessages()) {
-            if ("checkUpdate".equals(message.key) && message.isStringMessage()) {
-                processMessage(message.getSender(), message.getStringValue());
-            }
-        }
     }
 
-    private void processMessage(final String sender, final String forgeVersion) {
-        final ModContainer container = Loader.instance().getIndexedModList().get(sender);
-        if (container != null) {
-            VersionChecker.registerMod(container, forgeVersion);
-        }
-    }
+
 }

src/main/java/com/mrzak34/thunderhack/Discord.java

@@ -3,8 +3,7 @@
 import club.minnced.discord.rpc.DiscordEventHandlers;
 import club.minnced.discord.rpc.DiscordRPC;
 import club.minnced.discord.rpc.DiscordRichPresence;
-
-import com.mrzak34.thunderhack.modules.misc.ChatTweaks;
+import com.mrzak34.thunderhack.modules.misc.NameProtect;
 import com.mrzak34.thunderhack.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiMainMenu;
@@ -17,7 +16,6 @@
 import java.io.*;
 import java.util.Objects;
 
-import static com.mrzak34.thunderhack.util.ItemUtil.mc;
 
 public
 class Discord {
@@ -47,7 +45,7 @@ void start ( ) {
             Discord.presence.startTimestamp = (System.currentTimeMillis() / 1000L);
             Discord.presence.details = Util.mc.currentScreen instanceof GuiMainMenu ? "В главном меню" : "Играет " + (Minecraft.getMinecraft().currentServerData != null ? (RPC.INSTANCE.showIP.getValue() ? Minecraft.getMinecraft().currentServerData.serverIP.equals("localhost") ? "на " + "2bt2.org via 2bored2wait" : "на " + Minecraft.getMinecraft().currentServerData.serverIP : " НН сервер") : " Читерит в одиночке");
             Discord.presence.state = RPC.INSTANCE.state.getValue();
-            Discord.presence.largeImageText = "v2.37";
+            Discord.presence.largeImageText = "v2.38";
             rpc.Discord_UpdatePresence(presence);
 
             thread = new Thread(() -> {
@@ -65,8 +63,12 @@ void start ( ) {
 
 
                     if (RPC.INSTANCE.nickname.getValue()) {
-                        Discord.presence.smallImageText = "logged as - " + mc.session.getUsername();
-                        Discord.presence.smallImageKey = "https://minotar.net/helm/" + mc.session.getUsername() + "/100.png";
+                        if(Thunderhack.moduleManager.getModuleByClass(NameProtect.class).isDisabled()) {
+                            Discord.presence.smallImageText = "logged as - " + Util.mc.session.getUsername();
+                        } else {
+                            Discord.presence.smallImageText = "logged as - Protected";
+                        }
+                        Discord.presence.smallImageKey = "https://minotar.net/helm/" +  Util.mc.session.getUsername()+ "/100.png";
                     }
                     if (RPC.INSTANCE.Mode.getValue() == RPC.mode.MegaCute) {
                         Discord.presence.largeImageKey = "https://media1.tenor.com/images/6bcbfcc0be97d029613b54f97845bc59/tenor.gif?itemid=26823781";
@@ -157,4 +159,5 @@ public static void stop ( ) {
         }
         rpc.Discord_Shutdown ( );
     }
+
 }