summaryrefslogtreecommitdiffstats
path: root/forge
diff options
context:
space:
mode:
Diffstat (limited to 'forge')
-rw-r--r--forge/build.gradle51
-rw-r--r--forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jarbin500301 -> 0 bytes
-rw-r--r--forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom9
-rw-r--r--forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jarbin0 -> 1066644 bytes
-rw-r--r--forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom (renamed from forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom)4
-rw-r--r--forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jarbin2140 -> 0 bytes
-rw-r--r--forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jarbin2109 -> 0 bytes
-rw-r--r--forge/docs/META-INF/mods.toml2
-rw-r--r--forge/settings.gradle3
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java13
-rw-r--r--forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json1
11 files changed, 26 insertions, 57 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index 2e60b18..8e68445 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,30 +1,9 @@
-buildscript {
- repositories {
- mavenCentral()
- maven { url file("deps") }
- maven { url = 'https://maven.minecraftforge.net' }
- maven { url = 'https://dist.creeper.host/Sponge/maven' }
- maven { url 'https://plugins.gradle.org/m2/' }
- maven {
- url = 'https://repo.spongepowered.org/repository/maven-public/'
- content { includeGroup "org.spongepowered" }
- }
- maven {
- name "Gradle Plugin Portal"
- url 'https://plugins.gradle.org/m2/'
- content {
- includeGroup "com.modrinth"
- }
- }
- }
-}
-
plugins {
id 'java'
id 'idea'
id 'eclipse'
id 'maven-publish'
- id 'net.minecraftforge.gradle' version '[7.0.17,8.0)'
+ id 'net.minecraftforge.gradle' version '[7.0.17,8)'
id "com.modrinth.minotaur" version "2.+"
id 'net.darkhax.curseforgegradle' version '1.+'
}
@@ -81,14 +60,17 @@ sourceSets.main.resources {
// NO-OP
}
+sourceSets.main.java {
+ // NO-OP
+}
+
repositories {
println("Specifying repositories...")
maven { url file("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
minecraft.mavenizer(it) // minecraft
+ maven fg.forgeMaven
+ maven fg.minecraftLibsMaven
+ mavenCentral()
}
dependencies {
@@ -96,12 +78,10 @@ dependencies {
// Minecraft & Forge
implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version")
- implementation "generic:modmenu:5.0.2"
implementation "generic:fabric-annotations:v1.0.0"
- implementation "generic:cloth-config-api:14.0.126"
+ implementation "generic:cloth-config:26.2.155"
- // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+
- implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
+ annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1'
}
@@ -143,7 +123,9 @@ processResources {
'issue_tracker_url': issue_tracker_url,
'dep_forge': dep_forge,
'dep_minecraft': dep_minecraft,
- 'contributor_0': contributor_0
+ 'contributor_0': contributor_0,
+ 'contributor_1': contributor_1,
+ 'contributor_2': contributor_2
into 'META-INF'
}
@@ -172,6 +154,8 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
mainFile.addModLoader('Forge')
mainFile.addJavaVersion('Java 25')
mainFile.addGameVersion(project.minecraft_version)
+
+ mainFile.addOptional('cloth-config-forge')
}
modrinth {
@@ -183,6 +167,11 @@ modrinth {
changelog = rootProject.file("docs/CHANGELOG.md").text
uploadFile = jar
gameVersions = [ project.minecraft_version ]
+
+ dependencies {
+ // The scope can be `required`, `optional`, or `incompatible`
+ optional.project "cloth-config-forge"
+ }
syncBodyFrom = rootProject.file("docs/README.md").text
}
diff --git a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar b/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar
deleted file mode 100644
index 3c81eb4..0000000
--- a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.jar
+++ /dev/null
Binary files differ
diff --git a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom b/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom
deleted file mode 100644
index c28f9d0..0000000
--- a/forge/deps/generic/cloth-config-api/14.0.126/cloth-config-api-14.0.126.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>generic</groupId>
- <artifactId>cloth-config-api</artifactId>
- <version>14.0.126</version>
- <dependencies></dependencies>
-</project>
diff --git a/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar
new file mode 100644
index 0000000..5d5d1de
--- /dev/null
+++ b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.jar
Binary files differ
diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom
index c96a313..42ad9a9 100644
--- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.pom
+++ b/forge/deps/generic/cloth-config/26.2.155/cloth-config-26.2.155.pom
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>generic</groupId>
- <artifactId>modmenu</artifactId>
- <version>5.0.2</version>
+ <artifactId>cloth-config</artifactId>
+ <version>26.2.155</version>
<dependencies></dependencies>
</project>
diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar b/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar
deleted file mode 100644
index 5d27531..0000000
--- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2-obf.jar
+++ /dev/null
Binary files differ
diff --git a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar b/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar
deleted file mode 100644
index a7bf40b..0000000
--- a/forge/deps/generic/modmenu/5.0.2/modmenu-5.0.2.jar
+++ /dev/null
Binary files differ
diff --git a/forge/docs/META-INF/mods.toml b/forge/docs/META-INF/mods.toml
index e533f72..f340665 100644
--- a/forge/docs/META-INF/mods.toml
+++ b/forge/docs/META-INF/mods.toml
@@ -8,7 +8,7 @@ version="${mod_version}"
displayName="${mod_name}"
displayURL="${mod_url}"
logoFile="${mod_icon}"
-credits="${contributor_0}"
+credits="${contributor_0}, ${contributor_1}, ${contributor_2}"
authors="${mod_author}"
description='''
${mod_description}
diff --git a/forge/settings.gradle b/forge/settings.gradle
new file mode 100644
index 0000000..4ced2d9
--- /dev/null
+++ b/forge/settings.gradle
@@ -0,0 +1,3 @@
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
index 7ca0815..0c02ce8 100644
--- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
@@ -1,18 +1,14 @@
package com.aizistral.nochatreports.forge;
import java.nio.file.Path;
-import java.util.function.Function;
-import com.aizistral.nochatreports.common.NCRClient;
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.gui.screens.Screen;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -27,15 +23,6 @@ public class NoChatReports implements PlatformProvider {
public NoChatReports(FMLJavaModLoadingContext context) {
NCRCore.awaken(this);
- Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen();
- if (isOnClient() && configScreenFactory != null) {
- context.registerExtensionPoint(
- ConfigScreenHandler.ConfigScreenFactory.class,
- () -> new ConfigScreenHandler.ConfigScreenFactory(
- (minecraft, parent) -> configScreenFactory.apply(parent)
- )
- );
- }
}
@Override
diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
index 7d16556..fb22f5d 100644
--- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
+++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
@@ -2,7 +2,6 @@
"required": true,
"minVersion": "0.8",
"package": "com.aizistral.nochatreports.forge.mixins",
- "compatibilityLevel": "JAVA_25",
"mixins": [],
"client": [
"client.MixinClientConnection",