summaryrefslogtreecommitdiffstats
path: root/forge
diff options
context:
space:
mode:
authorAizistral2023-01-02 20:28:03 +0100
committerAizistral2023-01-02 20:28:03 +0100
commit0de301bfd62f3bb2f816dcaa292c494cae807af1 (patch)
tree159469b46802ccad186e53ceebf65d881a63def7 /forge
parent487425958d0742efbf970dd29411a24ff5a3f55c (diff)
Figure this shit out, more or less
Diffstat (limited to 'forge')
-rw-r--r--forge/.gitignore6
-rw-r--r--forge/build.gradle24
-rw-r--r--forge/gradle.properties2
-rw-r--r--forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java42
-rw-r--r--forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java115
-rw-r--r--forge/src/forge/resources/META-INF/MANIFEST.MF1
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java84
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java (renamed from forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java)4
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java (renamed from forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java)4
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java (renamed from forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java)4
-rw-r--r--forge/src/main/java/net/fabricmc/api/EnvType.java (renamed from forge/src/forge/java/net/fabricmc/api/EnvType.java)0
-rw-r--r--forge/src/main/java/net/fabricmc/api/Environment.java (renamed from forge/src/forge/java/net/fabricmc/api/Environment.java)0
-rw-r--r--forge/src/main/resources/META-INF/accesstransformer.cfg (renamed from forge/src/forge/resources/META-INF/accesstransformer.cfg)0
-rw-r--r--forge/src/main/resources/META-INF/mods.toml (renamed from forge/src/forge/resources/META-INF/mods.toml)0
-rw-r--r--forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json (renamed from forge/src/forge/resources/nochatreports-forge.mixins.json)2
-rw-r--r--forge/src/main/resources/pack.mcmeta (renamed from forge/src/forge/resources/pack.mcmeta)0
16 files changed, 103 insertions, 185 deletions
diff --git a/forge/.gitignore b/forge/.gitignore
index 41f9d62..61ca1e8 100644
--- a/forge/.gitignore
+++ b/forge/.gitignore
@@ -33,4 +33,8 @@ multiuser_args.txt
old_enigmatic_desc.txt
**/TestEventHandler*
/.apt_generated_tests/
-src/main \ No newline at end of file
+
+# Symlink directories
+src/main/java/com/aizistral/nochatreports/common
+src/main/resources/assets
+src/main/resources/mixins/common \ No newline at end of file
diff --git a/forge/build.gradle b/forge/build.gradle
index ab5ff70..f00115b 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -47,7 +47,6 @@ archivesBaseName = "${mod_archives_name}"
println("Specifying Java compatibility...")
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-compileJava.options.encoding = "UTF-8"
println("Java Installation Data:")
println(" - Java Version: " + System.getProperty('java.version'))
@@ -55,31 +54,21 @@ println(" - JVM Version: " + System.getProperty('java.vm.version'))
println(" - Vendor: " + System.getProperty('java.vendor'))
println(" - OS Archetype: " + System.getProperty('os.arch'))
-sourceSets {
- forge {
- java {
- compileClasspath += main.output
- runtimeClasspath += main.output
- }
- }
-}
-
-configurations {
- forgeCompile.extendsFrom mainCompile
- forgeRuntime.extendsFrom mainRuntime
-}
+compileJava.options.encoding = "UTF-8"
mixin {
println("Specifying refmaps for Mixin...")
- add sourceSets.main, "nochatreports.refmap.json"
- add sourceSets.forge, "nochatreports-forge.refmap.json"
+ add sourceSets.main, "nochatreports-forge.refmap.json"
+ config "mixins/common/nochatreports.mixins.json"
+ config "mixins/forge/nochatreports-forge.mixins.json"
+ defaultObfuscationEnv "searge"
}
minecraft {
println("Specifying MCP mappings...")
mappings channel: 'official', version: project.version_mc
println("Specifying Access Transformer configuration...")
- accessTransformer = file('src/forge/resources/META-INF/accesstransformer.cfg')
+ accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs {
client {
@@ -138,7 +127,6 @@ dependencies {
jar {
- from sourceSets.forge.output
println("Processing manifest...")
manifest {
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 0cc420c..51d7f1d 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
# Mod
-mod_version=1.19.3-v1.6.0
+mod_version=1.19.3-v2.0.0
mod_group=com.aizistral.nochatreports
mod_id=nochatreports
mod_name=No Chat Reports
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java
deleted file mode 100644
index 65bac6e..0000000
--- a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aizistral.nochatreports.forge;
-
-import java.nio.charset.Charset;
-import java.util.function.Predicate;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.aizistral.nochatreports.config.NCRConfig;
-
-import net.minecraft.network.protocol.login.ServerboundHelloPacket;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.event.EventNetworkChannel;
-import net.minecraftforge.network.simple.SimpleChannel;
-import net.minecraftforge.server.ServerLifecycleHooks;
-
-@Mod("nochatreports")
-public class NoChatReports {
- public static final Logger LOGGER = LogManager.getLogger();
-
- public NoChatReports() {
- LOGGER.info("KONNICHIWA ZA WARUDO!");
- LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName());
-
- NCRConfig.load();
- }
-}
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java
deleted file mode 100644
index 4181a77..0000000
--- a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.aizistral.nochatreports.forge;
-
-import java.util.List;
-
-import com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerDataExtension;
-import com.aizistral.nochatreports.core.ServerSafetyLevel;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.aizistral.nochatreports.core.SigningMode;
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-import com.google.common.collect.ImmutableList;
-
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.ChatScreen;
-import net.minecraft.client.gui.screens.ConnectScreen;
-import net.minecraft.client.gui.screens.DisconnectedScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
-import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-
-@EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE)
-public class NoChatReportsClient {
- private static boolean signingKeysPresent = false;
-
- private NoChatReportsClient() {
- throw new IllegalStateException("Can't touch this");
- }
-
- @OnlyIn(Dist.CLIENT)
- public static void onDisconnect(Minecraft client) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!");
- }
-
- ServerSafetyState.reset();
- }
-
- @SubscribeEvent
- @OnlyIn(Dist.CLIENT)
- public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) {
- Minecraft client = Minecraft.getInstance();
- ClientPacketListener handler = client.getConnection();
-
- if (!NCRConfig.getClient().enableMod())
- return;
-
- client.execute(() -> {
- if (!client.isLocalServer()) {
- if (ServerSafetyState.isOnRealms()) {
- // NO-OP
- } else if (!handler.getConnection().isEncrypted()) {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
- } else if (client.getCurrentServer() instanceof ServerDataExtension ext &&
- ext.preventsChatReports()) {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
- } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(),
- SigningMode.ALWAYS)) {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
- ServerSafetyState.setAllowChatSigning(true);
- } else {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN);
- }
- } else {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER);
- }
-
- if (NCRConfig.getCommon().enableDebugLog()) {
- NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent());
- }
-
- if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) {
- handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client"));
- }
- });
- }
-
- public static boolean areSigningKeysPresent() {
- return signingKeysPresent;
- }
-
- public static void setSigningKeysPresent(boolean present) {
- signingKeysPresent = present;
- }
-
- public static void resendLastChatMessage() {
- var mc = Minecraft.getInstance();
- var chatScr = mc.screen instanceof ChatScreen chat ? chat : null;
-
- if (chatScr == null) {
- chatScr = new ChatScreen("");
- chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
- }
-
- chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false);
- }
-
-
-}
diff --git a/forge/src/forge/resources/META-INF/MANIFEST.MF b/forge/src/forge/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index b4613f2..0000000
--- a/forge/src/forge/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-MixinConfigs: nochatreports.mixins.json, nochatreports-forge.mixins.json \ No newline at end of file
diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
new file mode 100644
index 0000000..56d72e1
--- /dev/null
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
@@ -0,0 +1,84 @@
+package com.aizistral.nochatreports.forge;
+
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.aizistral.nochatreports.common.NCRCore;
+import com.aizistral.nochatreports.common.platform.PlatformProvider;
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
+
+import net.fabricmc.api.EnvType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.login.ServerboundHelloPacket;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
+import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.event.EventNetworkChannel;
+import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+@Mod("nochatreports")
+public class NoChatReports implements PlatformProvider {
+
+ public NoChatReports() {
+ NCRCore.awaken(this);
+ }
+
+ @Override
+ public EnvType getEnvironment() {
+ return switch(FMLEnvironment.dist) {
+ case CLIENT -> EnvType.CLIENT;
+ case DEDICATED_SERVER -> EnvType.SERVER;
+ };
+ }
+
+ @Override
+ public Path getMinecraftDir() {
+ return FMLPaths.GAMEDIR.get();
+ }
+
+ @Override
+ public Path getConfigDir() {
+ return FMLPaths.CONFIGDIR.get();
+ }
+
+ @EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE)
+ public static class Events {
+
+ @SubscribeEvent
+ @OnlyIn(Dist.CLIENT)
+ public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) {
+ Minecraft client = Minecraft.getInstance();
+ ClientPacketListener handler = client.getConnection();
+ ClientEvents.PLAY_READY.invoker().handle(handler, client);
+ }
+
+ }
+
+}
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java
index 74f1220..5943b37 100644
--- a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java
@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import com.aizistral.nochatreports.forge.NoChatReportsClient;
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.client.Minecraft;
@@ -25,7 +25,7 @@ public class MixinClientConnection {
// not the case for client/server query
if (this.packetListener instanceof ClientHandshakePacketListenerImpl
|| this.packetListener instanceof ClientPacketListener) {
- NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
}
}
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java
index e128c3e..6a7e23d 100644
--- a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import com.aizistral.nochatreports.forge.NoChatReportsClient;
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
@@ -16,7 +16,7 @@ public class MixinClientHandshakePacketListenerImpl {
@Inject(method = "onDisconnect", at = @At("HEAD"))
private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) {
- NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
}
}
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java
index 817cea3..1fe873a 100644
--- a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import com.aizistral.nochatreports.forge.NoChatReportsClient;
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientPacketListener;
@@ -16,7 +16,7 @@ public class MixinClientPacketListener {
@Inject(method = "onDisconnect", at = @At("HEAD"))
private void handleDisconnection(Component reason, CallbackInfo info) {
- NoChatReportsClient.onDisconnect(Minecraft.getInstance());
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
}
}
diff --git a/forge/src/forge/java/net/fabricmc/api/EnvType.java b/forge/src/main/java/net/fabricmc/api/EnvType.java
index 253b6e8..253b6e8 100644
--- a/forge/src/forge/java/net/fabricmc/api/EnvType.java
+++ b/forge/src/main/java/net/fabricmc/api/EnvType.java
diff --git a/forge/src/forge/java/net/fabricmc/api/Environment.java b/forge/src/main/java/net/fabricmc/api/Environment.java
index 1db59da..1db59da 100644
--- a/forge/src/forge/java/net/fabricmc/api/Environment.java
+++ b/forge/src/main/java/net/fabricmc/api/Environment.java
diff --git a/forge/src/forge/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
index 390e8b0..390e8b0 100644
--- a/forge/src/forge/resources/META-INF/accesstransformer.cfg
+++ b/forge/src/main/resources/META-INF/accesstransformer.cfg
diff --git a/forge/src/forge/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index d3afb8e..d3afb8e 100644
--- a/forge/src/forge/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
diff --git a/forge/src/forge/resources/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
index 0f0effa..e91062c 100644
--- a/forge/src/forge/resources/nochatreports-forge.mixins.json
+++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
@@ -14,5 +14,5 @@
"injectors": {
"defaultRequire": 1
},
- "refmap": "nochatreports-forge.refmap.json"
+ "refmap": "nochatreports.refmap.json"
}
diff --git a/forge/src/forge/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
index 1a52c3a..1a52c3a 100644
--- a/forge/src/forge/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta