summaryrefslogtreecommitdiffstats
path: root/neoforge
diff options
context:
space:
mode:
Diffstat (limited to 'neoforge')
-rw-r--r--neoforge/.gitignore41
-rw-r--r--neoforge/build.gradle215
-rw-r--r--neoforge/docs/META-INF/mods.toml34
-rw-r--r--neoforge/gradle.properties1
-rw-r--r--neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java60
-rw-r--r--neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java30
-rw-r--r--neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java20
-rw-r--r--neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java25
-rw-r--r--neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java43
-rw-r--r--neoforge/src/main/resources/META-INF/accesstransformer.cfg23
-rw-r--r--neoforge/src/main/resources/META-INF/mods.toml13
-rw-r--r--neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json17
12 files changed, 522 insertions, 0 deletions
diff --git a/neoforge/.gitignore b/neoforge/.gitignore
new file mode 100644
index 0000000..fd65394
--- /dev/null
+++ b/neoforge/.gitignore
@@ -0,0 +1,41 @@
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+eclipse
+run
+
+# Aizistral
+.apt_generated
+logs
+omniconfig_first
+*works
+Users
+.factorypath
+deps/Soulbound*
+multiuser_args.txt
+old_enigmatic_desc.txt
+**/TestEventHandler*
+/.apt_generated_tests/
+
+# Symlink directories
+deps
+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/neoforge/build.gradle b/neoforge/build.gradle
new file mode 100644
index 0000000..858bb9e
--- /dev/null
+++ b/neoforge/build.gradle
@@ -0,0 +1,215 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ maven { url "file:///${project.projectDir}/deps/" }
+ maven { url 'https://plugins.gradle.org/m2/' }
+ maven {
+ name "Gradle Plugin Portal"
+ url 'https://plugins.gradle.org/m2/'
+ content {
+ includeGroup "gradle.plugin.com.matthewprenger"
+ includeGroup "com.modrinth"
+ }
+ }
+ }
+ dependencies {
+ classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
+ }
+}
+
+plugins {
+ id "com.modrinth.minotaur" version "2.+"
+ id "net.neoforged.gradle.userdev" version "7.0.94"
+}
+
+println("Applying plugins...")
+
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+apply plugin: 'maven-publish'
+apply plugin: 'com.matthewprenger.cursegradle'
+
+apply from: '../common.gradle'
+
+println("Specifying project version/group/archivesBaseName...")
+version = "${mod_version}"
+group = "${maven_group}"
+archivesBaseName = "${archives_base_name}"
+
+println("Specifying Java compatibility...")
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+
+println("Java Installation Data:")
+println(" - Java Version: " + System.getProperty('java.version'))
+println(" - JVM Version: " + System.getProperty('java.vm.version'))
+println(" - Vendor: " + System.getProperty('java.vendor'))
+println(" - OS Archetype: " + System.getProperty('os.arch'))
+
+compileJava.options.encoding = "UTF-8"
+
+println("Specifying Access Transformer configuration...")
+
+minecraft.accessTransformers.file project.file('src/main/resources/META-INF/accesstransformer.cfg')
+
+runs {
+ client {
+ systemProperty 'org.gradle.jvmargs', '-Xms4G -Xmx4G'
+ systemProperty 'fml.earlyprogresswindow', 'false'
+ systemProperty 'mixin.env.disableRefMap', 'true'
+ workingDirectory project.file('run')
+
+ systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+ systemProperty 'forge.logging.console.level', 'debug'
+
+ modSource project.sourceSets.main
+ }
+
+ server {
+ systemProperty 'mixin.env.disableRefMap', 'true'
+ workingDirectory project.file('run')
+
+ systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+ systemProperty 'forge.logging.console.level', 'debug'
+
+ modSource project.sourceSets.main
+ }
+}
+
+sourceSets.main.resources {
+ // NO-OP
+}
+
+repositories {
+ println("Specifying repositories...")
+ maven { url "file:///${project.projectDir}/deps/" } // local
+ maven { url = "https://maven.theillusivec4.top/" } // curios
+ maven { url = "https://maven.blamejared.com/" } // patchouli
+ maven { url = "https://repo.spongepowered.org/maven" } // mixin
+ maven { url "https://maven.shedaniel.me/" } // cloth config
+}
+
+dependencies {
+ println("Processing dependencies...")
+
+ // Minecraft & Forge
+ implementation "net.neoforged:neoforge:${neoforge_version}"
+ implementation "generic:modmenu:5.0.2"
+ implementation "generic:fabric-annotations:v1.0.0"
+ implementation "me.shedaniel.cloth:cloth-config-neoforge:" + rootProject.cloth_config_version
+}
+
+
+jar {
+ println("Processing manifest...")
+
+ manifest {
+ attributes([
+ "Specification-Title": "${mod_name}",
+ "Specification-Vendor": "${mod_author}",
+ "Specification-Version": "${version}",
+ "Implementation-Title": "${mod_name}",
+ "Implementation-Version": "${version}",
+ "Implementation-Vendor" :"${mod_author}",
+ "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+ ])
+ }
+}
+
+processResources {
+ println("Processing resources...")
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ exclude 'META-INF/mods.toml'
+
+ from("${project.projectDir}/docs/META-INF") {
+ println("Inflating mods.toml...")
+
+ // Replace properties in mods.toml with ones derived from settings.gradle
+ include 'mods.toml'
+ expand 'mod_license': mod_license,
+ 'mod_version': version,
+ 'mod_id' : mod_id,
+ 'mod_name': mod_name,
+ 'mod_url': mod_url,
+ 'mod_author': mod_author,
+ 'mod_icon': mod_icon,
+ 'mod_description': mod_description,
+ 'issue_tracker_url': issue_tracker_url,
+ 'dep_neoforge': dep_neoforge,
+ 'dep_minecraft': dep_minecraft,
+ 'contributor_0': contributor_0
+ into 'META-INF'
+ }
+
+ from("${rootProject.projectDir}/docs") {
+ include 'CHANGELOG.md'
+ }
+
+ from("${rootProject.projectDir}") {
+ include 'LICENSE'
+ }
+}
+
+curseforge {
+
+ project {
+ println("Pushing CurseGradle specifications for project ID: ${curse_id}")
+
+ // Specified as cmd argument
+ apiKey = findProperty('curseKey') ?: 'none'
+
+ id = "${curse_id}"
+ releaseType = "${version_type}"
+ changelogType = 'markdown'
+ changelog = rootProject.file('docs/CHANGELOG.md')
+
+ addGameVersion project.minecraft_version
+ addGameVersion "Java 17"
+ addGameVersion "NeoForge"
+
+ //addArtifact(sourcesJar)
+ //addArtifact(apiJar)
+ }
+}
+
+modrinth {
+ token = findProperty('modrinthKey') ?: 'none'
+ projectId = "no-chat-reports"
+ versionNumber = "NeoForge-" + project.version
+ versionName = "No Chat Reports NeoForge-" + project.version
+ versionType = "${version_type}"
+ changelog = rootProject.file("docs/CHANGELOG.md").text
+ uploadFile = jar
+ gameVersions = [ project.minecraft_version ]
+
+ syncBodyFrom = rootProject.file("docs/README.md").text
+}
+
+task upload {
+ dependsOn('modrinth')
+ dependsOn('curseforge')
+}
+
+
+task updateResources() {
+ // NO-OP
+}
+
+tasks.updateResources.dependsOn processResources
+
+//tasks.withType(JavaCompile) {
+// options.failOnError(true)
+//}
+
+publishing {
+
+ publications {
+ mavenJava(MavenPublication) {
+ artifact jar
+ }
+ }
+ repositories {
+ maven {
+ url "file:///${project.projectDir}/mcmodsrepo"
+ }
+ }
+} \ No newline at end of file
diff --git a/neoforge/docs/META-INF/mods.toml b/neoforge/docs/META-INF/mods.toml
new file mode 100644
index 0000000..ed0d16d
--- /dev/null
+++ b/neoforge/docs/META-INF/mods.toml
@@ -0,0 +1,34 @@
+license="${mod_license}"
+modLoader="javafml"
+loaderVersion="[1,)"
+issueTrackerURL="${issue_tracker_url}"
+
+[[mixins]]
+config="mixins/common/nochatreports.mixins.json"
+
+[[mixins]]
+config="mixins/neoforge/nochatreports-neoforge.mixins.json"
+
+[[mods]]
+modId="${mod_id}"
+version="${mod_version}"
+displayName="${mod_name}"
+displayURL="${mod_url}"
+logoFile="${mod_icon}"
+credits="${contributor_0}"
+authors="${mod_author}"
+description='''
+${mod_description}
+'''
+[[dependencies.${mod_id}]]
+ modId="neoforge"
+ type="required"
+ versionRange="${dep_neoforge}"
+ ordering="NONE"
+ side="BOTH"
+[[dependencies.${mod_id}]]
+ modId="minecraft"
+ type="required"
+ versionRange="${dep_minecraft}"
+ ordering="NONE"
+ side="BOTH" \ No newline at end of file
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
new file mode 100644
index 0000000..12c0f7d
--- /dev/null
+++ b/neoforge/gradle.properties
@@ -0,0 +1 @@
+archives_base_name=NoChatReports-NEOFORGE \ No newline at end of file
diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java
new file mode 100644
index 0000000..5cf87aa
--- /dev/null
+++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java
@@ -0,0 +1,60 @@
+package com.aizistral.nochatreports.neoforge;
+
+import com.aizistral.nochatreports.common.NCRCore;
+import com.aizistral.nochatreports.common.platform.PlatformProvider;
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
+import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.common.Mod.EventBusSubscriber;
+import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.fml.loading.FMLPaths;
+
+import java.nio.file.Path;
+
+@Mod("nochatreports")
+public class NoChatReports implements PlatformProvider {
+
+ public NoChatReports() {
+ NCRCore.awaken(this);
+ }
+
+ @Override
+ public boolean isOnClient() {
+ return FMLEnvironment.dist == Dist.CLIENT;
+ }
+
+ @Override
+ public boolean isOnDedicatedServer() {
+ return FMLEnvironment.dist == Dist.DEDICATED_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/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java
new file mode 100644
index 0000000..8616b5a
--- /dev/null
+++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java
@@ -0,0 +1,30 @@
+package com.aizistral.nochatreports.neoforge.mixins.client;
+
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
+import io.netty.channel.ChannelHandlerContext;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.Connection;
+import net.minecraft.network.PacketListener;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Connection.class)
+public class MixinClientConnection {
+ @Shadow
+ private PacketListener packetListener;
+
+ @Inject(method = "channelInactive", at = @At("HEAD"))
+ private void handleDisconnect(ChannelHandlerContext context, CallbackInfo info) {
+ // not the case for client/server query
+ if (this.packetListener instanceof ClientHandshakePacketListenerImpl
+ || this.packetListener instanceof ClientPacketListener) {
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
+ }
+ }
+
+}
diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java
new file mode 100644
index 0000000..a250137
--- /dev/null
+++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java
@@ -0,0 +1,20 @@
+package com.aizistral.nochatreports.neoforge.mixins.client;
+
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientHandshakePacketListenerImpl.class)
+public class MixinClientHandshakePacketListenerImpl {
+
+ @Inject(method = "onDisconnect", at = @At("HEAD"))
+ private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) {
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
+ }
+
+}
diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java
new file mode 100644
index 0000000..ee1b56a
--- /dev/null
+++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java
@@ -0,0 +1,25 @@
+package com.aizistral.nochatreports.neoforge.mixins.client;
+
+import com.aizistral.nochatreports.common.platform.events.ClientEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = ClientCommonPacketListenerImpl.class)
+public class MixinClientPacketListener {
+
+ @Inject(method = "onDisconnect", at = @At("HEAD"))
+ private void handleDisconnection(Component reason, CallbackInfo info) {
+ Object self = this;
+
+ if (self instanceof ClientPacketListener) {
+ ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance());
+ }
+ }
+
+}
diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java
new file mode 100644
index 0000000..80bb635
--- /dev/null
+++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java
@@ -0,0 +1,43 @@
+package com.aizistral.nochatreports.neoforge.mixins.client;
+
+import com.aizistral.nochatreports.common.NCRCore;
+import com.aizistral.nochatreports.common.platform.extensions.ServerPingerExtension;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerData;
+import org.spongepowered.asm.mixin.Mixin;
+
+import java.lang.reflect.Field;
+
+@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1")
+public class MixinServerStatusPinger$1 implements ServerPingerExtension {
+ private static final Field SERVER_DATA_FIELD;
+
+ static {
+ // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol
+ try {
+ Class<?> pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1");
+
+ SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_");
+ SERVER_DATA_FIELD.setAccessible(true);
+ } catch (Exception ex) {
+ Error error = new Error("Reflection failed in MixinServerStatusPinger$1!", ex);
+
+ NCRCore.LOGGER.catching(error);
+ Minecraft.getInstance().execute(() -> {
+ throw error;
+ });
+
+ throw error;
+ }
+ }
+
+ @Override
+ public ServerData getServerData() {
+ try {
+ return (ServerData) SERVER_DATA_FIELD.get(this);
+ } catch (Exception ex) {
+ throw new RuntimeException("Failed to get ServerData field via reflection", ex);
+ }
+ }
+
+}
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
new file mode 100644
index 0000000..7106c8d
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
@@ -0,0 +1,23 @@
+public net.minecraft.client.gui.screens.SimpleOptionsSubScreen list
+public-f net.minecraft.network.chat.MutableComponent contents
+public-f net.minecraft.network.chat.contents.TranslatableContents args
+public-f net.minecraft.network.chat.MutableComponent contents
+public net.minecraft.client.gui.screens.multiplayer.WarningScreen message
+public net.minecraft.client.multiplayer.ClientPacketListener signedMessageEncoder
+public net.minecraft.client.multiplayer.ClientPacketListener chatSession
+public net.minecraft.client.gui.components.Tooltip MAX_WIDTH
+public net.minecraft.client.gui.components.Tooltip message
+public net.minecraft.client.gui.components.Tooltip narration
+public net.minecraft.client.gui.components.Tooltip cachedTooltip
+public net.minecraft.client.gui.screens.Screen minecraft
+public net.minecraft.client.gui.screens.Screen itemRenderer
+public net.minecraft.client.gui.screens.Screen font
+public net.minecraft.client.gui.components.AbstractWidget tooltip
+#public net.minecraft.client.gui.components.AbstractWidget tooltipMsDelay
+public net.minecraft.client.gui.screens.OptionsScreen TELEMETRY
+
+public net.minecraft.client.gui.components.Tooltip <init>(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V
+#public-f net.minecraft.client.gui.components.AbstractWidget updateTooltip()V
+#public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V
+
+public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V \ No newline at end of file
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
new file mode 100644
index 0000000..8b4420c
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,13 @@
+license="WTFPL"
+modLoader="javafml"
+loaderVersion="[1,)"
+
+[[mods]]
+modId="nochatreports"
+version="1.0.0"
+displayName="No Chat Reports"
+authors="Aizistral"
+logoFile="ncr_logo.png"
+description='''
+None
+''' \ No newline at end of file
diff --git a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json
new file mode 100644
index 0000000..81e5afb
--- /dev/null
+++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json
@@ -0,0 +1,17 @@
+{
+ "required": true,
+ "minVersion": "0.8",
+ "package": "com.aizistral.nochatreports.neoforge.mixins",
+ "compatibilityLevel": "JAVA_17",
+ "mixins": [],
+ "client": [
+ "client.MixinClientConnection",
+ "client.MixinClientHandshakePacketListenerImpl",
+ "client.MixinClientPacketListener",
+ "client.MixinServerStatusPinger$1"
+ ],
+ "server": [],
+ "injectors": {
+ "defaultRequire": 1
+ }
+}