mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4360f916ac | ||
|
|
d389a628a1 | ||
|
|
3534d4664b |
No files matched your search
@@ -2,7 +2,7 @@ name: Publish
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ '26.3' ]
|
branches: [ '26.2' ]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|||||||
+6
-5
@@ -11,7 +11,7 @@ forgedev
|
|||||||
/eclipse/
|
/eclipse/
|
||||||
|
|
||||||
#idea
|
#idea
|
||||||
**/.idea
|
/.idea
|
||||||
/*/out
|
/*/out
|
||||||
/classes
|
/classes
|
||||||
*.iml
|
*.iml
|
||||||
@@ -33,12 +33,13 @@ forgedev
|
|||||||
src/minecraft
|
src/minecraft
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/*/runs/
|
/projects/**/build/
|
||||||
|
/projects/**/out/
|
||||||
|
/projects/**/run/
|
||||||
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
/rejects-*/
|
/rejects-*/
|
||||||
**/src/*/generated/**/.cache/
|
src/*/generated/**/.cache/
|
||||||
**/*.launch
|
|
||||||
**/.project_info.properties
|
|
||||||
|
|
||||||
# Generated by gradle every import
|
# Generated by gradle every import
|
||||||
**/src/main/resources/META-INF/MANIFEST.MF
|
**/src/main/resources/META-INF/MANIFEST.MF
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("groovy-gradle-plugin")
|
|
||||||
alias(libs.plugins.licenser)
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
gradlePluginPortal()
|
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
|
||||||
//mavenLocal()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly gradleApi()
|
|
||||||
|
|
||||||
// Manually import plugins so that we can apply them by id.
|
|
||||||
implementation plugin('licenser')
|
|
||||||
implementation plugin('gradleutils')
|
|
||||||
implementation plugin('gitversion')
|
|
||||||
implementation plugin('changelog')
|
|
||||||
implementation plugin('forgedev')
|
|
||||||
}
|
|
||||||
|
|
||||||
gradlePlugin {
|
|
||||||
plugins {
|
|
||||||
register('convention') {
|
|
||||||
id = 'net.minecraftforge.forge.build.convention'
|
|
||||||
implementationClass = 'net.minecraftforge.forge.build.ConventionPlugin'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final Provider<String> plugin(String alias) {
|
|
||||||
return (Provider<String>)project.extensions.getByType(VersionCatalogsExtension)
|
|
||||||
.named("libs")
|
|
||||||
.findPlugin(alias).get()
|
|
||||||
.map { it.pluginId + ":" + it.pluginId + ".gradle.plugin:" + it.version }
|
|
||||||
}
|
|
||||||
|
|
||||||
license {
|
|
||||||
header = file('../LICENSE-header.txt')
|
|
||||||
}
|
|
||||||
BIN
Binary file not shown.
@@ -1,7 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
|
||||||
networkTimeout=10000
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
Vendored
-251
@@ -1,251 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015 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.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# 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».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# This is normally unused
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH="\\\"\\\""
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
if ! command -v java >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
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=SC2039,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=SC2039,SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# 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"'
|
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
||||||
# and any embedded shellness will be escaped.
|
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
||||||
# treated as '${Hostname}' itself on the command line.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
Vendored
-94
@@ -1,94 +0,0 @@
|
|||||||
@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
|
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@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. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
|
||||||
|
|
||||||
: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
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
gradlePluginPortal()
|
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
|
||||||
mavenLocal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
|
|
||||||
}
|
|
||||||
|
|
||||||
//enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
|
|
||||||
|
|
||||||
dependencyResolutionManagement.versionCatalogs {
|
|
||||||
register('bootLibs') {
|
|
||||||
description = 'Important version numbers that are externally declared for easy modification.'
|
|
||||||
from(files('../minecraft.versions.toml'))
|
|
||||||
}
|
|
||||||
|
|
||||||
create('libs') {
|
|
||||||
description = 'Libraries used by Forge and its subprojects.'
|
|
||||||
from(files("../gradle/libs.versions.toml"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (new File('forgedev/settings.gradle').exists())
|
|
||||||
includeBuild '../forgedev'
|
|
||||||
|
|
||||||
-166
@@ -1,166 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.Action
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.Task
|
|
||||||
import org.gradle.api.artifacts.ExternalModuleDependencyBundle
|
|
||||||
import org.gradle.api.artifacts.MinimalExternalModuleDependency
|
|
||||||
import org.gradle.api.model.ObjectFactory
|
|
||||||
import org.gradle.api.provider.Provider
|
|
||||||
import org.gradle.api.provider.ProviderFactory
|
|
||||||
import org.gradle.api.publish.maven.MavenPublication
|
|
||||||
import org.gradle.api.tasks.TaskProvider
|
|
||||||
import org.gradle.jvm.tasks.Jar
|
|
||||||
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class ConventionExtension implements Meta {
|
|
||||||
private final Project project;
|
|
||||||
private final Runs runs
|
|
||||||
|
|
||||||
protected abstract @Inject ObjectFactory getObjects()
|
|
||||||
protected abstract @Inject ProviderFactory getProviders()
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
ConventionExtension(Project project) {
|
|
||||||
this.project = project
|
|
||||||
this.runs = objects.newInstance(Runs, this)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
Project getProject() {
|
|
||||||
this.project
|
|
||||||
}
|
|
||||||
|
|
||||||
void manifest(String pkg) {
|
|
||||||
this.project.tasks.named('jar', Jar).configure {
|
|
||||||
this.gradleutils.manifestDefaults(it.manifest, pkg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void manifest(String pkg, Map<String, String> info) {
|
|
||||||
manifest(pkg)
|
|
||||||
this.project.tasks.named('jar', Jar).configure {
|
|
||||||
it.manifest.getAttributes().with {
|
|
||||||
for (var entry : info.entrySet())
|
|
||||||
put(entry.key, entry.value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// region Maven publishing ==============================================================
|
|
||||||
void publish() {
|
|
||||||
publish(pub -> pub.from(project.components.getByName('java')))
|
|
||||||
}
|
|
||||||
void publish(Action<MavenPublication> config) {
|
|
||||||
project.with {
|
|
||||||
publishing.with {
|
|
||||||
repositories.with {
|
|
||||||
maven gradleutils.publishingForgeMaven
|
|
||||||
}
|
|
||||||
publications.register('mavenJava', MavenPublication) {
|
|
||||||
changelog.publish(it)
|
|
||||||
gradleutils.promote(it)
|
|
||||||
|
|
||||||
// The actual artifacts to be published should be configured, so run the config
|
|
||||||
config.execute(it)
|
|
||||||
|
|
||||||
it.pom.with {
|
|
||||||
description = project.description
|
|
||||||
gradleutils.pom.addRemoteDetails(it)
|
|
||||||
license.with {
|
|
||||||
gradleutils.pom.licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// endregion
|
|
||||||
|
|
||||||
// region Runs ================================================================
|
|
||||||
private TaskProvider<Task> genAllData = null
|
|
||||||
TaskProvider<Task> getGenAllData() {
|
|
||||||
if (genAllData == null)
|
|
||||||
genAllData = this.project.tasks.register('genAllData')
|
|
||||||
return genAllData
|
|
||||||
}
|
|
||||||
TaskProvider<Task> getGenAllData(Action<Task> config) {
|
|
||||||
getGenAllData().configure(config)
|
|
||||||
return getGenAllData()
|
|
||||||
}
|
|
||||||
|
|
||||||
Runs getRuns() {
|
|
||||||
return this.runs
|
|
||||||
}
|
|
||||||
Runs runs(Action<Runs> config) {
|
|
||||||
config.execute(this.runs)
|
|
||||||
return this.runs
|
|
||||||
}
|
|
||||||
Runs basicRuns() {
|
|
||||||
return basicRuns({})
|
|
||||||
}
|
|
||||||
Runs basicRuns(Action<Runs> config) {
|
|
||||||
this.runs.main(null, null)
|
|
||||||
config.execute(this.runs)
|
|
||||||
return getRuns()
|
|
||||||
}
|
|
||||||
Runs basicRuns(String mods, File output) {
|
|
||||||
return basicRuns(mods, output, {})
|
|
||||||
}
|
|
||||||
Runs basicRuns(String mods, File output, Action<Runs> config) {
|
|
||||||
this.runs.main(mods, output)
|
|
||||||
config.execute(this.runs)
|
|
||||||
return getRuns()
|
|
||||||
}
|
|
||||||
Runs testRuns(String mods, File output) {
|
|
||||||
return testRuns(mods, output, {})
|
|
||||||
}
|
|
||||||
Runs testRuns(String mods, File output, Action<Runs> config) {
|
|
||||||
this.runs.test(mods, output)
|
|
||||||
config.execute(this.runs)
|
|
||||||
return getRuns()
|
|
||||||
}
|
|
||||||
// endregion
|
|
||||||
|
|
||||||
// region Forge Version Json ===================================================
|
|
||||||
private TaskProvider<WriteForgeVersionJson> writeForgeVersionJson = null
|
|
||||||
TaskProvider<WriteForgeVersionJson> getForgeVersionJson() {
|
|
||||||
if (writeForgeVersionJson == null) {
|
|
||||||
writeForgeVersionJson = this.project.tasks.register('writeForgeVersionJson', WriteForgeVersionJson)
|
|
||||||
final versions = this.versions
|
|
||||||
writeForgeVersionJson.configure {
|
|
||||||
it.forgeVersion.set(versions.forge)
|
|
||||||
it.minecraftVersion.set(versions.minecraft)
|
|
||||||
it.mcpVersion.set(versions.mcp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return writeForgeVersionJson
|
|
||||||
}
|
|
||||||
TaskProvider<WriteForgeVersionJson> forgeVersionJson(Action<WriteForgeVersionJson> config) {
|
|
||||||
forgeVersionJson.configure(config)
|
|
||||||
return forgeVersionJson
|
|
||||||
}
|
|
||||||
// endregion
|
|
||||||
|
|
||||||
// region Natives helper =========================================================
|
|
||||||
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
|
|
||||||
// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so
|
|
||||||
// that they can be finalized after configuration.
|
|
||||||
List<MinimalExternalModuleDependency> nativeVariants(Provider<ExternalModuleDependencyBundle> bundle) {
|
|
||||||
final natives = "natives-" + forgedev.os
|
|
||||||
final deps = this.project.dependencies
|
|
||||||
bundle.get().collect { dep ->
|
|
||||||
(deps.variantOf(providers.provider { (MinimalExternalModuleDependency)dep }) {
|
|
||||||
it.classifier(natives)
|
|
||||||
}).get()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// endregion
|
|
||||||
}
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.Plugin
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.tasks.compile.JavaCompile
|
|
||||||
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class ConventionPlugin implements Plugin<Project>, Meta {
|
|
||||||
Project project
|
|
||||||
@Override
|
|
||||||
Project getProject() {
|
|
||||||
this.project
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void apply(Project project) {
|
|
||||||
this.project = project
|
|
||||||
project.with {
|
|
||||||
pluginManager.with {
|
|
||||||
apply 'java-library'
|
|
||||||
apply 'maven-publish'
|
|
||||||
apply pluginId('licenser')
|
|
||||||
apply pluginId('gradleutils')
|
|
||||||
apply pluginId('gitversion')
|
|
||||||
apply pluginId('changelog')
|
|
||||||
apply pluginId('forgedev')
|
|
||||||
}
|
|
||||||
|
|
||||||
final versions = extensions.create("versions", VersionsExtension, project)
|
|
||||||
final convention = extensions.create('convention', ConventionExtension, project)
|
|
||||||
|
|
||||||
logger.lifecycle(name + " " + version)
|
|
||||||
|
|
||||||
gradleutils.with {
|
|
||||||
vendor.set('Forge Development LLC')
|
|
||||||
version.set(gitversion.version)
|
|
||||||
}
|
|
||||||
project.setGroup('net.minecraftforge')
|
|
||||||
|
|
||||||
java.with {
|
|
||||||
toolchain.languageVersion.set(JavaLanguageVersion.of(versions.java))
|
|
||||||
// This is needed for IDE runtime classpath to be correct/not have multiple of the same artifact
|
|
||||||
consistentResolution {
|
|
||||||
it.useCompileClasspathVersions()
|
|
||||||
}
|
|
||||||
// Forge needs to build its own sources jar due to patching, everything else should use the default
|
|
||||||
if (project != rootProject)
|
|
||||||
it.withSourcesJar()
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
it.options.with {
|
|
||||||
encoding = 'UTF-8'
|
|
||||||
compilerArgs << '-Xlint:-unchecked' // This is mainly for vanilla code, but just makes it quiet down outside the IDE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: We are adding dependencies to projects instead of through settings, so we don't have to apply forgedev in settings.
|
|
||||||
// Applying forgedev in settings will break IDE linting support, which makes it very hard to work with.
|
|
||||||
// We can reconsider this if/when JetBrains gets their shit together.
|
|
||||||
// - I doubt they will ever fix their shit 8/28/2006 - Lex
|
|
||||||
repositories.with {
|
|
||||||
// Libraries has to be before maven central because Mojang hosts a classifer that central doesn't (org.lwjgl:lwjgl-freetype:3.3.3:natives-macos-patch)
|
|
||||||
maven { url = 'https://libraries.minecraft.net/' }
|
|
||||||
mavenCentral()
|
|
||||||
maven gradleutils.forgeMaven
|
|
||||||
project.pluginManager.withPlugin('net.minecraftforge.forgedev') {
|
|
||||||
maven forgedev.mavenizer
|
|
||||||
}
|
|
||||||
|
|
||||||
mavenLocal()
|
|
||||||
}
|
|
||||||
|
|
||||||
changelog.with {
|
|
||||||
from versions.changelogBase
|
|
||||||
}
|
|
||||||
|
|
||||||
license.with {
|
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
|
||||||
exclude('.project_info.properties')
|
|
||||||
}
|
|
||||||
|
|
||||||
// Common dependencies,
|
|
||||||
project.dependencies.with {
|
|
||||||
add('compileOnly', libs.findLibrary('jetbrains.annotations').get())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.forgedev.ForgeDevExtension
|
|
||||||
import net.minecraftforge.gitversion.gradle.GitVersionExtension
|
|
||||||
import net.minecraftforge.gitversion.gradle.changelog.ChangelogExtension
|
|
||||||
import net.minecraftforge.gradleutils.GradleUtilsExtensionForProject
|
|
||||||
import net.minecraftforge.licenser.LicenseExtension
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.artifacts.VersionCatalog
|
|
||||||
import org.gradle.api.artifacts.VersionCatalogsExtension
|
|
||||||
import org.gradle.api.plugins.ExtraPropertiesExtension
|
|
||||||
import org.gradle.api.plugins.JavaPluginExtension
|
|
||||||
import org.gradle.api.publish.PublishingExtension
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
interface Meta {
|
|
||||||
Project getProject();
|
|
||||||
|
|
||||||
default VersionCatalog getLibs() {
|
|
||||||
project.extensions.getByType(VersionCatalogsExtension).named("libs")
|
|
||||||
}
|
|
||||||
|
|
||||||
default ExtraPropertiesExtension getExt() {
|
|
||||||
project.extensions.getByType(ExtraPropertiesExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default JavaPluginExtension getJava() {
|
|
||||||
project.extensions.getByType(JavaPluginExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default GradleUtilsExtensionForProject getGradleutils() {
|
|
||||||
project.extensions.getByType(GradleUtilsExtensionForProject)
|
|
||||||
}
|
|
||||||
|
|
||||||
default GitVersionExtension getGitversion() {
|
|
||||||
project.extensions.getByType(GitVersionExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default ForgeDevExtension getForgedev() {
|
|
||||||
project.extensions.getByType(ForgeDevExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default ChangelogExtension getChangelog() {
|
|
||||||
project.extensions.getByType(ChangelogExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default LicenseExtension getLicense() {
|
|
||||||
project.extensions.getByType(LicenseExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default PublishingExtension getPublishing() {
|
|
||||||
project.extensions.getByType(PublishingExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default VersionsExtension getVersions() {
|
|
||||||
project.extensions.getByType(VersionsExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default ConventionExtension getConvention() {
|
|
||||||
project.extensions.getByType(ConventionExtension)
|
|
||||||
}
|
|
||||||
|
|
||||||
default String pluginId(String alias) {
|
|
||||||
getLibs().findPlugin(alias).orElseThrow { new IllegalStateException("Could not find plugin " + alias) }.get().pluginId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,220 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.licenser.LicenseExtension
|
|
||||||
import net.minecraftforge.licenser.tasks.LicenseCheck
|
|
||||||
import org.gradle.api.Action
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.tasks.SourceSet
|
|
||||||
import org.gradle.api.tasks.TaskProvider
|
|
||||||
import org.gradle.api.tasks.WriteProperties
|
|
||||||
import org.jspecify.annotations.Nullable
|
|
||||||
|
|
||||||
import javax.inject.Inject
|
|
||||||
import javax.naming.spi.ObjectFactory
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class Runs implements Meta {
|
|
||||||
private final ConventionExtension ext
|
|
||||||
private boolean hasDependency = false
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
Runs(ConventionExtension ext) {
|
|
||||||
this.ext = ext
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
Project getProject() {
|
|
||||||
this.ext.project
|
|
||||||
}
|
|
||||||
|
|
||||||
void main(@Nullable String mods, @Nullable File output) {
|
|
||||||
final project = this.project
|
|
||||||
final genAllData = this.ext.genAllData
|
|
||||||
|
|
||||||
project.with {
|
|
||||||
final SourceSet sourceSet = getJava().getSourceSets().named("main").get()
|
|
||||||
if (!hasDependency && project != project.rootProject) {
|
|
||||||
dependencies.with {
|
|
||||||
add('implementation', it.project(':')) // Root project is forge itself
|
|
||||||
}
|
|
||||||
hasDependency = true
|
|
||||||
}
|
|
||||||
if (output != null)
|
|
||||||
sourceSet.resources.with { srcDir output }
|
|
||||||
|
|
||||||
forgedev.runs.with {
|
|
||||||
final File existing = sourceSet.getResources().getSrcDirs()[0]
|
|
||||||
|
|
||||||
configureEach {
|
|
||||||
it.with {
|
|
||||||
cache.set(project.layout.projectDirectory.dir('runs/cache'))
|
|
||||||
eclipsePrefix = project.name
|
|
||||||
|
|
||||||
// If we're not forge, we need to get the metadata from the forge project
|
|
||||||
if (project != project.rootProject)
|
|
||||||
metadata = project.files(getForgedev().consumeFile('metadata', project.rootProject))
|
|
||||||
|
|
||||||
var runName = it.name.toLowerCase(Locale.ENGLISH)
|
|
||||||
|
|
||||||
if (runName.contains('client') || runName.contains('data')) {
|
|
||||||
options.with {
|
|
||||||
// LWJGL needs native access, Mojang gets away with just saying 'ALL-UNNAMED' because it doesnt boot into module land
|
|
||||||
// We need a system to translate that to module names
|
|
||||||
//jvmArgs '--enable-native-access=ALL-UNNAMED', '--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED'
|
|
||||||
args '--assetsDir', '{assets_root}', '--assetIndex', '{asset_index}'
|
|
||||||
systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (runName.contains('data')) {
|
|
||||||
options.with(sourceSet).with {
|
|
||||||
systemProperties.put("forge.project.list", getProjectList().flatMap { it.destinationFile.map{ it.asFile.absolutePath } })
|
|
||||||
if (mods != null) args('--mod', mods)
|
|
||||||
if (output != null) args('--output', output)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
options.with {
|
|
||||||
getWorkingDir().set(project.layout.projectDirectory.dir("runs/$name"))
|
|
||||||
getMainClass().set('net.minecraftforge.bootstrap.ForgeBootstrap')
|
|
||||||
args '--gameDir', '.'
|
|
||||||
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32'
|
|
||||||
|
|
||||||
//systemProperty 'forge.logging.marker.registries', 'ACCEPT'
|
|
||||||
//systemProperty 'forge.logging.console.level', 'debug'
|
|
||||||
systemProperty 'bsl.debug', 'true'
|
|
||||||
systemProperty 'terminal.jline', 'true'
|
|
||||||
systemProperty 'forge.enableGameTest', 'true'
|
|
||||||
systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
maybeCreate('client').with {
|
|
||||||
options.with {
|
|
||||||
args '--launchTarget', 'forge_dev_client',
|
|
||||||
'--username', 'Dev',
|
|
||||||
'--version', project.name,
|
|
||||||
'--accessToken', '0',
|
|
||||||
'--userType', 'mojang',
|
|
||||||
'--versionType', 'release'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
maybeCreate('server').with {
|
|
||||||
options.with {
|
|
||||||
args '--launchTarget', 'forge_dev_server'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
maybeCreate('gameTestServer').with {
|
|
||||||
options.with {
|
|
||||||
args '--launchTarget', 'forge_dev_server_gametest',
|
|
||||||
'--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
maybeCreate('data').with {
|
|
||||||
options.with {
|
|
||||||
args '--launchTarget', 'forge_dev_data',
|
|
||||||
'--all',
|
|
||||||
'--existing', existing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
maybeCreate('clientData').with {
|
|
||||||
options.with {
|
|
||||||
args '--launchTarget', 'forge_dev_client_data',
|
|
||||||
'--all',
|
|
||||||
'--existing', existing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
genAllData.configure {
|
|
||||||
it.dependsOn forgedev.runs.getByName('data').with(sourceSet).run, forgedev.runs.getByName('clientData').with(sourceSet).run
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void test(@Nullable String mods, @Nullable File output) {
|
|
||||||
final project = this.project
|
|
||||||
final genAllData = this.ext.genAllData
|
|
||||||
|
|
||||||
project.with {
|
|
||||||
final SourceSet sourceSet = getJava().getSourceSets().named("test").get()
|
|
||||||
forgedev.runs.with {
|
|
||||||
final File existing = sourceSet.getResources().getSrcDirs()[0]
|
|
||||||
|
|
||||||
configureEach {
|
|
||||||
it.with {
|
|
||||||
var runName = it.name.toLowerCase(Locale.ENGLISH)
|
|
||||||
options.with(sourceSet).with {
|
|
||||||
systemProperty 'forgedev.enableTestMods', 'true'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (runName.contains('data')) {
|
|
||||||
options.with(sourceSet).with {
|
|
||||||
if (mods != null) args('--mod', mods)
|
|
||||||
if (output != null) args('--output', output)
|
|
||||||
args('--existing', existing)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
genAllData.configure {
|
|
||||||
it.dependsOn forgedev.runs.getByName('data').with(sourceSet).run, forgedev.runs.getByName('clientData').with(sourceSet).run
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private TaskProvider<WriteProperties> projectInfo = null
|
|
||||||
TaskProvider<WriteProperties> getProjectInfo() {
|
|
||||||
if (projectInfo == null) {
|
|
||||||
projectInfo = this.project.tasks.register("writeProjectInfo", WriteProperties)
|
|
||||||
projectInfo.configure {
|
|
||||||
it.destinationFile.set(this.project.file('src/main/resources/.project_info.properties'))
|
|
||||||
it.property('name', this.project.rootProject.name + this.project.isolated.path.replaceAll(':', '.'))
|
|
||||||
it.property('output', 'src/main/generated')
|
|
||||||
}
|
|
||||||
this.project.tasks.named("generateResources").configure { it.dependsOn(projectInfo) }
|
|
||||||
this.project.tasks.withType(LicenseCheck).configureEach {
|
|
||||||
it.dependsOn(projectInfo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return projectInfo
|
|
||||||
}
|
|
||||||
TaskProvider<WriteProperties> projectInfo(Action<? extends WriteProperties> action) {
|
|
||||||
getProjectInfo().configure(action)
|
|
||||||
return getProjectInfo()
|
|
||||||
}
|
|
||||||
void setFlat(boolean value) {
|
|
||||||
projectInfo(task -> task.property('flat', value))
|
|
||||||
}
|
|
||||||
|
|
||||||
private TaskProvider<WriteProperties> projectList = null
|
|
||||||
TaskProvider<WriteProperties> getProjectList() {
|
|
||||||
if (projectList == null) {
|
|
||||||
projectList = this.project.tasks.register("writeProjectList", WriteProperties)
|
|
||||||
projectList.configure { task ->
|
|
||||||
task.destinationFile.set(this.project.layout.buildDirectory.file('project_list.properties'))
|
|
||||||
task.encoding = 'UTF-8'
|
|
||||||
final root = this.project.rootProject.name
|
|
||||||
this.project.rootProject.allprojects.forEach { p ->
|
|
||||||
task.property(root + p.isolated.path.replaceAll(':', '.'), p.isolated.projectDirectory.asFile.absolutePath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return projectList
|
|
||||||
}
|
|
||||||
TaskProvider<WriteProperties> projectList(Action<? extends WriteProperties> action) {
|
|
||||||
getProjectList().configure(action)
|
|
||||||
return getProjectList()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build;
|
|
||||||
|
|
||||||
import net.minecraftforge.gitversion.gradle.GitVersionExtension;
|
|
||||||
import org.gradle.api.Project;
|
|
||||||
import org.gradle.api.artifacts.VersionCatalog;
|
|
||||||
import org.gradle.api.artifacts.VersionCatalogsExtension;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
public abstract class VersionsExtension {
|
|
||||||
private final VersionCatalog libs;
|
|
||||||
|
|
||||||
public final String java, minecraft, forge, forgeSpec, minecraftNext, mcp, changelogBase;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public VersionsExtension(Project project) {
|
|
||||||
final var extensions = project.getExtensions();
|
|
||||||
final var gitversion = extensions.getByType(GitVersionExtension.class);
|
|
||||||
libs = extensions.getByType(VersionCatalogsExtension.class).named("bootLibs");
|
|
||||||
java = get("java");
|
|
||||||
minecraft = get("minecraft");
|
|
||||||
minecraftNext = get("minecraft.next");
|
|
||||||
mcp = get("mcp");
|
|
||||||
changelogBase = get("changelog.base");
|
|
||||||
forge = gitversion.of(project.getRootProject()).getVersion();
|
|
||||||
forgeSpec = forge.split("\\.")[0];
|
|
||||||
project.setVersion(minecraft + '-' + gitversion.getVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
private String get(String name) {
|
|
||||||
var ver = this.libs.findVersion(name);
|
|
||||||
if (ver.isEmpty())
|
|
||||||
throw new IllegalStateException("No version found for " + name);
|
|
||||||
return ver.get().toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-42
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.build
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import groovy.transform.CompileDynamic
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class WriteForgeVersionJson extends DefaultTask {
|
|
||||||
abstract @Input Property<String> getForgeVersion()
|
|
||||||
abstract @Input Property<String> getMinecraftVersion()
|
|
||||||
abstract @Input Property<String> getMcpVersion()
|
|
||||||
|
|
||||||
abstract @OutputFile RegularFileProperty getOutputFile()
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
WriteForgeVersionJson() {}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
@CompileDynamic
|
|
||||||
void exec() {
|
|
||||||
var json = new JsonBuilder()
|
|
||||||
json {
|
|
||||||
forge this.forgeVersion.get()
|
|
||||||
mc this.minecraftVersion.get()
|
|
||||||
mcp this.mcpVersion.get()
|
|
||||||
}
|
|
||||||
this.outputFile.asFile.get().text = json.toPrettyString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+251
-46
@@ -1,16 +1,30 @@
|
|||||||
import org.apache.tools.ant.filters.ReplaceTokens
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'idea'
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
alias libs.plugins.versions
|
alias libs.plugins.versions
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
alias libs.plugins.jarsigner
|
alias libs.plugins.jarsigner
|
||||||
alias libs.plugins.forgedev
|
id 'net.minecraftforge.forgedev'
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'Forge'
|
gradleutils.displayName = 'Forge'
|
||||||
|
group = 'net.minecraftforge'
|
||||||
description = 'Modifications to Minecraft to enable mod developers.'
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
|
// NOTE: See settings.gradle for all the referenceable version variables.
|
||||||
|
// All subprojects (that apply 'net.minecraftforge.forge.build.convention') will have these available.
|
||||||
|
println "Version: $version"
|
||||||
|
|
||||||
|
java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
|
||||||
jarSigner.autoDetect('forge')
|
jarSigner.autoDetect('forge')
|
||||||
|
|
||||||
// We have to tell ForgeDev to use the exact versions of tools we ship in the installer
|
// We have to tell ForgeDev to use the exact versions of tools we ship in the installer
|
||||||
@@ -30,19 +44,18 @@ fdtools {
|
|||||||
forgedev.validatePublish {
|
forgedev.validatePublish {
|
||||||
task {
|
task {
|
||||||
baseBranch = 'upstream/26.1.2'
|
baseBranch = 'upstream/26.1.2'
|
||||||
versionPrefix = versions.minecraft
|
versionPrefix = minecraftVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
final minecraftFiles = forgedev.minecraftFiles(versions.minecraft)
|
final minecraftFiles = forgedev.minecraftFiles(minecraftVersion)
|
||||||
|
|
||||||
final mcpBase = forgedev.mcpBase {
|
final mcpBase = forgedev.mcpBase {
|
||||||
mcpVersion = "${versions.minecraft}-${versions.mcp}"
|
mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}"
|
||||||
accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
|
accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
sideAnnotationStrippers.from file('src/main/resources/forge.sas')
|
sideAnnotationStrippers.from file('src/main/resources/forge.sas')
|
||||||
}
|
}
|
||||||
forgedev.provideFile('metadata', mcpBase.metadata)
|
|
||||||
|
|
||||||
forgedev.patches {
|
forgedev.patches {
|
||||||
base = mcpBase
|
base = mcpBase
|
||||||
@@ -55,12 +68,34 @@ tasks.register('setup') {
|
|||||||
dependsOn forgedev.patches.apply
|
dependsOn forgedev.patches.apply
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
named('main') {
|
||||||
|
resources.srcDir 'src/main/generated'
|
||||||
|
}
|
||||||
|
named('test') {
|
||||||
|
resources.srcDir 'src/test/generated'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
license {
|
license {
|
||||||
|
header = file('LICENSE-header.txt')
|
||||||
|
|
||||||
include 'net/minecraftforge/'
|
include 'net/minecraftforge/'
|
||||||
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
||||||
|
|
||||||
|
tasks.tap {
|
||||||
|
register('main') {
|
||||||
|
files.from files('src/main/java')
|
||||||
|
}
|
||||||
|
|
||||||
|
register('test') {
|
||||||
|
files.from files('src/test/java')
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
changelog {
|
changelog {
|
||||||
|
from changelogBase
|
||||||
publishAll = false
|
publishAll = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,7 +117,10 @@ configurations {
|
|||||||
|
|
||||||
named('api') {
|
named('api') {
|
||||||
extendsFrom(installer)
|
extendsFrom(installer)
|
||||||
// Inherit vanilla Minecraft's dependencies, and let downstream access them
|
}
|
||||||
|
|
||||||
|
named('implementation') {
|
||||||
|
// Inherit vanilla Minecraft's dependencies
|
||||||
extendsFrom(mcpBase.dependencyConfiguration)
|
extendsFrom(mcpBase.dependencyConfiguration)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,12 +171,106 @@ dependencies {
|
|||||||
annotationProcessor libs.eventbus.validator
|
annotationProcessor libs.eventbus.validator
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.basicRuns('forge', file('src/main/generated/'))
|
|
||||||
|
|
||||||
final EXTRA_TXTS = [
|
final EXTRA_TXTS = [
|
||||||
file('LICENSE.txt'),
|
file('LICENSE.txt'),
|
||||||
changelog.task.flatMap(task -> task.outputFile)
|
changelog.task.flatMap(task -> task.outputFile)
|
||||||
]
|
]
|
||||||
|
forgedev.runs {
|
||||||
|
configureEach {
|
||||||
|
options {
|
||||||
|
workingDir = layout.projectDirectory.dir("runs/$name")
|
||||||
|
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args '--gameDir', '.'
|
||||||
|
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
|
||||||
|
|
||||||
|
systemProperty 'bsl.debug', 'true'
|
||||||
|
systemProperty 'terminal.jline', 'true'
|
||||||
|
with(sourceSets.test) {
|
||||||
|
systemProperty 'forge.enableGameTest', 'true'
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('client') {
|
||||||
|
options {
|
||||||
|
systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
|
||||||
|
systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
|
||||||
|
|
||||||
|
args '--launchTarget', 'forge_dev_client',
|
||||||
|
'--username', 'Dev',
|
||||||
|
'--version', project.name,
|
||||||
|
'--accessToken', '0',
|
||||||
|
'--userType', 'mojang',
|
||||||
|
'--versionType', 'release',
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('server') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_server'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('gameTestServer') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_server_gametest'
|
||||||
|
args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('data') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_data',
|
||||||
|
'--all',
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
|
||||||
|
with(sourceSets.main) {
|
||||||
|
args '--mod', 'forge',
|
||||||
|
'--output', rootProject.file('src/main/generated/')
|
||||||
|
}
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
args '--mod', '.+',
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--output', rootProject.file('src/test/generated/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('clientData') {
|
||||||
|
options {
|
||||||
|
args '--all',
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
|
||||||
|
with(sourceSets.main) {
|
||||||
|
args '--launchTarget', 'forge_dev_client_data',
|
||||||
|
'--mod', 'forge',
|
||||||
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
|
'--mod', 'forge'
|
||||||
|
}
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
args '--launchTarget', 'forge_dev',
|
||||||
|
'--launchEntry', 'minecraft/net.minecraft.client.data.Main',
|
||||||
|
'--launchData',
|
||||||
|
'--mod', '.+',
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--output', rootProject.file('src/test/generated/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tasks.register('genAllData') {
|
||||||
|
dependsOn forgedev.runs.data.run, forgedev.runs.data.runTest, forgedev.runs.clientData.run, forgedev.runs.clientData.runTest
|
||||||
|
}
|
||||||
|
|
||||||
final serverShim = forgedev.shim {
|
final serverShim = forgedev.shim {
|
||||||
config {
|
config {
|
||||||
@@ -165,7 +297,7 @@ final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
forgedev.validateDeprecations(tasks.named('jar', Jar)) {
|
forgedev.validateDeprecations(tasks.named('jar', Jar)) {
|
||||||
mcVersion = versions.minecraft
|
mcVersion = minecraftVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
forgedev.checks() {
|
forgedev.checks() {
|
||||||
@@ -204,15 +336,24 @@ tasks.named('jar', Jar) {
|
|||||||
|
|
||||||
manifest {
|
manifest {
|
||||||
attributes([
|
attributes([
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.forge'
|
'Automatic-Module-Name': 'net.minecraftforge.forge'
|
||||||
])
|
|
||||||
gradleutils.manifestDefaults(it, 'net/minecraftforge/versions/forge/')
|
|
||||||
gradleutils.manifestDefaults(it, 'net/minecraftforge/versions/mcp/', [
|
|
||||||
'Specification-Title' : 'Minecraft',
|
|
||||||
'Specification-Version' : versions.minecraft,
|
|
||||||
'Implementation-Title' : 'MCP',
|
|
||||||
'Implementation-Version': versions.mcp
|
|
||||||
])
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Specification-Version' : gitversion.info.tag,
|
||||||
|
'Implementation-Title' : project.group,
|
||||||
|
'Implementation-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/versions/forge/')
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : 'Minecraft',
|
||||||
|
'Specification-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Specification-Version' : minecraftVersion,
|
||||||
|
'Implementation-Title' : 'MCP',
|
||||||
|
'Implementation-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Implementation-Version': mcpVersion
|
||||||
|
], 'net/minecraftforge/versions/mcp/')
|
||||||
}
|
}
|
||||||
jarSigner.sign(it)
|
jarSigner.sign(it)
|
||||||
}
|
}
|
||||||
@@ -259,7 +400,7 @@ forgedev.userDev {
|
|||||||
parents = []
|
parents = []
|
||||||
main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
args '--gameDir', '.'
|
args '--gameDir', '.'
|
||||||
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32'
|
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
|
||||||
client = it.name.containsIgnoreCase('client')
|
client = it.name.containsIgnoreCase('client')
|
||||||
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
}
|
}
|
||||||
@@ -304,7 +445,7 @@ forgedev.userDev {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
forgedev.userdevCompatibility(versions.minecraft) {
|
forgedev.userdevCompatibility(minecraftVersion) {
|
||||||
clean = mcpBase.classes
|
clean = mcpBase.classes
|
||||||
dirty = tasks.named('jar', Jar)
|
dirty = tasks.named('jar', Jar)
|
||||||
}
|
}
|
||||||
@@ -313,8 +454,8 @@ forgedev.userdevCompatibility(versions.minecraft) {
|
|||||||
final clientBinPatches = forgedev.binaryPatches('client') {
|
final clientBinPatches = forgedev.binaryPatches('client') {
|
||||||
clean = minecraftFiles.client
|
clean = minecraftFiles.client
|
||||||
// Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
|
// Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
|
||||||
apply {
|
apply {
|
||||||
store = true
|
store = true
|
||||||
marker = '.forge_patched_minecraft'
|
marker = '.forge_patched_minecraft'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -342,7 +483,7 @@ forgedev.installer {
|
|||||||
|
|
||||||
launcherLibraries configurations.installer
|
launcherLibraries configurations.installer
|
||||||
|
|
||||||
final launcherId = "${versions.minecraft}-${project.name}-${versions.forge}"
|
final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
|
||||||
final installertools = tool(buildLibs.installertools)
|
final installertools = tool(buildLibs.installertools)
|
||||||
final binarypatcher = tool(buildLibs.binarypatcher)
|
final binarypatcher = tool(buildLibs.binarypatcher)
|
||||||
|
|
||||||
@@ -385,12 +526,12 @@ forgedev.installer {
|
|||||||
json {
|
json {
|
||||||
icon = rootProject.file('icon.ico')
|
icon = rootProject.file('icon.ico')
|
||||||
executable serverShim.jar
|
executable serverShim.jar
|
||||||
minecraft = versions.minecraft
|
minecraft = minecraftVersion
|
||||||
profileVersion = launcherId
|
profileVersion = launcherId
|
||||||
|
|
||||||
final projectArtifact = "${project.group}:${project.name}:${project.version}"
|
final projectArtifact = "${project.group}:${project.name}:${project.version}"
|
||||||
|
|
||||||
data 'MC_UNPACKED', "[net.minecraft:client:${versions.minecraft}]", "[net.minecraft:server:${versions.minecraft}:unpacked]"
|
data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]"
|
||||||
data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
|
data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
|
||||||
|
|
||||||
data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
|
data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
|
||||||
@@ -451,10 +592,57 @@ forgedev.installer {
|
|||||||
librariesLast = false // Makes libraries be added before args
|
librariesLast = false // Makes libraries be added before args
|
||||||
|
|
||||||
id = launcherId
|
id = launcherId
|
||||||
inheritsFrom = versions.minecraft
|
inheritsFrom = minecraftVersion
|
||||||
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
gameArgs = [ '--launchTarget', 'forge_client' ]
|
gameArgs = [ '--launchTarget', 'forge_client' ]
|
||||||
jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32' ]
|
jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders' ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
|
||||||
|
gradleVersion = '9.5.0'
|
||||||
|
scriptFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradlew")
|
||||||
|
jarFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradle/wrapper/gradle-wrapper.jar")
|
||||||
|
}
|
||||||
|
|
||||||
|
final mdkZip = tasks.register('mdkZip', Zip) {
|
||||||
|
dependsOn mdkGradleWrapper
|
||||||
|
|
||||||
|
archiveBaseName = project.name
|
||||||
|
archiveClassifier = 'mdk'
|
||||||
|
archiveVersion = project.version
|
||||||
|
destinationDirectory = file('build/libs')
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getScriptFile)
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getBatchScript)
|
||||||
|
into('gradle/wrapper/') {
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getJarFile)
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
|
||||||
|
}
|
||||||
|
from(rootProject.file('mdk/')){
|
||||||
|
rootProject.file('mdk/gitignore.txt').eachLine {
|
||||||
|
if (!it.trim().isEmpty() && !it.trim().startsWith('#'))
|
||||||
|
exclude it
|
||||||
|
}
|
||||||
|
filter(ReplaceTokens, tokens: [
|
||||||
|
FORGE_VERSION: forgeVersion,
|
||||||
|
FORGE_GROUP: project.group,
|
||||||
|
FORGE_NAME: project.name,
|
||||||
|
MC_VERSION: minecraftVersion,
|
||||||
|
FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0],
|
||||||
|
MC_NEXT_VERSION: minecraftNextVersion,
|
||||||
|
EVENTBUS_VERSION: libs.versions.eventbus.get()
|
||||||
|
])
|
||||||
|
rename 'gitignore\\.txt', '.gitignore'
|
||||||
|
rename 'gitattributes\\.txt', '.gitattributes'
|
||||||
|
}
|
||||||
|
from(rootProject.file('src/test/java/com/example/examplemod/')) {
|
||||||
|
into('src/main/java/com/example/examplemod/')
|
||||||
|
}
|
||||||
|
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
||||||
|
into('src/main/resources/')
|
||||||
|
exclude '**/.cache/'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -522,8 +710,8 @@ tasks.named('javadoc', Javadoc) {
|
|||||||
|
|
||||||
bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1."
|
bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1."
|
||||||
windowTitle = "Minecraft Forge API ${version}"
|
windowTitle = "Minecraft Forge API ${version}"
|
||||||
docTitle = "Minecraft Forge API - ${versions.forge} for Minecraft ${versions.minecraft}"
|
docTitle = "Minecraft Forge API - ${forgeVersion} for Minecraft ${minecraftVersion}"
|
||||||
header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${versions.forge} for Minecraft ${versions.minecraft}</strong></div>"
|
header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${forgeVersion} for Minecraft ${minecraftVersion}</strong></div>"
|
||||||
}
|
}
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
@@ -535,36 +723,52 @@ tasks.named('javadoc', Javadoc) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
final mdkZip = forgedev.consumeFile("mdkZip", project(':forge-mdk'))
|
|
||||||
convention.publish {
|
publishing {
|
||||||
artifact universalJar
|
repositories {
|
||||||
artifact forgedev.installer.jar
|
maven gradleutils.publishingForgeMaven
|
||||||
artifact(mdkZip.map { it.singleFile }) {
|
}
|
||||||
builtBy mdkZip
|
|
||||||
classifier = "mdk"
|
publications.register('mavenJava', MavenPublication) {
|
||||||
extension = "zip"
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
artifact universalJar
|
||||||
|
artifact forgedev.installer.jar
|
||||||
|
artifact mdkZip
|
||||||
|
artifact forgedev.userDev.jar
|
||||||
|
artifact sourcesJar
|
||||||
|
artifact serverShim.jar
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
artifact forgedev.userDev.jar
|
|
||||||
artifact sourcesJar
|
|
||||||
artifact serverShim.jar
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching
|
// These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching
|
||||||
// region ForgeDev Tests
|
// region ForgeDev Tests
|
||||||
def all = tasks.register('all') {}
|
def all = tasks.register('all') {}
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
if (gradle.startParameter.taskNames.contains('all')) {
|
if (gradle.startParameter.taskNames.contains('all')) {
|
||||||
tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check
|
tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check
|
||||||
if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return
|
if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return
|
||||||
if (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea',
|
if (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea',
|
||||||
'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm',
|
'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm',
|
||||||
'generateActionsWorkflow'
|
'generateActionsWorkflow'
|
||||||
]) return
|
]) return
|
||||||
if (task.name.startsWith('clean')) return
|
if (task.name.startsWith('clean')) return
|
||||||
if (task.name == 'checkJarCompatibility') return // This doesn't work in FG6 dev, I think it's cuz we check vs srg names. Will need to look at later
|
if (task.name == 'checkJarCompatibility') return // This doesn't work in FG6 dev, I think it's cuz we check vs srg names. Will need to look at later
|
||||||
all.configure { dependsOn(task) }
|
all.configure { dependsOn(task) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
@@ -578,7 +782,8 @@ tasks.withType(AbstractTestTask).configureEach {
|
|||||||
[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
|
[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
|
||||||
.each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
|
.each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
|
||||||
forgedev.runs.configureEach {
|
forgedev.runs.configureEach {
|
||||||
run.configure { dependsOn finalizeSpawn }
|
run.configure { dependsOn finalizeSpawn}
|
||||||
|
runTest.configure { dependsOn finalizeSpawn}
|
||||||
}
|
}
|
||||||
// run gradlew dependencyUpdates --no-parallel
|
// run gradlew dependencyUpdates --no-parallel
|
||||||
//noinspection UnnecessaryQualifiedReference
|
//noinspection UnnecessaryQualifiedReference
|
||||||
|
|||||||
+3
-3
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[][Download]
|
[][Download]
|
||||||
[][Download] [][Discord] [][Patreon]
|
)][Download] [][Discord] [][Patreon]
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
@@ -74,7 +74,7 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
### Thanks
|
### Thanks
|
||||||
[](https://www.yourkit.com/)
|
[](https://www.yourkit.com/)
|
||||||
|
|
||||||
YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvement.
|
YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
|
||||||
|
|
||||||
[Contributing]: ./CONTRIBUTING.md
|
[Contributing]: ./CONTRIBUTING.md
|
||||||
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
||||||
|
|||||||
+64
-6
@@ -1,20 +1,78 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'FML'
|
gradleutils.displayName = 'FML'
|
||||||
description = 'Core library used for Forge ModLoader.'
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
api libs.eventbus
|
api libs.eventbus
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation projects.fmlloader
|
||||||
implementation libs.commons.io
|
implementation libs.commons.io
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/', [
|
java {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
'FMLModType' : 'LIBRARY'
|
withSourcesJar()
|
||||||
])
|
}
|
||||||
|
|
||||||
convention.publish()
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.compilerArgs << '-Xlint:-unchecked'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
|
||||||
|
'FMLModType' : 'LIBRARY'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Version': '1.0',
|
||||||
|
'Implementation-Vendor' : vendor
|
||||||
|
], 'net/minecraftforge/fml/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ import java.util.function.Supplier;
|
|||||||
/**
|
/**
|
||||||
* Used to allow access to certain things from the game layer
|
* Used to allow access to certain things from the game layer
|
||||||
*/
|
*/
|
||||||
public final class Bindings {
|
public class Bindings {
|
||||||
private Bindings() {}
|
private Bindings() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -27,7 +27,7 @@ public final class Bindings {
|
|||||||
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return A supplier of {@link BusGroup#DEFAULT}
|
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
||||||
*/
|
*/
|
||||||
public static Supplier<BusGroup> getForgeBus() {
|
public static Supplier<BusGroup> getForgeBus() {
|
||||||
return PROVIDER.getForgeBusSupplier();
|
return PROVIDER.getForgeBusSupplier();
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public final class ModList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Optional<? extends ModContainer> getModContainerById(String modId) {
|
public static Optional<? extends ModContainer> getModContainerById(String modId) {
|
||||||
return Optional.ofNullable(indexedMods == null ? null : indexedMods.get(modId));
|
return Optional.ofNullable(indexedMods.get(modId));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
||||||
|
|||||||
@@ -366,10 +366,6 @@ public final class ModLoader {
|
|||||||
mod.acceptEvent(e);
|
mod.acceptEvent(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends IModBusEvent> void postEvent(ModContainer mod, T e) {
|
|
||||||
mod.acceptEvent(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T extends IModBusEvent> T postEventWithReturn(T e) {
|
public static <T extends IModBusEvent> T postEventWithReturn(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
|
|||||||
@@ -1,14 +1,49 @@
|
|||||||
import org.gradle.api.plugins.jvm.JvmTestSuite
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
import org.gradle.internal.os.OperatingSystem
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
id 'jvm-test-suite'
|
id 'jvm-test-suite'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (OperatingSystem.current()) {
|
||||||
|
case OperatingSystem.LINUX:
|
||||||
|
project.ext.lwjglNatives = "natives-linux"
|
||||||
|
break
|
||||||
|
case OperatingSystem.MAC_OS:
|
||||||
|
project.ext.lwjglNatives = "natives-macos"
|
||||||
|
break
|
||||||
|
case OperatingSystem.WINDOWS:
|
||||||
|
project.ext.lwjglNatives = "natives-windows"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'FML Early Display'
|
gradleutils.displayName = 'FML Early Display'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation projects.fmlloader
|
||||||
implementation projects.fmlcore
|
implementation projects.fmlcore
|
||||||
implementation libs.bundles.lwjgl
|
implementation libs.bundles.lwjgl
|
||||||
@@ -16,19 +51,67 @@ dependencies {
|
|||||||
implementation libs.jopt.simple
|
implementation libs.jopt.simple
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
|
||||||
|
// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration.
|
||||||
|
var lwjglTestLibs = [
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.glfw) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives }
|
||||||
|
].with { list ->
|
||||||
|
provider { list.collect { it.get() } }
|
||||||
|
}
|
||||||
|
|
||||||
testing.suites.named('test', JvmTestSuite) {
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
useJUnitJupiter('5.8.2')
|
useJUnitJupiter('5.8.2')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation earlyDisplayTestLibs.powermock.core
|
implementation earlyDisplayTestLibs.powermock.core
|
||||||
runtimeOnly earlyDisplayLibs.slf4j.jdk14
|
runtimeOnly earlyDisplayLibs.slf4j.jdk14
|
||||||
runtimeOnly.bundle convention.nativeVariants(earlyDisplayTestLibs.bundles.lwjgl)
|
runtimeOnly.bundle lwjglTestLibs
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/earlydisplay/', [
|
tasks.withType(JavaCompile).configureEach {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
'Forge-Module-Layer' : 'boot'
|
}
|
||||||
])
|
|
||||||
|
|
||||||
convention.publish()
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
|
||||||
|
'Forge-Module-Layer' : 'boot'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': '1.0'
|
||||||
|
], 'net/minecraftforge/fml/earlydisplay/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+180
-220
@@ -13,12 +13,10 @@ import net.minecraftforge.fml.loading.ImmediateWindowHandler;
|
|||||||
import net.minecraftforge.fml.loading.ImmediateWindowProvider;
|
import net.minecraftforge.fml.loading.ImmediateWindowProvider;
|
||||||
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.lwjgl.opengl.GL;
|
import org.lwjgl.PointerBuffer;
|
||||||
import org.lwjgl.sdl.SDLError;
|
import org.lwjgl.glfw.GLFWVidMode;
|
||||||
import org.lwjgl.sdl.SDLVideo;
|
|
||||||
import org.lwjgl.sdl.SDL_Event;
|
|
||||||
import org.lwjgl.sdl.SDL_Rect;
|
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
|
import org.lwjgl.system.MemoryUtil;
|
||||||
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -31,10 +29,12 @@ import java.net.URI;
|
|||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.StringJoiner;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
@@ -43,18 +43,17 @@ import java.util.concurrent.Semaphore;
|
|||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.IntConsumer;
|
import java.util.function.IntConsumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
import java.util.stream.Collector;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static org.lwjgl.glfw.GLFW.*;
|
||||||
|
import static org.lwjgl.opengl.GL.createCapabilities;
|
||||||
import static org.lwjgl.opengl.GL32C.*;
|
import static org.lwjgl.opengl.GL32C.*;
|
||||||
|
|
||||||
import static org.lwjgl.sdl.SDLError.*;
|
|
||||||
import static org.lwjgl.sdl.SDLEvents.*;
|
|
||||||
import static org.lwjgl.sdl.SDLHints.*;
|
|
||||||
import static org.lwjgl.sdl.SDLInit.*;
|
|
||||||
import static org.lwjgl.sdl.SDLVideo.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Loading Window that is opened Immediately after Forge starts.
|
* The Loading Window that is opened Immediately after Forge starts.
|
||||||
* It is called from the ModDirTransformerDiscoverer, the soonest method that ModLauncher calls into Forge code.
|
* It is called from the ModDirTransformerDiscoverer, the soonest method that ModLauncher calls into Forge code.
|
||||||
@@ -84,10 +83,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
private ScheduledFuture<?> initializationFuture;
|
private ScheduledFuture<?> initializationFuture;
|
||||||
|
|
||||||
private PerformanceInfo performanceInfo;
|
private PerformanceInfo performanceInfo;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
private ScheduledFuture<?> performanceTick;
|
||||||
// The GL ID of the window. Used for all operations
|
// The GL ID of the window. Used for all operations
|
||||||
private long window;
|
private long window;
|
||||||
// The SDL Context we use for switching between threads
|
|
||||||
private long sdlContext;
|
|
||||||
// The thread that contains and ticks the window while Forge is loading mods
|
// The thread that contains and ticks the window while Forge is loading mods
|
||||||
private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
||||||
final var thread = Executors.defaultThreadFactory().newThread(r);
|
final var thread = Executors.defaultThreadFactory().newThread(r);
|
||||||
@@ -117,8 +116,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
@Override
|
@Override
|
||||||
public ImmediateWindowProvider selectBackend(String backend) {
|
public ImmediateWindowProvider selectBackend(String backend) {
|
||||||
// We only support opengl
|
// We only support opengl
|
||||||
//if ("default".equals(backend) || "opengl".equals(backend))
|
if ("default".equals(backend) || "opengl".equals(backend))
|
||||||
// return this;
|
return this;
|
||||||
return ImmediateWindowProvider.getFallbackHandler();
|
return ImmediateWindowProvider.getFallbackHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,7 +184,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
nextFrameTime = nt + MINFRAMETIME;
|
nextFrameTime = nt + MINFRAMETIME;
|
||||||
SDL_GL_MakeCurrent(window, sdlContext);
|
glfwMakeContextCurrent(window);
|
||||||
framebuffer.activate();
|
framebuffer.activate();
|
||||||
glViewport(0, 0, this.context.scaledWidth(), this.context.scaledHeight());
|
glViewport(0, 0, this.context.scaledWidth(), this.context.scaledHeight());
|
||||||
this.context.elementShader().activate();
|
this.context.elementShader().activate();
|
||||||
@@ -197,12 +196,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glViewport(0, 0, fbWidth, fbHeight);
|
glViewport(0, 0, fbWidth, fbHeight);
|
||||||
framebuffer.draw(this.fbWidth, this.fbHeight);
|
framebuffer.draw(this.fbWidth, this.fbHeight);
|
||||||
// Swap buffers; we're done
|
// Swap buffers; we're done
|
||||||
SDL_GL_SwapWindow(window);
|
glfwSwapBuffers(window);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
LOGGER.error("BARF", t);
|
LOGGER.error("BARF", t);
|
||||||
} finally {
|
} finally {
|
||||||
if (this.windowTick != null)
|
if (this.windowTick != null) glfwMakeContextCurrent(0); // we release the gl context IF we're running off the main thread
|
||||||
SDL_GL_MakeCurrent(window, 0); // we release the gl context IF we're running off the main thread
|
|
||||||
renderLock.release();
|
renderLock.release();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -214,18 +212,12 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
* Nothing fancy, we just want to draw and render text.
|
* Nothing fancy, we just want to draw and render text.
|
||||||
*/
|
*/
|
||||||
private void initRender(final @Nullable String mcVersion, final String forgeVersion) {
|
private void initRender(final @Nullable String mcVersion, final String forgeVersion) {
|
||||||
this.sdlContext = SDL_GL_CreateContext(window);
|
|
||||||
if (sdlContext == 0)
|
|
||||||
throw new IllegalStateException("Failed to create OpenGL context: " + SDL_GetError());
|
|
||||||
|
|
||||||
// This thread owns the GL render context now. We should make a note of that.
|
// This thread owns the GL render context now. We should make a note of that.
|
||||||
bindGlContext();
|
glfwMakeContextCurrent(window);
|
||||||
GL.createCapabilities();
|
|
||||||
|
|
||||||
// Wait for one frame to be complete before swapping; enable vsync in other words.
|
// Wait for one frame to be complete before swapping; enable vsync in other words.
|
||||||
SDL_GL_SetSwapInterval(1);
|
glfwSwapInterval(1);
|
||||||
|
createCapabilities();
|
||||||
LOGGER.info("GL info: " + glGetString(GL_RENDERER) + " GL version " + glGetString(GL_VERSION) + ", " + glGetString(GL_VENDOR));
|
LOGGER.info("GL info: "+ glGetString(GL_RENDERER) + " GL version " + glGetString(GL_VERSION) + ", " + glGetString(GL_VENDOR));
|
||||||
|
|
||||||
elementShader = new ElementShader();
|
elementShader = new ElementShader();
|
||||||
try {
|
try {
|
||||||
@@ -235,7 +227,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
crashElegantly("An error occurred initializing shaders.");
|
crashElegantly("An error occurred initializing shaders.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the clear color based on the color scheme
|
// Set the clear color based on the colour scheme
|
||||||
glClearColor(colourScheme.background().redf(), colourScheme.background().greenf(), colourScheme.background().bluef(), 1f);
|
glClearColor(colourScheme.background().redf(), colourScheme.background().greenf(), colourScheme.background().bluef(), 1f);
|
||||||
|
|
||||||
// we always render to an 854x480 texture and then fit that to the screen - with a scale factor
|
// we always render to an 854x480 texture and then fit that to the screen - with a scale factor
|
||||||
@@ -261,15 +253,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
glfwMakeContextCurrent(0);
|
||||||
releaseGlContext();
|
|
||||||
|
|
||||||
this.windowTick = renderScheduler.scheduleAtFixedRate(this::renderThreadFunc, 50, 50, TimeUnit.MILLISECONDS);
|
this.windowTick = renderScheduler.scheduleAtFixedRate(this::renderThreadFunc, 50, 50, TimeUnit.MILLISECONDS);
|
||||||
|
this.performanceTick = renderScheduler.scheduleAtFixedRate(performanceInfo::update, 0, 500, TimeUnit.MILLISECONDS);
|
||||||
// Update the performance information every 1/2 second
|
|
||||||
renderScheduler.scheduleAtFixedRate(performanceInfo::update, 0, 500, TimeUnit.MILLISECONDS);
|
|
||||||
// schedule a 50 ms ticker to try and smooth out the rendering
|
// schedule a 50 ms ticker to try and smooth out the rendering
|
||||||
//renderScheduler.scheduleAtFixedRate(() -> animationTimerTrigger.set(true), 1, 50, TimeUnit.MILLISECONDS);
|
renderScheduler.scheduleAtFixedRate(()-> animationTimerTrigger.set(true), 1, 50, TimeUnit.MILLISECONDS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -306,7 +294,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glBindVertexArray(currentVAO);
|
glBindVertexArray(currentVAO);
|
||||||
glBindFramebuffer(GL_FRAMEBUFFER, currentFB);
|
glBindFramebuffer(GL_FRAMEBUFFER, currentFB);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start the window and Render Thread; we're ready to go.
|
* Start the window and Render Thread; we're ready to go.
|
||||||
*/
|
*/
|
||||||
@@ -355,65 +342,71 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
* As long as we can verify that, then GL (and things like OS X) have no complaints with doing this.
|
* As long as we can verify that, then GL (and things like OS X) have no complaints with doing this.
|
||||||
*
|
*
|
||||||
* @param mcVersion Minecraft Version
|
* @param mcVersion Minecraft Version
|
||||||
|
* @return The selected GL profile as an integer pair
|
||||||
*/
|
*/
|
||||||
public void initWindow(@Nullable String mcVersion) {
|
public void initWindow(@Nullable String mcVersion) {
|
||||||
// Initialize a time guard, in case something goes wrong
|
// Initialize GLFW with a time guard, in case something goes wrong
|
||||||
long initBegin = System.nanoTime();
|
long glfwInitBegin = System.nanoTime();
|
||||||
if (!SDL_Init(SDL_INIT_VIDEO)) {
|
if (!glfwInit()) {
|
||||||
crashElegantly("We are unable to initialize the graphics system.\nSDL_Init failed.\n");
|
crashElegantly("We are unable to initialize the graphics system.\nglfwInit failed.\n");
|
||||||
throw new IllegalStateException("Unable to initialize SDL");
|
throw new IllegalStateException("Unable to initialize GLFW");
|
||||||
}
|
}
|
||||||
long initEnd = System.nanoTime();
|
long glfwInitEnd = System.nanoTime();
|
||||||
|
|
||||||
if (initEnd - initBegin > 1e9)
|
if (glfwInitEnd - glfwInitBegin > 1e9) {
|
||||||
LOGGER.error("WARNING : Window init took {} seconds to start.", (initEnd - initBegin) / 1.0e9);
|
LOGGER.error("WARNING : glfwInit took {} seconds to start.", (glfwInitEnd - glfwInitBegin) / 1.0e9);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear the Last Exception (#7285 - Prevent Vanilla throwing an IllegalStateException due to invalid controller mappings)
|
||||||
|
handleLastGLFWError((error, description) -> LOGGER.error(String.format("Suppressing Last GLFW error: [0x%X]%s", error, description)));
|
||||||
|
|
||||||
// Set window hints for the new window we're gonna create.
|
// Set window hints for the new window we're gonna create.
|
||||||
SDL_ResetHints();
|
glfwDefaultWindowHints();
|
||||||
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
|
||||||
|
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
|
||||||
|
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
|
||||||
|
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
|
||||||
|
|
||||||
String vanillaWindowTitle = "Minecraft* ";
|
String vanillaWindowTitle = "Minecraft* ";
|
||||||
if (mcVersion != null)
|
if (mcVersion != null) vanillaWindowTitle += mcVersion;
|
||||||
vanillaWindowTitle += mcVersion;
|
|
||||||
|
|
||||||
var primaryMonitor = SDL_GetPrimaryDisplay();
|
// this emulates what we would get without early progress window
|
||||||
|
// as vanilla never sets these, so GLFW uses the first window title
|
||||||
|
// set them explicitly to avoid it using "FML early loading progress" as the class
|
||||||
|
glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
|
||||||
|
glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
|
||||||
|
|
||||||
|
long primaryMonitor = glfwGetPrimaryMonitor();
|
||||||
if (primaryMonitor == 0) {
|
if (primaryMonitor == 0) {
|
||||||
LOGGER.error("Failed to find a primary monitor - this means LWJGL isn't working properly");
|
LOGGER.error("Failed to find a primary monitor - this means LWJGL isn't working properly");
|
||||||
crashElegantly("Failed to locate a primary monitor.\nSDL_GetPrimaryDisplay failed.\n");
|
crashElegantly("Failed to locate a primary monitor.\nglfwGetPrimaryMonitor failed.\n");
|
||||||
throw new IllegalStateException("Can't find a primary monitor");
|
throw new IllegalStateException("Can't find a primary monitor");
|
||||||
}
|
}
|
||||||
|
GLFWVidMode vidmode = glfwGetVideoMode(primaryMonitor);
|
||||||
|
|
||||||
var vidmode = SDL_GetDesktopDisplayMode(primaryMonitor);
|
|
||||||
if (vidmode == null) {
|
if (vidmode == null) {
|
||||||
LOGGER.error("Failed to get the current display video mode.");
|
LOGGER.error("Failed to get the current display video mode.");
|
||||||
crashElegantly("Failed to get current display resolution.\nSDL_GetDesktopDisplayMode failed.\n");
|
crashElegantly("Failed to get current display resolution.\nglfwGetVideoMode failed.\n");
|
||||||
throw new IllegalStateException("Can't get a resolution");
|
throw new IllegalStateException("Can't get a resolution");
|
||||||
}
|
}
|
||||||
|
|
||||||
long window = 0;
|
long window = 0;
|
||||||
var successfulWindow = new AtomicBoolean(false);
|
var successfulWindow = new AtomicBoolean(false);
|
||||||
var windowFailFuture = renderScheduler.schedule(() -> {
|
var windowFailFuture = renderScheduler.schedule(()->{
|
||||||
if (!successfulWindow.get())
|
if (!successfulWindow.get()) crashElegantly("Timed out trying to setup the Game Window.");
|
||||||
crashElegantly("Timed out trying to setup the Game Window.");
|
|
||||||
}, 10, TimeUnit.SECONDS);
|
}, 10, TimeUnit.SECONDS);
|
||||||
|
int versidx = 0;
|
||||||
var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
|
var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
|
||||||
boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
|
boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
|
||||||
|
final String[] lastGLError = new String[GL_VERSIONS.length];
|
||||||
record Attempt(String vesion, String error) {}
|
do {
|
||||||
final List<Attempt> attempts = new ArrayList<>();
|
final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
|
||||||
String requestedVersion = null;
|
if (skipVersions.contains(glVersionToTry)) {
|
||||||
|
LOGGER.info("Skipping GL version "+ glVersionToTry+" because of configuration");
|
||||||
for (int x = 0; x < GL_VERSIONS.length; x++) {
|
versidx++;
|
||||||
var version = GL_VERSIONS[x];
|
|
||||||
requestedVersion = version[0] + "." + version[1];
|
|
||||||
|
|
||||||
if (skipVersions.contains(requestedVersion)) {
|
|
||||||
LOGGER.info("Skipping GL version " + requestedVersion + " because of configuration");
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
LOGGER.info("Trying GL version " + glVersionToTry);
|
||||||
LOGGER.info("Trying GL version " + requestedVersion);
|
if (showHelpLog && versidx == 0) {
|
||||||
if (showHelpLog && x == 0) {
|
|
||||||
LOGGER.info("""
|
LOGGER.info("""
|
||||||
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
||||||
|
|
||||||
@@ -425,105 +418,132 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
You can safely ignore this message if the game starts up successfully.""");
|
You can safely ignore this message if the game starts up successfully.""");
|
||||||
}
|
}
|
||||||
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, version[0]);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, version[1]);
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
|
window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
|
||||||
SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, GL_TRUE);
|
var erridx = versidx;
|
||||||
window = SDL_CreateWindow(vanillaWindowTitle, winWidth, winHeight,
|
handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
|
||||||
SDL_WINDOW_OPENGL
|
if (lastGLError[versidx] != null) {
|
||||||
| SDL_WINDOW_RESIZABLE
|
LOGGER.trace(lastGLError[versidx]);
|
||||||
| SDL_WINDOW_HIGH_PIXEL_DENSITY
|
|
||||||
);
|
|
||||||
|
|
||||||
if (window == 0) {
|
|
||||||
var error = Objects.requireNonNullElse(SDLError.SDL_GetError(), "<no error>");
|
|
||||||
attempts.add(new Attempt(requestedVersion, error));
|
|
||||||
LOGGER.trace("Failed to create window using %d.%d: %s", version[0], version[1], error);
|
|
||||||
} else {
|
|
||||||
SDLVideo.SDL_SetWindowMinimumSize(window, 320, 240);
|
|
||||||
LOGGER.info("Created window using SDL video driver: {}", SDLVideo.SDL_GetCurrentVideoDriver());
|
|
||||||
break; // We got a valid window!
|
|
||||||
}
|
}
|
||||||
}
|
versidx++;
|
||||||
|
} while (window == 0 && versidx < GL_VERSIONS.length);
|
||||||
|
// LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(12));
|
||||||
|
if (versidx== GL_VERSIONS.length && window == 0) {
|
||||||
|
LOGGER.error("Failed to find any valid GLFW profile. "+lastGLError[0]);
|
||||||
|
|
||||||
if (window == 0) {
|
crashElegantly("Failed to find a valid GLFW profile.\nWe tried "+
|
||||||
LOGGER.error("Failed to find any valid GLFW profile.");
|
Arrays.stream(GL_VERSIONS).map(p->p[0]+"."+p[1]).filter(o -> !skipVersions.contains(o))
|
||||||
var message = new StringBuilder()
|
.collect(Collector.of(()->new StringJoiner(", ").setEmptyValue("no versions"), StringJoiner::add, StringJoiner::merge, StringJoiner::toString))+
|
||||||
.append("Failed to find a valid GLFW profile.\n");
|
" but none of them worked.\n"+ Arrays.stream(lastGLError).filter(Objects::nonNull).collect(Collectors.joining("\n")));
|
||||||
|
|
||||||
if (attempts.isEmpty()) {
|
|
||||||
message.append("All GL Versions were skipped");
|
|
||||||
} else {
|
|
||||||
message.append("We tried:");
|
|
||||||
for (var attempt : attempts)
|
|
||||||
message.append("\n\t").append(attempt.vesion).append(':').append(attempt.error);
|
|
||||||
}
|
|
||||||
|
|
||||||
crashElegantly(message.toString());
|
|
||||||
throw new IllegalStateException("Failed to create a GLFW window with any profile");
|
throw new IllegalStateException("Failed to create a GLFW window with any profile");
|
||||||
}
|
}
|
||||||
|
|
||||||
successfulWindow.set(true);
|
successfulWindow.set(true);
|
||||||
if (!windowFailFuture.cancel(true))
|
if (!windowFailFuture.cancel(true)) throw new IllegalStateException("We died but didn't somehow?");
|
||||||
throw new IllegalStateException("We died but didn't somehow?");
|
var requestedVersion = GL_VERSIONS[versidx-1][0]+"."+GL_VERSIONS[versidx-1][1];
|
||||||
|
var maj = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MAJOR);
|
||||||
try (var stack = org.lwjgl.system.MemoryStack.stackPush()) {
|
var min = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MINOR);
|
||||||
var majBuf = stack.mallocInt(1);
|
var gotVersion = maj+"."+min;
|
||||||
var minBuf = stack.mallocInt(1);
|
LOGGER.info("Requested GL version "+requestedVersion+" got version "+gotVersion);
|
||||||
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majBuf);
|
this.glVersion = gotVersion;
|
||||||
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minBuf);
|
|
||||||
this.glVersion = majBuf.get(0) + "." + minBuf.get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOGGER.info("Requested GL version " + requestedVersion + " got version " + this.glVersion);
|
|
||||||
this.window = window;
|
this.window = window;
|
||||||
|
|
||||||
if (showHelpLog)
|
if (showHelpLog)
|
||||||
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
|
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
|
||||||
|
|
||||||
if (this.maximized)
|
int[] x = new int[1];
|
||||||
SDL_MaximizeWindow(window);
|
int[] y = new int[1];
|
||||||
|
glfwGetMonitorPos(primaryMonitor, x, y);
|
||||||
|
int monitorX = x[0];
|
||||||
|
int monitorY = y[0];
|
||||||
|
// glfwSetWindowSizeLimits(window, 854, 480, GLFW_DONT_CARE, GLFW_DONT_CARE);
|
||||||
|
if (this.maximized) {
|
||||||
|
glfwMaximizeWindow(window);
|
||||||
|
}
|
||||||
|
|
||||||
var size = getWindowSize(window);
|
glfwGetWindowSize(window, x, y);
|
||||||
this.onWindowResize(size.x, size.y);
|
this.winWidth = x[0];
|
||||||
|
this.winHeight = y[0];
|
||||||
|
|
||||||
var monitor = getMonitorSize(primaryMonitor);
|
// Setting the window position isn't supported on wayland, so check the error here
|
||||||
if (monitor != null)
|
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
|
||||||
SDL_SetWindowPosition(window, (monitor.width - size.x) / 2 + monitor.x, (monitor.height - size.y) / 2 + monitor.y);
|
handleLastGLFWError();
|
||||||
|
|
||||||
pollEvents();
|
// Attempt setting the icon
|
||||||
|
// int[] channels = new int[1];
|
||||||
|
// try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
|
||||||
|
// final ByteBuffer imgBuffer;
|
||||||
|
// try (GLFWImage glfwImages = GLFWImage.malloc()) {
|
||||||
|
// imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
|
||||||
|
// glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
|
||||||
|
// glfwSetWindowIcon(window, glfwImgBuffer);
|
||||||
|
// STBImage.stbi_image_free(imgBuffer);
|
||||||
|
// }
|
||||||
|
// } catch (NullPointerException e) {
|
||||||
|
// System.err.println("Failed to load forge logo");
|
||||||
|
// }
|
||||||
|
// handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
|
||||||
|
|
||||||
SDL_ShowWindow(window);
|
glfwSetFramebufferSizeCallback(window, this::fbResize);
|
||||||
|
glfwSetWindowPosCallback(window, this::winMove);
|
||||||
|
glfwSetWindowSizeCallback(window, this::winResize);
|
||||||
|
|
||||||
|
// Show the window
|
||||||
|
glfwShowWindow(window);
|
||||||
|
// Getting the window position isn't supported on wayland, so check the error here
|
||||||
|
glfwGetWindowPos(window, x, y);
|
||||||
|
handleLastGLFWError();
|
||||||
|
|
||||||
|
this.winX = x[0];
|
||||||
|
this.winY = y[0];
|
||||||
|
glfwGetFramebufferSize(window, x, y);
|
||||||
|
this.fbWidth = x[0];
|
||||||
|
this.fbHeight = y[0];
|
||||||
|
glfwPollEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
private record Point(int x, int y) {}
|
private static void handleLastGLFWError() {
|
||||||
private record Rect(int x, int y, int width, int height) {}
|
handleLastGLFWError((error, description) -> {
|
||||||
|
if (error == GLFW_FEATURE_UNAVAILABLE) {
|
||||||
private static @Nullable Rect getMonitorSize(int monitor) {
|
// suppress window pos errors for unsupported platforms (wayland)
|
||||||
try (var bounds = SDL_Rect.malloc()) {
|
LOGGER.debug(String.format("Suppressing GLFW error: [0x%X]%s", error, description));
|
||||||
// Fetch the display bounds for the current index
|
return;
|
||||||
if (SDL_GetDisplayBounds(monitor, bounds)) {
|
|
||||||
int x = bounds.x();
|
|
||||||
int y = bounds.y();
|
|
||||||
int width = bounds.w();
|
|
||||||
int height = bounds.h();
|
|
||||||
LOGGER.info("Display {} Bounds -> X: {}, Y: {}, Width: {}, Height: {}", monitor, x, y, width, height);
|
|
||||||
return new Rect(x, y, width, height);
|
|
||||||
} else {
|
|
||||||
LOGGER.warn("Could not get bounds for display: " + SDL_GetError());
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
throw new IllegalStateException(String.format("GLFW error: [0x%X]%s", error, description));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void winResize(long window, int width, int height) {
|
||||||
|
if (window == this.window && width != 0 && height != 0) {
|
||||||
|
this.winWidth = width;
|
||||||
|
this.winHeight = height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private void fbResize(long window, int width, int height) {
|
||||||
|
if (window == this.window && width != 0 && height != 0) {
|
||||||
|
this.fbWidth = width;
|
||||||
|
this.fbHeight = height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Point getWindowSize(long window) {
|
private void winMove(long window, int x, int y) {
|
||||||
try (var stack = MemoryStack.stackPush()) {
|
if (window == this.window) {
|
||||||
var width = stack.mallocInt(1);
|
this.winX = x;
|
||||||
var height = stack.mallocInt(1);
|
this.winY = y;
|
||||||
SDL_GetWindowSize(window, width, height);
|
}
|
||||||
return new Point(width.get(0), height.get(0));
|
}
|
||||||
|
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
||||||
|
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
||||||
|
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
||||||
|
int error = glfwGetError(pointerbuffer);
|
||||||
|
if (error != GLFW_NO_ERROR) {
|
||||||
|
long pDescription = pointerbuffer.get();
|
||||||
|
String description = pDescription == 0L ? "" : MemoryUtil.memUTF8(pDescription);
|
||||||
|
handler.accept(error, description);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -533,8 +553,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
*
|
*
|
||||||
* @return the Window we own.
|
* @return the Window we own.
|
||||||
*/
|
*/
|
||||||
@Override
|
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
|
||||||
public long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend) {
|
|
||||||
// wait for the window to actually be initialized
|
// wait for the window to actually be initialized
|
||||||
try {
|
try {
|
||||||
this.initializationFuture.get(30, TimeUnit.SECONDS);
|
this.initializationFuture.get(30, TimeUnit.SECONDS);
|
||||||
@@ -566,10 +585,14 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
// we don't want the lock, just making sure it's back on the main thread
|
// we don't want the lock, just making sure it's back on the main thread
|
||||||
renderLock.release();
|
renderLock.release();
|
||||||
|
|
||||||
SDL_GL_MakeCurrent(window, sdlContext);
|
glfwMakeContextCurrent(window);
|
||||||
// Set the title to what the game wants
|
// Set the title to what the game wants
|
||||||
SDL_SetWindowTitle(window, title);
|
glfwSetWindowTitle(window, title);
|
||||||
SDL_GL_SetSwapInterval(0); // Disable vsync, let Minecraft control it
|
glfwSwapInterval(0);
|
||||||
|
// Clean up our hooks
|
||||||
|
glfwSetFramebufferSizeCallback(window, null).free();
|
||||||
|
glfwSetWindowPosCallback(window, null).free();
|
||||||
|
glfwSetWindowSizeCallback(window, null).free();
|
||||||
this.repaintTick = this::renderThreadFunc; // the repaint will continue to be called until the overlay takes over
|
this.repaintTick = this::renderThreadFunc; // the repaint will continue to be called until the overlay takes over
|
||||||
this.windowTick = null; // this tells the render thread that the async ticker is done
|
this.windowTick = null; // this tells the render thread that the async ticker is done
|
||||||
return window;
|
return window;
|
||||||
@@ -635,7 +658,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void periodicTick() {
|
public void periodicTick() {
|
||||||
pollEvents();
|
glfwPollEvents();
|
||||||
repaintTick.run();
|
repaintTick.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -650,67 +673,4 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.context.elementShader().close();
|
this.context.elementShader().close();
|
||||||
SimpleBufferBuilder.destroy();
|
SimpleBufferBuilder.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void bindGlContext() {
|
|
||||||
SDL_GL_MakeCurrent(window, sdlContext);
|
|
||||||
//if (!SDL_GL_MakeCurrent(window, sdlContext))
|
|
||||||
// throw new IllegalStateException("Failed to make OpenGL context current: " + SDL_GetError());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void releaseGlContext() {
|
|
||||||
SDL_GL_MakeCurrent(window, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void pollEvents() {
|
|
||||||
try (var event = SDL_Event.malloc()) {
|
|
||||||
while (SDL_PollEvent(event)) {
|
|
||||||
switch (event.type()) {
|
|
||||||
case SDL_EVENT_WINDOW_MOVED:
|
|
||||||
this.onWindowMove(event.window().data1(), event.window().data2());
|
|
||||||
break;
|
|
||||||
case SDL_EVENT_WINDOW_RESIZED:
|
|
||||||
this.onWindowResize(event.window().data1(), event.window().data2());
|
|
||||||
break;
|
|
||||||
case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
|
|
||||||
this.onFrameBufferResize(event.window().data1(), event.window().data2());
|
|
||||||
break;
|
|
||||||
|
|
||||||
/*
|
|
||||||
We were told to quit for some reason, find a way to abort?
|
|
||||||
case SDL_EVENT_QUIT:
|
|
||||||
case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
|
|
||||||
case SDL_EVENT_TERMINATING:
|
|
||||||
|
|
||||||
Window was minimized or restored, maybe stop rendering?
|
|
||||||
case SDL_EVENT_WINDOW_MINIMIZED:
|
|
||||||
case SDL_EVENT_WINDOW_MAXIMIZED:
|
|
||||||
case SDL_EVENT_WINDOW_RESTORED:
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onWindowResize(int width, int height) {
|
|
||||||
if (width == 0 || height == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
this.winWidth = width;
|
|
||||||
this.winHeight = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onFrameBufferResize(int width, int height) {
|
|
||||||
if (width == 0 || height == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
this.fbWidth = width;
|
|
||||||
this.fbHeight = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onWindowMove(int x, int y) {
|
|
||||||
this.winX = x;
|
|
||||||
this.winY = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,8 @@ import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import static org.lwjgl.opengl.GL32C.*;
|
import static org.lwjgl.opengl.GL32C.*;
|
||||||
|
|
||||||
public class RenderElement {
|
public class RenderElement {
|
||||||
@@ -37,6 +39,11 @@ public class RenderElement {
|
|||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
|
@FunctionalInterface
|
||||||
|
interface Initializer extends Supplier<Renderer> {}
|
||||||
|
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
interface TextGenerator {
|
interface TextGenerator {
|
||||||
void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
|
void accept(SimpleBufferBuilder bb, SimpleFont fh, DisplayContext ctx);
|
||||||
@@ -52,6 +59,13 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
|
public RenderElement(final Initializer rendererInitializer) {
|
||||||
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
|
this.renderer = rendererInitializer.get();
|
||||||
|
}
|
||||||
|
|
||||||
public RenderElement(Renderer renderer) {
|
public RenderElement(Renderer renderer) {
|
||||||
this.bb = new SimpleBufferBuilder(1);
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
this.renderer = renderer;
|
this.renderer = renderer;
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
id 'jvm-test-suite'
|
|
||||||
}
|
|
||||||
|
|
||||||
gradleutils.displayName = 'FMLLoader-Tests'
|
|
||||||
description = 'JUnit tests for FMLLoader, not meant for distribution'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
testImplementation(project(':fmlloader'))
|
|
||||||
testImplementation(libs.guava)
|
|
||||||
testImplementation(libs.junit.api)
|
|
||||||
testRuntimeOnly(libs.bundles.junit.runtime)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('test') {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
-172
@@ -1,172 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading.test;
|
|
||||||
|
|
||||||
import com.google.common.graph.Graph;
|
|
||||||
import com.google.common.graph.GraphBuilder;
|
|
||||||
import com.google.common.graph.MutableGraph;
|
|
||||||
|
|
||||||
import net.minecraftforge.fml.loading.toposort.CyclePresentException;
|
|
||||||
import net.minecraftforge.fml.loading.toposort.StronglyConnectedComponentDetector;
|
|
||||||
import net.minecraftforge.fml.loading.toposort.TopologicalSort;
|
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Assertions;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for {@link TopologicalSort} and {@link StronglyConnectedComponentDetector}
|
|
||||||
*/
|
|
||||||
class TopologicalSortTest {
|
|
||||||
@Test
|
|
||||||
void resultProperlySorted() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("a", "c");
|
|
||||||
graph.putEdge("b", "c");
|
|
||||||
var sorted = TopologicalSort.topologicalSort(graph, Comparator.naturalOrder());
|
|
||||||
assertEquals(List.of("a", "b", "c"), sorted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void throwsOnCycle() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("b", "a");
|
|
||||||
|
|
||||||
var exception = Assertions.assertThrows(CyclePresentException.class, () -> TopologicalSort.topologicalSort(graph, Comparator.naturalOrder()));
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("a", "b")
|
|
||||||
), exception.getCycles());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void simpleCycle() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
// a -> b -> c -> a
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("b", "c");
|
|
||||||
graph.putEdge("c", "a");
|
|
||||||
|
|
||||||
var cycles = cyclesOf(graph);
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("a", "b", "c")
|
|
||||||
), cycles);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void noCycle() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("a", "c");
|
|
||||||
graph.putEdge("b", "d");
|
|
||||||
graph.putEdge("c", "d");
|
|
||||||
graph.putEdge("d", "e");
|
|
||||||
|
|
||||||
var cycles = cyclesOf(graph);
|
|
||||||
assertTrue(cycles.isEmpty());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Regression test: the previous implementation lowered the lowlink of a node from every already-visited
|
|
||||||
* successor, including successors whose component was already completed. That merged nodes into the wrong
|
|
||||||
* component, so a member of the real cycle ({@code c}) was missing from the reported cycle.
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
void reportsAllMembersOfCycle() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
graph.addNode("a");
|
|
||||||
graph.addNode("b");
|
|
||||||
graph.addNode("c");
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("a", "c");
|
|
||||||
graph.putEdge("b", "a");
|
|
||||||
graph.putEdge("c", "b");
|
|
||||||
|
|
||||||
var cycles = cyclesOf(graph);
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("a", "b", "c")
|
|
||||||
), cycles);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Regression test: the previous implementation invented a cycle out of {@code c -> d -> a}, which is a plain
|
|
||||||
* path, because it compared against the DFS depth instead of a discovery counter and ignored whether a
|
|
||||||
* successor was still on the stack.
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
void doesNotInventCycles() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
graph.addNode("a");
|
|
||||||
graph.addNode("b");
|
|
||||||
graph.addNode("c");
|
|
||||||
graph.addNode("d");
|
|
||||||
graph.putEdge("a", "b");
|
|
||||||
graph.putEdge("b", "a");
|
|
||||||
graph.putEdge("c", "d");
|
|
||||||
graph.putEdge("d", "a");
|
|
||||||
|
|
||||||
var cycles = cyclesOf(graph);
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("a", "b")
|
|
||||||
), cycles);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reproduces the shape of the mod graphs that reported bogus cycles in the wild: one real three-node cycle,
|
|
||||||
* with nodes that merely depend on members of the cycle and a node on a plain path into it.
|
|
||||||
*
|
|
||||||
* <p>Every reported component must be the real cycle itself; nodes such as {@code dependent_a} only depend on
|
|
||||||
* the cycle and must not be reported.
|
|
||||||
*
|
|
||||||
* @see <a href="https://github.com/MinecraftForge/MinecraftForge/pull/10924">related GitHub issue</a>
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
void reportsOnlyRealCycles() {
|
|
||||||
MutableGraph<String> graph = GraphBuilder.directed().build();
|
|
||||||
// Mirrors the insertion order of ModSorter: every mod is added as a node first, edges are added afterwards.
|
|
||||||
for (String mod : List.of("upstream", "cycle_a", "cycle_b", "dependent_a", "cycle_c", "dependent_b")) {
|
|
||||||
graph.addNode(mod);
|
|
||||||
}
|
|
||||||
// a -> b -> a
|
|
||||||
graph.putEdge("cycle_a", "cycle_b");
|
|
||||||
graph.putEdge("cycle_b", "cycle_a");
|
|
||||||
// a -> c -> b -> a
|
|
||||||
graph.putEdge("cycle_a", "cycle_c");
|
|
||||||
graph.putEdge("cycle_c", "cycle_b");
|
|
||||||
// dA -> b -> a - Valid
|
|
||||||
graph.putEdge("dependent_a", "cycle_b");
|
|
||||||
// dB -> b -> a - Valid
|
|
||||||
graph.putEdge("dependent_b", "cycle_b");
|
|
||||||
// u -> a -> b -> a - Not valid, but u is not part of the cycle so shouldn't be reported
|
|
||||||
graph.putEdge("upstream", "cycle_a");
|
|
||||||
|
|
||||||
var cycles = cyclesOf(graph);
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("cycle_a", "cycle_b", "cycle_c")
|
|
||||||
), cycles);
|
|
||||||
|
|
||||||
var exception = Assertions.assertThrows(CyclePresentException.class, () -> TopologicalSort.topologicalSort(graph, Comparator.naturalOrder()));
|
|
||||||
assertEquals(Set.of(
|
|
||||||
Set.of("cycle_a", "cycle_b", "cycle_c")
|
|
||||||
), exception.getCycles());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Set<Set<String>> cyclesOf(Graph<String> graph) {
|
|
||||||
var detector = new StronglyConnectedComponentDetector<>(graph);
|
|
||||||
var connected = detector.getComponents();
|
|
||||||
var cycles = new HashSet<>(connected);
|
|
||||||
cycles.removeIf(component -> component.size() < 2);
|
|
||||||
return cycles;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+120
-16
@@ -1,15 +1,44 @@
|
|||||||
|
import groovy.transform.CompileDynamic
|
||||||
|
import groovy.transform.CompileStatic
|
||||||
|
import groovy.transform.PackageScope
|
||||||
import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions
|
import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions
|
||||||
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'java-library'
|
||||||
|
id 'jvm-test-suite'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
alias libs.plugins.apt
|
alias libs.plugins.apt
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'FMLLoader'
|
gradleutils.displayName = 'FMLLoader'
|
||||||
description = 'Mod Locator and manager for Minecraft Forge.'
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the installer
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
|
// TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller
|
||||||
api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
||||||
api(libs.forgespi ){ transitive = false }
|
api(libs.forgespi ){ transitive = false }
|
||||||
api(libs.mergetool.api ){ transitive = false }
|
api(libs.mergetool.api ){ transitive = false }
|
||||||
@@ -29,6 +58,7 @@ dependencies {
|
|||||||
implementation(libs.securemodules ){ transitive = false }
|
implementation(libs.securemodules ){ transitive = false }
|
||||||
implementation(libs.accesstransformers ){ transitive = false }
|
implementation(libs.accesstransformers ){ transitive = false }
|
||||||
implementation(libs.terminalconsoleappender){ transitive = false }
|
implementation(libs.terminalconsoleappender){ transitive = false }
|
||||||
|
implementation(libs.jimfs ){ transitive = false }
|
||||||
implementation(libs.roimfs ){ transitive = false }
|
implementation(libs.roimfs ){ transitive = false }
|
||||||
|
|
||||||
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
|
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
|
||||||
@@ -36,19 +66,93 @@ dependencies {
|
|||||||
annotationProcessor(libs.bundles.log4j){ transitive = false }
|
annotationProcessor(libs.bundles.log4j){ transitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/loading/', [
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
|
dependencies {
|
||||||
'Forge-Module-Layer' : 'boot'
|
compileOnly libs.jetbrains.annotations
|
||||||
])
|
runtimeOnly libs.bootstrap
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
convention.publish()
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
|
||||||
|
'Forge-Module-Layer' : 'boot'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/fml/loading/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A simple task to write JSON to a file. Using Task#doLast to output files is no longer supported.
|
||||||
|
// This code may seem verbose, but it's better this way. If more projects need this, we can move it to buildSrc.
|
||||||
|
@CompileStatic
|
||||||
|
@PackageScope abstract class WriteForgeVersionJson extends DefaultTask {
|
||||||
|
abstract @Input Property<String> getForgeVersion()
|
||||||
|
abstract @Input Property<String> getMinecraftVersion()
|
||||||
|
abstract @Input Property<String> getMcpVersion()
|
||||||
|
|
||||||
|
abstract @OutputFile RegularFileProperty getOutputFile()
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
WriteForgeVersionJson() {}
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
@CompileDynamic
|
||||||
|
void exec() {
|
||||||
|
var json = new groovy.json.JsonBuilder()
|
||||||
|
json {
|
||||||
|
forge this.forgeVersion.get()
|
||||||
|
mc this.minecraftVersion.get()
|
||||||
|
mcp this.mcpVersion.get()
|
||||||
|
}
|
||||||
|
this.outputFile.asFile.get().text = json.toPrettyString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('writeForgeVersionJson', WriteForgeVersionJson) {
|
||||||
|
forgeVersion = project.forgeVersion
|
||||||
|
minecraftVersion = project.minecraftVersion
|
||||||
|
mcpVersion = project.mcpVersion
|
||||||
|
|
||||||
final forgeJson = convention.forgeVersionJson {
|
|
||||||
outputFile = file('src/main/resources/forge_version.json')
|
outputFile = file('src/main/resources/forge_version.json')
|
||||||
}
|
}
|
||||||
|
|
||||||
final jarJarJson = tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
|
tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
|
||||||
metadataFile = file('src/main/resources/jarjar_options.json')
|
metadataFile = project.file('src/main/resources/jarjar_options.json')
|
||||||
// This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually...
|
// This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually...
|
||||||
//add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class')
|
//add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class')
|
||||||
add(libs.mixinextras.forge) {
|
add(libs.mixinextras.forge) {
|
||||||
@@ -64,11 +168,11 @@ final jarJarJson = tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
|
|||||||
|
|
||||||
tasks.named('generateResources') {
|
tasks.named('generateResources') {
|
||||||
dependsOn(
|
dependsOn(
|
||||||
tasks.named('eclipseJdt'),
|
tasks.named('eclipseJdt'),
|
||||||
tasks.named('eclipseJdtApt'),
|
tasks.named('eclipseJdtApt'),
|
||||||
tasks.named('eclipseFactorypath'),
|
tasks.named('eclipseFactorypath'),
|
||||||
forgeJson,
|
tasks.named('writeForgeVersionJson', WriteForgeVersionJson),
|
||||||
jarJarJson
|
tasks.named('jarJarOptionsJson')
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
classNode.methods.stream().filter(m -> m.name.equals("<init>")).forEach(m -> sb.append(" : ").append(m.desc).append("\n"));
|
classNode.methods.stream().filter(m -> m.name.equals("<init>")).forEach(m -> sb.append(" : ").append(m.desc).append("\n"));
|
||||||
LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
|
LOGGER.error(LogUtils.FATAL_MARKER, sb.toString());
|
||||||
}
|
}
|
||||||
throw new IllegalStateException("Enum has create method with no matching constructor: " + classType.getClassName() + " " + desc);
|
throw new IllegalStateException("Enum has create method with no matching constructor: " + desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (values == null)
|
if (values == null)
|
||||||
|
|||||||
@@ -102,8 +102,8 @@ public class ImmediateWindowHandler {
|
|||||||
return "default";
|
return "default";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend) {
|
public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
||||||
return provider.setupMinecraftWindow(width, height, title, backend);
|
return provider.setupMinecraftWindow(width, height, title, monitor, backend);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
|
public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
|
||||||
@@ -155,9 +155,9 @@ public class ImmediateWindowHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend) {
|
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
||||||
try {
|
try {
|
||||||
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, backend);
|
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
|
||||||
return longsupplier.getAsLong();
|
return longsupplier.getAsLong();
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
throw new IllegalStateException("How did you get here?", e);
|
throw new IllegalStateException("How did you get here?", e);
|
||||||
|
|||||||
@@ -86,9 +86,10 @@ public interface ImmediateWindowProvider {
|
|||||||
* @param width This is the width of the window Mojang expects
|
* @param width This is the width of the window Mojang expects
|
||||||
* @param height This is the height of the Window Mojang expects.
|
* @param height This is the height of the Window Mojang expects.
|
||||||
* @param title This is the title for the window.
|
* @param title This is the title for the window.
|
||||||
|
* @param monitor This is the monitor it should appear on.
|
||||||
* @return The window id
|
* @return The window id
|
||||||
*/
|
*/
|
||||||
long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend);
|
long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
|
* This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
|
||||||
|
|||||||
@@ -5,16 +5,39 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading.targets;
|
package net.minecraftforge.fml.loading.targets;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.StandardOpenOption;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
import org.objectweb.asm.AnnotationVisitor;
|
||||||
|
import org.objectweb.asm.ClassReader;
|
||||||
|
import org.objectweb.asm.ClassVisitor;
|
||||||
|
import org.objectweb.asm.Opcodes;
|
||||||
|
|
||||||
|
import com.electronwill.nightconfig.core.Config;
|
||||||
|
import com.electronwill.nightconfig.core.file.FileNotFoundAction;
|
||||||
|
import com.electronwill.nightconfig.core.io.WritingMode;
|
||||||
|
import com.electronwill.nightconfig.toml.TomlParser;
|
||||||
|
import com.electronwill.nightconfig.toml.TomlWriter;
|
||||||
|
import com.google.common.jimfs.Jimfs;
|
||||||
|
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
|
import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
|
||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
import net.minecraftforge.forgespi.locating.IModLocator;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ForgeDevLocator extends AbstractModProvider implements IModLocator {
|
public final class ForgeDevLocator extends AbstractModProvider implements IModLocator {
|
||||||
|
private static final String PACK_META = "pack.mcmeta";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
return "forge_dev_locator";
|
return "forge_dev_locator";
|
||||||
@@ -48,6 +71,228 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
var ret = new ArrayList<Path>();
|
var ret = new ArrayList<Path>();
|
||||||
ret.add(forge);
|
ret.add(forge);
|
||||||
|
|
||||||
|
var isTest = Boolean.getBoolean("forgedev.enableTestMods");
|
||||||
|
if (!isTest)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class", ClassLoader.getSystemClassLoader());
|
||||||
|
// Explode our test mods into a framework that treats them all as separate jars.
|
||||||
|
var tests = explodeTestMods(test);
|
||||||
|
ret.addAll(tests);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static List<Path> explodeTestMods(Path path) {
|
||||||
|
var mod = new ArrayList<Path>();
|
||||||
|
var memory = Jimfs.newFileSystem();
|
||||||
|
|
||||||
|
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
||||||
|
var packages = findTestModPackages(path);
|
||||||
|
for (var entry : packages.entrySet()) {
|
||||||
|
var pkg = entry.getKey() + '/';
|
||||||
|
var modids = entry.getValue();
|
||||||
|
|
||||||
|
// Find resource directories for every mod in this group
|
||||||
|
var paths = new LinkedHashSet<Path>();
|
||||||
|
for (var modid : modids.stream().sorted().toList()) {
|
||||||
|
var rsc = path.resolve(modid);
|
||||||
|
if (Files.exists(rsc))
|
||||||
|
paths.add(rsc);
|
||||||
|
}
|
||||||
|
|
||||||
|
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
||||||
|
buildModsToml(paths, modids, root, pkg.startsWith("net/minecraftforge/debug/client/"));
|
||||||
|
buildPackMeta(paths, root);
|
||||||
|
moveModuleInfo(paths, root);
|
||||||
|
|
||||||
|
if (Files.exists(root))
|
||||||
|
paths.add(root);
|
||||||
|
|
||||||
|
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
||||||
|
var classes = UnionHelper.newFileSystem(
|
||||||
|
(name, _) -> {
|
||||||
|
if (name.endsWith("/")) {
|
||||||
|
if (name.startsWith("/"))
|
||||||
|
name = name.substring(1);
|
||||||
|
return pkg.startsWith(name) || name.startsWith(pkg);
|
||||||
|
}
|
||||||
|
return name.endsWith(".class") && name.startsWith(pkg);
|
||||||
|
}, new Path[] { path }
|
||||||
|
);
|
||||||
|
|
||||||
|
paths.addFirst(classes.getRootDirectories().iterator().next());
|
||||||
|
|
||||||
|
// Union of unions, Yay!
|
||||||
|
var union = UnionHelper.newFileSystem(null, paths.stream().toArray(Path[]::new));
|
||||||
|
mod.add(union.getRootDirectories().iterator().next());
|
||||||
|
}
|
||||||
|
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
|
||||||
|
// I could make it merge all the way up, but I think this would be fine.
|
||||||
|
private static Map<String, Set<String>> findTestModPackages(Path path) {
|
||||||
|
var mods = new HashMap<String, Set<String>>();
|
||||||
|
try (var files = Files.walk(path)) {
|
||||||
|
var classes = files
|
||||||
|
.filter(Files::isRegularFile)
|
||||||
|
.filter(p -> p.getFileName().toString().endsWith(".class"))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
for (var cls : classes) {
|
||||||
|
try (var is = Files.newInputStream(cls)) {
|
||||||
|
var reader = new ClassReader(is);
|
||||||
|
reader.accept(new ClassVisitor(Opcodes.ASM9) {
|
||||||
|
private String clsName;
|
||||||
|
@Override
|
||||||
|
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
||||||
|
this.clsName = name;
|
||||||
|
super.visit(version, access, name, signature, superName, interfaces);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AnnotationVisitor visitAnnotation(String name, boolean runtime) {
|
||||||
|
if (!"Lnet/minecraftforge/fml/common/Mod;".equals(name))
|
||||||
|
return super.visitAnnotation(name, runtime);
|
||||||
|
|
||||||
|
return new AnnotationVisitor(Opcodes.ASM9) {
|
||||||
|
@Override
|
||||||
|
public void visit(String key, Object value) {
|
||||||
|
if ("value".equals(key)) {
|
||||||
|
int idx = clsName.lastIndexOf('/');
|
||||||
|
var pkg = clsName.substring(0, idx);
|
||||||
|
mods.computeIfAbsent(pkg, _ -> new HashSet<>()).add((String)value);
|
||||||
|
|
||||||
|
idx = pkg.lastIndexOf('/');
|
||||||
|
while (idx != -1) {
|
||||||
|
pkg = pkg.substring(0, idx);
|
||||||
|
idx = pkg.lastIndexOf('/');
|
||||||
|
if (mods.containsKey(pkg))
|
||||||
|
throw new IllegalStateException("Invalid ForgeDev test mod layout, conflicting packages: " + pkg + " for " + clsName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
sneak(e);
|
||||||
|
}
|
||||||
|
return mods;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Builds or update the mods.toml file for all @Mods in this package
|
||||||
|
private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root, boolean clientOnly) {
|
||||||
|
var toml = resources.stream()
|
||||||
|
.map(p -> p.resolve(MODS_TOML))
|
||||||
|
.filter(Files::exists)
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
Config cfg = null;
|
||||||
|
|
||||||
|
if (toml != null)
|
||||||
|
cfg = new TomlParser().parse(toml, FileNotFoundAction.READ_NOTHING);
|
||||||
|
else
|
||||||
|
cfg = Config.inMemory();
|
||||||
|
|
||||||
|
boolean modified = false;
|
||||||
|
var defaults = Map.of(
|
||||||
|
"modLoader", "javafml",
|
||||||
|
"loaderVersion", "[0,)",
|
||||||
|
"license", "Doesnt fucking matter",
|
||||||
|
"clientSideOnly", clientOnly
|
||||||
|
);
|
||||||
|
|
||||||
|
for (var key : defaults.keySet()) {
|
||||||
|
if (!cfg.contains(key)) {
|
||||||
|
cfg.set(key, defaults.get(key));
|
||||||
|
modified = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var modlist = new ArrayList<Config>();
|
||||||
|
if (cfg.contains("mods")) {
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
var existing = ((List<Config>)cfg.get("mods"));
|
||||||
|
modlist.addAll(existing);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var modid : modids) {
|
||||||
|
if (modlist.stream().noneMatch(c -> modid.equals(c.get("modId")))) {
|
||||||
|
modified = true;
|
||||||
|
var tmp = Config.inMemory();
|
||||||
|
tmp.set("modId", modid);
|
||||||
|
modlist.add(tmp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.set("mods", modlist);
|
||||||
|
|
||||||
|
if (modified) {
|
||||||
|
var target = root.resolve(MODS_TOML);
|
||||||
|
try {
|
||||||
|
Files.createDirectories(target.getParent());
|
||||||
|
new TomlWriter().write(cfg, target, WritingMode.REPLACE);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new IllegalStateException("Failed to create in memory toml: " + target, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
|
||||||
|
private static void buildPackMeta(Set<Path> paths, Path root) {
|
||||||
|
var existing = paths.stream()
|
||||||
|
.map(p -> p.resolve(PACK_META))
|
||||||
|
.filter(Files::exists)
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
if (existing != null)
|
||||||
|
return;
|
||||||
|
var target = root.resolve(PACK_META);
|
||||||
|
try {
|
||||||
|
Files.createDirectories(target.getParent());
|
||||||
|
Files.writeString(target,
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"pack": {
|
||||||
|
"description": "doesn't matter",
|
||||||
|
"pack_format": 18
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""", StandardCharsets.UTF_8, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new IllegalStateException("Failed to make in memory pack.mcmeta: " + target, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void moveModuleInfo(Set<Path> paths, Path root) {
|
||||||
|
var existing = paths.stream()
|
||||||
|
.map(p -> p.resolve("module-info.dat"))
|
||||||
|
.filter(Files::exists)
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
if (existing == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var target = root.resolve("module-info.class");
|
||||||
|
try {
|
||||||
|
Files.createDirectories(target.getParent());
|
||||||
|
Files.copy(existing, target);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new IllegalStateException("Failed to copy module-info.dat to memory: " + target, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
||||||
|
throw (E)e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+28
-26
@@ -22,18 +22,15 @@ import java.util.Set;
|
|||||||
*
|
*
|
||||||
* <p>This detector evaluates the graph lazily and won't reflect the modifications in the
|
* <p>This detector evaluates the graph lazily and won't reflect the modifications in the
|
||||||
* graph after initial evaluation.
|
* graph after initial evaluation.
|
||||||
*
|
|
||||||
* <p> Implementation based on <a href="https://en.wikipedia.org/w/index.php?title=Tarjan%27s_strongly_connected_components_algorithm&oldid=1384955226">Wikipedia Psudocode</a>
|
|
||||||
*/
|
*/
|
||||||
public class StronglyConnectedComponentDetector<T> {
|
public class StronglyConnectedComponentDetector<T> {
|
||||||
private final Graph<T> graph;
|
private final Graph<T> graph;
|
||||||
private final Map<T, Integer> ids = new HashMap<>();
|
private final Map<T, Integer> ids = new HashMap<>();
|
||||||
private T[] elements;
|
private T[] elements;
|
||||||
private int[] indexes;
|
private int[] dfn;
|
||||||
private int[] lowlinks;
|
private int[] low;
|
||||||
private int[] stack;
|
private int[] stack;
|
||||||
private int top;
|
private int top;
|
||||||
private int index;
|
|
||||||
private BitSet onStack;
|
private BitSet onStack;
|
||||||
private Set<Set<T>> components;
|
private Set<Set<T>> components;
|
||||||
|
|
||||||
@@ -61,43 +58,48 @@ public class StronglyConnectedComponentDetector<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int n = nodes.size();
|
final int n = nodes.size();
|
||||||
indexes = new int[n];
|
dfn = new int[n];
|
||||||
lowlinks = new int[n];
|
low = new int[n];
|
||||||
stack = new int[n];
|
stack = new int[n];
|
||||||
onStack = new BitSet(n);
|
onStack = new BitSet(n);
|
||||||
top = -1;
|
top = -1;
|
||||||
index = 1;
|
|
||||||
for (int i = 0; i < n; i++) {
|
for (int i = 0; i < n; i++) {
|
||||||
if (indexes[i] == 0)
|
if (dfn[i] == 0) {
|
||||||
dfs(i);
|
dfs(i, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dfs(int now) {
|
private void dfs(int now, int depth) {
|
||||||
indexes[now] = lowlinks[now] = index++;
|
dfn[now] = depth;
|
||||||
stack[++top] = now;
|
low[now] = depth;
|
||||||
|
top++;
|
||||||
|
stack[top] = now;
|
||||||
onStack.set(now);
|
onStack.set(now);
|
||||||
|
|
||||||
for (T each : graph.successors(elements[now])) {
|
for (T each : graph.successors(elements[now])) {
|
||||||
int to = ids.get(each);
|
int to = ids.get(each);
|
||||||
if (indexes[to] == 0) { // 0 is unvisited
|
if (dfn[to] != 0) {
|
||||||
dfs(to);
|
if (low[now] > dfn[to]) {
|
||||||
if (lowlinks[now] > lowlinks[to])
|
low[now] = dfn[to];
|
||||||
lowlinks[now] = lowlinks[to];
|
}
|
||||||
} else if (onStack.get(to)) {
|
} else {
|
||||||
if (lowlinks[now] > indexes[to])
|
dfs(to, depth + 1);
|
||||||
lowlinks[now] = indexes[to];
|
if (low[now] > low[to]) {
|
||||||
|
low[now] = low[to];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (indexes[now] == lowlinks[now]) {
|
if (dfn[now] == low[now]) {
|
||||||
Set<T> component = new HashSet<>();
|
Set<T> component = new HashSet<>();
|
||||||
while (top >= 0) {
|
while (top >= 0) {
|
||||||
final int w = stack[top--];
|
final int t = stack[top];
|
||||||
onStack.clear(w);
|
component.add(elements[t]);
|
||||||
component.add(elements[w]);
|
onStack.clear(t);
|
||||||
if (w == now)
|
top--;
|
||||||
|
if (t == now) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
components.add(component);
|
components.add(component);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
}
|
|
||||||
|
|
||||||
gradleutils.displayName = 'Forge-Examiner'
|
|
||||||
description = 'Forge Mod Locator for multiple mods merged together into one code source'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation project(':fmlloader')
|
|
||||||
implementation(libs.jimfs){ transitive = false }
|
|
||||||
implementation(libs.bootstrap.api)
|
|
||||||
}
|
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/examiner/', [
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.examiner',
|
|
||||||
'Forge-Module-Layer' : 'boot'
|
|
||||||
])
|
|
||||||
|
|
||||||
convention.publish()
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.examiner;
|
|
||||||
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraftforge.bootstrap.api.BootstrapClasspathModifier;
|
|
||||||
|
|
||||||
public class BootstrapFilter implements BootstrapClasspathModifier {
|
|
||||||
@Override
|
|
||||||
public String name() {
|
|
||||||
return "examiner";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean process(List<Path[]> classpath) {
|
|
||||||
var modified = false;
|
|
||||||
|
|
||||||
for (var itr = classpath.iterator(); itr.hasNext(); ) {
|
|
||||||
for (var path : itr.next()) {
|
|
||||||
final var target = path.resolve(Locator.MARKER);
|
|
||||||
if (Files.exists(target)) {
|
|
||||||
itr.remove();
|
|
||||||
modified = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return modified;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,338 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.examiner;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.StandardOpenOption;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.objectweb.asm.AnnotationVisitor;
|
|
||||||
import org.objectweb.asm.ClassReader;
|
|
||||||
import org.objectweb.asm.ClassVisitor;
|
|
||||||
import org.objectweb.asm.Opcodes;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.Config;
|
|
||||||
import com.electronwill.nightconfig.core.file.FileNotFoundAction;
|
|
||||||
import com.electronwill.nightconfig.core.io.WritingMode;
|
|
||||||
import com.electronwill.nightconfig.toml.TomlParser;
|
|
||||||
import com.electronwill.nightconfig.toml.TomlWriter;
|
|
||||||
import com.google.common.jimfs.Jimfs;
|
|
||||||
import com.mojang.logging.LogUtils;
|
|
||||||
|
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
|
|
||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
|
||||||
|
|
||||||
public class Locator extends AbstractModProvider implements IModLocator {
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
|
||||||
static final String MARKER = ".examiner";
|
|
||||||
private static final String PACK_META = "pack.mcmeta";
|
|
||||||
private static final String PROJECT_INFO = ".project_info.properties";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String name() {
|
|
||||||
return "examiner";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ModFileOrException> scanMods() {
|
|
||||||
var mods = getMods();
|
|
||||||
var ret = new ArrayList<ModFileOrException>();
|
|
||||||
for (var path : mods) {
|
|
||||||
var mod = createMod(path);
|
|
||||||
if (mod != null)
|
|
||||||
ret.add(mod);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private Collection<Path> getMods() {
|
|
||||||
var ret = new HashSet<Path>();
|
|
||||||
var cl = ClassLoader.getSystemClassLoader();
|
|
||||||
var markers = getUrls(cl, MARKER);
|
|
||||||
markers.addAll(getUrls(getClass().getClassLoader(), MARKER));
|
|
||||||
for (var url : markers) {
|
|
||||||
var path = getPath(url, MARKER);
|
|
||||||
var mods = explodeTestMods(path);
|
|
||||||
for (var mod : mods)
|
|
||||||
ret.add(mod);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Set<URL> getUrls(ClassLoader cl, String resource) {
|
|
||||||
try {
|
|
||||||
var lst = Collections.list(cl.getResources(resource));
|
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
|
||||||
lst.sort(Comparator.comparing(URL::toString));
|
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
|
|
||||||
for (var url : lst)
|
|
||||||
LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
|
|
||||||
}
|
|
||||||
return new LinkedHashSet<URL>(lst);
|
|
||||||
} catch (IOException e) {
|
|
||||||
LOGGER.warn(LogMarkers.SCAN, "Error finding resources for: " + resource, e);
|
|
||||||
return Set.of();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Path getPath(URL url, String resource) {
|
|
||||||
var str = url.toString();
|
|
||||||
int len = resource.length();
|
|
||||||
if ("jar".equalsIgnoreCase(url.getProtocol())) {
|
|
||||||
str = url.getFile();
|
|
||||||
len += 2;
|
|
||||||
}
|
|
||||||
str = str.substring(0, str.length() - len);
|
|
||||||
return Path.of(URI.create(str));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private static List<Path> explodeTestMods(Path path) {
|
|
||||||
var mod = new ArrayList<Path>();
|
|
||||||
var memory = Jimfs.newFileSystem();
|
|
||||||
|
|
||||||
var info = path.resolve(PROJECT_INFO);
|
|
||||||
if (!Files.exists(info))
|
|
||||||
info = null;
|
|
||||||
|
|
||||||
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
|
||||||
var packages = findTestModPackages(path);
|
|
||||||
|
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
|
||||||
var ordered = packages.entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.toString())).toList();
|
|
||||||
for (var entry : ordered)
|
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Examiner located {} with mods {}", entry.getKey(), entry.getValue().stream().sorted().toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var entry : packages.entrySet()) {
|
|
||||||
var pkg = entry.getKey() + '/';
|
|
||||||
var modids = entry.getValue();
|
|
||||||
|
|
||||||
// Find resource directories for every mod in this group
|
|
||||||
var paths = new LinkedHashSet<Path>();
|
|
||||||
for (var modid : modids.stream().sorted().toList()) {
|
|
||||||
var rsc = path.resolve(modid);
|
|
||||||
if (Files.exists(rsc))
|
|
||||||
paths.add(rsc);
|
|
||||||
}
|
|
||||||
|
|
||||||
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
|
||||||
buildModsToml(paths, modids, root, pkg.startsWith("net/minecraftforge/debug/client/"));
|
|
||||||
buildPackMeta(paths, root);
|
|
||||||
moveModuleInfo(paths, root);
|
|
||||||
copyFile(info, root.resolve(PROJECT_INFO));
|
|
||||||
|
|
||||||
if (Files.exists(root))
|
|
||||||
paths.add(root);
|
|
||||||
|
|
||||||
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
|
||||||
var classes = UnionHelper.newFileSystem(
|
|
||||||
(name, _) -> {
|
|
||||||
if (name.endsWith("/")) {
|
|
||||||
if (name.startsWith("/"))
|
|
||||||
name = name.substring(1);
|
|
||||||
return pkg.startsWith(name) || name.startsWith(pkg);
|
|
||||||
}
|
|
||||||
return name.endsWith(".class") && name.startsWith(pkg);
|
|
||||||
}, new Path[] { path }
|
|
||||||
);
|
|
||||||
|
|
||||||
paths.addFirst(classes.getRootDirectories().iterator().next());
|
|
||||||
|
|
||||||
// Union of unions, Yay!
|
|
||||||
var union = UnionHelper.newFileSystem(null, paths.stream().toArray(Path[]::new));
|
|
||||||
mod.add(union.getRootDirectories().iterator().next());
|
|
||||||
}
|
|
||||||
|
|
||||||
return mod;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
|
|
||||||
// I could make it merge all the way up, but I think this would be fine.
|
|
||||||
private static Map<String, Set<String>> findTestModPackages(Path path) {
|
|
||||||
var mods = new HashMap<String, Set<String>>();
|
|
||||||
try (var files = Files.walk(path)) {
|
|
||||||
var classes = files
|
|
||||||
.filter(Files::isRegularFile)
|
|
||||||
.filter(p -> p.getFileName().toString().endsWith(".class"))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
for (var cls : classes) {
|
|
||||||
try (var is = Files.newInputStream(cls)) {
|
|
||||||
var reader = new ClassReader(is);
|
|
||||||
reader.accept(new ClassVisitor(Opcodes.ASM9) {
|
|
||||||
private String clsName;
|
|
||||||
@Override
|
|
||||||
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
|
||||||
this.clsName = name;
|
|
||||||
super.visit(version, access, name, signature, superName, interfaces);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AnnotationVisitor visitAnnotation(String name, boolean runtime) {
|
|
||||||
if (!"Lnet/minecraftforge/fml/common/Mod;".equals(name))
|
|
||||||
return super.visitAnnotation(name, runtime);
|
|
||||||
|
|
||||||
return new AnnotationVisitor(Opcodes.ASM9) {
|
|
||||||
@Override
|
|
||||||
public void visit(String key, Object value) {
|
|
||||||
if ("value".equals(key)) {
|
|
||||||
int idx = clsName.lastIndexOf('/');
|
|
||||||
var pkg = clsName.substring(0, idx);
|
|
||||||
mods.computeIfAbsent(pkg, _ -> new HashSet<>()).add((String)value);
|
|
||||||
|
|
||||||
idx = pkg.lastIndexOf('/');
|
|
||||||
while (idx != -1) {
|
|
||||||
pkg = pkg.substring(0, idx);
|
|
||||||
idx = pkg.lastIndexOf('/');
|
|
||||||
if (mods.containsKey(pkg))
|
|
||||||
throw new IllegalStateException("Invalid ForgeDev test mod layout, conflicting packages: " + pkg + " for " + clsName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
sneak(e);
|
|
||||||
}
|
|
||||||
return mods;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Builds or update the mods.toml file for all @Mods in this package
|
|
||||||
private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root, boolean clientOnly) {
|
|
||||||
var toml = resources.stream()
|
|
||||||
.map(p -> p.resolve(MODS_TOML))
|
|
||||||
.filter(Files::exists)
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
Config cfg = null;
|
|
||||||
|
|
||||||
if (toml != null)
|
|
||||||
cfg = new TomlParser().parse(toml, FileNotFoundAction.READ_NOTHING);
|
|
||||||
else
|
|
||||||
cfg = Config.inMemory();
|
|
||||||
|
|
||||||
boolean modified = false;
|
|
||||||
var defaults = Map.of(
|
|
||||||
"modLoader", "javafml",
|
|
||||||
"loaderVersion", "[0,)",
|
|
||||||
"license", "Doesnt fucking matter",
|
|
||||||
"clientSideOnly", clientOnly
|
|
||||||
);
|
|
||||||
|
|
||||||
for (var key : defaults.keySet()) {
|
|
||||||
if (!cfg.contains(key)) {
|
|
||||||
cfg.set(key, defaults.get(key));
|
|
||||||
modified = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var modlist = new ArrayList<Config>();
|
|
||||||
if (cfg.contains("mods")) {
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
var existing = ((List<Config>)cfg.get("mods"));
|
|
||||||
modlist.addAll(existing);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var modid : modids) {
|
|
||||||
if (modlist.stream().noneMatch(c -> modid.equals(c.get("modId")))) {
|
|
||||||
modified = true;
|
|
||||||
var tmp = Config.inMemory();
|
|
||||||
tmp.set("modId", modid);
|
|
||||||
modlist.add(tmp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.set("mods", modlist);
|
|
||||||
|
|
||||||
if (modified) {
|
|
||||||
var target = root.resolve(MODS_TOML);
|
|
||||||
try {
|
|
||||||
Files.createDirectories(target.getParent());
|
|
||||||
new TomlWriter().write(cfg, target, WritingMode.REPLACE);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new IllegalStateException("Failed to create in memory toml: " + target, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
|
|
||||||
private static void buildPackMeta(Set<Path> paths, Path root) {
|
|
||||||
var existing = paths.stream()
|
|
||||||
.map(p -> p.resolve(PACK_META))
|
|
||||||
.filter(Files::exists)
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
if (existing != null)
|
|
||||||
return;
|
|
||||||
var target = root.resolve(PACK_META);
|
|
||||||
try {
|
|
||||||
Files.createDirectories(target.getParent());
|
|
||||||
Files.writeString(target,
|
|
||||||
"""
|
|
||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "doesn't matter",
|
|
||||||
"pack_format": 18
|
|
||||||
}
|
|
||||||
}
|
|
||||||
""", StandardCharsets.UTF_8, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new IllegalStateException("Failed to make in memory pack.mcmeta: " + target, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void moveModuleInfo(Set<Path> paths, Path root) {
|
|
||||||
var existing = paths.stream()
|
|
||||||
.map(p -> p.resolve("module-info.dat"))
|
|
||||||
.filter(Files::exists)
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
var target = root.resolve("module-info.class");
|
|
||||||
copyFile(existing, target);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void copyFile(@Nullable Path existing, Path target) {
|
|
||||||
if (existing == null)
|
|
||||||
return;
|
|
||||||
try {
|
|
||||||
Files.createDirectories(target.getParent());
|
|
||||||
Files.copy(existing, target);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new IllegalStateException("Failed to copy " + existing.getFileName() + " to memory: " + target, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
|
||||||
throw (E)e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.examiner;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.FileSystem;
|
|
||||||
import java.nio.file.FileSystems;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.spi.FileSystemProvider;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.function.BiPredicate;
|
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
|
||||||
final class UnionHelper {
|
|
||||||
private static final FileSystemProvider UFSP = getUnionFileSystemProvider();
|
|
||||||
private static FileSystemProvider getUnionFileSystemProvider() {
|
|
||||||
for (var provider : FileSystemProvider.installedProviders()) {
|
|
||||||
if ("union".equals(provider.getScheme()))
|
|
||||||
return provider;
|
|
||||||
}
|
|
||||||
throw new IllegalStateException("Missing UnionFileSystemProvider");
|
|
||||||
};
|
|
||||||
|
|
||||||
static FileSystem newFileSystem(BiPredicate<String, String> filter, Path[] paths) {
|
|
||||||
try {
|
|
||||||
if (paths == null || paths.length == 0)
|
|
||||||
throw new IllegalArgumentException("Must contain atleast one path");
|
|
||||||
|
|
||||||
if (filter == null && paths.length == 1)
|
|
||||||
return FileSystems.newFileSystem(paths[0]);
|
|
||||||
|
|
||||||
var map = new HashMap<String, Object>();
|
|
||||||
if (filter != null)
|
|
||||||
map.put("filter", filter);
|
|
||||||
|
|
||||||
var lst = new ArrayList<>(Arrays.asList(paths));
|
|
||||||
var base = lst.remove(0);
|
|
||||||
map.put("additional", lst);
|
|
||||||
return UFSP.newFileSystem(base, map);
|
|
||||||
} catch (IOException e) {
|
|
||||||
return sneak(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
|
||||||
throw (E)e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
net.minecraftforge.examiner.BootstrapFilter
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
net.minecraftforge.examiner.Locator
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
}
|
|
||||||
|
|
||||||
gradleutils.displayName = 'Forge-Tests'
|
|
||||||
description = 'Mods used for testing Forge features'
|
|
||||||
|
|
||||||
license {
|
|
||||||
exclude 'com/example/'
|
|
||||||
}
|
|
||||||
|
|
||||||
convention.basicRuns('mdk_datagen', file('src/main/generated')) {
|
|
||||||
flat = true
|
|
||||||
}
|
|
||||||
|
|
||||||
final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
|
|
||||||
gradleVersion = libs.versions.gradle.get()
|
|
||||||
scriptFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradlew")
|
|
||||||
jarFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradle/wrapper/gradle-wrapper.jar")
|
|
||||||
}
|
|
||||||
|
|
||||||
final mdkZip = tasks.register('mdkZip', Zip) {
|
|
||||||
dependsOn mdkGradleWrapper
|
|
||||||
|
|
||||||
archiveBaseName = project.name
|
|
||||||
archiveClassifier = 'mdk'
|
|
||||||
archiveVersion = project.version
|
|
||||||
destinationDirectory = file('build/libs')
|
|
||||||
|
|
||||||
from(rootProject.file('LICENSE.txt'))
|
|
||||||
from(changelog.task.flatMap(task -> task.outputFile))
|
|
||||||
|
|
||||||
from mdkGradleWrapper.map(Wrapper.&getScriptFile)
|
|
||||||
from mdkGradleWrapper.map(Wrapper.&getBatchScript)
|
|
||||||
|
|
||||||
into('gradle/wrapper/') {
|
|
||||||
from mdkGradleWrapper.map(Wrapper.&getJarFile)
|
|
||||||
from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
|
|
||||||
}
|
|
||||||
from(file('template/')){
|
|
||||||
file('template/gitignore.txt').eachLine {
|
|
||||||
if (!it.trim().isEmpty() && !it.trim().startsWith('#'))
|
|
||||||
exclude it
|
|
||||||
}
|
|
||||||
|
|
||||||
filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [
|
|
||||||
FORGE_VERSION: versions.forge,
|
|
||||||
FORGE_GROUP: project.group,
|
|
||||||
FORGE_NAME: project.name,
|
|
||||||
MC_VERSION: versions.minecraft,
|
|
||||||
FORGE_SPEC_VERSION: versions.forgeSpec,
|
|
||||||
MC_NEXT_VERSION: versions.minecraftNext,
|
|
||||||
EVENTBUS_VERSION: libs.versions.eventbus.get()
|
|
||||||
])
|
|
||||||
|
|
||||||
rename 'gitignore\\.txt', '.gitignore'
|
|
||||||
rename 'gitattributes\\.txt', '.gitattributes'
|
|
||||||
}
|
|
||||||
from(file('src/main/java/com/example/examplemod/')) {
|
|
||||||
into('src/main/java/com/example/examplemod/')
|
|
||||||
}
|
|
||||||
from(file('src/main/generated/')) {
|
|
||||||
into('src/main/resources/')
|
|
||||||
exclude '**/.cache/'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
forgedev.provideFile('mdkZip', mdkZip.flatMap { it.archiveFile } )
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "${mod_id} resources",
|
|
||||||
"max_format": 121,
|
|
||||||
"min_format": 121
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
modLoader="javafml"
|
|
||||||
loaderVersion="[0,)"
|
|
||||||
license="LGPL_v2"
|
|
||||||
|
|
||||||
[[mods]]
|
|
||||||
modId="examplemod"
|
|
||||||
version="1.0.0"
|
|
||||||
displayName="Example Mod DataGen"
|
|
||||||
description="Example Mod DataGen"
|
|
||||||
|
|
||||||
[[mods]]
|
|
||||||
modId="mdk_datagen"
|
|
||||||
version="1.0.0"
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
}
|
|
||||||
|
|
||||||
gradleutils.displayName = 'Forge-Tests'
|
|
||||||
description = 'Mods used for testing Forge features'
|
|
||||||
|
|
||||||
license {
|
|
||||||
exclude 'com/example/'
|
|
||||||
}
|
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/forge/test/', [
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.forge.test'
|
|
||||||
])
|
|
||||||
convention.manifest('net/minecraftforge/forge/debug/')
|
|
||||||
|
|
||||||
convention.publish()
|
|
||||||
|
|
||||||
convention.basicRuns('.+', file('src/main/generated')) {
|
|
||||||
flat = false
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
api project(':forge-examiner')
|
|
||||||
}
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "minecraft:no_op"
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-76
@@ -1,76 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:children": [
|
|
||||||
{
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"child": {
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_oak_log": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:oak_log"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_oak_log"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:true"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_bee_nest": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:bee_nest"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:true"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_bee_nest"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_oak_log": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:oak_log"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:true"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_oak_log"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_redstone_ore": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:redstone_ore"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_redstone_ore"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_redstone_ore": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:redstone_ore"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:true"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_redstone_ore"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_redstone_ore": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:redstone_ore"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:true"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_redstone_ore"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-35
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:false"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-36
@@ -1,36 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_iron_ore": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:iron_ore"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:tag_empty",
|
|
||||||
"tag": "minecraft:dirt"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_iron_ore"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-36
@@ -1,36 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_gold_ore": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:gold_ore"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:tag_empty",
|
|
||||||
"tag": "conditional_recipe:empty_tag_for_testing"
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_gold_ore"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-63
@@ -1,63 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:recipes/root",
|
|
||||||
"criteria": {
|
|
||||||
"has_dirt": {
|
|
||||||
"conditions": {
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"items": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:inventory_changed"
|
|
||||||
},
|
|
||||||
"has_the_recipe": {
|
|
||||||
"conditions": {
|
|
||||||
"recipes": "minecraft:diamond_block"
|
|
||||||
},
|
|
||||||
"trigger": "minecraft:recipe_unlocked"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"forge:condition": {
|
|
||||||
"type": "forge:and",
|
|
||||||
"values": [
|
|
||||||
{
|
|
||||||
"type": "forge:or",
|
|
||||||
"values": [
|
|
||||||
{
|
|
||||||
"type": "forge:not",
|
|
||||||
"value": {
|
|
||||||
"type": "forge:mod_loaded",
|
|
||||||
"modid": "minecraft"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "forge:item_exists",
|
|
||||||
"item": "minecraft:dirt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "forge:true"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "forge:tag_empty",
|
|
||||||
"tag": "minecraft:dirt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "forge:false"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"requirements": [
|
|
||||||
[
|
|
||||||
"has_the_recipe",
|
|
||||||
"has_dirt"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"rewards": {
|
|
||||||
"recipes": [
|
|
||||||
"minecraft:diamond_block"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "minecraft:ore",
|
|
||||||
"discard_chance_on_air_exposure": 0.0,
|
|
||||||
"size": 5,
|
|
||||||
"targets": [
|
|
||||||
{
|
|
||||||
"state": "minecraft:mossy_stone_bricks",
|
|
||||||
"target": {
|
|
||||||
"predicate_type": "minecraft:any_of",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"predicate_type": "minecraft:tag_match",
|
|
||||||
"tag": "minecraft:stone_ore_replaceables"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"predicate_type": "minecraft:tag_match",
|
|
||||||
"tag": "minecraft:deepslate_ore_replaceables"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "Forge tests resource pack",
|
|
||||||
"max_format": 121,
|
|
||||||
"min_format": 121
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Whitespace-only changes.
@@ -1,21 +1,78 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'Forge Transformers'
|
gradleutils.displayName = 'Forge Transformers'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
description = 'Forge-specific transformers unrelated to the FML project.'
|
description = 'Forge-specific transformers unrelated to the FML project.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly(libs.jetbrains.annotations)
|
||||||
|
|
||||||
implementation(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
implementation(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
||||||
implementation(libs.log4j.api ){ transitive = false }
|
implementation(libs.log4j.api ){ transitive = false }
|
||||||
implementation(libs.gson ){ transitive = false }
|
implementation(libs.gson ){ transitive = false }
|
||||||
implementation(libs.modlauncher ){ transitive = false }
|
implementation(libs.modlauncher ){ transitive = false }
|
||||||
implementation(libs.coremods.api){ transitive = false }
|
implementation(libs.coremods.api){ transitive = false }
|
||||||
|
|
||||||
|
testCompileOnly(libs.jetbrains.annotations)
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/forge/transformers/', [
|
tasks.named('jar', Jar) {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.forge.transformers',
|
manifest {
|
||||||
'Forge-Module-Layer' : 'boot'
|
attributes([
|
||||||
])
|
'Automatic-Module-Name': 'net.minecraftforge.forge.transformers',
|
||||||
|
'Forge-Module-Layer' : 'boot'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/forge/transformers/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
convention.publish()
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom { pom ->
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+6
@@ -32,6 +32,12 @@ record FieldToMethodTransformer(String className, Map<String, String> fields) im
|
|||||||
// TODO [Forge][Transformer] Make this properly data driven or configurable.
|
// TODO [Forge][Transformer] Make this properly data driven or configurable.
|
||||||
// It was hard-coded like this before when using JS CoreMods, though.
|
// It was hard-coded like this before when using JS CoreMods, though.
|
||||||
static final Map<String, Map<String, String>> TARGETS = Map.of(
|
static final Map<String, Map<String, String>> TARGETS = Map.of(
|
||||||
|
"net.minecraft.world.level.biome.Biome",
|
||||||
|
Map.of(
|
||||||
|
"climateSettings", "getModifiedClimateSettings",
|
||||||
|
"specialEffects", "getModifiedSpecialEffects"
|
||||||
|
),
|
||||||
|
|
||||||
"net.minecraft.world.effect.MobEffectInstance",
|
"net.minecraft.world.effect.MobEffectInstance",
|
||||||
Map.of(
|
Map.of(
|
||||||
"effect", "getEffect"
|
"effect", "getEffect"
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
"class": "net/minecraft/world/level/NaturalSpawner",
|
"class": "net/minecraft/world/level/NaturalSpawner",
|
||||||
"methods": [
|
"methods": [
|
||||||
"spawnCategoryForPosition(Lnet/minecraft/world/entity/MobCategory;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/NaturalSpawner$SpawnPredicate;Lnet/minecraft/world/level/NaturalSpawner$AfterSpawnCallback;)V",
|
"spawnCategoryForPosition(Lnet/minecraft/world/entity/MobCategory;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/NaturalSpawner$SpawnPredicate;Lnet/minecraft/world/level/NaturalSpawner$AfterSpawnCallback;)V",
|
||||||
"spawnMobsForChunkGeneration(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/util/RandomSource;)V"
|
"spawnMobsForChunkGeneration(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/Holder;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/util/RandomSource;)V"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
# Libraries used solely during the build and publish process.
|
|
||||||
|
|
||||||
[libraries]
|
|
||||||
binarypatcher = { module = "net.minecraftforge:binarypatcher", version = "1.3.4" }
|
|
||||||
installer = { module = "net.minecraftforge:installer", version = "2.2.+" }
|
|
||||||
installertools = { module = "net.minecraftforge:installertools", version = "1.4.6" }
|
|
||||||
srg2source = { module = "net.minecraftforge:Srg2Source", version = "8.2.0" }
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
[versions]
|
|
||||||
slf4j = "2.0.17"
|
|
||||||
|
|
||||||
[libraries]
|
|
||||||
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
|
|
||||||
slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
[libraries]
|
|
||||||
powermock-core = { module = "org.powermock:powermock-core", version = "2.0.9" }
|
|
||||||
lwjgl = { module = "org.lwjgl:lwjgl" }
|
|
||||||
lwjgl-sdl = { module = "org.lwjgl:lwjgl-sdl" }
|
|
||||||
lwjgl-opengl = { module = "org.lwjgl:lwjgl-opengl" }
|
|
||||||
lwjgl-stb = { module = "org.lwjgl:lwjgl-stb" }
|
|
||||||
|
|
||||||
[bundles]
|
|
||||||
lwjgl = ["lwjgl", "lwjgl-sdl", "lwjgl-opengl", "lwjgl-stb"]
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
# Libraries used by Forge and its subprojects.
|
|
||||||
# Most of these are from Minecraft itself. We should really export those as BOM from Mavenizer
|
|
||||||
|
|
||||||
[plugins]
|
|
||||||
forgedev = { id = "net.minecraftforge.forgedev", version = "7.0.0-beta.56" }
|
|
||||||
licenser = { id = "net.minecraftforge.licenser", version = "1.2.0" }
|
|
||||||
versions = { id = "com.github.ben-manes.versions", version = "0.54.0" }
|
|
||||||
gradleutils = { id = "net.minecraftforge.gradleutils", version = "3.4.9" }
|
|
||||||
gitversion = { id = "net.minecraftforge.gitversion", version = "4.0.0" }
|
|
||||||
changelog = { id = "net.minecraftforge.changelog", version = "3.2.2" }
|
|
||||||
download = { id = "de.undercouch.download", version = "5.6.0" }
|
|
||||||
jarsigner = { id = "net.minecraftforge.gradlejarsigner", version = "1.2.1" }
|
|
||||||
apt = { id = "com.diffplug.eclipse.apt", version = "4.4.1" }
|
|
||||||
|
|
||||||
|
|
||||||
[versions]
|
|
||||||
eventbus = "7.0.6"
|
|
||||||
mixinextras = "0.5.4"
|
|
||||||
bootstrap = "2.1.8"
|
|
||||||
asm = "9.10.1"
|
|
||||||
jline = "3.25.1"
|
|
||||||
night-config = "3.7.4"
|
|
||||||
jarjar = "0.4.2"
|
|
||||||
log4j = "2.26.0"
|
|
||||||
lwjgl = "3.4.3"
|
|
||||||
gradle = "9.7.1" # Gradle we bundle with the MDK
|
|
||||||
junit = "6.1.3"
|
|
||||||
|
|
||||||
[libraries]
|
|
||||||
# TODO [Forge][Buildscript We should not be needing to manually add transitive dependencies
|
|
||||||
# If we need to make strict versions for dependencies, we should do so using dependency constraints
|
|
||||||
forgespi = { module = "net.minecraftforge:forgespi", version = "8.0.0" } # Needs modlauncher
|
|
||||||
modlauncher = { module = "net.minecraftforge:modlauncher", version = "10.2.6" } # Needs securemodules
|
|
||||||
securemodules = { module = "net.minecraftforge:securemodules", version = "2.2.24" } # // Needs unsafe
|
|
||||||
unsafe = { module = "net.minecraftforge:unsafe", version = "0.9.2" }
|
|
||||||
accesstransformers = { module = "net.minecraftforge:accesstransformers", version = "8.2.17" }
|
|
||||||
coremods-api = { module = "net.minecraftforge:coremods-api", version = "5.3.1" }
|
|
||||||
mergetool-api = { module = "net.minecraftforge:mergetool-api", version = "1.0" }
|
|
||||||
maven-artifact = { module = "org.apache.maven:maven-artifact", version = "3.8.8" } # Used for version comparison
|
|
||||||
|
|
||||||
slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.17" }
|
|
||||||
|
|
||||||
# Annotations
|
|
||||||
jetbrains-annotations = { module = "org.jetbrains:annotations", version = "24.0.1" } # ApiStatus annotations
|
|
||||||
jspecify = { module = "org.jspecify:jspecify", version = "1.0.1" } # Nullability annotations
|
|
||||||
|
|
||||||
# Eventbus
|
|
||||||
eventbus = { module = "net.minecraftforge:eventbus", version.ref = "eventbus" }
|
|
||||||
eventbus-validator = { module = "net.minecraftforge:eventbus-validator", version.ref = "eventbus" }
|
|
||||||
|
|
||||||
# Bootstrap - Converting the process from normal loader into JPMS land
|
|
||||||
bootstrap = { module = "net.minecraftforge:bootstrap", version.ref = "bootstrap" }
|
|
||||||
bootstrap-api = { module = "net.minecraftforge:bootstrap-api", version.ref = "bootstrap" }
|
|
||||||
bootstrap-dev = { module = "net.minecraftforge:bootstrap-dev", version.ref = "bootstrap" }
|
|
||||||
bootstrap-shim = { module = "net.minecraftforge:bootstrap-shim", version.ref = "bootstrap" }
|
|
||||||
|
|
||||||
# ReadOnlyInMemoryFileSystem - Used for JarInJar extraction at runtime
|
|
||||||
roimfs = { module = "net.minecraftforge:roimfs", version = "1.0.0" }
|
|
||||||
# Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things.
|
|
||||||
# ROIMFS is faster if you need read only
|
|
||||||
jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.0" }
|
|
||||||
|
|
||||||
# Mixin
|
|
||||||
mixin = { module = "org.spongepowered:mixin", version = "0.8.7" }
|
|
||||||
mixinextras-forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinextras" }
|
|
||||||
mixinextras-common = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
|
|
||||||
|
|
||||||
# ASM it's used for so many of our hacks
|
|
||||||
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
|
|
||||||
asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
|
|
||||||
asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
|
|
||||||
asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
|
|
||||||
asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" }
|
|
||||||
|
|
||||||
# Terminal Console Appender. essentially make pretty colors in the console, but it's been a PITA
|
|
||||||
terminalconsoleappender = { module = "net.minecrell:terminalconsoleappender", version = "1.2.0" }
|
|
||||||
jline-reader = { module = "org.jline:jline-reader", version.ref = "jline" }
|
|
||||||
jline-terminal = { module = "org.jline:jline-terminal", version.ref = "jline" }
|
|
||||||
jline-terminal-jna = { module = "org.jline:jline-terminal-jna", version.ref = "jline" }
|
|
||||||
|
|
||||||
# The core of our configuration system, it has many flaws, but it works for the most part
|
|
||||||
night-config-toml = { module = "com.electronwill.night-config:toml", version.ref = "night-config" }
|
|
||||||
night-config-core = { module = "com.electronwill.night-config:core", version.ref = "night-config" }
|
|
||||||
|
|
||||||
# Jar In Jar FileSystem
|
|
||||||
jarjar-fs = { module = "net.minecraftforge:JarJarFileSystems", version.ref = "jarjar" }
|
|
||||||
jarjar-meta = { module = "net.minecraftforge:JarJarMetadata", version.ref = "jarjar" }
|
|
||||||
jarjar-selector = { module = "net.minecraftforge:JarJarSelector", version.ref = "jarjar" }
|
|
||||||
|
|
||||||
# These are libraries shipped by the MC launcher, try and keep them in sync with the manifest
|
|
||||||
# but honestly if we don't it just means we ship them as normal libraries by adding them to the installer config in the forge project
|
|
||||||
gson = { module = "com.google.code.gson:gson", version = "2.14.0" }
|
|
||||||
guava = { module = "com.google.guava:guava", version = "33.6.0-jre" }
|
|
||||||
failureaccess = { module = "com.google.guava:failureaccess", version = "1.0.3" }
|
|
||||||
apache-commons = { module = "org.apache.commons:commons-lang3", version = "3.20.0" }
|
|
||||||
mojang-logging = { module = "com.mojang:logging", version = "1.7.12" }
|
|
||||||
jopt-simple = { module = "net.sf.jopt-simple:jopt-simple", version = "5.0.4" }
|
|
||||||
commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
|
|
||||||
|
|
||||||
|
|
||||||
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
|
|
||||||
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
|
|
||||||
|
|
||||||
lwjgl = { module = "org.lwjgl:lwjgl", version.ref = "lwjgl" }
|
|
||||||
lwjgl-sdl = { module = "org.lwjgl:lwjgl-sdl", version.ref = "lwjgl" }
|
|
||||||
lwjgl-opengl = { module = "org.lwjgl:lwjgl-opengl", version.ref = "lwjgl" }
|
|
||||||
lwjgl-stb = { module = "org.lwjgl:lwjgl-stb", version.ref = "lwjgl" }
|
|
||||||
lwjgl-tinyfd = { module = "org.lwjgl:lwjgl-tinyfd", version.ref = "lwjgl" }
|
|
||||||
|
|
||||||
|
|
||||||
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
|
|
||||||
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
|
|
||||||
junit-platform = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit" }
|
|
||||||
|
|
||||||
|
|
||||||
[bundles]
|
|
||||||
# Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things.
|
|
||||||
jimfs = ["guava", "failureaccess"]
|
|
||||||
|
|
||||||
# ASM it's used for so many of our hacks
|
|
||||||
asm = ["asm", "asm-tree", "asm-util", "asm-commons", "asm-analysis"]
|
|
||||||
|
|
||||||
# Pretty colors in the server console
|
|
||||||
terminalconsoleappender = ["terminalconsoleappender", "jline-reader", "jline-terminal", "jline-terminal-jna"]
|
|
||||||
|
|
||||||
# Utility for reading and writing the TOML file format
|
|
||||||
night-config = ["night-config-toml", "night-config-core"]
|
|
||||||
|
|
||||||
# Bundeling dependencies in a single archive
|
|
||||||
jarjar = ["jarjar-fs", "jarjar-selector", "jarjar-meta"]
|
|
||||||
log4j = ["log4j-api", "log4j-core"]
|
|
||||||
lwjgl = ["lwjgl", "lwjgl-sdl", "lwjgl-opengl", "lwjgl-stb", "lwjgl-tinyfd"]
|
|
||||||
junit-runtime = ["junit-engine", "junit-platform"]
|
|
||||||
Vendored
BIN
Binary file not shown.
+1
-3
@@ -1,9 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -1,20 +1,79 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'JavaFMLMod'
|
gradleutils.displayName = 'JavaFMLMod'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
description = 'Language provider for Minecraft Forge that provides basic Java mod functionality.'
|
description = 'Language provider for Minecraft Forge that provides basic Java mod functionality.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation projects.fmlloader
|
||||||
implementation projects.fmlcore
|
implementation projects.fmlcore
|
||||||
implementation libs.unsafe
|
implementation libs.unsafe
|
||||||
implementation libs.securemodules
|
implementation libs.securemodules
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/javafmlmod/', [
|
tasks.withType(JavaCompile).configureEach {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.javafmlmod',
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
'FMLModType' : 'LANGPROVIDER'
|
}
|
||||||
])
|
|
||||||
|
|
||||||
convention.publish()
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.javafmlmod',
|
||||||
|
'FMLModType' : 'LANGPROVIDER'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/fml/javafmlmod/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,7 +37,8 @@ public @interface Mod {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Annotate a class which will be subscribed to an Event Bus at mod construction time.
|
* Annotate a class which will be subscribed to an Event Bus at mod construction time.
|
||||||
* Defaults to subscribing the current modid to the {@link Bus#BOTH} on both sides.
|
* Defaults to subscribing the current modid to the {@code MinecraftForge#EVENT_BUS}
|
||||||
|
* on both sides.
|
||||||
*
|
*
|
||||||
* @see Bus
|
* @see Bus
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
|
|||||||
/**
|
/**
|
||||||
* Automatic eventbus subscriber - reads {@link EventBusSubscriber}
|
* Automatic eventbus subscriber - reads {@link EventBusSubscriber}
|
||||||
* annotations and passes the class instances to the {@link Bus}
|
* annotations and passes the class instances to the {@link Bus}
|
||||||
* defined by the annotation. Defaults to {@code Bus.BOTH} if not specified.
|
* defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS}
|
||||||
*/
|
*/
|
||||||
public final class AutomaticEventSubscriber {
|
public final class AutomaticEventSubscriber {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|||||||
@@ -1,18 +1,77 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'LowCodeMod'
|
gradleutils.displayName = 'LowCodeMod'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
description = 'Language provider for Minecraft Forge that loads mods without a Java entrypoint.'
|
description = 'Language provider for Minecraft Forge that loads mods without a Java entrypoint.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation projects.fmlloader
|
||||||
implementation projects.fmlcore
|
implementation projects.fmlcore
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/lowcodemod/', [
|
tasks.withType(JavaCompile).configureEach {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.lowcodemod',
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
'FMLModType' : 'LANGPROVIDER'
|
}
|
||||||
])
|
|
||||||
|
|
||||||
convention.publish()
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.lowcodemod',
|
||||||
|
'FMLModType' : 'LANGPROVIDER'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1.0',
|
||||||
|
'Implementation-Title' : project.name,
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': forgeVersion.split('\\.')[0]
|
||||||
|
], 'net/minecraftforge/fml/lowcodemod/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+64
-5
@@ -1,18 +1,77 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias libs.plugins.licenser
|
||||||
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'MCLanguage'
|
gradleutils.displayName = 'MCLanguage'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
description = 'Language provider for Minecraft Forge that provides Minecraft Itself.'
|
description = 'Language provider for Minecraft Forge that provides Minecraft Itself.'
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation projects.fmlloader
|
||||||
implementation projects.fmlcore
|
implementation projects.fmlcore
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.manifest('net/minecraftforge/fml/mclanguageprovider/', [
|
tasks.withType(JavaCompile).configureEach {
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider',
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
'FMLModType' : 'LANGPROVIDER'
|
}
|
||||||
])
|
|
||||||
|
|
||||||
convention.publish()
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider',
|
||||||
|
'FMLModType' : 'LANGPROVIDER'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': '1.0'
|
||||||
|
], 'net/minecraftforge/fml/mclanguageprovider/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
|
|||||||
[versions]
|
[versions]
|
||||||
java = "25"
|
java = "25"
|
||||||
minecraft = "26.3"
|
minecraft = "26.2"
|
||||||
minecraft-next = "26.4"
|
minecraft-next = "26.3"
|
||||||
mcp = "20260918.230105"
|
mcp = "20260616.103818"
|
||||||
changelog-base = "66.0"
|
changelog-base = "65.0"
|
||||||
+5
-5
@@ -1,8 +1,8 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
|
--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
|
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
@@ -208,6 +_,9 @@
|
@@ -201,6 +_,9 @@
|
||||||
}
|
GlStateManager._colorMask(15);
|
||||||
|
GlStateManager._clear(16384);
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
|
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
|
||||||
+ // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
|
+ // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
|
||||||
+ if (colorTexture.isStencilEnabled())
|
+ if (colorTexture.isStencilEnabled())
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlConst.java
|
--- a/com/mojang/blaze3d/opengl/GlConst.java
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlConst.java
|
+++ b/com/mojang/blaze3d/opengl/GlConst.java
|
||||||
@@ -239,6 +_,10 @@
|
@@ -239,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlDebug.java
|
--- a/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlDebug.java
|
+++ b/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
@@ -22,6 +_,14 @@
|
@@ -22,6 +_,14 @@
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
+19
-5
@@ -1,6 +1,20 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlDevice.java
|
--- a/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlDevice.java
|
+++ b/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
@@ -200,6 +_,11 @@
|
@@ -150,7 +_,12 @@
|
||||||
|
final int depthOrLayers,
|
||||||
|
final int mipLevels
|
||||||
|
) {
|
||||||
|
- return this.createTexture(this.debugLabels.exists() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ return this.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(final @Nullable Supplier<String> label, @GpuTexture.Usage final int usage, final GpuFormat format, final int width, final int height, final int depthOrLayers, final int mipLevels, final boolean stencil) {
|
||||||
|
+ return this.createTexture(this.debugLabels.exists() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels, stencil);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -163,6 +_,11 @@
|
||||||
final int depthOrLayers,
|
final int depthOrLayers,
|
||||||
final int mipLevels
|
final int mipLevels
|
||||||
) {
|
) {
|
||||||
@@ -12,7 +26,7 @@
|
|||||||
GlStateManager.clearGlErrors();
|
GlStateManager.clearGlErrors();
|
||||||
int id = GlStateManager._genTexture();
|
int id = GlStateManager._genTexture();
|
||||||
if (label == null) {
|
if (label == null) {
|
||||||
@@ -223,9 +_,9 @@
|
@@ -186,9 +_,9 @@
|
||||||
GlStateManager._texParameter(target, 34892, 0);
|
GlStateManager._texParameter(target, 34892, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +39,7 @@
|
|||||||
if (glInternalID != 0 && glExternalID != 0 && glType != 0) {
|
if (glInternalID != 0 && glExternalID != 0 && glType != 0) {
|
||||||
if (isCubemap) {
|
if (isCubemap) {
|
||||||
for (int cubeTarget : GlConst.CUBEMAP_TARGETS) {
|
for (int cubeTarget : GlConst.CUBEMAP_TARGETS) {
|
||||||
@@ -248,7 +_,7 @@
|
@@ -211,7 +_,7 @@
|
||||||
throw new IllegalStateException("OpenGL error " + error);
|
throw new IllegalStateException("OpenGL error " + error);
|
||||||
}
|
}
|
||||||
|
|
||||||
+7
-7
@@ -1,18 +1,18 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlStateManager.java
|
--- a/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlStateManager.java
|
+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
@@ -82,6 +_,11 @@
|
@@ -80,6 +_,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static boolean _isBlendEnabled(int index) {
|
+ public static boolean _isBlendEnabled(int index) {
|
||||||
+ RenderSystem.assertOnRenderThread();
|
+ RenderSystem.assertOnRenderThread();
|
||||||
+ return BLEND_ENABLE[index];
|
+ return BLEND[index].mode.enabled;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static void _disableBlend(final int index) {
|
public static void _disableBlend(int index) {
|
||||||
RenderSystem.assertOnRenderThread();
|
RenderSystem.assertOnRenderThread();
|
||||||
if (BLEND_ENABLE[index]) {
|
BLEND[index].mode.disable();
|
||||||
@@ -401,9 +_,17 @@
|
@@ -390,9 +_,17 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
@@ -27,9 +_,14 @@
|
||||||
|
final int id,
|
||||||
|
final FrameBufferCache frameBufferCache
|
||||||
|
) {
|
||||||
|
+ this(usage, label, format, width, height, depthOrLayers, mipLevels, id, frameBufferCache, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected GlTexture(@GpuTexture.Usage int usage, String label, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, int id, FrameBufferCache frameBufferCache, boolean stencil) {
|
||||||
|
super(usage, label, format, width, height, depthOrLayers, mipLevels);
|
||||||
|
this.id = id;
|
||||||
|
this.frameBufferCache = frameBufferCache;
|
||||||
|
+ this.stencilEnabled = stencil;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -84,5 +_,12 @@
|
||||||
|
if (this.closed && this.views == 0) {
|
||||||
|
this.destroyImmediately();
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private final boolean stencilEnabled;
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isStencilEnabled() {
|
||||||
|
+ return this.stencilEnabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,18 +1,18 @@
|
|||||||
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
@@ -96,7 +_,7 @@
|
@@ -83,7 +_,7 @@
|
||||||
this.width = width;
|
this.width = width;
|
||||||
this.height = height;
|
this.height = height;
|
||||||
if (this.depthFormat != null) {
|
if (this.useDepth) {
|
||||||
- this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, this.depthFormat, width, height, 1, 1);
|
- this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, GpuFormat.D32_FLOAT, width, height, 1, 1);
|
||||||
+ this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, this.depthFormat, width, height, 1, 1, this.stencilEnabled);
|
+ this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, GpuFormat.D32_FLOAT, width, height, 1, 1, this.stencilEnabled);
|
||||||
this.depthTextureView = device.createTextureView(this.depthTexture);
|
this.depthTextureView = device.createTextureView(this.depthTexture);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,5 +_,26 @@
|
@@ -121,5 +_,26 @@
|
||||||
|
|
||||||
public boolean hasDepth() {
|
public @Nullable GpuTextureView getDepthTextureView() {
|
||||||
return this.depthFormat != null;
|
return this.depthTextureView;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private boolean stencilEnabled = false;
|
+ private boolean stencilEnabled = false;
|
||||||
|
|||||||
@@ -1,33 +1,31 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/Window.java
|
--- a/com/mojang/blaze3d/platform/Window.java
|
||||||
+++ b/com/mojang/blaze3d/platform/Window.java
|
+++ b/com/mojang/blaze3d/platform/Window.java
|
||||||
@@ -114,9 +_,10 @@
|
@@ -101,8 +_,9 @@
|
||||||
Monitor initialMonitor = monitorManager.getMonitor(SDLVideo.SDL_GetPrimaryDisplay());
|
Monitor initialMonitor = monitorManager.getMonitor(GLFW.glfwGetPrimaryMonitor());
|
||||||
this.windowedWidth = this.width = allowedWindowMinSize(displayData.width(), 320);
|
this.windowedWidth = this.width = allowedWindowMinSize(displayData.width());
|
||||||
this.windowedHeight = this.height = allowedWindowMinSize(displayData.height(), 240);
|
this.windowedHeight = this.height = allowedWindowMinSize(displayData.height());
|
||||||
- this.handle = this.createWindow(backend, this.width, this.height, title);
|
- this.handle = this.createWindow(backend, this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.monitor() : 0L);
|
||||||
+ this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(this.width, this.height, title, () -> backend);
|
+ this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.monitor() : 0L, () -> backend);
|
||||||
this.setWindowMaxSize(maximumSize, maximumSize);
|
this.backend = backend;
|
||||||
MacosUtil.disableCloseWindowMenuItem();
|
|
||||||
+ if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(initialMonitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
|
+ if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(initialMonitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
|
||||||
if (initialMonitor != null) {
|
if (initialMonitor != null) {
|
||||||
this.windowedX = this.x = initialMonitor.x() + (initialMonitor.w() - this.width) / 2;
|
VideoMode mode = initialMonitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
||||||
this.windowedY = this.y = initialMonitor.y() + (initialMonitor.h() - this.height) / 2;
|
this.windowedX = this.x = initialMonitor.x() + mode.getWidth() / 2 - this.width / 2;
|
||||||
@@ -132,6 +_,7 @@
|
@@ -114,6 +_,7 @@
|
||||||
this.windowedY = this.y = actualY.get(0);
|
this.windowedX = this.x = actualX[0];
|
||||||
}
|
this.windowedY = this.y = actualY[0];
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
this.setMode();
|
this.setMode();
|
||||||
this.refreshFramebufferSize();
|
this.refreshFramebufferSize();
|
||||||
@@ -148,6 +_,10 @@
|
@@ -306,6 +_,9 @@
|
||||||
|
outHeight[0] = this.isSoftScreen() ? outHeight[0] - 1 : outHeight[0];
|
||||||
|
this.framebufferWidth = outWidth[0] > 0 ? outWidth[0] : 1;
|
||||||
|
this.framebufferHeight = outHeight[0] > 0 ? outHeight[0] : 1;
|
||||||
|
+ if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
|
||||||
|
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
|
||||||
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
private long createWindow(final GpuBackend backend, final int width, final int height, final String title) {
|
private void onResize(final long handle, final int newWidth, final int newHeight) {
|
||||||
+ return createWindowStatic(backend, width, height, title);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public static long createWindowStatic(final GpuBackend backend, final int width, final int height, final String title) {
|
|
||||||
long flags = 8224L;
|
|
||||||
long windowHandle = backend.createWindow(title, width, height, 8224L);
|
|
||||||
if (windowHandle == 0L) {
|
|
||||||
+12
-13
@@ -1,14 +1,13 @@
|
|||||||
--- a/com/mojang/renderpearl/frontend/FrontendGpuDevice.java
|
--- a/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
+++ b/com/mojang/renderpearl/frontend/FrontendGpuDevice.java
|
+++ b/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
@@ -94,6 +_,21 @@
|
@@ -73,6 +_,21 @@
|
||||||
return this.createTexture(this.isDebuggingEnabled() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels);
|
return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ /** Forge: same as {@link #createTexture(Supplier, int, GpuFormat, int, int, int, int)} but with stencil support */
|
+ /** Forge: same as {@link #createTexture(Supplier, int, GpuFormat, int, int, int)} but with stencil support */
|
||||||
+ @Override
|
|
||||||
+ public GpuTexture createTexture(
|
+ public GpuTexture createTexture(
|
||||||
+ final @Nullable Supplier<String> label,
|
+ final @Nullable Supplier<String> label,
|
||||||
+ final @GpuTexture.Usage int usage,
|
+ @GpuTexture.Usage final int usage,
|
||||||
+ final GpuFormat format,
|
+ final GpuFormat format,
|
||||||
+ final int width,
|
+ final int width,
|
||||||
+ final int height,
|
+ final int height,
|
||||||
@@ -16,23 +15,23 @@
|
|||||||
+ final int mipLevels,
|
+ final int mipLevels,
|
||||||
+ final boolean stencil
|
+ final boolean stencil
|
||||||
+ ) {
|
+ ) {
|
||||||
+ return this.createTexture(this.isDebuggingEnabled() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels, stencil);
|
+ this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, stencil);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@Override
|
|
||||||
public GpuTexture createTexture(
|
public GpuTexture createTexture(
|
||||||
final @Nullable String label,
|
final @Nullable String label,
|
||||||
@@ -106,6 +_,22 @@
|
final @GpuTexture.Usage int usage,
|
||||||
|
@@ -84,6 +_,21 @@
|
||||||
) {
|
) {
|
||||||
this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
|
this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
|
||||||
return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** Forge: same as {@link #createTexture(String, int, GpuFormat, int, int, int, int)} but with stencil support */
|
+ /** Forge: same as {@link #createTexture(Supplier, int, GpuFormat, int, int, int)} but with stencil support */
|
||||||
+ @Override
|
|
||||||
+ public GpuTexture createTexture(
|
+ public GpuTexture createTexture(
|
||||||
+ final @Nullable String label,
|
+ final @Nullable String label,
|
||||||
+ final @GpuTexture.Usage int usage,
|
+ @GpuTexture.Usage final int usage,
|
||||||
+ final GpuFormat format,
|
+ final GpuFormat format,
|
||||||
+ final int width,
|
+ final int width,
|
||||||
+ final int height,
|
+ final int height,
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- a/com/mojang/blaze3d/systems/GpuDeviceBackend.java
|
||||||
|
+++ b/com/mojang/blaze3d/systems/GpuDeviceBackend.java
|
||||||
|
@@ -32,7 +_,17 @@
|
||||||
|
@Nullable Supplier<String> label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels
|
||||||
|
);
|
||||||
|
|
||||||
|
+ /** Forge: same as {@link #createTexture(Supplier<String>, int, GpuFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable Supplier<String> label, @GpuTexture.Usage final int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
|
||||||
|
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels);
|
||||||
|
+
|
||||||
|
+ /** Forge: same as {@link #createTexture(String, int, GpuFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage final int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
|
||||||
|
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
GpuTextureView createTextureView(GpuTexture texture);
|
||||||
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
@@ -9,7 +_,7 @@
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
-public abstract class GpuTexture implements AutoCloseable {
|
||||||
|
+public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
|
||||||
|
public static final int USAGE_COPY_DST = 1;
|
||||||
|
public static final int USAGE_COPY_SRC = 2;
|
||||||
|
public static final int USAGE_TEXTURE_BINDING = 4;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
@@ -17,7 +_,7 @@
|
@@ -16,7 +_,7 @@
|
||||||
import org.joml.Vector3fc;
|
import org.joml.Vector3fc;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|||||||
+11
-5
@@ -1,5 +1,5 @@
|
|||||||
--- a/com/mojang/renderpearl/api/vertex/VertexFormat.java
|
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
+++ b/com/mojang/renderpearl/api/vertex/VertexFormat.java
|
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
@@ -19,6 +_,7 @@
|
@@ -19,6 +_,7 @@
|
||||||
private final int vertexSize;
|
private final int vertexSize;
|
||||||
private final int stepRate;
|
private final int stepRate;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
private VertexFormat(final List<VertexFormatElement> elements, final int vertexSize, final int stepRate) {
|
private VertexFormat(final List<VertexFormatElement> elements, final int vertexSize, final int stepRate) {
|
||||||
this.vertexSize = vertexSize;
|
this.vertexSize = vertexSize;
|
||||||
@@ -29,7 +_,14 @@
|
@@ -29,6 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.elementValues = elements;
|
this.elementValues = elements;
|
||||||
@@ -18,8 +18,14 @@
|
|||||||
+ elementMapping.put(element.name(), element);
|
+ elementMapping.put(element.name(), element);
|
||||||
+ this.elementMapping = elementMapping.buildOrThrow();
|
+ this.elementMapping = elementMapping.buildOrThrow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static VertexFormat.Builder builder(final int stepRate) {
|
||||||
|
@@ -69,6 +_,8 @@
|
||||||
|
public int hashCode() {
|
||||||
|
return this.elementValues.hashCode();
|
||||||
|
}
|
||||||
+
|
+
|
||||||
+ public com.google.common.collect.ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
+ public com.google.common.collect.ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
||||||
|
|
||||||
public static VertexFormat.Builder builder(final int stepRate) {
|
@OnlyIn(Dist.CLIENT)
|
||||||
return new VertexFormat.Builder(stepRate);
|
public static class Builder {
|
||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
+ public boolean keyPressed(net.minecraft.client.input.KeyEvent event) {
|
+ public boolean keyPressed(net.minecraft.client.input.KeyEvent event) {
|
||||||
+ if (event.isEscape()) {
|
+ if (event.key() == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
|
||||||
+ minecraft.gui.setScreen(this.nextScreen);
|
+ minecraft.gui.setScreen(this.nextScreen);
|
||||||
+ return true;
|
+ return true;
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/api/device/GpuDevice.java
|
|
||||||
+++ b/com/mojang/renderpearl/api/device/GpuDevice.java
|
|
||||||
@@ -37,7 +_,17 @@
|
|
||||||
@Nullable Supplier<String> label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels
|
|
||||||
);
|
|
||||||
|
|
||||||
+ default GpuTexture createTexture(
|
|
||||||
+ @Nullable Supplier<String> label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil
|
|
||||||
+ ) {
|
|
||||||
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels);
|
|
||||||
+
|
|
||||||
+ default GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
|
|
||||||
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, stencil);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
GpuTextureView createTextureView(GpuTexture texture);
|
|
||||||
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/api/textures/GpuTexture.java
|
|
||||||
+++ b/com/mojang/renderpearl/api/textures/GpuTexture.java
|
|
||||||
@@ -10,7 +_,7 @@
|
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
-public interface GpuTexture extends UncheckedAutoCloseable {
|
|
||||||
+public interface GpuTexture extends UncheckedAutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
|
|
||||||
int USAGE_COPY_DST = 1;
|
|
||||||
int USAGE_COPY_SRC = 2;
|
|
||||||
int USAGE_TEXTURE_BINDING = 4;
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/api/GpuDeviceBackend.java
|
|
||||||
+++ b/com/mojang/renderpearl/backend/api/GpuDeviceBackend.java
|
|
||||||
@@ -30,6 +_,10 @@
|
|
||||||
|
|
||||||
GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels);
|
|
||||||
|
|
||||||
+ default GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage int usage, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
|
|
||||||
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
GpuTextureView createTextureView(GpuTexture texture, int baseMipLevel, int mipLevels);
|
|
||||||
|
|
||||||
GpuBuffer createBuffer(@Nullable Supplier<String> label, @GpuBuffer.Usage int usage, long size);
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/common/BaseGpuTexture.java
|
|
||||||
+++ b/com/mojang/renderpearl/backend/common/BaseGpuTexture.java
|
|
||||||
@@ -24,6 +_,19 @@
|
|
||||||
final int depthOrLayers,
|
|
||||||
final int mipLevels
|
|
||||||
) {
|
|
||||||
+ this(usage, label, format, width, height, depthOrLayers, mipLevels, false);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public BaseGpuTexture(
|
|
||||||
+ final @GpuTexture.Usage int usage,
|
|
||||||
+ final String label,
|
|
||||||
+ final GpuFormat format,
|
|
||||||
+ final int width,
|
|
||||||
+ final int height,
|
|
||||||
+ final int depthOrLayers,
|
|
||||||
+ final int mipLevels,
|
|
||||||
+ final boolean stencil
|
|
||||||
+ ) {
|
|
||||||
this.usage = usage;
|
|
||||||
this.label = label;
|
|
||||||
this.format = format;
|
|
||||||
@@ -31,6 +_,7 @@
|
|
||||||
this.height = height;
|
|
||||||
this.depthOrLayers = depthOrLayers;
|
|
||||||
this.mipLevels = mipLevels;
|
|
||||||
+ this.stencilEnabled = stencil;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@@ -66,5 +_,12 @@
|
|
||||||
@Override
|
|
||||||
public String getLabel() {
|
|
||||||
return this.label;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ private final boolean stencilEnabled;
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public boolean isStencilEnabled() {
|
|
||||||
+ return this.stencilEnabled;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlBackend.java
|
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlBackend.java
|
|
||||||
@@ -38,6 +_,8 @@
|
|
||||||
"OpenGL is not supported: " + Objects.requireNonNullElse(SDLError.SDL_GetError(), "<no error>"),
|
|
||||||
BackendCreationException.Reason.OPENGL_MISSING
|
|
||||||
);
|
|
||||||
+ // If we have loaded the early loading screen, we expect the libraries to be loaded, so don't actually error
|
|
||||||
+ if (!"OpenGL is not supported: OpenGL library already loaded".equals(this.libraryLoadFailure.getMessage()))
|
|
||||||
throw this.libraryLoadFailure;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
--- a/com/mojang/renderpearl/backend/opengl/GlTexture.java
|
|
||||||
+++ b/com/mojang/renderpearl/backend/opengl/GlTexture.java
|
|
||||||
@@ -28,7 +_,11 @@
|
|
||||||
final int id,
|
|
||||||
final FrameBufferCache frameBufferCache
|
|
||||||
) {
|
|
||||||
- super(usage, label, format, width, height, depthOrLayers, mipLevels);
|
|
||||||
+ this(usage, label, format, width, height, depthOrLayers, mipLevels, id, frameBufferCache, false);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ protected GlTexture(@GpuTexture.Usage int usage, String label, GpuFormat format, int width, int height, int depthOrLayers, int mipLevels, int id, FrameBufferCache frameBufferCache, boolean stencil) {
|
|
||||||
+ super(usage, label, format, width, height, depthOrLayers, mipLevels, stencil);
|
|
||||||
this.id = id;
|
|
||||||
this.frameBufferCache = frameBufferCache;
|
|
||||||
}
|
|
||||||
Loaded 100 of 882 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user