Merge pull request #11 from Lucaslah/develop

Minecraft 1.21 + Version 1.6.0

.github/workflows/build.yml

@@ -1,47 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

README.md

@@ -1,6 +1,5 @@
-[![CurseForge Downloads](https://img.shields.io/curseforge/dt/658722?style=flat&logo=curseforge&color=black)](https://www.curseforge.com/minecraft/mc-mods/no-report-button)
+[![curseforge-downloads](https://cf.way2muchnoise.eu/full_658722_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/no-report-button)
-[![Modrinth Downloads](https://img.shields.io/modrinth/dt/9WJeSpTH?logo=Modrinth)](https://modrinth.com/mod/nrb)
+[![modrinth-downloads](https://img.shields.io/modrinth/dt/9WJeSpTH?logo=Modrinth)](https://modrinth.com/mod/nrb)
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Lucaslah/No-Report-Button/total?logo=github)
 
 # No Report Button
 Removes the chat report button from the game menu screen
@@ -14,19 +13,18 @@ Should be compatible with any mods, but if you do find a mod that is not please
 See below for what NRB version to use.
 
 ## Released Versions
-| Version    | MC Version    | Mod loaders             | Git tag                                                                             | Supported |
+| 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-beta](https://github.com/Lucaslah/No-Report-Button/releases/tag/v1.6.0)      | 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.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.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.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.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.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.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.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.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        |
-| 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>

build.gradle

@@ -1,72 +1,41 @@
 plugins {
-	id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
+	id "architectury-plugin" version "3.4.155"
-	id 'architectury-plugin' version '3.4-SNAPSHOT'
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
-	minecraft = project.minecraft_version
+	injectInjectables = false
-}
+	minecraft = rootProject.properties["minecraft_version"]
-
-allprojects {
-	group = rootProject.maven_group
-	version = rootProject.mod_version
 }
 
 subprojects {
-	apply plugin: 'dev.architectury.loom'
+	apply plugin: "dev.architectury.loom"
-	apply plugin: 'architectury-plugin'
-	apply plugin: 'maven-publish'
 
-	base {
+	loom {
-		archivesName = "$rootProject.archives_name-$project.name"
+		silentMojangMappingsLicense()
-	}
-
-	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"
+		minecraft "com.mojang:minecraft:${rootProject.properties["minecraft_version"]}"
-		mappings loom.layered {
+		mappings "net.fabricmc:yarn:${rootProject.properties["yarn_mappings"]}:v2"
-			it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+	}
-			it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
+}
-		}
+
+allprojects {
+	apply plugin: "java"
+	apply plugin: "architectury-plugin"
+	apply plugin: "maven-publish"
+
+	archivesBaseName = rootProject.properties["archives_base_name"]
+	version = rootProject.properties["mod_version"]
+	group = rootProject.properties["maven_group"]
+
+	tasks.withType(JavaCompile).configureEach {
+		options.encoding = "UTF-8"
+		options.release.set(21)
 	}
 
 	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.
-		}
 	}
 }

fabric/build.gradle

@@ -1,49 +1,63 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 architectury {
+    injectInjectables = false
     platformSetupLoomIde()
     fabric()
 }
 
 configurations {
-    common {
+    common
-        canBeResolved = true
+    shadowCommon
-        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.fabric_loader_version"
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.properties["fabric_loader_version"]}"
 
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
+    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }
 
 processResources {
-    inputs.property 'version', project.version
+    inputs.property "version", project.version
 
-    filesMatching('fabric.mod.json') {
+    filesMatching("fabric.mod.json") {
-        expand version: project.version
+        expand "version": project.version
     }
 }
 
+
 shadowJar {
-    configurations = [project.configurations.shadowBundle]
+    exclude "architectury.common.json"
-    archiveClassifier = 'dev-shadow'
+
+    configurations = [project.configurations.shadowCommon]
+    setArchiveClassifier("dev-shadow")
 }
 
 remapJar {
-    inputFile.set shadowJar.archiveFile
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    setArchiveClassifier(null)
+}
+
+jar {
+    setArchiveClassifier("dev")
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
 }

forge/build.gradle

@@ -1,8 +1,9 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 architectury {
+    injectInjectables = false
     platformSetupLoomIde()
     forge()
 }
@@ -14,27 +15,19 @@ loom {
 }
 
 configurations {
-    common {
+    common
-        canBeResolved = true
+    shadowCommon
-        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 }
-    shadowBundle(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 }
 
 processResources {
@@ -46,10 +39,31 @@ processResources {
 }
 
 shadowJar {
-    configurations = [project.configurations.shadowBundle]
+    exclude "fabric.mod.json"
-    archiveClassifier = 'dev-shadow'
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    setArchiveClassifier("dev-shadow")
 }
 
 remapJar {
-    inputFile.set shadowJar.archiveFile
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    setArchiveClassifier(null)
+}
+
+jar {
+    setArchiveClassifier("dev")
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
 }

gradle.properties

@@ -1,20 +1,17 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
-org.gradle.parallel=true
-
-# Mod Properties
-mod_version = 1.6.1
-maven_group = me.lucaslah
-archives_name = no-report-button
-enabled_platforms=fabric,forge,neoforge
 
 # Minecraft Properties
 minecraft_version=1.21
 yarn_mappings=1.21+build.7
+fabric_loader_version=0.15.11
+enabled_platforms=fabric,forge
+
+# Mod Properties
+mod_version = 1.6.0
+maven_group = me.lucaslah
+archives_base_name = no-report-button
 
 # Dependencies
 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

neoforge/build.gradle

@@ -1,56 +0,0 @@
-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

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

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

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

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

@@ -1,31 +0,0 @@
-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

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

settings.gradle

@@ -17,4 +17,3 @@ rootProject.name = "No-Report-Button"
 include 'common'
 include 'fabric'
 include 'forge'
-include 'neoforge'