Merge pull request #12 from Lucaslah/feature/neoforge

NeoForge Support

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  push:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+      - name: Build
+        run: ./gradlew build
+
+      - name: Set Commit SHA
+        id: commit_short_sha
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Find Build Artifacts
+        run: |
+          mkdir -p artifacts
+          
+          find . -type d -path '*/build/libs' | while read -r dir; do
+            project_name=$(basename "$(dirname "$(dirname "$dir")")")
+            mkdir -p "artifacts/$project_name"
+            cp -r "$dir"/* "artifacts/$project_name/"
+          done
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: 'NRB-Build-${{ steps.commit_short_sha.outputs.sha_short }}'
+          path: 'artifacts/'

.github/workflows/gradle.yml

@@ -0,0 +1,25 @@
+name: Gradle
+
+on:
+  push:
+    branches: ["develop"]
+
+jobs:
+  dependency-submission:
+
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
+      # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

.gitignore

@@ -31,3 +31,5 @@ bin/
 # fabric
 
 run/
+
+.architectury-transformer/

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-contact@cssudii.xyz.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

README.md

@@ -1,5 +1,6 @@
 [![curseforge-downloads](https://cf.way2muchnoise.eu/full_658722_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/no-report-button)
-[![modrinth-downloads](https://modrinth-utils.vercel.app/api/badge/downloads?id=9WJeSpTH&logo=true)](https://modrinth.com/mod/nrb)
+[![modrinth-downloads](https://img.shields.io/modrinth/dt/9WJeSpTH?logo=Modrinth)](https://modrinth.com/mod/nrb)
+
 # No Report Button
 Removes the chat report button from the game menu screen
 
@@ -9,17 +10,22 @@ Should be compatible with any mods, but if you do find a mod that is not please
 **Fabric API not required.**\
 **Mod is client size only, this mod will not do anything if used on the server.**
 
-For Minecraft versions 1.19.1 and 1.19.2 use NRB v1.2.1, the latest version only supports 1.19.3+.
+See below for what NRB version to use.
 
 ## Released Versions
-| Version | MC Version    | Mod loaders          | Git tag                                                                   | Supported |
-|---------|---------------|----------------------|---------------------------------------------------------------------------|-----------|
-| 1.4.0   | 1.19.3        | fabric, forge, quilt | [1.4.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.4.0) | yes       |
-| 1.3.1   | 1.19.3        | fabric               | [1.3.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.1) | no        |
-| 1.3.0   | 1.19.3        | fabric               | [1.3.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.0) | no        |
-| 1.2.1   | 1.19.1-1.19.2 | fabric               | [1.2.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.2.1) | yes       |
-| 1.2.0   | 1.19.1-1.19.2 | fabric               | [1.2.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.2.0) | no        |
-| 1.1.0   | 1.19.1-1.19.2 | fabric               | [1.1.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.1.0) | no        |
+| Version    | MC Version    | Mod loaders             | Git tag                                                                             | Supported |
+|------------|---------------|-------------------------|-------------------------------------------------------------------------------------|-----------|
+| 1.6.1      | 1.21          | fabric, forge, neoforge | [1.6.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.6.1)           | yes       |
+| 1.6.0      | 1.21          | fabric, forge, quilt    | [1.6.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.6.0)           | no        |
+| 1.6.0-beta | 1.21          | fabric                  | [1.6.0-beta](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.6.0-beta) | no        |
+| 1.5.0      | 1.20.1-1.20.6 | fabric, forge, quilt    | [1.5.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.5.0)           | yes       |
+| 1.4.1      | 1.19.4        | fabric, forge, quilt    | [1.4.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.4.1)           | no        |
+| 1.4.0      | 1.19.3        | fabric, forge, quilt    | [1.4.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.4.0)           | no        |
+| 1.3.1      | 1.19.3        | fabric                  | [1.3.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.1)           | no        |
+| 1.3.0      | 1.19.3        | fabric                  | [1.3.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.3.0)           | no        |
+| 1.2.1      | 1.19.1-1.19.2 | fabric                  | [1.2.1](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.2.1)           | no        |
+| 1.2.0      | 1.19.1-1.19.2 | fabric                  | [1.2.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.2.0)           | no        |
+| 1.1.0      | 1.19.1-1.19.2 | fabric                  | [1.1.0](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.1.0)           | no        |
 
 ## Links
 Curseforge: https://www.curseforge.com/minecraft/mc-mods/no-report-button <br>

SECURITY.md

@@ -1,15 +1,5 @@
 # Security Policy
 
-## Supported Versions
-
-| Version | Supported          |
-|---------|--------------------|
-| 1.4.0   | :white_check_mark: |
-| 1.3.1   | :x:                |
-| 1.3.0   | :x:                |
-| 1.2.1   | :white_check_mark: |
-| < 1.2.1 | :x:                |
-
 ## Reporting a Vulnerability
 
-Please email contact@cssudii.xyz
+Please email nsx1luke@gmail.com

build.gradle

@@ -1,41 +1,72 @@
 plugins {
-	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false
+	id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
+	id 'architectury-plugin' version '3.4-SNAPSHOT'
+	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
-	injectInjectables = false
-	minecraft = rootProject.properties["minecraft_version"]
-}
-
-subprojects {
-	apply plugin: "dev.architectury.loom"
-
-	loom {
-		silentMojangMappingsLicense()
-	}
-
-	dependencies {
-		minecraft "com.mojang:minecraft:${rootProject.properties["minecraft_version"]}"
-		mappings "net.fabricmc:yarn:${rootProject.properties["yarn_mappings"]}:v2"
-	}
+	minecraft = project.minecraft_version
 }
 
 allprojects {
-	apply plugin: "java"
-	apply plugin: "architectury-plugin"
-	apply plugin: "maven-publish"
+	group = rootProject.maven_group
+	version = rootProject.mod_version
+}
 
-	archivesBaseName = rootProject.properties["archives_base_name"]
-	version = rootProject.properties["mod_version"]
-	group = rootProject.properties["maven_group"]
+subprojects {
+	apply plugin: 'dev.architectury.loom'
+	apply plugin: 'architectury-plugin'
+	apply plugin: 'maven-publish'
 
-	tasks.withType(JavaCompile).configureEach {
-		options.encoding = "UTF-8"
-		options.release.set(17)
+	base {
+		archivesName = "$rootProject.archives_name-$project.name"
+	}
+
+	repositories {
+		// Add repositories to retrieve artifacts from in here.
+		// You should only use this when depending on other mods because
+		// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+		// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+		// for more information about repositories.
+	}
+
+	dependencies {
+		minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+		mappings loom.layered {
+			it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+			it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
+		}
 	}
 
 	java {
+		// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+		// if it is present.
+		// If you remove this line, sources will not be generated.
 		withSourcesJar()
+
+		sourceCompatibility = JavaVersion.VERSION_21
+		targetCompatibility = JavaVersion.VERSION_21
+	}
+
+	tasks.withType(JavaCompile).configureEach {
+		it.options.release = 21
+	}
+
+	// Configure Maven publishing.
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				artifactId = base.archivesName.get()
+				from components.java
+			}
+		}
+
+		// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+		repositories {
+			// Add repositories to publish to here.
+			// Notice: This block does NOT have the same function as the block in the top level.
+			// The repositories here will be used for publishing your artifact, not for
+			// retrieving dependencies.
+		}
 	}
 }

common/src/main/java/me/lucaslah/nrb/mixin/GameMenuScreenMixin.java

@@ -1,10 +1,9 @@
 package me.lucaslah.nrb.mixin;
 
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.GridWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,29 +22,16 @@ public abstract class GameMenuScreenMixin extends Screen {
 
 	@Inject(method = "initWidgets()V", at = @At(value = "RETURN"))
 	public void initWidgets(CallbackInfo ci) {
-		final List<Element> widgets = ((ScreenAccessor) this).getChildren();
-		List<? extends Element> buttons = null;
+		final List<Drawable> drawables = ((ScreenAccessor) this).getDrawables();
 
-		for (Element clickableWidget : widgets) {
-			if (clickableWidget instanceof GridWidget widget) {
-				List<? extends Element> children = widget.children();
-
-				if (children != null) {
-					buttons = children;
-				}
-			}
-		}
-
-		if (buttons != null) {
-			for (Element element : buttons) {
-				if (element instanceof ClickableWidget button) {
-					if (button.getMessage().getString().equals(I18n.translate("menu.playerReporting"))) {
-						if (this.client != null) {
-							button.active = this.client.isIntegratedServerRunning() && !Objects.requireNonNull(this.client.getServer()).isRemote();
-						}
-
-						button.setMessage(Text.translatable("menu.shareToLan"));
+		for (Drawable drawable : drawables) {
+			if (drawable instanceof ClickableWidget widget) {
+				if (widget.getMessage().getString().equals(I18n.translate("menu.playerReporting"))) {
+					if (this.client != null) {
+						widget.active = this.client.isIntegratedServerRunning() && !Objects.requireNonNull(this.client.getServer()).isRemote();
 					}
+
+					widget.setMessage(Text.translatable("menu.shareToLan"));
 				}
 			}
 		}

common/src/main/java/me/lucaslah/nrb/mixin/ScreenAccessor.java

@@ -1,6 +1,6 @@
 package me.lucaslah.nrb.mixin;
 
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -10,5 +10,5 @@ import java.util.List;
 @Mixin(Screen.class)
 public interface ScreenAccessor {
     @Accessor
-    List<Element> getChildren();
+    List<Drawable> getDrawables();
 }

fabric/build.gradle

@@ -1,63 +1,49 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
-    injectInjectables = false
     platformSetupLoomIde()
     fabric()
 }
 
 configurations {
-    common
-    shadowCommon
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
-    archivesBaseName = rootProject.archives_base_name + "-fabric"
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.properties["fabric_loader_version"]}"
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property 'version', project.version
 
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
+    filesMatching('fabric.mod.json') {
+        expand version: project.version
     }
 }
 
-
 shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
+    inputFile.set shadowJar.archiveFile
 }

fabric/src/main/resources/fabric.mod.json

@@ -9,7 +9,7 @@
     "Lucaslah"
   ],
   "contact": {
-    "homepage": "https://cssudii.xyz/r/project/no-report-button",
+    "homepage": "https://github.com/Lucalah/no-report-button",
     "sources": "https://github.com/Lucalah/no-report-button"
   },
 
@@ -27,8 +27,8 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.6",
-    "minecraft": ">=1.19.3",
-    "java": ">=17"
+    "fabricloader": ">=0.14.17",
+    "minecraft": "~1.21",
+    "java": ">=21"
   }
 }

forge/build.gradle

@@ -1,9 +1,8 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
-    injectInjectables = false
     platformSetupLoomIde()
     forge()
 }
@@ -15,19 +14,27 @@ loom {
 }
 
 configurations {
-    common
-    shadowCommon
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
-    archivesBaseName = rootProject.archives_base_name + "-forge"
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }
 
 dependencies {
     forge "net.minecraftforge:forge:${rootProject.properties["forge_version"]}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+    shadowBundle(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 }
 
 processResources {
@@ -39,31 +46,10 @@ processResources {
 }
 
 shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
+    inputFile.set shadowJar.archiveFile
 }

forge/src/main/resources/META-INF/mods.toml

@@ -1,6 +1,7 @@
 modLoader = "javafml"
-loaderVersion = "[43,)"
+loaderVersion = "[0,)"
 license = "GNU LESSER GENERAL PUBLIC LICENSE"
+clientSideOnly=true
 
 [[mods]]
 modId = "noreportbutton"
@@ -15,13 +16,13 @@ logoFile = "icon.png"
 [[dependencies.noreportbutton]]
 modId = "forge"
 mandatory = true
-versionRange = "[43,)"
+versionRange = "[0,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.noreportbutton]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.3,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "CLIENT"

gradle.properties

@@ -1,19 +1,20 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
-
-# Minecraft Properties
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.3
-fabric_loader_version=0.14.11
-quilt_loader_version=0.18.1-beta.23
-enabled_platforms=quilt,fabric,forge
+org.gradle.jvmargs=-Xmx4G
+org.gradle.parallel=true
 
 # Mod Properties
-mod_version = 1.4.0
+mod_version = 1.6.1
 maven_group = me.lucaslah
-archives_base_name = no-report-button
+archives_name = no-report-button
+enabled_platforms=fabric,forge,neoforge
+
+# Minecraft Properties
+minecraft_version=1.21
+yarn_mappings=1.21+build.7
 
 # Dependencies
-architectury_version=6.2.43
-fabric_version=0.68.1+1.19.3
-forge_version=1.19.3-44.0.18
+fabric_version=0.100.1+1.21
+fabric_loader_version=0.15.11
+forge_version=1.21-51.0.5
+neoforge_version=21.0.167
+yarn_mappings_patch_neoforge_version = 1.21+build.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

neoforge/build.gradle

@@ -0,0 +1,56 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+repositories {
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('META-INF/neoforge.mods.toml') {
+        expand version: project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    inputFile.set shadowJar.archiveFile
+}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

neoforge/src/main/java/me/lucaslah/nrb/NoReportButtonNeoForge.java

@@ -0,0 +1,7 @@
+package me.lucaslah.nrb;
+
+import net.neoforged.fml.common.Mod;
+
+@Mod("noreportbutton")
+public class NoReportButtonNeoForge {
+}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,31 @@
+modLoader = "javafml"
+loaderVersion = "[0,)"
+license = "GNU LESSER GENERAL PUBLIC LICENSE"
+clientSideOnly=true
+
+[[mods]]
+modId = "noreportbutton"
+version = "${version}"
+displayName = "No Report Button"
+authors = "Lucaslah"
+description = '''
+Removes the chat report button from the multiplayer menu screen
+'''
+logoFile = "icon.png"
+
+[[dependencies.noreportbutton]]
+modId = "neoforge"
+mandatory = true
+versionRange = "[0,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.noreportbutton]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[mixins]]
+config = "noreportbutton.mixins.json"

neoforge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "NoReportButton",
+    "pack_format": 9
+  }
+}

settings.gradle

@@ -12,9 +12,9 @@ pluginManagement {
     }
 }
 
-rootProject.name = "no-report-button"
+rootProject.name = "No-Report-Button"
 
 include 'common'
 include 'fabric'
 include 'forge'
-
+include 'neoforge'