Updated Forge to 40.1.45 (cceb8db)

LICENSE-header.txt

@@ -1,2 +1,2 @@
-Minecraft Forge - Forge Development LLC
+Copyright (c) Forge Development LLC and contributors
 SPDX-License-Identifier: LGPL-2.1-only

README.md

@@ -1,7 +1,7 @@
 <div align="center">
 <img src="https://i.imgur.com/zTCTCWG.png" alt="Magma logo" align="middle"></img>
 
-[![](https://img.shields.io/badge/Minecraft%20Forge-1.18.2%20--%2040.0.44%20--%20fbaf9210-orange.svg)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html)
+[![](https://img.shields.io/badge/Minecraft%20Forge-1.18.2%20--%2040.1.45%20--%20cceb8db-orange.svg)](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html)
 [![](https://img.shields.io/badge/Bukkit-1.18%20r2-blue)](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/browse)
 [![](https://img.shields.io/badge/CraftBukkit-Build%20NA-orange)](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse?at=refs%2Fheads%2Fversion%2F1.16.5)
 [![](https://img.shields.io/badge/Spigot-Build%20NA-yellow)](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/browse)

build.gradle

@@ -61,13 +61,13 @@ ext {
     MIXIN_VERSION = '0.8.5'
 
     GIT_INFO = gradleutils.gitInfo
-    FORGE_VERSION = '40.0.44'
+    FORGE_VERSION = '40.1.45'
     MAGMA_VERISON = "1.18.2-$FORGE_VERSION-" + versioning.info.commit.substring(0, 8) // Use 8 characters for the commit hash
     VERSION = "1.18.2-$FORGE_VERSION"
 
     SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.10.0'
     BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
-    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.10'
+    INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
     JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
     FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
     MIN_TAG_FOR_CHANGELOG = "39.0"
@@ -375,7 +375,7 @@ def sharedFmlonlyForge = { Project prj ->
         }
 
         // SecureJarHandler bootstrap values.
-        run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,mclanguage,${prj.name}-"
+        run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
         // FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
         run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar'
         if (userdevRuns.contains(run)) {
@@ -1422,12 +1422,6 @@ project(':forge') {
         header = file("$rootDir/LICENSE-header.txt")
 
         include 'net/minecraftforge/'
-        exclude 'net/minecraftforge/server/terminalconsole/'
-        exclude 'net/minecraftforge/api/' // exclude API here because it's validated in the SPI build
-        exclude 'net/minecraftforge/fml/common/versioning/ComparableVersion.java'
-        exclude 'net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java'
-        exclude 'net/minecraftforge/fml/common/versioning/Restriction.java'
-        exclude 'net/minecraftforge/fml/common/versioning/VersionRange.java'
         exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
 
         tasks {

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CheckSAS.groovy

@@ -11,13 +11,13 @@ import org.gradle.api.tasks.TaskAction
 abstract class CheckSAS extends DefaultTask {
 	@InputFile abstract RegularFileProperty getInheritance()
 	@InputFiles abstract ConfigurableFileCollection getSass()
-	
-    @TaskAction
-    protected void exec() {
+
+	@TaskAction
+	protected void exec() {
 		Util.init()
 		def json = inheritance.get().asFile.json()
-		
-		sass.each { f -> 
+
+		sass.each { f ->
 			def lines = []
 			f.eachLine { line ->
 				if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
@@ -28,36 +28,80 @@ abstract class CheckSAS extends DefaultTask {
 				}
 				def comment = idx == -1 ? null : line.substring(idx)
 				if (idx != -1) line = line.substring(0, idx - 1)
-				def (cls, desc) = (line.trim() + '    ').split(' ', -1)
+				def (cls, name, desc) = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
 				cls = cls.replaceAll('\\.', '/')
-				desc = desc.replace('(', ' (')
 
-				if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
+				if (json[cls] == null) {
 					println('Invalid: ' + line)
-					return
-				}
+				} else if (name.isEmpty()) { //Class SAS
+					def toAdd = []
+					def clsSided = isSided(json[cls])
+					def sided = clsSided
 
-				//Class SAS
-				if (desc.isEmpty()) {
-					lines.add(cls + (comment == null ? '' : ' ' + comment))
-					if (json[cls]['methods'] != null)
-						(json[cls]['methods'] as TreeMap).each {
-							findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
+					/* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null) {
+                        for (entry in json[cls]['fields']) {
+                            if (isSided(entry.value)) {
+                                sided = true
+                                toAdd.add('\t' + cls + ' ' + entry.key)
+                            }
+                        }
+                    }
+                    */
+					if (json[cls]['methods'] != null) {
+						for (entry in json[cls]['methods']) {
+							if (isSided(entry.value)) {
+								sided = true
+								toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
+								findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
+								findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
+							} else if (clsSided) {
+								findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
+								findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
+							}
 						}
-					return
-				}
+					}
 
-				//Method SAS
-				lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
-				findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
+					if (sided) {
+						lines.add(cls + (comment == null ? '' : ' ' + comment))
+						lines.addAll(toAdd.sort())
+					} else
+						println('Invalid: ' + line)
+
+				} else if (desc.isEmpty()) { // Fields
+					/* TODO: MergeTool doesn't do fields
+                    if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
+                        lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
+                    else
+                    */
+					println('Invalid: ' + line)
+				} else { // Methods
+					if (json[cls]['methods'] == null || !isSided(json[cls]['methods'][name + ' ' + desc]))
+						println('Invalid: ' + line)
+					else {
+						lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
+						findChildMethods(json, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
+						findChildMethods(json, cls, name + ' ' + desc).each { lines.add('\t' + it) }
+					}
+				}
 			}
 			f.text = lines.join('\n')
 		}
 	}
 
+	protected static isSided(json) {
+		if (json == null || json['annotations'] == null)
+			return false
+		for (ann in json['annotations']) {
+			if ('Lnet/minecraftforge/api/distmarker/OnlyIn;'.equals(ann.desc))
+				return true
+		}
+		return false
+	}
+
 	protected static findChildMethods(json, cls, desc)
 	{
-		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
+		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
 				.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
 	}
 }

fmlcore/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.github.ben-manes.versions'
     id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
+    id 'org.cadixdev.licenser'
 }
 apply plugin: 'java-library'
 apply plugin: 'jacoco'
@@ -53,6 +54,12 @@ tasks.withType(JavaCompile) {
     options.compilerArgs << '-Xlint:unchecked'
 }
 
+license {
+    header = rootProject.file('LICENSE-header.txt')
+
+    include 'net/minecraftforge/'
+}
+
 artifacts {
     archives jar
     archives sourcesJar

fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;

fmlcore/src/main/java/net/minecraftforge/fml/CrashReportCallables.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import java.util.ArrayList;

fmlcore/src/main/java/net/minecraftforge/fml/DeferredWorkQueue.java

@@ -1,20 +1,6 @@
 /*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.minecraftforge.fml;

fmlcore/src/main/java/net/minecraftforge/fml/DistExecutor.java

@@ -1,20 +1,6 @@
 /*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.minecraftforge.fml;

fmlcore/src/main/java/net/minecraftforge/fml/I18NParser.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 public interface I18NParser {

fmlcore/src/main/java/net/minecraftforge/fml/IBindingsProvider.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.IEventBus;

fmlcore/src/main/java/net/minecraftforge/fml/ICrashCallable.java

@@ -0,0 +1,5 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+

fmlcore/src/main/java/net/minecraftforge/fml/IExtensionPoint.java

@@ -1,20 +1,6 @@
 /*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.minecraftforge.fml;
@@ -32,7 +18,7 @@ public interface IExtensionPoint<T extends Record>
      * The predicate tests the version from a remote instance or save for acceptability (Boolean is true for impl, false for local save)
      * and returns true if the version is compatible.
      *
-     * <p>Return {@code net.minecraftforge.impl.impl.FMLNetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
+     * <p>Return {@code net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
      * as a server side only mod.</p>
      * <p>Return true in the predicate for all values of the input string (when impl boolean is true) if you are client side,
      * and don't care about matching any potential server version.</p>
@@ -41,8 +27,8 @@ public interface IExtensionPoint<T extends Record>
      * Examples: A server only mod
      * </p>
      * <pre>{@code
-     *     registerExtensionPoint(DISPLAYTEST, ()->Pair.of(
-     *      ()->FMLNetworkConstants.IGNORESERVERONLY, // ignore me, I'm a server only mod
+     *     registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
+     *      ()->NetworkConstants.IGNORESERVERONLY, // ignore me, I'm a server only mod
      *      (s,b)->true // i accept anything from the server or the save, if I'm asked
      *     )
      * }</pre>
@@ -51,7 +37,7 @@ public interface IExtensionPoint<T extends Record>
      * Examples: A client only mod
      * </p>
      * <pre>{@code
-     *     registerExtensionPoint(DISPLAYTEST, ()->Pair.of(
+     *     registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
      *      ()->"anything. i don't care", // if i'm actually on the server, this string is sent but i'm a client only mod, so it won't be
      *      (remoteversionstring,networkbool)->networkbool // i accept anything from the server, by returning true if it's asking about the server
      *     )

fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;

fmlcore/src/main/java/net/minecraftforge/fml/IModStateProvider.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import java.util.List;

fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;

fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java

@@ -1,20 +1,6 @@
 /*
- * Minecraft Forge
- * Copyright (c) 2016-2021.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.minecraftforge.fml;