mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bc9649bd6 | ||
|
|
41dfdc8f8b | ||
|
|
4dae990880 | ||
|
|
f0f144156b | ||
|
|
d17cfd0b4b | ||
|
|
d697be351f | ||
|
|
703195cd36 | ||
|
|
3f1e9a90c9 | ||
|
|
da353a52fe | ||
|
|
3bac35089f | ||
|
|
cb2e205867 | ||
|
|
c5d015e60a | ||
|
|
72be0c9ccd | ||
|
|
dabe919492 |
No files matched your search
@@ -2,7 +2,7 @@ name: Publish
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ '26.2' ]
|
branches: [ '26.3' ]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|||||||
+14
-3
@@ -1,3 +1,6 @@
|
|||||||
|
#forgedev dev if the folder exists in here
|
||||||
|
forgedev
|
||||||
|
|
||||||
#eclipse
|
#eclipse
|
||||||
**/bin
|
**/bin
|
||||||
**/.settings
|
**/.settings
|
||||||
@@ -22,10 +25,12 @@
|
|||||||
/*/build
|
/*/build
|
||||||
/*/.gradle
|
/*/.gradle
|
||||||
|
|
||||||
|
# Minecraft
|
||||||
|
/run
|
||||||
|
/*.launch
|
||||||
|
|
||||||
# Projects repo, either ignore it, or ignore patches.
|
# Projects repo, either ignore it, or ignore patches.
|
||||||
/projects/mcp/
|
src/minecraft
|
||||||
/projects/clean/
|
|
||||||
/projects/forge/
|
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/projects/**/build/
|
/projects/**/build/
|
||||||
@@ -33,6 +38,7 @@
|
|||||||
/projects/**/run/
|
/projects/**/run/
|
||||||
/projects/**/*.launch
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
|
/rejects-*/
|
||||||
src/*/generated/**/.cache/
|
src/*/generated/**/.cache/
|
||||||
|
|
||||||
# Generated by gradle every import
|
# Generated by gradle every import
|
||||||
@@ -47,3 +53,8 @@ src/*/generated/**/.cache/
|
|||||||
/*/.factorypath
|
/*/.factorypath
|
||||||
/*/.apt_generated/
|
/*/.apt_generated/
|
||||||
/fmlcore/logs/
|
/fmlcore/logs/
|
||||||
|
/lib/
|
||||||
|
/_actual/
|
||||||
|
/runs/
|
||||||
|
/forge.ipr
|
||||||
|
/forge.iws
|
||||||
+1
-1
@@ -3,7 +3,7 @@ parts herein are licensed under the terms of the LGPL 2.1 found
|
|||||||
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
|
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
|
||||||
copied below.
|
copied below.
|
||||||
|
|
||||||
Homepage: http://minecraftforge.net/
|
Homepage: https://minecraftforge.net/
|
||||||
https://github.com/MinecraftForge/MinecraftForge
|
https://github.com/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+782
-37
@@ -1,57 +1,802 @@
|
|||||||
import net.minecraftforge.forge.tasks.*
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'net.minecraftforge.licenser' version '1.0.1'
|
id 'java-library'
|
||||||
id 'com.github.ben-manes.versions' version '0.46.0'
|
id 'idea'
|
||||||
id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)'
|
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'de.undercouch.download' version '5.4.0'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle.patcher' version '[6.0.51,6.2)' apply false
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradle.mcp' version '[6.0.51,6.2)' apply false
|
alias libs.plugins.versions
|
||||||
id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
|
alias libs.plugins.gradleutils
|
||||||
//id 'org.barfuin.gradle.taskinfo' version '3.0.1'
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
alias libs.plugins.jarsigner
|
||||||
|
id 'net.minecraftforge.forgedev'
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
Util.init() //Init all our extension methods!
|
gradleutils.displayName = 'Forge'
|
||||||
|
group = 'net.minecraftforge'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
ext {
|
// NOTE: See settings.gradle for all the referenceable version variables.
|
||||||
VERSION = gitversion.getMCTagOffsetBranch(MC_VERSION)
|
// All subprojects (that apply 'net.minecraftforge.forge.build.convention') will have these available.
|
||||||
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
println "Version: $version"
|
||||||
|
|
||||||
|
java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
|
||||||
|
jarSigner.autoDetect('forge')
|
||||||
|
|
||||||
|
// We have to tell ForgeDev to use the exact versions of tools we ship in the installer
|
||||||
|
fdtools {
|
||||||
|
configure('mavenizer') {
|
||||||
|
version = '0.5.22'
|
||||||
|
}
|
||||||
|
configure('binpatcher') {
|
||||||
|
version = buildLibs.binarypatcher.get().version
|
||||||
|
}
|
||||||
|
configure('installertools') {
|
||||||
|
version = buildLibs.installertools.get().version
|
||||||
|
}
|
||||||
|
configure('jarcompatibilitychecker') {
|
||||||
|
javaLauncher = javaToolchains.launcherFor(java.toolchain)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
changelog {
|
/* This is used for debugging, comparing all published artifacts against actual production
|
||||||
from '65.0'
|
forgedev.validatePublish {
|
||||||
|
task {
|
||||||
|
baseBranch = 'upstream/26.1.2'
|
||||||
|
versionPrefix = minecraftVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
final minecraftFiles = forgedev.minecraftFiles(minecraftVersion)
|
||||||
|
|
||||||
|
final mcpBase = forgedev.mcpBase {
|
||||||
|
mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}"
|
||||||
|
accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
|
sideAnnotationStrippers.from file('src/main/resources/forge.sas')
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.patches {
|
||||||
|
base = mcpBase
|
||||||
|
patches = file('patches/minecraft')
|
||||||
|
patched = file('src/minecraft/java')
|
||||||
|
sourceSets.main.java.srcDir patched
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('setup') {
|
tasks.register('setup') {
|
||||||
dependsOn ':forge:extractMapped'
|
dependsOn forgedev.patches.apply
|
||||||
if (findProject(':clean'))
|
|
||||||
dependsOn ':clean:extractMapped'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('doChecks') {
|
sourceSets {
|
||||||
dependsOn ':forge:checkJarCompatibility'
|
named('main') {
|
||||||
dependsOn ':forge:publish'
|
resources.srcDir 'src/main/generated'
|
||||||
}
|
|
||||||
|
|
||||||
project(':mcp') {
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.mcp'
|
|
||||||
mcp {
|
|
||||||
config MC_VERSION + '-' + MCP_VERSION
|
|
||||||
pipeline = 'joined'
|
|
||||||
}
|
}
|
||||||
repositories {
|
named('test') {
|
||||||
mavenLocal()
|
resources.srcDir 'src/test/generated'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (System.env.TEAMCITY_VERSION) {
|
license {
|
||||||
//Only setup the CI environment if and only if the environment variables are set.
|
header = file('LICENSE-header.txt')
|
||||||
tasks.named('configureTeamCity').configure {
|
|
||||||
doLast {
|
include 'net/minecraftforge/'
|
||||||
println "##teamcity[buildNumber '${project(':forge').version}']"
|
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
||||||
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
|
|
||||||
|
tasks.tap {
|
||||||
|
register('main') {
|
||||||
|
files.from files('src/main/java')
|
||||||
|
}
|
||||||
|
|
||||||
|
register('test') {
|
||||||
|
files.from files('src/test/java')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
publishAll = false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO [ForgeDev] Support compileOnlyApi, runtimeOnly, and a consumable annotation processor configuration
|
||||||
|
configurations {
|
||||||
|
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
||||||
|
register('bootstrap') {
|
||||||
|
transitive = false
|
||||||
|
canBeDeclared = true
|
||||||
|
canBeResolved = true
|
||||||
|
}
|
||||||
|
|
||||||
|
register('installer') {
|
||||||
|
transitive = false
|
||||||
|
canBeDeclared = true
|
||||||
|
canBeResolved = true
|
||||||
|
extendsFrom(bootstrap)
|
||||||
|
}
|
||||||
|
|
||||||
|
named('api') {
|
||||||
|
extendsFrom(installer)
|
||||||
|
}
|
||||||
|
|
||||||
|
named('implementation') {
|
||||||
|
// Inherit vanilla Minecraft's dependencies
|
||||||
|
extendsFrom(mcpBase.dependencyConfiguration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// These need to actually be on the classpath at the start. This is only used for the server shim jar.
|
||||||
|
// And this is only needed because custom file systems are REQUIRED to be on the boot classloader.
|
||||||
|
// This has ASM/BootStrap/Unsafe all because I haven't gotten around to moving UnionFileSystem out to its own project.
|
||||||
|
bootstrap libs.jarjar.fs // JarInJar file system
|
||||||
|
bootstrap libs.roimfs // JarInJar File System - FileSystems need to be on boot loader.
|
||||||
|
bootstrap libs.bundles.jimfs // In memory file system used for ForgeDev launches
|
||||||
|
bootstrap libs.securemodules // Has Union file system in it
|
||||||
|
bootstrap libs.unsafe // Needed by securemodules
|
||||||
|
bootstrap libs.bundles.asm // Needed by securemodules
|
||||||
|
|
||||||
|
implementation libs.jopt.simple
|
||||||
|
|
||||||
|
installer libs.bootstrap
|
||||||
|
installer libs.bootstrap.api // Needed by securemodules
|
||||||
|
installer libs.accesstransformers
|
||||||
|
installer libs.eventbus
|
||||||
|
installer libs.jspecify // Dep of EventBus
|
||||||
|
installer libs.forgespi
|
||||||
|
installer libs.coremods.api
|
||||||
|
installer libs.modlauncher
|
||||||
|
installer libs.mergetool.api
|
||||||
|
installer libs.bundles.night.config
|
||||||
|
installer libs.maven.artifact
|
||||||
|
installer libs.bundles.terminalconsoleappender
|
||||||
|
installer libs.mixin
|
||||||
|
installer libs.mixinextras.forge
|
||||||
|
installer libs.bundles.jarjar
|
||||||
|
installer libs.roimfs
|
||||||
|
|
||||||
|
installer projects.fmlcore
|
||||||
|
installer projects.fmlloader
|
||||||
|
installer projects.fmlearlydisplay
|
||||||
|
installer projects.javafmllanguage
|
||||||
|
installer projects.lowcodelanguage
|
||||||
|
installer projects.mclanguage
|
||||||
|
installer projects.forgeTransformers
|
||||||
|
|
||||||
|
runtimeOnly files(mcpBase.extra)
|
||||||
|
|
||||||
|
runtimeOnly libs.bootstrap
|
||||||
|
runtimeOnly libs.bootstrap.dev
|
||||||
|
|
||||||
|
annotationProcessor libs.eventbus.validator
|
||||||
|
}
|
||||||
|
|
||||||
|
final EXTRA_TXTS = [
|
||||||
|
file('LICENSE.txt'),
|
||||||
|
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', '-XX:StackShadowPages=32'
|
||||||
|
|
||||||
|
systemProperty 'bsl.debug', 'true'
|
||||||
|
systemProperty 'terminal.jline', '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}'
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
systemProperty 'forge.enableGameTest', 'true'
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('server') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_server'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('gameTestServer') {
|
||||||
|
options {
|
||||||
|
systemProperty 'forge.enableGameTest', 'true'
|
||||||
|
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
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
|
systemProperty 'forge.enableGameTest', 'true'
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
args '--mod', '.+',
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--output', rootProject.file('src/test/generated/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('clientData') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_client_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) {
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
args '--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 {
|
||||||
|
config {
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args = ['--launchTarget', 'forge_server']
|
||||||
|
}
|
||||||
|
classpath {
|
||||||
|
libraries configurations.installer
|
||||||
|
library tasks.named('universalJar', Jar)
|
||||||
|
library forgedev.binaryPatches('server').apply, 'server'
|
||||||
|
serverBundle.fileProvider(minecraftFiles.server)
|
||||||
|
}
|
||||||
|
bootstrapClasspath(configurations.bootstrap)
|
||||||
|
jar {
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') {
|
||||||
|
jar.fileProvider(mcpBase.classes)
|
||||||
|
output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
|
||||||
|
blacklist 'net/minecraft/world/level/BaseSpawner' // Ignore this class as we special case it.
|
||||||
|
invokeVirtual('finalizeSpawn', '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;')
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.validateDeprecations(tasks.named('jar', Jar)) {
|
||||||
|
mcVersion = minecraftVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.checks() {
|
||||||
|
base = mcpBase
|
||||||
|
ats {}
|
||||||
|
sas {}
|
||||||
|
execs {}
|
||||||
|
|
||||||
|
patches {
|
||||||
|
dependsOn forgedev.patches.make
|
||||||
|
patchDir = forgedev.patches.patches
|
||||||
|
patchesWithS2SArtifact = [
|
||||||
|
'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
|
||||||
|
'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fix {
|
||||||
|
dependsOn finalizeSpawn
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.patches.make.configure {
|
||||||
|
finalizedBy forgedev.checks.patches.fix
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final crowdin = forgedev.crowdin // Create the crowdin tasks
|
||||||
|
tasks.named('jar', Jar) {
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
exclude '.cache'
|
||||||
|
|
||||||
|
from(zipTree(crowdin.flatMap { it.output } )) {
|
||||||
|
include 'assets/forge/lang/*.json'
|
||||||
|
}
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.forge'
|
||||||
|
])
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
final universalJar = tasks.register('universalJar', Jar) {
|
||||||
|
from (zipTree(tasks.named('jar', Jar).flatMap { it.archiveFile } )) {
|
||||||
|
exclude(forgedev.filterVanilla(mcpBase.classes))
|
||||||
|
}
|
||||||
|
manifest = tasks.named('jar', Jar).get().manifest
|
||||||
|
archiveClassifier = 'universal'
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
final sourcesJarAll = tasks.register('sourcesJarAll', Jar) {
|
||||||
|
archiveClassifier = 'sources-all'
|
||||||
|
from(sourceSets.main.allJava.srcDirs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Our sources, plus the patches we do to Vanilla Minecraft
|
||||||
|
final sourcesJar = tasks.register('sourcesJar', Jar) {
|
||||||
|
archiveClassifier = 'sources'
|
||||||
|
from(sourceSets.main.allJava.srcDirs - forgedev.patches.patched.asFile.get())
|
||||||
|
mustRunAfter(forgedev.patches.make)
|
||||||
|
from(forgedev.patches.patches) {
|
||||||
|
into 'patches/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.userDev {
|
||||||
|
base(mcpBase)
|
||||||
|
|
||||||
|
config {
|
||||||
|
universal universalJar
|
||||||
|
sources sourcesJar
|
||||||
|
addLibraries(configurations.installer)
|
||||||
|
// TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config
|
||||||
|
// so we don't gotta keep making exceptions for MixinExtras
|
||||||
|
addCompileDependency(libs.mixinextras.common)
|
||||||
|
addAnnotationProcessorDependency(libs.mixinextras.common)
|
||||||
|
|
||||||
|
// TODO [ForgeDev] Consolidate Patcher + UserDev Config runs in a sane way
|
||||||
|
runs {
|
||||||
|
configureEach {
|
||||||
|
parents = []
|
||||||
|
main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args '--gameDir', '.'
|
||||||
|
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32'
|
||||||
|
client = it.name.containsIgnoreCase('client')
|
||||||
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('clientData') {
|
||||||
|
args '--launchTarget', "forge_userdev_client_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('client') {
|
||||||
|
property 'forge.enableGameTest', 'true'
|
||||||
|
args '--launchTarget', "forge_userdev_client"
|
||||||
|
args '--version', 'MOD_DEV'
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('server') {
|
||||||
|
property 'forge.enableGameTest', 'true'
|
||||||
|
args '--launchTarget', "forge_userdev_server"
|
||||||
|
}
|
||||||
|
|
||||||
|
register('gameTestServer') {
|
||||||
|
args '--launchTarget', "forge_userdev_server_gametest"
|
||||||
|
}
|
||||||
|
|
||||||
|
register('data') {
|
||||||
|
args '--launchTarget', "forge_userdev_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
patches {
|
||||||
|
modified.setFrom(sourcesJarAll.flatMap { it.archiveFile })
|
||||||
|
}
|
||||||
|
binaryPatches {
|
||||||
|
mustRunAfter(forgedev.patches.make)
|
||||||
|
patches.setFrom(forgedev.patches.patches)
|
||||||
|
dirty.setFrom(tasks.named('jar', Jar).flatMap { it.archiveFile })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.userdevCompatibility(minecraftVersion) {
|
||||||
|
clean = mcpBase.classes
|
||||||
|
dirty = tasks.named('jar', Jar)
|
||||||
|
}
|
||||||
|
|
||||||
|
// region Installer tasks, Not needed when we simplify the installer/remove obf
|
||||||
|
final clientBinPatches = forgedev.binaryPatches('client') {
|
||||||
|
clean = minecraftFiles.client
|
||||||
|
// Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
|
||||||
|
apply {
|
||||||
|
store = true
|
||||||
|
marker = '.forge_patched_minecraft'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final serverBinPatches = forgedev.binaryPatches('server') {
|
||||||
|
clean = minecraftFiles.serverExtracted
|
||||||
|
apply { store = true }
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
forgedev.installer {
|
||||||
|
dev = !forgedev.ci
|
||||||
|
offline = false
|
||||||
|
baseVersion = buildLibs.installer.get().version.toString()
|
||||||
|
|
||||||
|
// Add extra libraries
|
||||||
|
pack serverShim.jar // The Server executable jar IS needed to be packed, as the installer would need a spec bump in order to download it
|
||||||
|
pack universalJar // I don't think this is strictly needed to be packed anymore, will need to double check later
|
||||||
|
|
||||||
|
launcherLibrary universalJar
|
||||||
|
// We configure the launcher here to keep the order for easier diff, after publishing, move this to the LauncherJson configuration below
|
||||||
|
launcherJson {
|
||||||
|
// We create this during install, so it's not downloadable
|
||||||
|
generated(clientBinPatches.apply, 'client')
|
||||||
|
}
|
||||||
|
|
||||||
|
launcherLibraries configurations.installer
|
||||||
|
|
||||||
|
final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
|
||||||
|
final installertools = tool(buildLibs.installertools)
|
||||||
|
final binarypatcher = tool(buildLibs.binarypatcher)
|
||||||
|
|
||||||
|
jar {
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
from(rootProject.file('/forge_installer_logo.png')) {
|
||||||
|
rename { 'big_logo.png' }
|
||||||
|
}
|
||||||
|
from(clientBinPatches.create.flatMap { t -> t.output }) {
|
||||||
|
rename { 'data/client.lzma' }
|
||||||
|
}
|
||||||
|
from(serverBinPatches.create.flatMap { t -> t.output }) {
|
||||||
|
rename { 'data/server.lzma' }
|
||||||
|
}
|
||||||
|
|
||||||
|
final argsFile = rootProject.file('server_files/args.txt')
|
||||||
|
final tokens = [tokens: [
|
||||||
|
SHIM_JAR_FILE: serverShim.jar.get().archiveFileName.get(),
|
||||||
|
MAVEN_PATH: forgedev.mavenArtifact.directory
|
||||||
|
]]
|
||||||
|
from(argsFile) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
rename { 'unix_args.txt' }
|
||||||
|
}
|
||||||
|
from(argsFile) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
rename { 'win_args.txt' }
|
||||||
|
}
|
||||||
|
|
||||||
|
from(rootProject.file('server_files')) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
exclude 'args.txt'
|
||||||
|
}
|
||||||
|
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
json {
|
||||||
|
icon = rootProject.file('icon.ico')
|
||||||
|
executable serverShim.jar
|
||||||
|
minecraft = minecraftVersion
|
||||||
|
profileVersion = launcherId
|
||||||
|
|
||||||
|
final projectArtifact = "${project.group}:${project.name}:${project.version}"
|
||||||
|
|
||||||
|
data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]"
|
||||||
|
data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
|
||||||
|
|
||||||
|
data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
|
||||||
|
data 'PATCHED', "[$projectArtifact:client]", "[$projectArtifact:server]"
|
||||||
|
data 'PATCHED_SHA', clientBinPatches.apply.flatMap { it.output }, serverBinPatches.apply.flatMap { it.output }
|
||||||
|
|
||||||
|
steps = [
|
||||||
|
extract(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
archive '{INSTALLER}'
|
||||||
|
extract 'data/README.txt', '{ROOT}/README.txt'
|
||||||
|
extract 'data/run.sh', '{ROOT}/run.sh'
|
||||||
|
executable '{ROOT}/run.sh'
|
||||||
|
extract 'data/run.bat', '{ROOT}/run.bat'
|
||||||
|
optional 'data/user_jvm_args.txt', '{ROOT}/user_jvm_args.txt'
|
||||||
|
extract 'data/unix_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/unix_args.txt"
|
||||||
|
extract 'data/win_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/win_args.txt"
|
||||||
|
},
|
||||||
|
extractBundle(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
libraries()
|
||||||
|
},
|
||||||
|
extractBundle(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
jar '{MINECRAFT_JAR}', '{MC_UNPACKED}'
|
||||||
|
cache '{MC_UNPACKED}', '{MC_UNPACKED_SHA}'
|
||||||
|
},
|
||||||
|
step(binarypatcher) {
|
||||||
|
side = 'server'
|
||||||
|
args = [
|
||||||
|
'--clean', '{MC_UNPACKED}',
|
||||||
|
'--output', '{PATCHED}',
|
||||||
|
'--apply', '{BINPATCH}',
|
||||||
|
'--data', '--unpatched',
|
||||||
|
'--store'
|
||||||
|
]
|
||||||
|
cache '{PATCHED}', '{PATCHED_SHA}'
|
||||||
|
},
|
||||||
|
step(binarypatcher) {
|
||||||
|
side = 'client'
|
||||||
|
args = [
|
||||||
|
'--clean', '{MINECRAFT_JAR}',
|
||||||
|
'--output', '{PATCHED}',
|
||||||
|
'--apply', '{BINPATCH}',
|
||||||
|
'--data', '--unpatched',
|
||||||
|
'--store',
|
||||||
|
'--marker', '.forge_patched_minecraft'
|
||||||
|
]
|
||||||
|
cache '{PATCHED}', '{PATCHED_SHA}'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
launcherJson {
|
||||||
|
// These are flags to preserve glitchy old behavior to make diffing easier, removing when migrating to production is recommended
|
||||||
|
sortLibraries = false // Don't sort, makes things non-deterministic, but easier to diff old versions
|
||||||
|
duplicateLibraries = true // Our 'bootstrap' layer go added twice
|
||||||
|
librariesLast = false // Makes libraries be added before args
|
||||||
|
|
||||||
|
id = launcherId
|
||||||
|
inheritsFrom = minecraftVersion
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
gameArgs = [ '--launchTarget', 'forge_client' ]
|
||||||
|
jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders', '-XX:StackShadowPages=32' ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
|
||||||
|
gradleVersion = '9.7.1'
|
||||||
|
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/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
tasks.named('javadoc', Javadoc) {
|
||||||
|
description = 'Generates the combined javadocs for the FML projects and the main Forge project'
|
||||||
|
var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage', ':forge-transformers' ]
|
||||||
|
source includedProjects.collect { project(it).sourceSets.main.allJava }
|
||||||
|
classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath })
|
||||||
|
|
||||||
|
var docsDir = rootProject.file('src/docs/')
|
||||||
|
inputs.dir(docsDir)
|
||||||
|
.withPropertyName('docs resources directory')
|
||||||
|
.withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
|
.optional()
|
||||||
|
|
||||||
|
failOnError = false
|
||||||
|
|
||||||
|
// Exclude the Minecraft classes if not enabled
|
||||||
|
if (!project.hasProperty('generateAllDocumentation')) {
|
||||||
|
exclude 'net/minecraft/**'
|
||||||
|
exclude 'com/mojang/**'
|
||||||
|
}
|
||||||
|
exclude 'mcp/**'
|
||||||
|
|
||||||
|
options {
|
||||||
|
stylesheetFile = new File(docsDir, 'stylesheet.css')
|
||||||
|
|
||||||
|
tags = [
|
||||||
|
'apiNote:a:<em>API Note:</em>',
|
||||||
|
'implSpec:a:<em>Implementation Requirements:</em>',
|
||||||
|
'implNote:a:<em>Implementation Note:</em>'
|
||||||
|
]
|
||||||
|
|
||||||
|
groups = [
|
||||||
|
'Forge Mod Loader': [
|
||||||
|
'net.minecraftforge.fml.common.asm*',
|
||||||
|
'net.minecraftforge.fml.loading*',
|
||||||
|
'net.minecraftforge.fml.server*'
|
||||||
|
],
|
||||||
|
'FML Core': [
|
||||||
|
'net.minecraftforge.fml',
|
||||||
|
'net.minecraftforge.fml.config*',
|
||||||
|
'net.minecraftforge.fml.event*',
|
||||||
|
'net.minecraftforge.fml.util*'
|
||||||
|
],
|
||||||
|
'FML Common': [
|
||||||
|
'net.minecraftforge.fml.core',
|
||||||
|
'net.minecraftforge.fml.event.config',
|
||||||
|
'net.minecraftforge.fml.event.lifecycle'
|
||||||
|
],
|
||||||
|
'FML Java/MC Language Providers': [
|
||||||
|
'net.minecraftforge.fml.common',
|
||||||
|
'net.minecraftforge.fml.javafmlmod',
|
||||||
|
'net.minecraftforge.fml.mclanguageprovider'
|
||||||
|
],
|
||||||
|
'Minecraft Forge API': [
|
||||||
|
'net.minecraftforge*'
|
||||||
|
]
|
||||||
|
]
|
||||||
|
|
||||||
|
author = false
|
||||||
|
noSince = true
|
||||||
|
noHelp = true
|
||||||
|
|
||||||
|
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}"
|
||||||
|
docTitle = "Minecraft Forge API - ${forgeVersion} for Minecraft ${minecraftVersion}"
|
||||||
|
header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${forgeVersion} for Minecraft ${minecraftVersion}</strong></div>"
|
||||||
|
}
|
||||||
|
|
||||||
|
doLast {
|
||||||
|
project.copy {
|
||||||
|
from docsDir
|
||||||
|
exclude '/stylesheet.css'
|
||||||
|
into destinationDir
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
// These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching
|
||||||
|
// region ForgeDev Tests
|
||||||
|
def all = tasks.register('all') {}
|
||||||
|
afterEvaluate {
|
||||||
|
if (gradle.startParameter.taskNames.contains('all')) {
|
||||||
|
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 (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea',
|
||||||
|
'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm',
|
||||||
|
'generateActionsWorkflow'
|
||||||
|
]) 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
|
||||||
|
all.configure { dependsOn(task) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
// endregion
|
||||||
|
// We dont have any unit tests, so disable this error
|
||||||
|
tasks.withType(AbstractTestTask).configureEach {
|
||||||
|
failOnNoDiscoveredTests = false
|
||||||
|
}
|
||||||
|
// This shouldn't be needed according to the Gradle devs, as we never run these commands together.
|
||||||
|
// But in another case of Gradle being gradle, here we are
|
||||||
|
[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
|
||||||
|
.each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
|
||||||
|
forgedev.runs.configureEach {
|
||||||
|
run.configure { dependsOn finalizeSpawn}
|
||||||
|
runTest.configure { dependsOn finalizeSpawn}
|
||||||
|
}
|
||||||
|
// run gradlew dependencyUpdates --no-parallel
|
||||||
|
//noinspection UnnecessaryQualifiedReference
|
||||||
|
tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) {
|
||||||
|
resolutionStrategy {
|
||||||
|
mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions
|
||||||
|
force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
/.gradle/
|
|
||||||
/build/
|
|
||||||
/out/
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
repositories {
|
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation 'org.ow2.asm:asm:9.9.1'
|
|
||||||
implementation 'org.ow2.asm:asm-tree:9.9.1'
|
|
||||||
implementation 'net.minecraftforge:srgutils:0.6.2'
|
|
||||||
implementation 'net.minecraftforge:JarJarMetadata:0.3.27'
|
|
||||||
implementation 'commons-io:commons-io:2.13.0'
|
|
||||||
implementation 'com.google.code.gson:gson:2.10.1'
|
|
||||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.util.zip.ZipFile
|
|
||||||
|
|
||||||
abstract class BundleList extends DefaultTask {
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getConfig()
|
|
||||||
@InputFile abstract RegularFileProperty getServerBundle()
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
BundleList() {
|
|
||||||
config.setFrom(project.configurations.installer)
|
|
||||||
output.convention(project.layout.buildDirectory.file("$name/output.list"))
|
|
||||||
configure {
|
|
||||||
dependsOn(project.tasks.universalJar)
|
|
||||||
inputs.file(project.tasks.universalJar.archiveFile)
|
|
||||||
dependsOn(project.tasks.applyServerBinPatches)
|
|
||||||
inputs.file(project.tasks.applyServerBinPatches.output)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def entries = [:] as TreeMap
|
|
||||||
def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
|
|
||||||
for (def dep : resolved) {
|
|
||||||
def info = Util.getMavenInfoFromDep(dep)
|
|
||||||
//println("$dep.file.sha1\t$info.name\t$info.path")
|
|
||||||
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
|
|
||||||
}
|
|
||||||
|
|
||||||
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
|
||||||
var info = Util.getMavenInfoFromTask(packed)
|
|
||||||
def file = packed.archiveFile.get().asFile
|
|
||||||
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
|
|
||||||
|
|
||||||
var classifier = 'server'
|
|
||||||
var genned = project.tasks.applyServerBinPatches
|
|
||||||
info = Util.getMavenInfoFromTask(genned, classifier)
|
|
||||||
file = genned.output.get().asFile
|
|
||||||
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
|
|
||||||
|
|
||||||
try (def zip = new ZipFile(serverBundle.get().asFile)) {
|
|
||||||
def entry = zip.getEntry('META-INF/libraries.list')
|
|
||||||
def data = zip.getInputStream(entry).text.split('\n')
|
|
||||||
for (def line : data) {
|
|
||||||
def (sha, artifact, path) = line.split('\t')
|
|
||||||
def (group, name, other) = artifact.split(':', 3)
|
|
||||||
//println("Group: $group Name: $name")
|
|
||||||
def key = "$group:$name"
|
|
||||||
if (other.indexOf(':') != -1){
|
|
||||||
key += ':' + other.split(':', 2)[1]
|
|
||||||
//println("\tKey: $key")
|
|
||||||
}
|
|
||||||
if (!entries.containsKey(key))
|
|
||||||
entries.put(key, line)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
output.get().asFile.text = entries.values().join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.FieldNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class BytecodeFinder extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getJar()
|
|
||||||
// It should be fine to mark the output as internal as we want to control when we run it anyways.
|
|
||||||
// This also shuts Gradle 8 up about implicit task dependencies.
|
|
||||||
@Internal abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
BytecodeFinder() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
Util.init()
|
|
||||||
|
|
||||||
var outputFile = output.get().asFile
|
|
||||||
if (outputFile.exists())
|
|
||||||
outputFile.delete()
|
|
||||||
|
|
||||||
pre()
|
|
||||||
|
|
||||||
Util.processClassNodes(jar.get().asFile, this.&process)
|
|
||||||
|
|
||||||
post()
|
|
||||||
outputFile.text = new JsonBuilder(getData()).toPrettyString()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected process(ClassNode node) {
|
|
||||||
if (node.fields !== null) node.fields.each { process(node, it) }
|
|
||||||
if (node.methods !== null) node.methods.each { process(node, it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
protected pre() {}
|
|
||||||
protected process(ClassNode parent, FieldNode node) {}
|
|
||||||
protected process(ClassNode parent, MethodNode node) {}
|
|
||||||
protected post() {}
|
|
||||||
protected abstract Object getData()
|
|
||||||
}
|
|
||||||
-48
@@ -1,48 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
|
||||||
|
|
||||||
private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
|
||||||
for (final current : node.instructions) {
|
|
||||||
if (predicate.get().call(parent, node, current)) {
|
|
||||||
var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
|
|
||||||
|
|
||||||
// only add non-synthetic methods
|
|
||||||
if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
|
|
||||||
methods.add(node.name + node.desc)
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
@Override
|
|
||||||
protected Object getData() {
|
|
||||||
var array = new ArrayList<Object>()
|
|
||||||
matches.forEach { c, m ->
|
|
||||||
{
|
|
||||||
array.add(
|
|
||||||
'class': c,
|
|
||||||
'methods': m
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks;
|
|
||||||
|
|
||||||
import groovy.transform.CompileDynamic;
|
|
||||||
import groovy.transform.CompileStatic;
|
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.TreeSet;
|
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.Reader;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.io.Writer;
|
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Eclipse config files are literally just java properties, with the header cleaned up.
|
|
||||||
* https://github.com/eclipse/buildship/blob/5b2c7fca7fa86cd74d71b3c099c7b1559eba038e/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/internal/configuration/PreferenceStore.java#L238
|
|
||||||
*
|
|
||||||
* This does the same thing, as well as sorting alphabetically.
|
|
||||||
* It also ignores all comments. We can add them latter if someone cares.
|
|
||||||
*/
|
|
||||||
@CompileStatic
|
|
||||||
public class CleanProperties extends Properties {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
private static final String LINE_SEP = System.getProperty("line.separator");
|
|
||||||
private static final String UNIX_LINE_SEP = "\n";
|
|
||||||
private static final Charset ENCODING = StandardCharsets.UTF_8;
|
|
||||||
|
|
||||||
public CleanProperties load(File input) throws IOException {
|
|
||||||
if (input.exists()) {
|
|
||||||
try (Reader is = new InputStreamReader(new FileInputStream(input), ENCODING)) {
|
|
||||||
super.load(is);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void store(File out) throws IOException {
|
|
||||||
if (!out.getParentFile().exists())
|
|
||||||
out.getParentFile().mkdirs();
|
|
||||||
|
|
||||||
try (OutputStream os = new FileOutputStream(out)) {
|
|
||||||
store(os, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized Enumeration<Object> keys() {
|
|
||||||
Set<Object> ret = new TreeSet<>();
|
|
||||||
for (Enumeration<?> e = super.keys(); e.hasMoreElements();)
|
|
||||||
ret.add(e.nextElement());
|
|
||||||
return Collections.enumeration(ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileDynamic
|
|
||||||
@Override
|
|
||||||
public Set<Map.Entry<Object, Object>> entrySet() {
|
|
||||||
Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
|
|
||||||
ret.addAll(super.entrySet());
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void store(OutputStream out, String comments) throws IOException {
|
|
||||||
out.write(clean().getBytes(ENCODING));
|
|
||||||
out.flush();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void store(Writer out, String comments) throws IOException {
|
|
||||||
out.write(clean());
|
|
||||||
out.flush();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String clean() throws IOException {
|
|
||||||
ByteArrayOutputStream tmp = new ByteArrayOutputStream();
|
|
||||||
try {
|
|
||||||
super.store(tmp, null);
|
|
||||||
} finally {
|
|
||||||
tmp.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
String ret = tmp.toString(ENCODING).replace(LINE_SEP, UNIX_LINE_SEP);
|
|
||||||
ret = ret.substring(ret.indexOf(UNIX_LINE_SEP) + 1);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.stc.FirstParam
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer
|
|
||||||
|
|
||||||
public class ClosureHelper {
|
|
||||||
BiConsumer<String, Closure> callback
|
|
||||||
|
|
||||||
public ClosureHelper(Closure cl, BiConsumer<String, Closure> callback) {
|
|
||||||
this.callback = callback
|
|
||||||
apply(this, cl)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def methodMissing(String name, Object args) {
|
|
||||||
if (!args.class.isArray()) return
|
|
||||||
Object[] aargs = (Object[])args
|
|
||||||
|
|
||||||
if (aargs.length == 1 && aargs[0] instanceof Closure) {
|
|
||||||
this.callback.accept(name, (Closure)aargs[0])
|
|
||||||
} else {
|
|
||||||
throw new IllegalArgumentException('Unknown method: "' + name + '" with arguments ' + args + ' for ' + this)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
|
|
||||||
cl.delegate = obj
|
|
||||||
cl.resolveStrategy = Closure.DELEGATE_FIRST
|
|
||||||
cl()
|
|
||||||
return obj
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.DirectoryProperty
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.OutputFiles
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.gradle.api.tasks.OutputDirectory
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
abstract class DownloadLibraries extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInput()
|
|
||||||
@OutputDirectory abstract DirectoryProperty getOutput()
|
|
||||||
@OutputFile abstract RegularFileProperty getLibrariesOutput()
|
|
||||||
|
|
||||||
DownloadLibraries() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name))
|
|
||||||
librariesOutput.convention(project.layout.buildDirectory.dir(name).map(d -> d.file('libraries.txt')))
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
def run() {
|
|
||||||
Util.init()
|
|
||||||
File outputDir = output.get().asFile
|
|
||||||
var libraries = new ArrayList<String>()
|
|
||||||
|
|
||||||
def json = input.get().asFile.json().libraries.each { lib ->
|
|
||||||
//TODO: Thread?
|
|
||||||
def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
|
|
||||||
artifacts.each{ art ->
|
|
||||||
def target = new File(outputDir, art.path)
|
|
||||||
libraries.add(target.absolutePath)
|
|
||||||
if (!target.exists() || art.sha1 != target.sha1()) {
|
|
||||||
project.logger.lifecycle("Downloading ${art.url}")
|
|
||||||
if (!target.parentFile.exists()) {
|
|
||||||
target.parentFile.mkdirs()
|
|
||||||
}
|
|
||||||
new URL(art.url).withInputStream { i ->
|
|
||||||
target.withOutputStream { it << i }
|
|
||||||
}
|
|
||||||
if (art.sha1 != target.sha1()) {
|
|
||||||
throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Files.write(librariesOutput.get().asFile.toPath(), libraries)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
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.*
|
|
||||||
|
|
||||||
import java.util.zip.ZipFile
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class ExtractFile extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInput()
|
|
||||||
@Input abstract Property<String> getTarget()
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var zip = new ZipFile(input.get().asFile);
|
|
||||||
var entry = zip.getEntry(target.get())
|
|
||||||
if (entry == null)
|
|
||||||
throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
|
|
||||||
var stream = zip.getInputStream(entry)
|
|
||||||
output.get().asFile.withOutputStream { out ->
|
|
||||||
stream.transferTo(out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.EqualsAndHashCode
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.objectweb.asm.tree.AbstractInsnNode
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
import static org.objectweb.asm.Opcodes.*
|
|
||||||
|
|
||||||
abstract class FieldCompareFinder extends BytecodeFinder {
|
|
||||||
@Nested
|
|
||||||
Map<String, Search> fields = [:] as HashMap
|
|
||||||
@Internal
|
|
||||||
Map<Search, String> fieldsReverse = [:] as HashMap
|
|
||||||
@Internal
|
|
||||||
Map<String, Set<ObjectTarget>> targets = [:] as TreeMap
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected pre() {
|
|
||||||
//fields.each{ k,v -> logger.lifecycle("Fields: " + k + ' ' + v) }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
|
||||||
AbstractInsnNode last = null
|
|
||||||
def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
|
|
||||||
for (int x = 0; x < node.instructions.size(); x++) {
|
|
||||||
def current = node.instructions.get(x)
|
|
||||||
if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
|
|
||||||
if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
|
|
||||||
def target = new Search(cls: last.owner, name: last.name)
|
|
||||||
def wanted = fieldsReverse.get(target)
|
|
||||||
def original = fields.get(wanted)
|
|
||||||
def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
|
|
||||||
if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
|
|
||||||
targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
last = current
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
@Override
|
|
||||||
protected Object getData() {
|
|
||||||
def ret = [:] as HashMap
|
|
||||||
targets.forEach{ k, v ->
|
|
||||||
def e = fields.get(k)
|
|
||||||
ret[k] = [
|
|
||||||
cls: e.cls,
|
|
||||||
name: e.name,
|
|
||||||
replacement: e.replacement,
|
|
||||||
targets: v
|
|
||||||
]
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
@EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
|
|
||||||
static class Search {
|
|
||||||
@Input
|
|
||||||
String cls
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String name
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String replacement
|
|
||||||
|
|
||||||
@Nested
|
|
||||||
@Optional
|
|
||||||
Set<ObjectTarget> blacklist
|
|
||||||
|
|
||||||
@Override
|
|
||||||
String toString() {
|
|
||||||
return cls + '.' + name
|
|
||||||
}
|
|
||||||
|
|
||||||
def blacklist(String owner, String name, String desc) {
|
|
||||||
if (blacklist === null)
|
|
||||||
blacklist = new HashSet<>()
|
|
||||||
blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
|
|
||||||
}
|
|
||||||
def blacklist(String owner) {
|
|
||||||
blacklist(owner, '', '')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void fields(Closure cl) {
|
|
||||||
new ClosureHelper(cl, {name, ccl ->
|
|
||||||
def search = ClosureHelper.apply(new Search(), ccl)
|
|
||||||
this.fields.put(name, search)
|
|
||||||
this.fieldsReverse.put(search, name)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.reflect.TypeToken
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.TupleConstructor
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
@TupleConstructor
|
|
||||||
final class InheritanceData implements Annotatable {
|
|
||||||
String name
|
|
||||||
int access
|
|
||||||
String superName
|
|
||||||
List<String> interfaces = []
|
|
||||||
Map<String, Method> methods = [:]
|
|
||||||
Map<String, Field> fields = [:]
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Method implements Annotatable {
|
|
||||||
int access
|
|
||||||
String override
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Field implements Annotatable {
|
|
||||||
int access
|
|
||||||
String desc
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Annotation {
|
|
||||||
String desc
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Gson GSON = new Gson()
|
|
||||||
static Map<String, InheritanceData> parse(File file) {
|
|
||||||
try (final reader = file.newReader()) {
|
|
||||||
return GSON.fromJson(reader, new TypeToken<Map<String, InheritanceData>>() {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
interface Annotatable {
|
|
||||||
List<InheritanceData.Annotation> getAnnotations()
|
|
||||||
}
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.file.DuplicatesStrategy
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
import org.gradle.api.tasks.bundling.Zip
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
|
|
||||||
abstract class InstallerJar extends Zip {
|
|
||||||
@Input @Optional abstract Property<Boolean> getFat()
|
|
||||||
@Input @Optional abstract Property<Boolean> getOffline()
|
|
||||||
|
|
||||||
InstallerJar() {
|
|
||||||
archiveClassifier.set('installer')
|
|
||||||
archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
|
|
||||||
destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
|
|
||||||
fat.convention(false)
|
|
||||||
offline.convention(false)
|
|
||||||
|
|
||||||
def installerJson = project.tasks.installerJson
|
|
||||||
def launcherJson = project.tasks.launcherJson
|
|
||||||
def downloadInstaller = project.tasks.downloadInstaller
|
|
||||||
|
|
||||||
dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer)
|
|
||||||
from(installerJson, launcherJson)
|
|
||||||
|
|
||||||
from(project.rootProject.file('/src/main/resources/url.png'))
|
|
||||||
project.afterEvaluate {
|
|
||||||
from(project.zipTree(downloadInstaller.output)) {
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fat.get() || offline.get()) {
|
|
||||||
def cfg = project.tasks.register(name + "Config", Configure)
|
|
||||||
cfg.get().configure {
|
|
||||||
parent = this
|
|
||||||
dependsOn(project.tasks.installerJson, project.tasks.launcherJson)
|
|
||||||
}
|
|
||||||
dependsOn(cfg)
|
|
||||||
} else {
|
|
||||||
// Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file.
|
|
||||||
// I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
|
|
||||||
[
|
|
||||||
project.tasks.serverShimJar // Server bootstrap executable jar
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def path = Util.getMavenInfoFromTask(packed).path
|
|
||||||
from(packed) {
|
|
||||||
rename { "maven/$path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static abstract class Configure extends DefaultTask {
|
|
||||||
public Zip parent
|
|
||||||
private int count = 0;
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def deps = [:] as java.util.TreeMap
|
|
||||||
|
|
||||||
// Gather all things that need downloading
|
|
||||||
[
|
|
||||||
project.tasks.installerJson,
|
|
||||||
project.tasks.launcherJson
|
|
||||||
].each { task ->
|
|
||||||
def json = task.output.get().asFile.json
|
|
||||||
json.libraries.each { lib ->
|
|
||||||
if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
|
|
||||||
deps.put(lib.name, lib.downloads.artifact)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// First find things we build in this project.
|
|
||||||
[
|
|
||||||
project.tasks.universalJar, // Forge runtime code
|
|
||||||
project.tasks.serverShimJar // Shim jar for dedicated server
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def name = Util.getMavenInfoFromTask(packed).name
|
|
||||||
def info = deps.remove(name)
|
|
||||||
if (info !== null) {
|
|
||||||
println("Adding: $packed.path $name")
|
|
||||||
parent.from(packed) {
|
|
||||||
rename { "maven/$info.path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find any artifacts from the 'installer' config
|
|
||||||
// This config specifies the runtime files we intend for the interaller to have.
|
|
||||||
// And are typically what we would be developing and testing alongside Forge.
|
|
||||||
// So we may have local modified versions
|
|
||||||
def cfg = project.configurations.installer
|
|
||||||
while (cfg != null) {
|
|
||||||
//println('')
|
|
||||||
def resolved = cfg.resolvedConfiguration.resolvedArtifacts
|
|
||||||
int found = 0
|
|
||||||
for (def dep : resolved) {
|
|
||||||
def name = Util.getMavenInfoFromDep(dep).name
|
|
||||||
def info = deps.remove(name)
|
|
||||||
if (info == null) {
|
|
||||||
//println("Skipping: $name")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
//println("-$name")
|
|
||||||
found++
|
|
||||||
addFile(dep.file, info)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (deps.isEmpty()) {
|
|
||||||
cfg = null
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prevent infinite loops if something fucky happens
|
|
||||||
if (found == 0)
|
|
||||||
throw new IllegalStateException("Failed to find any installer dependencies")
|
|
||||||
|
|
||||||
def seen = [] as Set
|
|
||||||
cfg = project.configurations.detachedConfiguration()
|
|
||||||
cfg.transitive = false
|
|
||||||
for (def key : deps.keySet()) {
|
|
||||||
def (group, artifact, other) = key.split(':', 3)
|
|
||||||
// Only resolve unique group:artifact so we don't get version overrides
|
|
||||||
if (seen.add(group + ':' + artifact)) {
|
|
||||||
//println("+$key")
|
|
||||||
cfg.dependencies.add(project.dependencies.create(key))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void addFile(file, info) {
|
|
||||||
boolean pack = parent.offline.get() || info.url.isEmpty()
|
|
||||||
|
|
||||||
// If it's a offline jar just always pack
|
|
||||||
if (!pack) {
|
|
||||||
try {
|
|
||||||
var remote = new URL("${info.url}.sha1").getText('UTF-8')
|
|
||||||
pack = info.sha1 != remote
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
pack = !info.url.startsWith('https://libraries.minecraft.net/')
|
|
||||||
// Oh noes its not there!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pack) {
|
|
||||||
println("Adding: $file.absolutePath")
|
|
||||||
parent.from(file) {
|
|
||||||
rename { "maven/$info.path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.provider.SetProperty
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
abstract class InstallerJson extends DefaultTask {
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getInput()
|
|
||||||
@Input @Optional final Map<String, Object> libraries = new LinkedHashMap<>()
|
|
||||||
@Input Map<String, Object> json = new LinkedHashMap<>()
|
|
||||||
@InputFile abstract RegularFileProperty getIcon()
|
|
||||||
@Input abstract Property<String> getLauncherJsonName()
|
|
||||||
@Input abstract Property<String> getLogo()
|
|
||||||
@Input abstract Property<String> getMirrors()
|
|
||||||
@Input abstract Property<String> getWelcome()
|
|
||||||
|
|
||||||
InstallerJson() {
|
|
||||||
launcherJsonName.convention('/version.json')
|
|
||||||
logo.convention('/big_logo.png')
|
|
||||||
mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
|
|
||||||
welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
|
|
||||||
output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
|
|
||||||
|
|
||||||
project.afterEvaluate {
|
|
||||||
[
|
|
||||||
project.tasks.universalJar,
|
|
||||||
project.tasks.serverShimJar
|
|
||||||
].forEach { packed ->
|
|
||||||
dependsOn(packed)
|
|
||||||
input.from packed.archiveFile
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def libs = libraries
|
|
||||||
[
|
|
||||||
project.tasks.universalJar,
|
|
||||||
project.tasks.serverShimJar
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def info = Util.getMavenInfoFromTask(packed)
|
|
||||||
libs.put(info.name, [
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "https://maven.minecraftforge.net/$info.path",
|
|
||||||
sha1: packed.archiveFile.get().asFile.sha1(),
|
|
||||||
size: packed.archiveFile.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
json.libraries = libs.values().sort{a,b -> a.name.compareTo(b.name)}
|
|
||||||
json.icon = "data:image/png;base64," + new String(Base64.getEncoder().encode(Files.readAllBytes(icon.get().asFile.toPath())))
|
|
||||||
json.json = launcherJsonName.get()
|
|
||||||
json.logo = logo.get()
|
|
||||||
if (!mirrors.get().isEmpty())
|
|
||||||
json.mirrorList = mirrors.get()
|
|
||||||
json.welcome = welcome.get()
|
|
||||||
|
|
||||||
Files.writeString(output.get().getAsFile().toPath(), new JsonBuilder(json).toPrettyString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,415 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.tasks;
|
|
||||||
|
|
||||||
import com.google.common.reflect.TypeToken;
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier;
|
|
||||||
import net.minecraftforge.jarjar.metadata.ContainedJarMetadata;
|
|
||||||
import net.minecraftforge.jarjar.metadata.ContainedVersion;
|
|
||||||
import net.minecraftforge.jarjar.metadata.Metadata;
|
|
||||||
import net.minecraftforge.jarjar.metadata.MetadataIOHandler;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.ArtifactVersionSerializer;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.ContainedJarIdentifierSerializer;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.ContainedJarMetadataSerializer;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.ContainedVersionSerializer;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.MetadataSerializer;
|
|
||||||
import net.minecraftforge.jarjar.metadata.json.VersionRangeSerializer;
|
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
|
||||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|
||||||
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
|
|
||||||
import org.apache.maven.artifact.versioning.VersionRange;
|
|
||||||
import org.codehaus.groovy.runtime.InvokerHelper;
|
|
||||||
import org.gradle.api.Action;
|
|
||||||
import org.gradle.api.DefaultTask;
|
|
||||||
import org.gradle.api.artifacts.ConfigurationContainer;
|
|
||||||
import org.gradle.api.artifacts.Dependency;
|
|
||||||
import org.gradle.api.artifacts.ExternalModuleDependency;
|
|
||||||
import org.gradle.api.artifacts.FileCollectionDependency;
|
|
||||||
import org.gradle.api.artifacts.MinimalExternalModuleDependency;
|
|
||||||
import org.gradle.api.artifacts.ModuleDependency;
|
|
||||||
import org.gradle.api.artifacts.ModuleIdentifier;
|
|
||||||
import org.gradle.api.artifacts.ModuleVersionIdentifier;
|
|
||||||
import org.gradle.api.artifacts.ResolvedArtifact;
|
|
||||||
import org.gradle.api.file.ProjectLayout;
|
|
||||||
import org.gradle.api.file.RegularFileProperty;
|
|
||||||
import org.gradle.api.provider.Provider;
|
|
||||||
import org.gradle.api.provider.SetProperty;
|
|
||||||
import org.gradle.api.tasks.Input;
|
|
||||||
import org.gradle.api.tasks.OutputFile;
|
|
||||||
import org.gradle.api.tasks.TaskAction;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.Serial;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.zip.ZipFile;
|
|
||||||
|
|
||||||
// TODO SUPER SUPER SUPER UGLY, CLEAN UP IN FORGEDEV 7
|
|
||||||
@Deprecated(forRemoval = true) // Will be moved to JarJar plugin in ForgeDev 7
|
|
||||||
public abstract class JarJarMetadataOptions extends DefaultTask {
|
|
||||||
private static final Gson GSON = new GsonBuilder()
|
|
||||||
.registerTypeAdapter(VersionRange.class, new VersionRangeSerializer())
|
|
||||||
.registerTypeAdapter(ArtifactVersion.class, new ArtifactVersionSerializer())
|
|
||||||
.registerTypeAdapter(DefaultArtifactVersion.class, new ArtifactVersionSerializer())
|
|
||||||
.registerTypeAdapter(ContainedJarIdentifier.class, new ContainedJarIdentifierSerializer())
|
|
||||||
.registerTypeAdapter(ContainedJarMetadata.class, new ContainedJarMetadataSerializer())
|
|
||||||
.registerTypeAdapter(ContainedVersion.class, new ContainedVersionSerializer())
|
|
||||||
.registerTypeAdapter(Metadata.class, new MetadataSerializer())
|
|
||||||
.setPrettyPrinting()
|
|
||||||
.create();
|
|
||||||
|
|
||||||
protected abstract @Input SetProperty<ResolvedDependencyInfoImpl> getResolvedDependencies();
|
|
||||||
|
|
||||||
protected abstract @OutputFile RegularFileProperty getMetadataFile();
|
|
||||||
|
|
||||||
protected abstract @Inject ProjectLayout getLayout();
|
|
||||||
|
|
||||||
// NOTE: I'm not adding a non-provider version. please just use the version catalog entries for now.
|
|
||||||
public void add(Provider<MinimalExternalModuleDependency> dependency, Action<? super ResolvedDependencyInfo> action) {
|
|
||||||
this.getResolvedDependencies().add(dependency.map(d -> {
|
|
||||||
var ret = ResolvedDependencyInfoImpl.from(this.getProject().getConfigurations(), d);
|
|
||||||
action.execute(ret);
|
|
||||||
return ret;
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public JarJarMetadataOptions() {
|
|
||||||
this.getMetadataFile().convention(this.getLayout().getBuildDirectory().file(this.getName() + "/options.json"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
record ForgeLocaterOptions(String resource, String layer, String id, List<ContainedJarMetadata> deps, ContainedJarMetadata meta, boolean nested) { }
|
|
||||||
|
|
||||||
var resolved = this.getResolvedDependencies().get();
|
|
||||||
var jars = new ArrayList<ForgeLocaterOptions>(resolved.size());
|
|
||||||
for (var dependency : resolved) {
|
|
||||||
var deps = new ArrayList<ContainedJarMetadata>();
|
|
||||||
try (var zip = new ZipFile(dependency.artifact)) {
|
|
||||||
var entry = zip.getEntry("META-INF/jarjar/metadata.json");
|
|
||||||
if (entry != null) {
|
|
||||||
try (var stream = zip.getInputStream(entry)) {
|
|
||||||
var meta = MetadataIOHandler.fromStream(stream).orElse(null);
|
|
||||||
if (meta == null)
|
|
||||||
throw new IllegalStateException("Corrupt metadata.json in " + dependency.artifact.getAbsolutePath());
|
|
||||||
for (var dep : meta.jars())
|
|
||||||
deps.add(new ContainedJarMetadata(dep.identifier(), dep.version(), "", dep.isObfuscated()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
jars.add(new ForgeLocaterOptions(
|
|
||||||
dependency.resource,
|
|
||||||
dependency.layer,
|
|
||||||
dependency.identifier,
|
|
||||||
deps,
|
|
||||||
new ContainedJarMetadata(
|
|
||||||
new ContainedJarIdentifier(validateGroup(dependency), dependency.module.getName()),
|
|
||||||
new ContainedVersion(null, parseVersion(dependency)),
|
|
||||||
Objects.requireNonNull(dependency.path, "Dependency path is unspecified: " + dependency.asString),
|
|
||||||
false
|
|
||||||
),
|
|
||||||
dependency.nested
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
record Meta(List<ForgeLocaterOptions> options){}
|
|
||||||
|
|
||||||
Files.writeString(
|
|
||||||
this.getMetadataFile().getAsFile().get().toPath(),
|
|
||||||
GSON.toJson(new Meta(jars), Meta.class)
|
|
||||||
);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String validateGroup(ResolvedDependencyInfoImpl dependency) {
|
|
||||||
try {
|
|
||||||
return Objects.requireNonNull(dependency.module.getGroup());
|
|
||||||
} catch (NullPointerException e) {
|
|
||||||
throw new IllegalArgumentException("Module dependency has no group: " + dependency.asString, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private ArtifactVersion parseVersion(ResolvedDependencyInfoImpl resolved) {
|
|
||||||
try {
|
|
||||||
return VersionRange.createFromVersionSpec(Objects.requireNonNull(resolved.version)).getRecommendedVersion();
|
|
||||||
} catch (InvalidVersionSpecificationException e) {
|
|
||||||
throw new IllegalArgumentException("Version is invalid for: " + resolved.asString, e);
|
|
||||||
} catch (NullPointerException e) {
|
|
||||||
throw new IllegalArgumentException("Version is unspecified for: " + resolved.asString, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private VersionRange parseVersionRange(ResolvedDependencyInfoImpl dependency) {
|
|
||||||
if (dependency.hasManuallySpecifiedRange) {
|
|
||||||
try {
|
|
||||||
return VersionRange.createFromVersionSpec(dependency.versionRange);
|
|
||||||
} catch (InvalidVersionSpecificationException e) {
|
|
||||||
throw new IllegalArgumentException("Version is invalid for: " + dependency.asString, e);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
return VersionRange.createFromVersionSpec("[%s,)".formatted(Objects.requireNonNull(dependency.versionRange)));
|
|
||||||
} catch (InvalidVersionSpecificationException e) {
|
|
||||||
throw new IllegalArgumentException("Version range is invalid for: " + dependency.asString, e);
|
|
||||||
} catch (NullPointerException e) {
|
|
||||||
throw new IllegalArgumentException("Version is unspecified for: " + dependency.asString, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface ResolvedDependencyInfo {
|
|
||||||
void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action);
|
|
||||||
|
|
||||||
void setResource(String resource);
|
|
||||||
|
|
||||||
void setLayer(String layer);
|
|
||||||
|
|
||||||
void setId(String identifier);
|
|
||||||
|
|
||||||
void setNested(boolean nested);
|
|
||||||
|
|
||||||
interface ContainedJarMetadataInfo {
|
|
||||||
void setGroup(String group);
|
|
||||||
|
|
||||||
void setName(String name);
|
|
||||||
|
|
||||||
void setPath(String version);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class ResolvedDependencyInfoImpl implements ResolvedDependencyInfo, ResolvedDependencyInfo.ContainedJarMetadataInfo, Serializable {
|
|
||||||
private static final @Serial long serialVersionUID = -7577318115877822993L;
|
|
||||||
|
|
||||||
final MinimalModuleVersionIdentifier module;
|
|
||||||
final String version;
|
|
||||||
String versionRange;
|
|
||||||
boolean hasManuallySpecifiedRange;
|
|
||||||
boolean nested;
|
|
||||||
final File artifact;
|
|
||||||
String path;
|
|
||||||
String resource;
|
|
||||||
String layer;
|
|
||||||
String identifier;
|
|
||||||
final String asString;
|
|
||||||
|
|
||||||
public ResolvedDependencyInfoImpl(MinimalModuleVersionIdentifier module, String version, File artifact, String asString) {
|
|
||||||
this.module = module;
|
|
||||||
this.version = version;
|
|
||||||
this.artifact = artifact;
|
|
||||||
this.asString = asString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action) {
|
|
||||||
action.execute(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setGroup(String group) {
|
|
||||||
this.module.group = group;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setName(String name) {
|
|
||||||
this.module.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPath(String path) {
|
|
||||||
this.path = path;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setResource(String resource) {
|
|
||||||
this.resource = resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setLayer(String layer) {
|
|
||||||
this.layer = layer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setId(String identifier) {
|
|
||||||
this.identifier = identifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setNested(boolean nested) {
|
|
||||||
this.nested = nested;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Set<File> getFiles(Set<ResolvedDependencyInfoImpl> resolvedDependencies) {
|
|
||||||
var ret = new HashSet<File>(resolvedDependencies.size());
|
|
||||||
for (var dependency : resolvedDependencies) {
|
|
||||||
ret.add(dependency.artifact);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ResolvedDependencyInfoImpl from(ConfigurationContainer configurations, Dependency dependency) {
|
|
||||||
var group = dependency.getGroup();
|
|
||||||
var name = dependency.getName();
|
|
||||||
var version = dependency.getVersion();
|
|
||||||
|
|
||||||
if (dependency instanceof FileCollectionDependency filesDependency) {
|
|
||||||
File artifact;
|
|
||||||
try {
|
|
||||||
artifact = filesDependency.getFiles().getSingleFile();
|
|
||||||
} catch (IllegalStateException e) {
|
|
||||||
// TODO fileCollectionDependencyIsNotSingleFile
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new ResolvedDependencyInfoImpl(
|
|
||||||
new MinimalModuleVersionIdentifier(group, name, version),
|
|
||||||
version,
|
|
||||||
artifact,
|
|
||||||
filesDependency.toString()
|
|
||||||
);
|
|
||||||
} else if (dependency instanceof ModuleDependency moduleDependency) {
|
|
||||||
moduleDependency = moduleDependency.copy();
|
|
||||||
if (moduleDependency instanceof ExternalModuleDependency externalModuleDependency) {
|
|
||||||
externalModuleDependency.version(v -> v.strictly(version.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
var detachedConfiguration = configurations.detachedConfiguration(moduleDependency);
|
|
||||||
detachedConfiguration.setTransitive(false);
|
|
||||||
|
|
||||||
ResolvedDependencyInfoImpl ret = null;
|
|
||||||
for (var artifact : detachedConfiguration.getResolvedConfiguration().getFirstLevelModuleDependencies().iterator().next().getModuleArtifacts()) {
|
|
||||||
var fileName = getFileName(artifact);
|
|
||||||
if (!fileName.endsWith(".jar"))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (ret != null)
|
|
||||||
throw new IllegalArgumentException("Module dependency has too many Jar artifacts: " + moduleDependency);
|
|
||||||
|
|
||||||
ret = new ResolvedDependencyInfoImpl(
|
|
||||||
new MinimalModuleVersionIdentifier(group, name, artifact.getModuleVersion().getId().getVersion()),
|
|
||||||
version,
|
|
||||||
artifact.getFile(),
|
|
||||||
moduleDependency.toString()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (ret == null)
|
|
||||||
throw new IllegalArgumentException("Module dependency has no Jar artifacts: " + moduleDependency);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
} else {
|
|
||||||
throw new IllegalArgumentException("Unsupported dependency type: " + dependency.getClass().getName() + " -- " + dependency);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getFileName(ResolvedArtifact artifact) {
|
|
||||||
try {
|
|
||||||
return InvokerHelper.getProperty(artifact.getId(), "fileName").toString();
|
|
||||||
} catch (Throwable e) {
|
|
||||||
// NOTE: Why not just use this to begin with?
|
|
||||||
// ComponentArtifactIdentifier can have a getFileName() method, which doesn't necessarily resolve the file itself.
|
|
||||||
// This allows us to get the name of the file to be used without asking Gradle to download the file.
|
|
||||||
// So, if a file is not a JAR file, we can check the name without actually downloading it.
|
|
||||||
return artifact.getFile().getName();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
if (obj == this) return true;
|
|
||||||
if (obj == null || obj.getClass() != this.getClass()) return false;
|
|
||||||
var that = (ResolvedDependencyInfoImpl) obj;
|
|
||||||
return Objects.equals(this.module, that.module) &&
|
|
||||||
Objects.equals(this.version, that.version) &&
|
|
||||||
Objects.equals(this.versionRange, that.versionRange) &&
|
|
||||||
Objects.equals(this.artifact, that.artifact);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(module, version, versionRange, artifact);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "ResolvedDependencyInfo[" +
|
|
||||||
"module=" + module + ", " +
|
|
||||||
"fixedVersion=" + version + ", " +
|
|
||||||
"versionRange=" + versionRange + ", " +
|
|
||||||
"artifact=" + artifact + ']';
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class MinimalModuleVersionIdentifier implements ModuleIdentifier, ModuleVersionIdentifier {
|
|
||||||
private static final @Serial long serialVersionUID = -955346236759069739L;
|
|
||||||
|
|
||||||
private String group;
|
|
||||||
private String name;
|
|
||||||
private final String version;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public MinimalModuleVersionIdentifier(String group, String name, String version) {
|
|
||||||
this.group = group;
|
|
||||||
this.name = name;
|
|
||||||
this.version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ModuleIdentifier getModule() {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getGroup() {
|
|
||||||
return this.group;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getVersion() {
|
|
||||||
return this.version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
return this == obj || obj instanceof MinimalModuleVersionIdentifier o
|
|
||||||
&& Objects.equals(this.group, o.group)
|
|
||||||
&& Objects.equals(this.name, o.name)
|
|
||||||
&& Objects.equals(this.version, o.version);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(group, name, version);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "MinimalModuleVersionIdentifier[" +
|
|
||||||
"group=" + group + ", " +
|
|
||||||
"name=" + name + ", " +
|
|
||||||
"version=" + version + ']';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.SetProperty
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
import static net.minecraftforge.forge.tasks.Util.getArtifacts
|
|
||||||
import static net.minecraftforge.forge.tasks.Util.iso8601Now
|
|
||||||
|
|
||||||
abstract class LauncherJson extends DefaultTask {
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getInput()
|
|
||||||
@Input Map<String, Object> json = new LinkedHashMap<>()
|
|
||||||
|
|
||||||
LauncherJson() {
|
|
||||||
output.convention(project.layout.buildDirectory.file('libs/version.json'))
|
|
||||||
|
|
||||||
dependsOn(project.tasks.universalJar)
|
|
||||||
input.from(project.tasks.universalJar.archiveFile)
|
|
||||||
input.from(project.configurations.installer)
|
|
||||||
configure {
|
|
||||||
def mc = project.rootProject.ext.MC_VERSION
|
|
||||||
def forge = project.rootProject.ext.FORGE_VERSION
|
|
||||||
def timestamp = iso8601Now()
|
|
||||||
json.putAll([
|
|
||||||
_comment: [
|
|
||||||
"Please do not automate the download and installation of Forge.",
|
|
||||||
"Our efforts are supported by ads from the download page.",
|
|
||||||
"If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
|
|
||||||
],
|
|
||||||
id: "$mc-$project.name-$forge",
|
|
||||||
time: timestamp,
|
|
||||||
releaseTime: timestamp,
|
|
||||||
inheritsFrom: mc,
|
|
||||||
type: 'release',
|
|
||||||
logging: [:],
|
|
||||||
mainClass: '',
|
|
||||||
libraries: []
|
|
||||||
] as LinkedHashMap)
|
|
||||||
|
|
||||||
[
|
|
||||||
project.tasks.universalJar
|
|
||||||
].forEach { packed ->
|
|
||||||
dependsOn(packed)
|
|
||||||
input.from packed.archiveFile
|
|
||||||
}
|
|
||||||
|
|
||||||
def patched = project.tasks.applyClientBinPatches
|
|
||||||
dependsOn(patched)
|
|
||||||
input.from patched.output
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
|
||||||
def info = Util.getMavenInfoFromTask(packed)
|
|
||||||
json.libraries.add([
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "https://maven.minecraftforge.net/$info.path",
|
|
||||||
sha1: packed.archiveFile.get().asFile.sha1(),
|
|
||||||
size: packed.archiveFile.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
|
|
||||||
var classifier = 'client'
|
|
||||||
var genned = project.tasks.applyClientBinPatches
|
|
||||||
info = Util.getMavenInfoFromTask(genned, classifier)
|
|
||||||
json.libraries.add([
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "",
|
|
||||||
sha1: genned.output.get().asFile.sha1(),
|
|
||||||
size: genned.output.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
|
|
||||||
json.libraries.addAll(getArtifacts(project.configurations.installer).values())
|
|
||||||
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.apache.commons.io.IOUtils
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
import java.util.zip.ZipOutputStream
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class MergeJars extends DefaultTask {
|
|
||||||
MergeJars() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def jars = inputJars.files
|
|
||||||
|
|
||||||
try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
|
|
||||||
for (def jar : jars) {
|
|
||||||
try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
|
|
||||||
ZipEntry entry
|
|
||||||
while ((entry = zin.getNextEntry()) !== null) {
|
|
||||||
ZipEntry _new = new ZipEntry(entry.getName())
|
|
||||||
_new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
|
|
||||||
zout.putNextEntry(_new)
|
|
||||||
IOUtils.copy(zin, zout)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@InputFiles
|
|
||||||
abstract ConfigurableFileCollection getInputJars()
|
|
||||||
|
|
||||||
@OutputFile
|
|
||||||
abstract RegularFileProperty getOutput()
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.EqualsAndHashCode
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.Nested
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
|
|
||||||
@EqualsAndHashCode
|
|
||||||
public class ObjectTarget implements Comparable<ObjectTarget> {
|
|
||||||
@Input
|
|
||||||
String owner
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String name
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Optional
|
|
||||||
String desc
|
|
||||||
|
|
||||||
@Override
|
|
||||||
String toString() {
|
|
||||||
if (desc == null)
|
|
||||||
return owner + '.' + name
|
|
||||||
return owner + '.' + name + desc
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
int compareTo(ObjectTarget o) {
|
|
||||||
return toString() <=> o.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-47
@@ -1,47 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.artifacts.Dependency
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.StandardCopyOption
|
|
||||||
|
|
||||||
abstract class SetupCheckJarCompatibility extends DefaultTask {
|
|
||||||
SetupCheckJarCompatibility() {
|
|
||||||
group = 'jar compatibility'
|
|
||||||
onlyIf {
|
|
||||||
inputVersion.getOrNull() !== null
|
|
||||||
}
|
|
||||||
outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
|
|
||||||
|
|
||||||
baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def inputVersion = inputVersion.get()
|
|
||||||
|
|
||||||
def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
|
|
||||||
project.rootProject.extensions.download.run {
|
|
||||||
src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
|
|
||||||
dest baseForgeUserdev
|
|
||||||
}
|
|
||||||
|
|
||||||
def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
|
|
||||||
|
|
||||||
Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Optional
|
|
||||||
abstract Property<String> getInputVersion()
|
|
||||||
|
|
||||||
@OutputFile
|
|
||||||
abstract RegularFileProperty getBaseBinPatchesOutput()
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.reflect.TypeToken
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.eclipse.jgit.api.Git
|
|
||||||
|
|
||||||
import javax.annotation.Nullable
|
|
||||||
import java.util.stream.Collectors
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class TeamcityRequests {
|
|
||||||
public static final Gson GSON = new Gson()
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
|
|
||||||
final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
|
|
||||||
conn.setRequestProperty('Accept', 'application/json')
|
|
||||||
conn.setReadTimeout(5 * 1000)
|
|
||||||
conn.setConnectTimeout(5 * 1000)
|
|
||||||
conn.connect()
|
|
||||||
|
|
||||||
if (conn.responseCode !== 200) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
try (final InputStream is = conn.getInputStream()) {
|
|
||||||
GSON.fromJson(new InputStreamReader(is), clazz.getType())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static Map<String, Build> buildsByCommit() throws IOException {
|
|
||||||
final Map<String, Build> builds = [:]
|
|
||||||
jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
|
|
||||||
?.build?.forEach {
|
|
||||||
it.revisions.revision.each { rev -> builds[rev.version] = it }
|
|
||||||
}
|
|
||||||
return builds
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static String attemptFindBase(File gitPath) {
|
|
||||||
try (final git = Git.open(gitPath)) {
|
|
||||||
final Map<String, Build> buildByCommit = buildsByCommit()
|
|
||||||
for (final commit in git.log().setMaxCount(100).call()) {
|
|
||||||
// Find the first commit which was built on CI
|
|
||||||
final build = buildByCommit[commit.id.name]
|
|
||||||
if (build) {
|
|
||||||
return build.number
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception ignored) {}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Builds {
|
|
||||||
public List<Build> build
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Build {
|
|
||||||
public String number
|
|
||||||
public Revisions revisions
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Revisions {
|
|
||||||
public int count
|
|
||||||
public List<Revision> revision
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Revision {
|
|
||||||
public String version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.stc.ClosureParams
|
|
||||||
import groovy.transform.stc.SimpleType
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.Task
|
|
||||||
import org.gradle.api.artifacts.Configuration
|
|
||||||
import org.gradle.api.artifacts.ResolvedArtifact
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
import org.objectweb.asm.ClassReader
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
|
|
||||||
import java.net.http.HttpClient
|
|
||||||
import java.net.http.HttpRequest
|
|
||||||
import java.net.http.HttpResponse
|
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.concurrent.ConcurrentHashMap
|
|
||||||
import java.util.concurrent.Semaphore
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
final class Util {
|
|
||||||
public static final int ASM_LEVEL = Opcodes.ASM9
|
|
||||||
private static final HttpClient HTTP = HttpClient.newBuilder().build()
|
|
||||||
|
|
||||||
static void init() {
|
|
||||||
File.metaClass.sha1 = { ->
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
|
||||||
delegate.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
|
|
||||||
File.metaClass.sha256 = { ->
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-256')
|
|
||||||
delegate.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
|
|
||||||
|
|
||||||
File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
|
|
||||||
File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
|
|
||||||
File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
|
|
||||||
|
|
||||||
Date.metaClass.iso8601 = { ->
|
|
||||||
var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
|
|
||||||
var result = format.format(delegate)
|
|
||||||
return result[0..21] + ':' + result[22..-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
String.metaClass.rsplit = { String del, int limit = -1 ->
|
|
||||||
var lst = new ArrayList<String>()
|
|
||||||
int x = 0
|
|
||||||
int idx
|
|
||||||
String tmp = delegate
|
|
||||||
while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
|
|
||||||
lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
|
|
||||||
tmp = tmp.substring(0, idx)
|
|
||||||
}
|
|
||||||
lst.add(0, tmp)
|
|
||||||
return lst
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static String[] getClasspath(Project project, Map libs, String artifact) {
|
|
||||||
def ret = []
|
|
||||||
artifactTree(project, artifact).each { key, lib ->
|
|
||||||
libs[lib.name] = lib
|
|
||||||
if (lib.name != artifact)
|
|
||||||
ret.add(lib.name)
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getArtifacts(Configuration config) {
|
|
||||||
var ret = [:]
|
|
||||||
var semaphore = new Semaphore(1, true)
|
|
||||||
config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
|
|
||||||
var info = getMavenInfoFromDep(dep)
|
|
||||||
var domain = 'libraries.minecraft.net'
|
|
||||||
var url = "https://$domain/$info.path"
|
|
||||||
if (!checkExists(url))
|
|
||||||
url.values[0] = 'maven.minecraftforge.net'
|
|
||||||
|
|
||||||
var sha1 = sha1(dep.file)
|
|
||||||
|
|
||||||
semaphore.acquire()
|
|
||||||
ret[info.key] = [
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: url.toString(),
|
|
||||||
sha1: sha1,
|
|
||||||
size: dep.file.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]
|
|
||||||
semaphore.release()
|
|
||||||
})
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromDep(ResolvedArtifact dep) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: dep.moduleVersion.id.group,
|
|
||||||
name: dep.moduleVersion.id.name,
|
|
||||||
version: dep.moduleVersion.id.version,
|
|
||||||
classifier: dep.classifier,
|
|
||||||
extension: dep.extension
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromTask(AbstractArchiveTask task) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: task.project.group.toString(),
|
|
||||||
name: task.project.name,
|
|
||||||
version: task.project.version.toString(),
|
|
||||||
classifier: task.archiveClassifier.get(),
|
|
||||||
extension: task.archiveExtension.get()
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromTask(Task task, String classifier) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: task.project.group.toString(),
|
|
||||||
name: task.project.name,
|
|
||||||
version: task.project.version.toString(),
|
|
||||||
classifier: classifier,
|
|
||||||
extension: 'jar'
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static Map getMavenInfoFromMap(Map<String, String> art) {
|
|
||||||
var key = "$art.group:$art.name"
|
|
||||||
var name = "$art.group:$art.name:$art.version"
|
|
||||||
var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
|
|
||||||
if (art.classifier !== null) {
|
|
||||||
name += ":$art.classifier"
|
|
||||||
path += "-$art.classifier"
|
|
||||||
}
|
|
||||||
if ('jar' != art.extension) {
|
|
||||||
name += "@$art.extension"
|
|
||||||
path += ".$art.extension"
|
|
||||||
} else {
|
|
||||||
path += ".jar"
|
|
||||||
}
|
|
||||||
return [
|
|
||||||
key: key.toString(),
|
|
||||||
name: name.toString(),
|
|
||||||
path: path.toString(),
|
|
||||||
art: art
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
static String iso8601Now() { new Date().iso8601() }
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static String sha1(File file) {
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
|
||||||
file.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static String toHex(byte bite) {
|
|
||||||
return String.format('%02x', bite)
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
|
|
||||||
if (!project.ext.has('tree_resolver'))
|
|
||||||
project.ext.tree_resolver = 1
|
|
||||||
def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
|
|
||||||
cfg.transitive = transitive
|
|
||||||
def dep = project.dependencies.create(artifact)
|
|
||||||
cfg.dependencies.add(dep)
|
|
||||||
def files = cfg.resolve()
|
|
||||||
return getArtifacts(cfg)
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static boolean checkExists(String url) {
|
|
||||||
try {
|
|
||||||
return HTTP.send(HttpRequest.newBuilder(new URI(url))
|
|
||||||
.method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
|
|
||||||
).statusCode() === 200
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (e.toString().contains('unable to find valid certification path to requested target'))
|
|
||||||
throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static String getLatestForgeVersion(String mcVersion) {
|
|
||||||
final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
|
|
||||||
final ver = json.promos["$mcVersion-latest"]
|
|
||||||
ver === null ? null : (mcVersion + '-' + ver)
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
|
|
||||||
file.withInputStream { i ->
|
|
||||||
new ZipInputStream(i).withCloseable { zin ->
|
|
||||||
ZipEntry zein
|
|
||||||
while ((zein = zin.nextEntry) !== null) {
|
|
||||||
if (zein.name.endsWith('.class')) {
|
|
||||||
var node = new ClassNode(ASM_LEVEL)
|
|
||||||
new ClassReader(zin).accept(node, 0)
|
|
||||||
process(node)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.srgutils.MinecraftVersion
|
|
||||||
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.InputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.objectweb.asm.tree.AnnotationNode
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
|
|
||||||
abstract class ValidateDeprecations extends DefaultTask {
|
|
||||||
@InputFile
|
|
||||||
abstract RegularFileProperty getInput()
|
|
||||||
|
|
||||||
@Input
|
|
||||||
abstract Property<String> getMcVersion()
|
|
||||||
|
|
||||||
ValidateDeprecations() {
|
|
||||||
this.onlyIf { !System.env.TEAMCITY_VERSION }
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var mcVer = MinecraftVersion.from(mcVersion.get())
|
|
||||||
List<String> errors = []
|
|
||||||
|
|
||||||
Util.processClassNodes(input.get().asFile) {
|
|
||||||
processNode(mcVer, errors, it)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!errors.isEmpty()) {
|
|
||||||
errors.forEach {
|
|
||||||
this.logger.error("Deprecated ${it[0]} is marked for removal in ${it[1]} but is not yet removed")
|
|
||||||
}
|
|
||||||
throw new IllegalStateException("Found deprecated members marked for removal but not yet removed in ${mcVer}; see log for details")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected processNode(MinecraftVersion mcVer, List<String> errors, ClassNode node) {
|
|
||||||
node.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"class ${node.name}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node.fields?.each { field ->
|
|
||||||
field.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"field ${node.name}#${field.name}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node.methods?.each { method ->
|
|
||||||
method.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"method ${node.name}#${method.name}${method.desc}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
|
|
||||||
def values = annotation.values
|
|
||||||
if (values === null)
|
|
||||||
return
|
|
||||||
int forRemoval = values.indexOf('forRemoval')
|
|
||||||
int since = values.indexOf('since')
|
|
||||||
if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
|
|
||||||
def oldVersion = MinecraftVersion.from(values[since + 1])
|
|
||||||
int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
|
|
||||||
if (split.length < 2)
|
|
||||||
return
|
|
||||||
def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
|
|
||||||
if (removeVersion <= mcVer)
|
|
||||||
errors.add([context(), removeVersion])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static int[] splitDots(String version) {
|
|
||||||
String[] pts = version.split('\\.')
|
|
||||||
int[] values = new int[pts.length]
|
|
||||||
for (int x = 0; x < pts.length; x++)
|
|
||||||
values[x] = Integer.parseInt(pts[x])
|
|
||||||
return values
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.TupleConstructor
|
|
||||||
import net.minecraftforge.forge.tasks.InheritanceData
|
|
||||||
import net.minecraftforge.srgutils.IMappingFile
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFile
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckATs extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getAts()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
|
|
||||||
|
|
||||||
ats.each {
|
|
||||||
final lines = process(it, reporter, inheritance)
|
|
||||||
if (fix) {
|
|
||||||
it.text = joinBack(lines, inheritance).join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TreeMap<String, ATParser.Entry> process(File file, Reporter reporter, Map<String, InheritanceData> inheritance) {
|
|
||||||
final TreeMap<String, ATParser.Entry> lines = ATParser.parse(file.readLines(), reporter)
|
|
||||||
final Map<String, ATParser.Entry> constructorGroups = [:]
|
|
||||||
|
|
||||||
final itr = lines.entrySet().iterator()
|
|
||||||
final toRemove = []
|
|
||||||
while (itr.hasNext()) {
|
|
||||||
final next = itr.next()
|
|
||||||
String key = next.key
|
|
||||||
final entry = next.value
|
|
||||||
if (entry === null) continue
|
|
||||||
|
|
||||||
final binaryName = entry.cls.replaceAll('\\.', '/')
|
|
||||||
|
|
||||||
// Process Groups, this will remove any entries outside the group that is covered by the group
|
|
||||||
if (entry.group) {
|
|
||||||
final jcls = inheritance[binaryName]
|
|
||||||
if (jcls === null) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group: $key")
|
|
||||||
} else if ('*' == entry.desc) {
|
|
||||||
if (!jcls.fields) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group, class has no fields: $key")
|
|
||||||
} else {
|
|
||||||
jcls.fields.each { field, value ->
|
|
||||||
final fkey = entry.cls + ' ' + field
|
|
||||||
if (accessLevel(value.access) < accessStr(entry.modifier)) {
|
|
||||||
if (lines.containsKey(fkey)) {
|
|
||||||
toRemove.add(fkey)
|
|
||||||
} else if (!entry.existing.contains(fkey)) {
|
|
||||||
reporter.report("Missing group entry: $fkey")
|
|
||||||
}
|
|
||||||
entry.children.add(fkey)
|
|
||||||
} else if (lines.containsKey(fkey)) {
|
|
||||||
toRemove.add(fkey)
|
|
||||||
reporter.report("Found invalid group entry: $fkey")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('*()' == entry.desc) {
|
|
||||||
if (!jcls.methods) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group, class has no methods: $key")
|
|
||||||
} else {
|
|
||||||
jcls.methods.each { mtd, value ->
|
|
||||||
if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$')) return
|
|
||||||
key = entry.cls + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel(value.access) < accessStr(entry.modifier)) {
|
|
||||||
if (lines.containsKey(key)) {
|
|
||||||
toRemove.add(key)
|
|
||||||
} else if (!entry.existing.contains(key)) {
|
|
||||||
reporter.report("Missing group entry: $key")
|
|
||||||
}
|
|
||||||
entry.children.add(key)
|
|
||||||
} else if (lines.containsKey(key)) {
|
|
||||||
toRemove.add(key)
|
|
||||||
reporter.report("Found invalid group entry: $key")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('<init>' == entry.desc) { //Make all public non-abstract subclasses
|
|
||||||
constructorGroups.put(binaryName, entry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process normal lines, remove invalid and remove narrowing
|
|
||||||
else {
|
|
||||||
def jcls = inheritance.get(binaryName)
|
|
||||||
if (jcls === null) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else if (entry.desc == '') {
|
|
||||||
if (accessLevel(jcls.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key")
|
|
||||||
}
|
|
||||||
} else if (!entry.desc.contains('(')) {
|
|
||||||
if (!jcls.fields || !jcls.fields.containsKey(entry.desc)) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else {
|
|
||||||
final value = jcls.fields[entry.desc]
|
|
||||||
if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key - ${entry.comment}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
final jdesc = entry.desc.replace('(', ' (')
|
|
||||||
if (!jcls.methods || !jcls.methods.containsKey(jdesc)) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else {
|
|
||||||
final value = jcls.methods[jdesc]
|
|
||||||
if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inheritance.each { tcls, value ->
|
|
||||||
if (!value.methods || ((value.access & Opcodes.ACC_ABSTRACT) !== 0)) return
|
|
||||||
String parent = tcls
|
|
||||||
while (parent !== null) {
|
|
||||||
constructorGroups[parent]?.tap { entry ->
|
|
||||||
value.methods.each { mtd, v ->
|
|
||||||
if (mtd.startsWith('<init>')) {
|
|
||||||
final child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel(v.access) < 3) {
|
|
||||||
if (lines.containsKey(child)) {
|
|
||||||
toRemove.add(child)
|
|
||||||
} else if (child !in entry.existing) {
|
|
||||||
reporter.report("Missing group entry: $child")
|
|
||||||
}
|
|
||||||
entry.children.add(child)
|
|
||||||
} else if (lines.containsKey(child)) {
|
|
||||||
toRemove.add(child)
|
|
||||||
reporter.report("Found invalid group entry: $child")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
parent = inheritance[parent]?.superName
|
|
||||||
}
|
|
||||||
}
|
|
||||||
constructorGroups.values().each { entry -> entry.existing.findAll { it !in entry.children }.each{ reporter.report("Found invalid group entry: $it") } }
|
|
||||||
|
|
||||||
toRemove.each(lines.&remove)
|
|
||||||
|
|
||||||
return lines
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance) {
|
|
||||||
final data = [] as List<String>
|
|
||||||
lines.each { key, value ->
|
|
||||||
if (!value.group) {
|
|
||||||
def comment = null //value.comment
|
|
||||||
data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
|
|
||||||
} else {
|
|
||||||
data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
|
|
||||||
value.children.each {
|
|
||||||
final line = value.modifier + ' ' + it
|
|
||||||
final entry = ATParser.parseEntry(line)
|
|
||||||
final comment = null //entry.comment
|
|
||||||
data.add(line + (comment ? ' ' + comment : ''))
|
|
||||||
}
|
|
||||||
data.add('#endgroup')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
|
|
||||||
static int accessStr(String access) {
|
|
||||||
if (access.endsWith('-f') || access.endsWith('+f')) return 4
|
|
||||||
switch (access.toLowerCase()) {
|
|
||||||
case 'public': return 3
|
|
||||||
case 'protected': return 2
|
|
||||||
case 'default': return 1
|
|
||||||
case 'private': return 0
|
|
||||||
default: return -1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int accessLevel(int access) {
|
|
||||||
if ((access & Opcodes.ACC_PUBLIC) !== 0) return 3
|
|
||||||
if ((access & Opcodes.ACC_PROTECTED) !== 0) return 2
|
|
||||||
if ((access & Opcodes.ACC_PRIVATE) !== 0) return 0
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class ATParser {
|
|
||||||
static TreeMap<String, Entry> parse(List<String> lines, CheckTask.Reporter reporter) {
|
|
||||||
TreeMap<String, Entry> outLines = new TreeMap<>()
|
|
||||||
Entry group = null
|
|
||||||
for (final line : lines) {
|
|
||||||
if (line.isEmpty()) continue
|
|
||||||
if (line.startsWith('#group ')) {
|
|
||||||
final entry = parseEntry(line.substring(7))
|
|
||||||
|
|
||||||
if (entry.desc != '*' && entry.desc != '*()' && entry.desc != '<init>') {
|
|
||||||
reporter.report("Invalid group: $line", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
entry.group = true
|
|
||||||
entry.children = []
|
|
||||||
entry.existing = []
|
|
||||||
|
|
||||||
group = entry
|
|
||||||
|
|
||||||
if (outLines.containsKey(entry.key)) {
|
|
||||||
reporter.report("Duplicate group: $line", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
outLines[entry.key] = group
|
|
||||||
} else if (group !== null) {
|
|
||||||
if (line.startsWith('#endgroup')) {
|
|
||||||
group = null
|
|
||||||
} else {
|
|
||||||
final key = parseEntry(line).key
|
|
||||||
group.existing.add(key)
|
|
||||||
}
|
|
||||||
} else if (line.startsWith('#endgroup')) {
|
|
||||||
reporter.report("Invalid group ending: $line", false)
|
|
||||||
} else if (line.startsWith('#')) {
|
|
||||||
//Nom
|
|
||||||
} else {
|
|
||||||
final entry = parseEntry(line)
|
|
||||||
if (outLines.containsKey(entry.key)) {
|
|
||||||
reporter.report("Found duplicate: $line")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
outLines[entry.key] = entry
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return outLines
|
|
||||||
}
|
|
||||||
|
|
||||||
static Entry parseEntry(String line) {
|
|
||||||
final idx = line.indexOf('#')
|
|
||||||
final String comment = idx === -1 ? null : line.substring(idx)
|
|
||||||
if (idx !== -1) line = line.substring(0, idx - 1)
|
|
||||||
final data = (line.trim() + ' ').split(' ', -1)
|
|
||||||
data[1] = data[1].replaceAll('/', '.') // Convert to Source names, internal names are fine by spec, but not supported by old AST based AT implementations.
|
|
||||||
new Entry(data[0], data[1], data[2], comment)
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Entry {
|
|
||||||
String modifier, cls, desc, comment
|
|
||||||
|
|
||||||
Set<String> existing
|
|
||||||
TreeSet<String> children
|
|
||||||
boolean group = false
|
|
||||||
|
|
||||||
@Lazy
|
|
||||||
String key = {cls + (desc.isEmpty() ? '' : ' ' + desc)}()
|
|
||||||
|
|
||||||
Object getAt(String key) {
|
|
||||||
return getProperty(key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import net.minecraftforge.forge.tasks.Util
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.objectweb.asm.ClassReader
|
|
||||||
import org.objectweb.asm.ClassVisitor
|
|
||||||
import org.objectweb.asm.MethodVisitor
|
|
||||||
import org.objectweb.asm.Type
|
|
||||||
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
abstract class CheckExcs extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getBinary()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getExcs()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final Set<String> known = []
|
|
||||||
collectKnown(known)
|
|
||||||
|
|
||||||
excs.each { f ->
|
|
||||||
final lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
int idx = line.indexOf('#')
|
|
||||||
if (idx === 0 || line.isEmpty()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (idx !== -1) line = line.substring(0, idx - 1)
|
|
||||||
|
|
||||||
if (!line.contains('=')) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
def (String key, String value) = line.split('=', 2)
|
|
||||||
if (!known.contains(key)) {
|
|
||||||
reporter.report("Unknown: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
String desc = key.split('\\.', 2)[1]
|
|
||||||
if (!desc.contains('(')) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
desc = '(' + desc.split('\\(', 2)[1]
|
|
||||||
|
|
||||||
def (exceptions, String args) = value.contains('|') ? value.split('|', 2) : [value, '']
|
|
||||||
|
|
||||||
if (args.split(',').length !== Type.getArgumentTypes(desc).length) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lines.add(line)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fix) f.text = lines.sort().join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void collectKnown(Collection<String> known) {
|
|
||||||
binary.get().asFile.withInputStream { i ->
|
|
||||||
new ZipInputStream(i).withCloseable { zin ->
|
|
||||||
final visitor = new ClassVisitor(Util.ASM_LEVEL) {
|
|
||||||
private String cls
|
|
||||||
@Override
|
|
||||||
void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
|
||||||
this.cls = name
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
|
|
||||||
known.add(this.cls + '.' + name + descriptor)
|
|
||||||
super.visitMethod(access, name, descriptor, signature, exceptions)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ZipEntry zein
|
|
||||||
while ((zein = zin.nextEntry) !== null) {
|
|
||||||
if (zein.name.endsWith('.class')) {
|
|
||||||
ClassReader reader = new ClassReader(zin)
|
|
||||||
reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
enum CheckMode {
|
|
||||||
CHECK,
|
|
||||||
FIX
|
|
||||||
|
|
||||||
CheckMode() {}
|
|
||||||
}
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.file.DirectoryProperty
|
|
||||||
import org.gradle.api.provider.ListProperty
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.InputDirectory
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckPatches extends CheckTask {
|
|
||||||
|
|
||||||
private static final Pattern HUNK_START_PATTERN = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
|
|
||||||
private static final Pattern WHITESPACE_PATTERN = Pattern.compile('^[+\\-]\\s*$')
|
|
||||||
private static final Pattern IMPORT_PATTERN = Pattern.compile('^[+\\-]\\s*import.*')
|
|
||||||
private static final Pattern FIELD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
|
|
||||||
private static final Pattern METHOD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
|
|
||||||
private static final Pattern CLASS_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
|
|
||||||
private static final Map<String, Integer> ACCESS_MAP = [private: 0, protected: 2, public: 3].tap { it.put(null, 1) }
|
|
||||||
|
|
||||||
@InputDirectory abstract DirectoryProperty getPatchDir()
|
|
||||||
@Input @Optional abstract ListProperty<String> getPatchesWithS2SArtifact()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final patchDir = getPatchDir().get().asFile.toPath()
|
|
||||||
Files.walk(patchDir).withCloseable {
|
|
||||||
it.filter(Files.&isRegularFile).forEach { path ->
|
|
||||||
final String relativeName = patchDir.relativize(path).toString()
|
|
||||||
verifyPatch(path, reporter, fix, relativeName, patchesWithS2SArtifact.get().contains(relativeName.replace('\\', '/')))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean accessChange(String previous, String current) {
|
|
||||||
//return ACCESS_MAP[previous] < ACCESS_MAP[current]
|
|
||||||
return previous != current
|
|
||||||
}
|
|
||||||
|
|
||||||
void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
|
|
||||||
int oldFixedErrors = reporter.fixed.size()
|
|
||||||
|
|
||||||
final lines = Files.readAllLines(patch)
|
|
||||||
|
|
||||||
int hunksStart = 0
|
|
||||||
boolean onlyWhiteSpace = false
|
|
||||||
|
|
||||||
final List<String> newLines = []
|
|
||||||
|
|
||||||
// First two lines are file name ++/-- and we do not care
|
|
||||||
newLines.add(lines[0] + '\n')
|
|
||||||
newLines.add(lines[1] + '\n')
|
|
||||||
|
|
||||||
int i
|
|
||||||
for (i = 2; i < lines.size(); ++i) {
|
|
||||||
def line = lines[i]
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
|
|
||||||
if (HUNK_START_PATTERN.matcher(line).find()) {
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
|
|
||||||
int toRemove = i - hunksStart
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
}
|
|
||||||
hunksStart = i
|
|
||||||
onlyWhiteSpace = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.startsWithAny('+','-')) {
|
|
||||||
def prefixChange = false
|
|
||||||
def prevLine = lines[i - 1]
|
|
||||||
|
|
||||||
if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
|
|
||||||
def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
|
|
||||||
def currTrim = line.substring(1).replaceAll("\\s", "")
|
|
||||||
|
|
||||||
if (prevTrim == currTrim) {
|
|
||||||
prefixChange = true
|
|
||||||
}
|
|
||||||
|
|
||||||
def pMatcher = FIELD_PATTERN.matcher(prevLine)
|
|
||||||
def cMatcher = FIELD_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // = ...
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // field name
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
pMatcher = METHOD_PATTERN.matcher(prevLine)
|
|
||||||
cMatcher = METHOD_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // params
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // <T> void name
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
pMatcher = CLASS_PATTERN.matcher(prevLine)
|
|
||||||
cMatcher = CLASS_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // class | interface
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
|
|
||||||
final nextLine = lines[i + 1]
|
|
||||||
if (nextLine.charAt(0) == (char)'+') {
|
|
||||||
final nextTrim = nextLine.substring(1).replaceAll("\\s", "")
|
|
||||||
final currTrim = line.substring(1).replaceAll("\\s", "")
|
|
||||||
|
|
||||||
if (nextTrim == currTrim) {
|
|
||||||
prefixChange = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final isWhiteSpaceChange = WHITESPACE_PATTERN.matcher(line).find()
|
|
||||||
|
|
||||||
if (!prefixChange && !isWhiteSpaceChange) {
|
|
||||||
onlyWhiteSpace = hasS2SArtifact && IMPORT_PATTERN.matcher(line).find()
|
|
||||||
} else if (isWhiteSpaceChange) {
|
|
||||||
final prevLineChange = prevLine.startsWithAny('+','-')
|
|
||||||
final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
|
|
||||||
|
|
||||||
if (!prevLineChange && !nextLineChange) {
|
|
||||||
reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.contains('\t')) {
|
|
||||||
reporter.report("Patch contains tabs on line ${i + 1}, file: $patchPath")
|
|
||||||
line = line.replaceAll('\t', ' ')
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IMPORT_PATTERN.matcher(line).find() && !hasS2SArtifact) {
|
|
||||||
reporter.report("Patch contains import change on line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
|
|
||||||
def toRemove = i - hunksStart;
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((reporter.fixed.size() > oldFixedErrors && fix) || hasS2SArtifact) {
|
|
||||||
if (newLines.size() <= 2) {
|
|
||||||
logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
|
|
||||||
Files.delete(patch)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
|
|
||||||
Files.newBufferedWriter(patch).withCloseable {
|
|
||||||
newLines.each { l -> it.write(l) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.forge.tasks.Annotatable
|
|
||||||
import net.minecraftforge.forge.tasks.InheritanceData
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckSAS extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getSass()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
|
|
||||||
|
|
||||||
sass.each { f ->
|
|
||||||
final lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
if (line[0] == '\t') return // Skip any tabbed lines, those are ones we add
|
|
||||||
final idx = line.indexOf('#')
|
|
||||||
if (idx == 0 || line.isEmpty()) {
|
|
||||||
lines.add(line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
|
||||||
final spl = (line.trim().replace('(', ' (') + ' ').split(' ', -1)
|
|
||||||
def (String cls, String name, String desc) = [spl[0], spl[1], spl[2]]
|
|
||||||
cls = cls.replaceAll('\\.', '/')
|
|
||||||
|
|
||||||
if (inheritance[cls] === null) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
} else if (name.isEmpty()) { //Class SAS
|
|
||||||
final toAdd = []
|
|
||||||
final clsSided = isSided(inheritance[cls])
|
|
||||||
boolean sided = clsSided
|
|
||||||
|
|
||||||
/* TODO: MergeTool doesn't do fields
|
|
||||||
if (json[cls]['fields'] != null) {
|
|
||||||
for (entry in json[cls]['fields']) {
|
|
||||||
if (isSided(entry.value)) {
|
|
||||||
sided = true
|
|
||||||
toAdd.add('\t' + cls + ' ' + entry.key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} */
|
|
||||||
|
|
||||||
final clsInh = inheritance[cls]
|
|
||||||
if (clsInh.methods) {
|
|
||||||
for (entry in clsInh.methods) {
|
|
||||||
if (isSided(entry.value)) {
|
|
||||||
sided = true
|
|
||||||
toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
|
|
||||||
} else if (clsSided) {
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sided) {
|
|
||||||
lines.add(cls + (comment == null ? '' : ' ' + comment))
|
|
||||||
lines.addAll(toAdd.sort())
|
|
||||||
} else {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (desc.isEmpty()) { // Fields
|
|
||||||
/* TODO: MergeTool doesn't do fields
|
|
||||||
if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
|
|
||||||
lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
|
|
||||||
else */
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
} else { // Methods
|
|
||||||
final clsInh = inheritance[cls]
|
|
||||||
if (clsInh.methods === null || !isSided(clsInh.methods[name + ' ' + desc]))
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
else {
|
|
||||||
lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
|
|
||||||
findChildMethods(inheritance, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
|
|
||||||
findChildMethods(inheritance, cls, name + ' ' + desc).each { lines.add('\t' + it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fix) f.text = lines.join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static boolean isSided(Annotatable annotatable) {
|
|
||||||
if (annotatable === null) return false
|
|
||||||
for (ann in annotatable.annotations) {
|
|
||||||
if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
|
|
||||||
return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
|
|
||||||
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.stc.ClosureParams
|
|
||||||
import groovy.transform.stc.ThirdParam
|
|
||||||
import net.minecraftforge.forge.tasks.Util
|
|
||||||
import org.gradle.api.Action
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.logging.LogLevel
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.gradle.api.tasks.TaskContainer
|
|
||||||
import org.gradle.api.tasks.VerificationTask
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckTask extends DefaultTask implements VerificationTask {
|
|
||||||
@Input
|
|
||||||
abstract Property<CheckMode> getMode()
|
|
||||||
|
|
||||||
private boolean ignoreFailures = false
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Override
|
|
||||||
boolean getIgnoreFailures() {
|
|
||||||
return ignoreFailures
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void setIgnoreFailures(boolean ignoreFailures) {
|
|
||||||
this.ignoreFailures = ignoreFailures
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
Util.init()
|
|
||||||
|
|
||||||
boolean doFix = getMode().get() === CheckMode.FIX
|
|
||||||
final Reporter reporter = new Reporter(doFix)
|
|
||||||
check(reporter, doFix)
|
|
||||||
|
|
||||||
if (reporter.messages) {
|
|
||||||
if (getMode().get() === CheckMode.CHECK) {
|
|
||||||
logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
|
|
||||||
if (!ignoreFailures) {
|
|
||||||
throw new IllegalArgumentException("${reporter.messages.size()} errors were found!")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (logger.isEnabled(LogLevel.DEBUG)) {
|
|
||||||
logger.warn("Check task '{}' found {} errors and fixed {}:\n{}", name, reporter.messages.size(), reporter.fixed.size(), reporter.fixed.join('\n'))
|
|
||||||
} else {
|
|
||||||
logger.warn("Check task '{}' found {} errors and fixed {}.", name, reporter.messages.size(), reporter.fixed.size())
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reporter.notFixed) {
|
|
||||||
logger.error('{} errors could not be fixed:\n{}', reporter.notFixed.size(), reporter.notFixed.join('\n'))
|
|
||||||
if (!ignoreFailures) {
|
|
||||||
throw new IllegalArgumentException("${reporter.notFixed.size()} errors which cannot be fixed were found!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract void check(Reporter reporter, boolean fix)
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static final class Reporter {
|
|
||||||
final boolean trackFixed
|
|
||||||
Reporter(boolean trackFixed) {
|
|
||||||
this.trackFixed = trackFixed
|
|
||||||
}
|
|
||||||
|
|
||||||
public final List<String> messages = []
|
|
||||||
|
|
||||||
public final List<String> fixed = []
|
|
||||||
public final List<String> notFixed = []
|
|
||||||
|
|
||||||
void report(String message, boolean canBeFixed = true) {
|
|
||||||
messages.add(message)
|
|
||||||
|
|
||||||
if (trackFixed) {
|
|
||||||
if (canBeFixed) {
|
|
||||||
fixed.add(message)
|
|
||||||
} else {
|
|
||||||
notFixed.add(message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
|
|
||||||
@DelegatesTo(genericTypeIndex = 0, target = 'type')
|
|
||||||
@ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
|
|
||||||
taskName = taskName.capitalize()
|
|
||||||
tasks.register("check$taskName", clazz) { CheckTask task ->
|
|
||||||
def castedTask = task as T
|
|
||||||
configuration.setDelegate(castedTask)
|
|
||||||
configuration.call(castedTask)
|
|
||||||
castedTask.mode.set(CheckMode.CHECK)
|
|
||||||
castedTask.group = 'checks'
|
|
||||||
}
|
|
||||||
tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
|
|
||||||
|
|
||||||
tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
|
|
||||||
def castedTask = task as T
|
|
||||||
configuration.setDelegate(castedTask)
|
|
||||||
configuration.call(castedTask)
|
|
||||||
castedTask.mode.set(CheckMode.FIX)
|
|
||||||
castedTask.group = 'checks'
|
|
||||||
}
|
|
||||||
tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'java-library'
|
|
||||||
id 'net.minecraftforge.gradle.patcher'
|
|
||||||
}
|
|
||||||
|
|
||||||
evaluationDependsOn(':mcp')
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven gradleutils.forgeMaven
|
|
||||||
maven gradleutils.minecraftLibsMaven
|
|
||||||
}
|
|
||||||
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(libs.forgespi)
|
|
||||||
}
|
|
||||||
|
|
||||||
patcher {
|
|
||||||
parent = project(':mcp')
|
|
||||||
mcVersion = MC_VERSION
|
|
||||||
patchedSrc = file('src/main/java')
|
|
||||||
|
|
||||||
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
|
||||||
|
|
||||||
runs {
|
|
||||||
clean_client {
|
|
||||||
client true
|
|
||||||
taskName 'clean_client'
|
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.client.main.Main'
|
|
||||||
workingDirectory project.file('run/client')
|
|
||||||
|
|
||||||
args '--gameDir', '.'
|
|
||||||
args '--version', MC_VERSION
|
|
||||||
args '--assetsDir', downloadAssets.output
|
|
||||||
args '--assetIndex', '{asset_index}'
|
|
||||||
args '--accessToken', '0'
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_server {
|
|
||||||
client false
|
|
||||||
taskName 'clean_server'
|
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.server.Main'
|
|
||||||
workingDirectory project.file('run/server')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
|
||||||
}
|
|
||||||
|
|
||||||
eclipse.classpath.file.whenMerged {
|
|
||||||
// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
|
|
||||||
def src = entries.find { it.path == 'src/main/java' }
|
|
||||||
if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
|
|
||||||
src.entryAttributes['ignore_optional_problems'] = 'true'
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('genPatches').configure {
|
|
||||||
onlyIf { false }
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('extractRangeMap').configure {
|
|
||||||
onlyIf { false }
|
|
||||||
tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
|
|
||||||
}
|
|
||||||
-1021
File diff suppressed because it is too large.
Load diff
@@ -1,89 +0,0 @@
|
|||||||
import net.minecraftforge.forge.tasks.CleanProperties
|
|
||||||
|
|
||||||
apply plugin: 'eclipse'
|
|
||||||
apply plugin: 'idea'
|
|
||||||
apply plugin: 'net.minecraftforge.gradleutils'
|
|
||||||
|
|
||||||
group = 'net.minecraftforge'
|
|
||||||
version = VERSION
|
|
||||||
println("Version: $version")
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven gradleutils.forgeMaven
|
|
||||||
maven gradleutils.minecraftLibsMaven
|
|
||||||
//mavenLocal()
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(Javadoc).configureEach {
|
|
||||||
options.tags = [
|
|
||||||
'apiNote:a:<em>API Note:</em>',
|
|
||||||
'implSpec:a:<em>Implementation Requirements:</em>',
|
|
||||||
'implNote:a:<em>Implementation Note:</em>'
|
|
||||||
]
|
|
||||||
options.addStringOption('Xdoclint:all,-missing', '-public')
|
|
||||||
}
|
|
||||||
|
|
||||||
// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
|
|
||||||
tasks.register('writeManifest') {
|
|
||||||
doLast {
|
|
||||||
if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
|
|
||||||
universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
|
|
||||||
else
|
|
||||||
jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('generateResources') {
|
|
||||||
dependsOn('writeManifest')
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('processResources') {
|
|
||||||
dependsOn(generateResources)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
dependsOn 'generateResources'
|
|
||||||
dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
|
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
|
||||||
options.forkOptions.jvmArgs += '-Xmx6G' // Needed to make compiling faster, and not run out of heap space in some cases.
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge the resources and classes into the same directory. We'll need to split them at runtime because
|
|
||||||
// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
|
|
||||||
sourceSets.each {
|
|
||||||
def dir = layout.buildDirectory.dir("classes/java/$it.name")
|
|
||||||
it.output.resourcesDir = dir
|
|
||||||
it.java.destinationDirectory = dir
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('copyEclipseSettings') {
|
|
||||||
doLast {
|
|
||||||
rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
|
|
||||||
def target = project.file('.settings/' + file.name)
|
|
||||||
def temp = new CleanProperties().load(file)
|
|
||||||
def exst = new CleanProperties().load(target)
|
|
||||||
exst.put('eclipse.preferences.version', '1')
|
|
||||||
exst.putAll(temp)
|
|
||||||
exst.store(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
|
|
||||||
eclipse {
|
|
||||||
// Run everytime eclipse builds the code
|
|
||||||
//autoBuildTasks writeManifest
|
|
||||||
// Run when importing the project
|
|
||||||
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
|
||||||
}
|
|
||||||
|
|
||||||
idea {
|
|
||||||
module {
|
|
||||||
// IntelliJ IDEA does not do this by itself anymore...
|
|
||||||
downloadJavadoc = true
|
|
||||||
downloadSources = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-2
@@ -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!
|
||||||
|
|||||||
+50
-40
@@ -1,68 +1,78 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'FML'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.jetbrains.annotations)
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
api(libs.eventbus)
|
api libs.eventbus
|
||||||
annotationProcessor(libs.eventbus.validator)
|
|
||||||
|
|
||||||
implementation(project(':fmlloader'))
|
implementation projects.fmlloader
|
||||||
implementation(libs.commons.io)
|
implementation libs.commons.io
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
license {
|
||||||
manifest {
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
attributes([
|
}
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
|
changelog {
|
||||||
'FMLModType': 'LIBRARY'
|
from changelogBase
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'FML',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'FML',
|
|
||||||
'Implementation-Version': '1.0',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC'
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
options.compilerArgs << '-Xlint:-unchecked'
|
options.compilerArgs << '-Xlint:-unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
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 {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlcore'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Modifactions to Minecraft to enable mod developers.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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 class Bindings {
|
public final class Bindings {
|
||||||
private Bindings() {}
|
private Bindings() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -27,7 +27,7 @@ public class Bindings {
|
|||||||
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
* @return A supplier of {@link BusGroup#DEFAULT}
|
||||||
*/
|
*/
|
||||||
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.get(modId));
|
return Optional.ofNullable(indexedMods == null ? null : indexedMods.get(modId));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
||||||
|
|||||||
@@ -1,67 +1,74 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
import org.gradle.internal.os.OperatingSystem
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'jvm-test-suite'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
|
||||||
|
|
||||||
import org.gradle.internal.os.OperatingSystem
|
|
||||||
switch (OperatingSystem.current()) {
|
switch (OperatingSystem.current()) {
|
||||||
case OperatingSystem.LINUX:
|
case OperatingSystem.LINUX:
|
||||||
project.ext.lwjglNatives = "natives-linux"
|
project.ext.lwjglNatives = "natives-linux"
|
||||||
break
|
break
|
||||||
case OperatingSystem.MAC_OS:
|
case OperatingSystem.MAC_OS:
|
||||||
project.ext.lwjglNatives = "natives-macos"
|
project.ext.lwjglNatives = "natives-macos"
|
||||||
break
|
break
|
||||||
case OperatingSystem.WINDOWS:
|
case OperatingSystem.WINDOWS:
|
||||||
project.ext.lwjglNatives = "natives-windows"
|
project.ext.lwjglNatives = "natives-windows"
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gradleutils.displayName = 'FML Early Display'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.jetbrains.annotations)
|
compileOnly libs.jetbrains.annotations
|
||||||
implementation(project(':fmlloader'))
|
|
||||||
implementation(project(':fmlcore'))
|
implementation projects.fmlloader
|
||||||
implementation(libs.bundles.lwjgl)
|
implementation projects.fmlcore
|
||||||
implementation('org.slf4j:slf4j-api:1.8.0-beta4')
|
implementation libs.bundles.lwjgl
|
||||||
implementation(libs.jopt.simple)
|
implementation earlyDisplayLibs.slf4j.api
|
||||||
testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
|
implementation libs.jopt.simple
|
||||||
testImplementation('org.powermock:powermock-core:2.0.9')
|
|
||||||
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
|
|
||||||
testRuntimeOnly('org.slf4j:slf4j-jdk14:1.8.0-beta4')
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test', Test).configure {
|
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
|
||||||
useJUnitPlatform()
|
// 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.opengl) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.sdl) { classifier lwjglNatives }
|
||||||
|
].with { list ->
|
||||||
|
provider { list.collect { it.get() } }
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
manifest {
|
useJUnitJupiter('5.8.2')
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
|
dependencies {
|
||||||
'Forge-Module-Layer': 'boot'
|
implementation earlyDisplayTestLibs.powermock.core
|
||||||
] as LinkedHashMap)
|
runtimeOnly earlyDisplayLibs.slf4j.jdk14
|
||||||
attributes([
|
runtimeOnly.bundle lwjglTestLibs
|
||||||
'Specification-Title': 'FML Early Display',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'FML Early Display',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': '1.0'
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,24 +76,42 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
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 {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlearlydisplay'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+231
-166
@@ -13,10 +13,12 @@ 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.PointerBuffer;
|
import org.lwjgl.opengl.GL;
|
||||||
import org.lwjgl.glfw.GLFWVidMode;
|
import org.lwjgl.sdl.SDLError;
|
||||||
|
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;
|
||||||
@@ -29,12 +31,10 @@ 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,17 +43,18 @@ 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.
|
||||||
@@ -83,10 +84,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);
|
||||||
@@ -113,6 +114,14 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return "fmlearlywindow";
|
return "fmlearlywindow";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ImmediateWindowProvider selectBackend(String backend) {
|
||||||
|
// We only support opengl
|
||||||
|
//if ("default".equals(backend) || "opengl".equals(backend))
|
||||||
|
// return this;
|
||||||
|
return ImmediateWindowProvider.getFallbackHandler();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Runnable initialize(String[] arguments) {
|
public Runnable initialize(String[] arguments) {
|
||||||
String mcVersion = FMLLoader.versionInfo().mcVersion();
|
String mcVersion = FMLLoader.versionInfo().mcVersion();
|
||||||
@@ -137,7 +146,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.colourScheme = ColourScheme.BLACK;
|
this.colourScheme = ColourScheme.BLACK;
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
// check the options file for the colour scheme
|
// check the options file for the color scheme
|
||||||
var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
|
var optionLines = Files.readAllLines(FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt")));
|
||||||
var keyName = "darkMojangStudiosBackground:";
|
var keyName = "darkMojangStudiosBackground:";
|
||||||
for (String line : optionLines) {
|
for (String line : optionLines) {
|
||||||
@@ -176,7 +185,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
nextFrameTime = nt + MINFRAMETIME;
|
nextFrameTime = nt + MINFRAMETIME;
|
||||||
glfwMakeContextCurrent(window);
|
SDL_GL_MakeCurrent(window, sdlContext);
|
||||||
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();
|
||||||
@@ -188,11 +197,12 @@ 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
|
||||||
glfwSwapBuffers(window);
|
SDL_GL_SwapWindow(window);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
LOGGER.error("BARF", t);
|
LOGGER.error("BARF", t);
|
||||||
} finally {
|
} finally {
|
||||||
if (this.windowTick != null) glfwMakeContextCurrent(0); // we release the gl context IF we're running off the main thread
|
if (this.windowTick != null)
|
||||||
|
SDL_GL_MakeCurrent(window, 0); // we release the gl context IF we're running off the main thread
|
||||||
renderLock.release();
|
renderLock.release();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -204,12 +214,18 @@ 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.
|
||||||
glfwMakeContextCurrent(window);
|
bindGlContext();
|
||||||
|
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.
|
||||||
glfwSwapInterval(1);
|
SDL_GL_SetSwapInterval(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 {
|
||||||
@@ -219,7 +235,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 colour scheme
|
// Set the clear color based on the color 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
|
||||||
@@ -245,11 +261,15 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -286,6 +306,7 @@ 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.
|
||||||
*/
|
*/
|
||||||
@@ -334,71 +355,65 @@ 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 GLFW with a time guard, in case something goes wrong
|
// Initialize a time guard, in case something goes wrong
|
||||||
long glfwInitBegin = System.nanoTime();
|
long initBegin = System.nanoTime();
|
||||||
if (!glfwInit()) {
|
if (!SDL_Init(SDL_INIT_VIDEO)) {
|
||||||
crashElegantly("We are unable to initialize the graphics system.\nglfwInit failed.\n");
|
crashElegantly("We are unable to initialize the graphics system.\nSDL_Init failed.\n");
|
||||||
throw new IllegalStateException("Unable to initialize GLFW");
|
throw new IllegalStateException("Unable to initialize SDL");
|
||||||
}
|
}
|
||||||
long glfwInitEnd = System.nanoTime();
|
long initEnd = System.nanoTime();
|
||||||
|
|
||||||
if (glfwInitEnd - glfwInitBegin > 1e9) {
|
if (initEnd - initBegin > 1e9)
|
||||||
LOGGER.error("WARNING : glfwInit took {} seconds to start.", (glfwInitEnd - glfwInitBegin) / 1.0e9);
|
LOGGER.error("WARNING : Window init took {} seconds to start.", (initEnd - initBegin) / 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.
|
||||||
glfwDefaultWindowHints();
|
SDL_ResetHints();
|
||||||
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) vanillaWindowTitle += mcVersion;
|
if (mcVersion != null)
|
||||||
|
vanillaWindowTitle += mcVersion;
|
||||||
|
|
||||||
// this emulates what we would get without early progress window
|
var primaryMonitor = SDL_GetPrimaryDisplay();
|
||||||
// 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.\nglfwGetPrimaryMonitor failed.\n");
|
crashElegantly("Failed to locate a primary monitor.\nSDL_GetPrimaryDisplay 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.\nglfwGetVideoMode failed.\n");
|
crashElegantly("Failed to get current display resolution.\nSDL_GetDesktopDisplayMode 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()) crashElegantly("Timed out trying to setup the Game Window.");
|
if (!successfulWindow.get())
|
||||||
|
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];
|
|
||||||
do {
|
record Attempt(String vesion, String error) {}
|
||||||
final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
|
final List<Attempt> attempts = new ArrayList<>();
|
||||||
if (skipVersions.contains(glVersionToTry)) {
|
String requestedVersion = null;
|
||||||
LOGGER.info("Skipping GL version "+ glVersionToTry+" because of configuration");
|
|
||||||
versidx++;
|
for (int x = 0; x < GL_VERSIONS.length; x++) {
|
||||||
|
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);
|
|
||||||
if (showHelpLog && versidx == 0) {
|
LOGGER.info("Trying GL version " + requestedVersion);
|
||||||
|
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.
|
||||||
|
|
||||||
@@ -410,125 +425,116 @@ 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
|
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
|
|
||||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
|
||||||
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
|
||||||
window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
|
|
||||||
var erridx = versidx;
|
|
||||||
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));
|
|
||||||
if (lastGLError[versidx] != null) {
|
|
||||||
LOGGER.trace(lastGLError[versidx]);
|
|
||||||
}
|
|
||||||
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]);
|
|
||||||
|
|
||||||
crashElegantly("Failed to find a valid GLFW profile.\nWe tried "+
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, version[0]);
|
||||||
Arrays.stream(GL_VERSIONS).map(p->p[0]+"."+p[1]).filter(o -> !skipVersions.contains(o))
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, version[1]);
|
||||||
.collect(Collector.of(()->new StringJoiner(", ").setEmptyValue("no versions"), StringJoiner::add, StringJoiner::merge, StringJoiner::toString))+
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
|
||||||
" but none of them worked.\n"+ Arrays.stream(lastGLError).filter(Objects::nonNull).collect(Collectors.joining("\n")));
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
|
||||||
|
SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, GL_TRUE);
|
||||||
|
window = SDL_CreateWindow(vanillaWindowTitle, winWidth, winHeight,
|
||||||
|
SDL_WINDOW_OPENGL
|
||||||
|
| SDL_WINDOW_RESIZABLE
|
||||||
|
| 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!
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (window == 0) {
|
||||||
|
LOGGER.error("Failed to find any valid GLFW profile.");
|
||||||
|
var message = new StringBuilder()
|
||||||
|
.append("Failed to find a valid GLFW profile.\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)) throw new IllegalStateException("We died but didn't somehow?");
|
if (!windowFailFuture.cancel(true))
|
||||||
var requestedVersion = GL_VERSIONS[versidx-1][0]+"."+GL_VERSIONS[versidx-1][1];
|
throw new IllegalStateException("We died but didn't somehow?");
|
||||||
var maj = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MAJOR);
|
|
||||||
var min = glfwGetWindowAttrib(window, GLFW_CONTEXT_VERSION_MINOR);
|
try (var stack = org.lwjgl.system.MemoryStack.stackPush()) {
|
||||||
var gotVersion = maj+"."+min;
|
var majBuf = stack.mallocInt(1);
|
||||||
LOGGER.info("Requested GL version "+requestedVersion+" got version "+gotVersion);
|
var minBuf = stack.mallocInt(1);
|
||||||
this.glVersion = gotVersion;
|
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majBuf);
|
||||||
|
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);
|
||||||
|
|
||||||
int[] x = new int[1];
|
if (this.maximized)
|
||||||
int[] y = new int[1];
|
SDL_MaximizeWindow(window);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
glfwGetWindowSize(window, x, y);
|
var size = getWindowSize(window);
|
||||||
this.winWidth = x[0];
|
this.onWindowResize(size.x, size.y);
|
||||||
this.winHeight = y[0];
|
|
||||||
|
|
||||||
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
|
var monitor = getMonitorSize(primaryMonitor);
|
||||||
|
if (monitor != null)
|
||||||
|
SDL_SetWindowPosition(window, (monitor.width - size.x) / 2 + monitor.x, (monitor.height - size.y) / 2 + monitor.y);
|
||||||
|
|
||||||
// Attempt setting the icon
|
pollEvents();
|
||||||
// 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)));
|
|
||||||
|
|
||||||
glfwSetFramebufferSizeCallback(window, this::fbResize);
|
SDL_ShowWindow(window);
|
||||||
glfwSetWindowPosCallback(window, this::winMove);
|
|
||||||
glfwSetWindowSizeCallback(window, this::winResize);
|
|
||||||
|
|
||||||
// Show the window
|
|
||||||
glfwShowWindow(window);
|
|
||||||
glfwGetWindowPos(window, x, y);
|
|
||||||
this.winX = x[0];
|
|
||||||
this.winY = y[0];
|
|
||||||
glfwGetFramebufferSize(window, x, y);
|
|
||||||
this.fbWidth = x[0];
|
|
||||||
this.fbHeight = y[0];
|
|
||||||
glfwPollEvents();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void winResize(long window, int width, int height) {
|
private record Point(int x, int y) {}
|
||||||
if (window == this.window && width != 0 && height != 0) {
|
private record Rect(int x, int y, int width, int height) {}
|
||||||
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 void winMove(long window, int x, int y) {
|
private static @Nullable Rect getMonitorSize(int monitor) {
|
||||||
if (window == this.window) {
|
try (var bounds = SDL_Rect.malloc()) {
|
||||||
this.winX = x;
|
// Fetch the display bounds for the current index
|
||||||
this.winY = y;
|
if (SDL_GetDisplayBounds(monitor, bounds)) {
|
||||||
}
|
int x = bounds.x();
|
||||||
}
|
int y = bounds.y();
|
||||||
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
int width = bounds.w();
|
||||||
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
int height = bounds.h();
|
||||||
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
LOGGER.info("Display {} Bounds -> X: {}, Y: {}, Width: {}, Height: {}", monitor, x, y, width, height);
|
||||||
int error = glfwGetError(pointerbuffer);
|
return new Rect(x, y, width, height);
|
||||||
if (error != GLFW_NO_ERROR) {
|
} else {
|
||||||
long pDescription = pointerbuffer.get();
|
LOGGER.warn("Could not get bounds for display: " + SDL_GetError());
|
||||||
String description = pDescription == 0L ? "" : MemoryUtil.memUTF8(pDescription);
|
return null;
|
||||||
handler.accept(error, description);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Point getWindowSize(long window) {
|
||||||
|
try (var stack = MemoryStack.stackPush()) {
|
||||||
|
var width = stack.mallocInt(1);
|
||||||
|
var height = stack.mallocInt(1);
|
||||||
|
SDL_GetWindowSize(window, width, height);
|
||||||
|
return new Point(width.get(0), height.get(0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hand-off the window to the vanilla game.
|
* Hand-off the window to the vanilla game.
|
||||||
* Called on the main thread instead of the game's initialization.
|
* Called on the main thread instead of the game's initialization.
|
||||||
*
|
*
|
||||||
* @return the Window we own.
|
* @return the Window we own.
|
||||||
*/
|
*/
|
||||||
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
|
@Override
|
||||||
|
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);
|
||||||
@@ -560,14 +566,10 @@ 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();
|
||||||
|
|
||||||
glfwMakeContextCurrent(window);
|
SDL_GL_MakeCurrent(window, sdlContext);
|
||||||
// Set the title to what the game wants
|
// Set the title to what the game wants
|
||||||
glfwSetWindowTitle(window, title);
|
SDL_SetWindowTitle(window, title);
|
||||||
glfwSwapInterval(0);
|
SDL_GL_SetSwapInterval(0); // Disable vsync, let Minecraft control it
|
||||||
// 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;
|
||||||
@@ -633,7 +635,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void periodicTick() {
|
public void periodicTick() {
|
||||||
glfwPollEvents();
|
pollEvents();
|
||||||
repaintTick.run();
|
repaintTick.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -648,4 +650,67 @@ 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,8 +11,6 @@ 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 {
|
||||||
@@ -39,11 +37,6 @@ 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);
|
||||||
@@ -59,13 +52,6 @@ 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;
|
||||||
|
|||||||
+144
-100
@@ -1,69 +1,75 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
import groovy.transform.CompileDynamic
|
||||||
|
import groovy.transform.CompileStatic
|
||||||
|
import groovy.transform.PackageScope
|
||||||
|
import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions
|
||||||
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'jvm-test-suite'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
alias(libs.plugins.apt)
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
alias libs.plugins.apt
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'FMLLoader'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
configurations.forEach{ it.transitive = false }
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(libs.jetbrains.annotations)
|
|
||||||
|
|
||||||
api(libs.bundles.asm) // Needed by all the black magic
|
|
||||||
api(libs.forgespi)
|
|
||||||
api(libs.mergetool.api)
|
|
||||||
api(libs.log4j.api)
|
|
||||||
api(libs.slf4j.api)
|
|
||||||
api(libs.guava)
|
|
||||||
api(libs.gson)
|
|
||||||
api(libs.maven.artifact)
|
|
||||||
api(libs.apache.commons)
|
|
||||||
api(libs.bundles.night.config)
|
|
||||||
api(libs.modlauncher)
|
|
||||||
api(libs.mojang.logging)
|
|
||||||
api(libs.jarjar.selector)
|
|
||||||
api(libs.jarjar.meta)
|
|
||||||
|
|
||||||
implementation(libs.jopt.simple)
|
|
||||||
implementation(libs.securemodules)
|
|
||||||
implementation(libs.accesstransformers)
|
|
||||||
implementation(libs.terminalconsoleappender)
|
|
||||||
implementation(libs.jimfs)
|
|
||||||
implementation(libs.roimfs)
|
|
||||||
|
|
||||||
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
|
|
||||||
implementation(libs.log4j.core)
|
|
||||||
annotationProcessor(libs.bundles.log4j)
|
|
||||||
|
|
||||||
testCompileOnly(libs.jetbrains.annotations)
|
|
||||||
testRuntimeOnly(libs.bootstrap)
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
license {
|
||||||
manifest {
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
attributes([
|
}
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
|
|
||||||
'Forge-Module-Layer': 'boot'
|
changelog {
|
||||||
] as LinkedHashMap)
|
from changelogBase
|
||||||
attributes([
|
}
|
||||||
'Specification-Title': 'FMLLoader',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
dependencies {
|
||||||
'Specification-Version': '1',
|
compileOnly libs.jetbrains.annotations
|
||||||
'Implementation-Title': 'FMLLoader',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
// TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller
|
||||||
'Implementation-Version': FORGE_VERSION
|
api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/loading/')
|
api(libs.forgespi ){ transitive = false }
|
||||||
|
api(libs.mergetool.api ){ transitive = false }
|
||||||
|
api(libs.log4j.api ){ transitive = false }
|
||||||
|
api(libs.slf4j.api ){ transitive = false }
|
||||||
|
api(libs.guava ){ transitive = false }
|
||||||
|
api(libs.gson ){ transitive = false }
|
||||||
|
api(libs.maven.artifact ){ transitive = false }
|
||||||
|
api(libs.apache.commons ){ transitive = false }
|
||||||
|
api(libs.bundles.night.config){ transitive = false }
|
||||||
|
api(libs.modlauncher ){ transitive = false }
|
||||||
|
api(libs.mojang.logging ){ transitive = false }
|
||||||
|
api(libs.jarjar.selector ){ transitive = false }
|
||||||
|
api(libs.jarjar.meta ){ transitive = false }
|
||||||
|
|
||||||
|
implementation(libs.jopt.simple ){ transitive = false }
|
||||||
|
implementation(libs.securemodules ){ transitive = false }
|
||||||
|
implementation(libs.accesstransformers ){ transitive = false }
|
||||||
|
implementation(libs.terminalconsoleappender){ transitive = false }
|
||||||
|
implementation(libs.jimfs ){ 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
|
||||||
|
implementation(libs.log4j.core ){ transitive = false }
|
||||||
|
annotationProcessor(libs.bundles.log4j){ transitive = false }
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
runtimeOnly libs.bootstrap
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,39 +77,81 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
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 {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlloader'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Modifactions to Minecraft to enable mod developers.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('writeForgeVersionJson') {
|
publications.register('mavenJava', MavenPublication) {
|
||||||
doLast {
|
changelog.publish(it)
|
||||||
file('src/main/resources/forge_version.json').json = [
|
gradleutils.promote(it)
|
||||||
forge: FORGE_VERSION,
|
|
||||||
mc: MC_VERSION,
|
from components.java
|
||||||
mcp: MCP_VERSION
|
|
||||||
]
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('jarJarOptionsJson', net.minecraftforge.forge.tasks.JarJarMetadataOptions) {
|
// 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
|
||||||
|
|
||||||
|
outputFile = file('src/main/resources/forge_version.json')
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
|
||||||
metadataFile = project.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')
|
||||||
@@ -118,29 +166,25 @@ tasks.register('jarJarOptionsJson', net.minecraftforge.forge.tasks.JarJarMetadat
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('generateResources').configure {
|
tasks.named('generateResources') {
|
||||||
dependsOn('eclipseJdt')
|
dependsOn(
|
||||||
dependsOn('eclipseJdtApt')
|
tasks.named('eclipseJdt'),
|
||||||
dependsOn('eclipseFactorypath')
|
tasks.named('eclipseJdtApt'),
|
||||||
dependsOn('writeForgeVersionJson')
|
tasks.named('eclipseFactorypath'),
|
||||||
dependsOn('jarJarOptionsJson')
|
tasks.named('writeForgeVersionJson', WriteForgeVersionJson),
|
||||||
|
tasks.named('jarJarOptionsJson')
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('sourcesJar') {
|
eclipse.classpath {
|
||||||
dependsOn('jarJarOptionsJson')
|
// We need to set the default output directory for the log4j annotation processor
|
||||||
}
|
// Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
|
||||||
|
// So we have to do a hacky whenMerged
|
||||||
eclipse {
|
//defaultOutputDir = file('bin/main')
|
||||||
classpath {
|
file.whenMerged {
|
||||||
// We need to set the default output directory for the log4j annotation processor
|
entries.each { entry ->
|
||||||
// Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
|
if (entry.kind == 'output' && entry.hasProperty('path'))
|
||||||
// So we have to do a hacky whenMerged
|
entry.path = 'bin/main'
|
||||||
//defaultOutputDir = file('bin/main')
|
}
|
||||||
file.whenMerged {
|
|
||||||
entries.each { entry ->
|
|
||||||
if (entry.kind == 'output' && entry.hasProperty('path'))
|
|
||||||
entry.path = 'bin/main'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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: " + desc);
|
throw new IllegalStateException("Enum has create method with no matching constructor: " + classType.getClassName() + " " + desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (values == null)
|
if (values == null)
|
||||||
|
|||||||
@@ -10,8 +10,13 @@ import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
|||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import joptsimple.OptionParser;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.*;
|
import java.util.function.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -41,18 +46,64 @@ public class ImmediateWindowHandler {
|
|||||||
if (provider == null) {
|
if (provider == null) {
|
||||||
LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
|
LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
|
||||||
provider = new DummyProvider();
|
provider = new DummyProvider();
|
||||||
|
} else {
|
||||||
|
var backend = findBackend(arguments);
|
||||||
|
var newProvider = provider.selectBackend(backend);
|
||||||
|
if (provider != newProvider) {
|
||||||
|
if (newProvider == null)
|
||||||
|
newProvider = new DummyProvider();
|
||||||
|
|
||||||
|
LOGGER.info("ImmediateWindowProvider {} does not support {}, switching to {}", provider.name(), backend, newProvider.name());
|
||||||
|
provider = newProvider;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only update config if the provider isn't the dummy provider
|
// Only update config if the provider isn't the dummy provider
|
||||||
if (!Objects.equals(provider.name(), "dummyprovider"))
|
if (!Objects.equals(provider.name(), "dummyprovider"))
|
||||||
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER, provider.name());
|
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER, provider.name());
|
||||||
|
|
||||||
FMLLoader.progressWindowTick = provider.initialize(arguments);
|
FMLLoader.progressWindowTick = provider.initialize(arguments);
|
||||||
earlyProgress = StartupNotificationManager.addProgressBar("EARLY", 0);
|
earlyProgress = StartupNotificationManager.addProgressBar("EARLY", 0);
|
||||||
earlyProgress.label("Bootstrapping Minecraft");
|
earlyProgress.label("Bootstrapping Minecraft");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
private static String findBackend(String[] arguments) {
|
||||||
return provider.setupMinecraftWindow(width, height, title, monitor, backend);
|
// Try and parse from the command line arguments
|
||||||
|
var parser = new OptionParser();
|
||||||
|
var backendOption = parser.accepts("graphicsBackend").withRequiredArg();
|
||||||
|
parser.allowsUnrecognizedOptions();
|
||||||
|
var parsed = parser.parse(arguments);
|
||||||
|
|
||||||
|
if (parsed.has(backendOption))
|
||||||
|
return parsed.valueOf(backendOption).toLowerCase(Locale.ENGLISH);
|
||||||
|
|
||||||
|
|
||||||
|
// Read the options.txt if it exists.
|
||||||
|
var optionsFile = FMLPaths.GAMEDIR.get().resolve(Path.of("options.txt"));
|
||||||
|
if (!Files.exists(optionsFile)) // Default is OpenGL first
|
||||||
|
return "default";
|
||||||
|
|
||||||
|
List<String> lines = null;
|
||||||
|
try {
|
||||||
|
lines = Files.readAllLines(optionsFile);
|
||||||
|
} catch (IOException e) {
|
||||||
|
return "default"; // We failed to read for some reason, assume we're using the default.
|
||||||
|
}
|
||||||
|
|
||||||
|
final String key = "preferredGraphicsBackend:";
|
||||||
|
for (var line : lines) {
|
||||||
|
if (line.startsWith(key)) {
|
||||||
|
var backend = line.substring(key.length() + 1, line.length() - 1);
|
||||||
|
return backend.toLowerCase(Locale.ENGLISH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "default";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend) {
|
||||||
|
return provider.setupMinecraftWindow(width, height, title, 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) {
|
||||||
@@ -83,7 +134,7 @@ public class ImmediateWindowHandler {
|
|||||||
earlyProgress.label(message);
|
earlyProgress.label(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private record DummyProvider() implements ImmediateWindowProvider {
|
record DummyProvider() implements ImmediateWindowProvider {
|
||||||
private static Method NV_HANDOFF;
|
private static Method NV_HANDOFF;
|
||||||
private static Method NV_POSITION;
|
private static Method NV_POSITION;
|
||||||
private static Method NV_OVERLAY;
|
private static Method NV_OVERLAY;
|
||||||
@@ -104,9 +155,9 @@ public class ImmediateWindowHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
public long setupMinecraftWindow(final int width, final int height, final String title, final Supplier<Object> backend) {
|
||||||
try {
|
try {
|
||||||
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
|
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, 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);
|
||||||
|
|||||||
+26
-2
@@ -24,11 +24,36 @@ import java.util.function.Supplier;
|
|||||||
* No doubt many more things can be said here.
|
* No doubt many more things can be said here.
|
||||||
*/
|
*/
|
||||||
public interface ImmediateWindowProvider {
|
public interface ImmediateWindowProvider {
|
||||||
|
/**
|
||||||
|
* Returns a new instance of ImmediateWindowProvider which just bounces to the vanilla code.
|
||||||
|
* This can be useful when you want to disable your provider and defer to vanilla behavior for some reason.
|
||||||
|
*/
|
||||||
|
public static ImmediateWindowProvider getFallbackHandler() {
|
||||||
|
return new ImmediateWindowHandler.DummyProvider();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The name of this window provider. Do NOT use fmlearlywindow.
|
* @return The name of this window provider. Do NOT use fmlearlywindow.
|
||||||
*/
|
*/
|
||||||
String name();
|
String name();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is called before initialize, but after reading the preferred graphics backend config value from the user's
|
||||||
|
* options.txt or command line.
|
||||||
|
*
|
||||||
|
* If you do not support the requested backend, you can return a new ImmediateWindowProvider that does.
|
||||||
|
* {@link #getFallbackHandler()} can be used to get an instance that falls back to Vanilla's code effectively
|
||||||
|
* disabling the early loading screen.
|
||||||
|
*
|
||||||
|
* @param backend - The backend the user has selected, known values: "default", "opengl", and "vulkan". However this
|
||||||
|
* is read from the config file, or command line arguments so could be anything.
|
||||||
|
* Default and OpenGL are treated the same, attempting to load OpenGL first, then Vulkan.
|
||||||
|
* Vulkan attempts to load Vulkan first then OpenGL
|
||||||
|
*/
|
||||||
|
default ImmediateWindowProvider selectBackend(String backend) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is called very early on to initialize ourselves. Use this to initialize the window and other GL core resources.
|
* This is called very early on to initialize ourselves. Use this to initialize the window and other GL core resources.
|
||||||
*
|
*
|
||||||
@@ -61,10 +86,9 @@ 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 long monitor, final Supplier<Object> backend);
|
long setupMinecraftWindow(final int width, final int height, final String title, 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
|
||||||
|
|||||||
+16
-5
@@ -6,11 +6,13 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.file.FileConfig;
|
import com.electronwill.nightconfig.core.file.FileConfig;
|
||||||
|
import com.electronwill.nightconfig.core.io.ParsingException;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import net.minecraftforge.forgespi.locating.ModFileFactory;
|
import net.minecraftforge.forgespi.locating.ModFileFactory;
|
||||||
|
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@@ -24,6 +26,7 @@ public class ModFileParser {
|
|||||||
return parser.build(modFile);
|
return parser.build(modFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note: Although @Nullable, several other places in FML assume ModFileInfo is not null. Keep this in mind
|
||||||
public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
|
public static @Nullable IModFileInfo modsTomlParser(final IModFile imodFile) {
|
||||||
ModFile modFile = (ModFile) imodFile;
|
ModFile modFile = (ModFile) imodFile;
|
||||||
LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
|
LOGGER.debug(LogMarkers.LOADING,"Considering mod file candidate {}", modFile.getFilePath());
|
||||||
@@ -32,11 +35,19 @@ public class ModFileParser {
|
|||||||
LOGGER.warn(LogMarkers.LOADING, "Mod file {} is missing mods.toml file", modFile.getFilePath());
|
LOGGER.warn(LogMarkers.LOADING, "Mod file {} is missing mods.toml file", modFile.getFilePath());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
final FileConfig fileConfig = FileConfig.builder(modsjson).build();
|
||||||
|
fileConfig.load();
|
||||||
|
fileConfig.close();
|
||||||
|
final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
|
||||||
|
return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
|
||||||
|
} catch (ParsingException e) { // Handle landmine toml errors, e.g. incorrectly ported mods.
|
||||||
|
LOGGER.error("Mod candidate {} contains a corrupt or misconfigured toml.", modFile.getFileName());
|
||||||
|
throw new ModFileLoadingException("Mod candidate " + modFile.getFileName() + " contains a corrupt or misconfigured toml.");
|
||||||
|
} catch (Exception other) { // Otherwise this is just someone who (probably) forgot a comma or something.
|
||||||
|
LOGGER.error("Mod candidate {}'s toml .", modFile.getFileName());
|
||||||
|
throw new ModFileLoadingException("Mod candidate " + modFile.getFileName() + " contains broken toml, likely due to a typo.");
|
||||||
|
}
|
||||||
|
|
||||||
final FileConfig fileConfig = FileConfig.builder(modsjson).build();
|
|
||||||
fileConfig.load();
|
|
||||||
fileConfig.close();
|
|
||||||
final NightConfigWrapper configWrapper = new NightConfigWrapper(fileConfig);
|
|
||||||
return new ModFileInfo(modFile, configWrapper, configWrapper::setFile);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -11,8 +11,8 @@
|
|||||||
"artifact": "MixinExtras"
|
"artifact": "MixinExtras"
|
||||||
},
|
},
|
||||||
"version": {
|
"version": {
|
||||||
"range": "[0.5.3,)",
|
"range": "[0.5.4,)",
|
||||||
"artifactVersion": "0.5.3"
|
"artifactVersion": "0.5.4"
|
||||||
},
|
},
|
||||||
"path": "",
|
"path": "",
|
||||||
"isObfuscated": false
|
"isObfuscated": false
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"artifact": "mixinextras-forge"
|
"artifact": "mixinextras-forge"
|
||||||
},
|
},
|
||||||
"version": {
|
"version": {
|
||||||
"artifactVersion": "0.5.3"
|
"artifactVersion": "0.5.4"
|
||||||
},
|
},
|
||||||
"path": "",
|
"path": "",
|
||||||
"isObfuscated": false
|
"isObfuscated": false
|
||||||
|
|||||||
@@ -1,73 +1,78 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
alias(libs.plugins.apt)
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'Forge Transformers'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
configurations.forEach{ it.transitive = false }
|
description = 'Forge-specific transformers unrelated to the FML project.'
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(libs.jetbrains.annotations)
|
|
||||||
|
|
||||||
implementation(libs.bundles.asm) // Needed by all the black magic
|
|
||||||
implementation(libs.log4j.api)
|
|
||||||
implementation(libs.gson)
|
|
||||||
implementation(libs.modlauncher)
|
|
||||||
implementation(libs.coremods.api)
|
|
||||||
|
|
||||||
testCompileOnly(libs.jetbrains.annotations)
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar) {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.forge.transformers',
|
|
||||||
'Forge-Module-Layer': 'boot'
|
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'Forge Transformers',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'Forge Transformers',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': FORGE_VERSION
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/forge/transformers/')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
changelog {
|
||||||
publications.register('mavenJava', MavenPublication) {
|
from changelogBase
|
||||||
from components.java
|
}
|
||||||
artifactId = 'forge-transformers'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Forge-specific transformers unrelated to the FML project.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly(libs.jetbrains.annotations)
|
||||||
|
|
||||||
|
implementation(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
||||||
|
implementation(libs.log4j.api ){ transitive = false }
|
||||||
|
implementation(libs.gson ){ transitive = false }
|
||||||
|
implementation(libs.modlauncher ){ transitive = false }
|
||||||
|
implementation(libs.coremods.api){ transitive = false }
|
||||||
|
|
||||||
|
testCompileOnly(libs.jetbrains.annotations)
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('jar', Jar) {
|
||||||
|
manifest {
|
||||||
|
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/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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,12 +32,6 @@ 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"
|
||||||
|
|||||||
@@ -42,12 +42,6 @@
|
|||||||
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
|
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"class": "net/minecraft/world/entity/animal/frog/Tadpole",
|
|
||||||
"methods": [
|
|
||||||
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"class": "net/minecraft/world/entity/monster/Strider",
|
"class": "net/minecraft/world/entity/monster/Strider",
|
||||||
"methods": [
|
"methods": [
|
||||||
@@ -85,24 +79,12 @@
|
|||||||
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
|
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"class": "net/minecraft/world/entity/monster/zombie/ZombieVillager",
|
|
||||||
"methods": [
|
|
||||||
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"class": "net/minecraft/world/entity/npc/CatSpawner",
|
"class": "net/minecraft/world/entity/npc/CatSpawner",
|
||||||
"methods": [
|
"methods": [
|
||||||
"spawnCat(Lnet/minecraft/core/BlockPos;Lnet/minecraft/server/level/ServerLevel;Z)V"
|
"spawnCat(Lnet/minecraft/core/BlockPos;Lnet/minecraft/server/level/ServerLevel;Z)V"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"class": "net/minecraft/world/entity/npc/villager/Villager",
|
|
||||||
"methods": [
|
|
||||||
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"class": "net/minecraft/world/entity/raid/Raid",
|
"class": "net/minecraft/world/entity/raid/Raid",
|
||||||
"methods": [
|
"methods": [
|
||||||
@@ -113,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/Holder;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/util/RandomSource;)V"
|
"spawnMobsForChunkGeneration(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/util/RandomSource;)V"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -158,11 +140,5 @@
|
|||||||
"methods": [
|
"methods": [
|
||||||
"handleDataMarker(Ljava/lang/String;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V"
|
"handleDataMarker(Ljava/lang/String;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"class": "net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate",
|
|
||||||
"methods": [
|
|
||||||
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
+23
-11
@@ -1,17 +1,29 @@
|
|||||||
|
# TODO Re-evaluate
|
||||||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
||||||
# This is required to provide enough memory for the Minecraft decompilation process.
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
org.gradle.jvmargs=-Xmx6G
|
org.gradle.jvmargs=-Xmx6G
|
||||||
org.gradle.daemon=false
|
|
||||||
|
org.gradle.warning.mode=all
|
||||||
|
org.gradle.caching=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
org.gradle.configureondemand=true
|
||||||
|
|
||||||
JAVA_VERSION=25
|
# TODO [ForgeDev] Enable this once ForgeDev 7 tasks are fully migrated
|
||||||
MC_VERSION=26.2
|
org.gradle.configuration-cache=false
|
||||||
MC_NEXT_VERSION=26.3
|
org.gradle.configuration-cache.parallel=false
|
||||||
MCP_VERSION=20260616.103818
|
#org.gradle.configuration-cache.problems=warn
|
||||||
MAPPING_CHANNEL=official
|
#org.gradle.configuration-cache.integrity-check=true
|
||||||
MAPPING_VERSION=26.2
|
|
||||||
|
|
||||||
# Set to true before the first build of a new MC version, so we don't do compatibility checks
|
net.minecraftforge.gradleutils.ide.automatic.sources=true
|
||||||
CHECK_COMPATIBILITY=false
|
net.minecraftforge.gradleutils.compilation.defaults=true
|
||||||
# Set to true to allow for fuzzy patching. Useful during updateing
|
|
||||||
UPDATING=false
|
net.minecraftforge.gradle.merge-source-sets=true
|
||||||
|
|
||||||
|
# Controls if the compatibility checks are auto-added to the 'check' task.
|
||||||
|
# The check tasks are still created and can be run, they just are not grouped with the normal 'check' task.
|
||||||
|
# Set to false for the first builds of a new Minecraft version.
|
||||||
|
net.minecraftforge.forge.build.check.compatibility=false
|
||||||
|
# Set to true to allow for fuzzy patching. Useful during updating.
|
||||||
|
net.minecraftforge.forge.build.updating=false
|
||||||
|
# Set to true to enable the 'validatePublish' task which is currently a work in progress
|
||||||
|
net.minecraftforge.forgedev.validate.publish=false
|
||||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# 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.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
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.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -112,7 +114,6 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -170,7 +171,6 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -203,15 +203,14 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# 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
|
# * 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.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
Vendored
+3
-2
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -68,11 +70,10 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
@@ -1,66 +1,79 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'JavaFMLMod'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
dependencies {
|
description = 'Language provider for Minecraft Forge that provides basic Java mod functionality.'
|
||||||
compileOnly(libs.jetbrains.annotations)
|
|
||||||
implementation(project(':fmlloader'))
|
|
||||||
implementation(project(':fmlcore'))
|
|
||||||
implementation(libs.unsafe)
|
|
||||||
implementation(libs.securemodules)
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.javafmlmod',
|
|
||||||
'FMLModType': 'LANGPROVIDER'
|
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'JavaFMLMod',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'JavaFMLMod',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': FORGE_VERSION
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/javafmlmod/')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
changelog {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
from changelogBase
|
||||||
from components.java
|
}
|
||||||
artifactId = 'javafmllanguage'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Language provider for Minecraft Forge that provides basic java mod functionality'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
|
implementation projects.fmlloader
|
||||||
|
implementation projects.fmlcore
|
||||||
|
implementation libs.unsafe
|
||||||
|
implementation libs.securemodules
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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,8 +37,7 @@ 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 {@code MinecraftForge#EVENT_BUS}
|
* Defaults to subscribing the current modid to the {@link Bus#BOTH} on both sides.
|
||||||
* 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 MinecraftForge#EVENT_BUS}
|
* defined by the annotation. Defaults to {@code Bus.BOTH} if not specified.
|
||||||
*/
|
*/
|
||||||
public final class AutomaticEventSubscriber {
|
public final class AutomaticEventSubscriber {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|||||||
@@ -1,65 +1,77 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'LowCodeMod'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'Language provider for Minecraft Forge that loads mods without a Java entrypoint.'
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(libs.jetbrains.annotations)
|
|
||||||
|
|
||||||
implementation(project(':fmlloader'))
|
|
||||||
implementation(project(':fmlcore'))
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.lowcodemod',
|
|
||||||
'FMLModType': 'LANGPROVIDER'
|
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'LowCodeMod',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1.0',
|
|
||||||
'Implementation-Title': project.name,
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': FORGE_VERSION.split('\\.')[0]
|
|
||||||
] as java.util.LinkedHashMap, 'net/minecraftforge/fml/lowcodemod/')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
changelog {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
from changelogBase
|
||||||
from components.java
|
}
|
||||||
artifactId = 'lowcodelanguage'
|
|
||||||
pom {
|
dependencies {
|
||||||
name = project.name
|
compileOnly libs.jetbrains.annotations
|
||||||
description = 'Language provider for Minecraft Forge that loads resource packs as mods'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
implementation projects.fmlloader
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
implementation projects.fmlcore
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
}
|
||||||
}
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+58
-45
@@ -1,64 +1,77 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'MCLanguage'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
dependencies {
|
description = 'Language provider for Minecraft Forge that provides Minecraft Itself.'
|
||||||
compileOnly(libs.jetbrains.annotations)
|
|
||||||
implementation(project(':fmlloader'))
|
|
||||||
implementation(project(':fmlcore'))
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider',
|
|
||||||
'FMLModType': 'LANGPROVIDER'
|
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'MCLanguage',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'MCLanguage',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': '1.0'
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/mclanguageprovider/')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
changelog {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
from changelogBase
|
||||||
from components.java
|
}
|
||||||
artifactId = 'mclanguage'
|
|
||||||
pom {
|
dependencies {
|
||||||
name = project.name
|
compileOnly libs.jetbrains.annotations
|
||||||
description = 'Language provider for Minecraft Forge that provides Minecraft Itself'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
implementation projects.fmlloader
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
implementation projects.fmlcore
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
}
|
||||||
}
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
[versions]
|
||||||
|
java = "25"
|
||||||
|
minecraft = "26.3"
|
||||||
|
minecraft-next = "26.4"
|
||||||
|
mcp = "20260918.230105"
|
||||||
|
changelog-base = "66.0"
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
--- 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
|
||||||
@@ -83,7 +_,7 @@
|
@@ -96,7 +_,7 @@
|
||||||
this.width = width;
|
this.width = width;
|
||||||
this.height = height;
|
this.height = height;
|
||||||
if (this.useDepth) {
|
if (this.depthFormat != null) {
|
||||||
- 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.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, GpuFormat.D32_FLOAT, width, height, 1, 1, this.stencilEnabled);
|
+ this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, this.depthFormat, width, height, 1, 1, this.stencilEnabled);
|
||||||
this.depthTextureView = device.createTextureView(this.depthTexture);
|
this.depthTextureView = device.createTextureView(this.depthTexture);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,5 +_,26 @@
|
@@ -140,5 +_,26 @@
|
||||||
|
|
||||||
public @Nullable GpuTextureView getDepthTextureView() {
|
public boolean hasDepth() {
|
||||||
return this.depthTextureView;
|
return this.depthFormat != null;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private boolean stencilEnabled = false;
|
+ private boolean stencilEnabled = false;
|
||||||
|
|||||||
@@ -1,31 +1,33 @@
|
|||||||
--- 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
|
||||||
@@ -101,8 +_,9 @@
|
@@ -114,9 +_,10 @@
|
||||||
Monitor initialMonitor = monitorManager.getMonitor(GLFW.glfwGetPrimaryMonitor());
|
Monitor initialMonitor = monitorManager.getMonitor(SDLVideo.SDL_GetPrimaryDisplay());
|
||||||
this.windowedWidth = this.width = allowedWindowMinSize(displayData.width());
|
this.windowedWidth = this.width = allowedWindowMinSize(displayData.width(), 320);
|
||||||
this.windowedHeight = this.height = allowedWindowMinSize(displayData.height());
|
this.windowedHeight = this.height = allowedWindowMinSize(displayData.height(), 240);
|
||||||
- this.handle = this.createWindow(backend, this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.monitor() : 0L);
|
- this.handle = this.createWindow(backend, this.width, this.height, title);
|
||||||
+ this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.monitor() : 0L, () -> backend);
|
+ this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(this.width, this.height, title, () -> backend);
|
||||||
this.backend = backend;
|
this.setWindowMaxSize(maximumSize, maximumSize);
|
||||||
|
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) {
|
||||||
VideoMode mode = initialMonitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
this.windowedX = this.x = initialMonitor.x() + (initialMonitor.w() - this.width) / 2;
|
||||||
this.windowedX = this.x = initialMonitor.x() + mode.getWidth() / 2 - this.width / 2;
|
this.windowedY = this.y = initialMonitor.y() + (initialMonitor.h() - this.height) / 2;
|
||||||
@@ -114,6 +_,7 @@
|
@@ -132,6 +_,7 @@
|
||||||
this.windowedX = this.x = actualX[0];
|
this.windowedY = this.y = actualY.get(0);
|
||||||
this.windowedY = this.y = actualY[0];
|
}
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
this.setMode();
|
this.setMode();
|
||||||
this.refreshFramebufferSize();
|
this.refreshFramebufferSize();
|
||||||
@@ -306,6 +_,9 @@
|
@@ -148,6 +_,10 @@
|
||||||
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 void onResize(final long handle, final int newWidth, final int newHeight) {
|
private long createWindow(final GpuBackend backend, final int width, final int height, final String title) {
|
||||||
|
+ 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) {
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
--- 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);
|
|
||||||
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- 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
|
||||||
@@ -16,7 +_,7 @@
|
@@ -17,7 +_,7 @@
|
||||||
import org.joml.Vector3fc;
|
import org.joml.Vector3fc;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|||||||
+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.key() == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
|
+ if (event.isEscape()) {
|
||||||
+ minecraft.gui.setScreen(this.nextScreen);
|
+ minecraft.gui.setScreen(this.nextScreen);
|
||||||
+ return true;
|
+ return true;
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- 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);
|
||||||
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- 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;
|
||||||
+5
-11
@@ -1,5 +1,5 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
--- a/com/mojang/renderpearl/api/vertex/VertexFormat.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
+++ b/com/mojang/renderpearl/api/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,6 +_,11 @@
|
@@ -29,7 +_,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.elementValues = elements;
|
this.elementValues = elements;
|
||||||
@@ -18,14 +18,8 @@
|
|||||||
+ 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; }
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
public static VertexFormat.Builder builder(final int stepRate) {
|
||||||
public static class Builder {
|
return new VertexFormat.Builder(stepRate);
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
--- 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);
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
--- 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- 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;
|
||||||
|
}
|
||||||
|
|
||||||
+5
-5
@@ -1,8 +1,8 @@
|
|||||||
--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
--- a/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
|
||||||
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
+++ b/com/mojang/renderpearl/backend/opengl/GlCommandEncoder.java
|
||||||
@@ -201,6 +_,9 @@
|
@@ -208,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/blaze3d/opengl/GlConst.java
|
--- a/com/mojang/renderpearl/backend/opengl/GlConst.java
|
||||||
+++ b/com/mojang/blaze3d/opengl/GlConst.java
|
+++ b/com/mojang/renderpearl/backend/opengl/GlConst.java
|
||||||
@@ -239,6 +_,10 @@
|
@@ -239,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
--- a/com/mojang/blaze3d/opengl/GlDebug.java
|
--- a/com/mojang/renderpearl/backend/opengl/GlDebug.java
|
||||||
+++ b/com/mojang/blaze3d/opengl/GlDebug.java
|
+++ b/com/mojang/renderpearl/backend/opengl/GlDebug.java
|
||||||
@@ -22,6 +_,14 @@
|
@@ -22,6 +_,14 @@
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
+5
-19
@@ -1,20 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/opengl/GlDevice.java
|
--- a/com/mojang/renderpearl/backend/opengl/GlDevice.java
|
||||||
+++ b/com/mojang/blaze3d/opengl/GlDevice.java
|
+++ b/com/mojang/renderpearl/backend/opengl/GlDevice.java
|
||||||
@@ -150,7 +_,12 @@
|
@@ -200,6 +_,11 @@
|
||||||
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
|
||||||
) {
|
) {
|
||||||
@@ -26,7 +12,7 @@
|
|||||||
GlStateManager.clearGlErrors();
|
GlStateManager.clearGlErrors();
|
||||||
int id = GlStateManager._genTexture();
|
int id = GlStateManager._genTexture();
|
||||||
if (label == null) {
|
if (label == null) {
|
||||||
@@ -186,9 +_,9 @@
|
@@ -223,9 +_,9 @@
|
||||||
GlStateManager._texParameter(target, 34892, 0);
|
GlStateManager._texParameter(target, 34892, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,7 +25,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) {
|
||||||
@@ -211,7 +_,7 @@
|
@@ -248,7 +_,7 @@
|
||||||
throw new IllegalStateException("OpenGL error " + error);
|
throw new IllegalStateException("OpenGL error " + error);
|
||||||
}
|
}
|
||||||
|
|
||||||
+7
-7
@@ -1,18 +1,18 @@
|
|||||||
--- a/com/mojang/blaze3d/opengl/GlStateManager.java
|
--- a/com/mojang/renderpearl/backend/opengl/GlStateManager.java
|
||||||
+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
|
+++ b/com/mojang/renderpearl/backend/opengl/GlStateManager.java
|
||||||
@@ -80,6 +_,11 @@
|
@@ -82,6 +_,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static boolean _isBlendEnabled(int index) {
|
+ public static boolean _isBlendEnabled(int index) {
|
||||||
+ RenderSystem.assertOnRenderThread();
|
+ RenderSystem.assertOnRenderThread();
|
||||||
+ return BLEND[index].mode.enabled;
|
+ return BLEND_ENABLE[index];
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static void _disableBlend(int index) {
|
public static void _disableBlend(final int index) {
|
||||||
RenderSystem.assertOnRenderThread();
|
RenderSystem.assertOnRenderThread();
|
||||||
BLEND[index].mode.disable();
|
if (BLEND_ENABLE[index]) {
|
||||||
@@ -390,9 +_,17 @@
|
@@ -401,9 +_,17 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- 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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
--- a/com/mojang/renderpearl/backend/vulkan/VulkanDevice.java
|
||||||
|
+++ b/com/mojang/renderpearl/backend/vulkan/VulkanDevice.java
|
||||||
|
@@ -213,7 +_,21 @@
|
||||||
|
final int depthOrLayers,
|
||||||
|
final int mipLevels
|
||||||
|
) {
|
||||||
|
- return new VulkanGpuTexture(this, usage, this.isDebuggingEnabled() && label != null ? label : "", format, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(
|
||||||
|
+ final @Nullable String label,
|
||||||
|
+ final @GpuTexture.Usage int usage,
|
||||||
|
+ final GpuFormat format,
|
||||||
|
+ final int width,
|
||||||
|
+ final int height,
|
||||||
|
+ final int depthOrLayers,
|
||||||
|
+ final int mipLevels,
|
||||||
|
+ final boolean stencil
|
||||||
|
+ ) {
|
||||||
|
+ return new VulkanGpuTexture(this, usage, this.isDebuggingEnabled() && label != null ? label : "", format, width, height, depthOrLayers, mipLevels, stencil);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
--- a/com/mojang/renderpearl/backend/vulkan/VulkanGpuTexture.java
|
||||||
|
+++ b/com/mojang/renderpearl/backend/vulkan/VulkanGpuTexture.java
|
||||||
|
@@ -34,7 +_,21 @@
|
||||||
|
final int depthOrLayers,
|
||||||
|
final int mipLevels
|
||||||
|
) {
|
||||||
|
- super(usage, label, format, width, height, depthOrLayers, mipLevels);
|
||||||
|
+ this(device, usage, label, format, width, height, depthOrLayers, mipLevels, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public VulkanGpuTexture(
|
||||||
|
+ final VulkanDevice device,
|
||||||
|
+ 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
|
||||||
|
+ ) {
|
||||||
|
+ super(usage, label, format, width, height, depthOrLayers, mipLevels, stencil);
|
||||||
|
this.device = device;
|
||||||
|
|
||||||
|
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||||
+13
-12
@@ -1,13 +1,14 @@
|
|||||||
--- a/com/mojang/blaze3d/systems/GpuDevice.java
|
--- a/com/mojang/renderpearl/frontend/FrontendGpuDevice.java
|
||||||
+++ b/com/mojang/blaze3d/systems/GpuDevice.java
|
+++ b/com/mojang/renderpearl/frontend/FrontendGpuDevice.java
|
||||||
@@ -73,6 +_,21 @@
|
@@ -94,6 +_,21 @@
|
||||||
return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
|
return this.createTexture(this.isDebuggingEnabled() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ /** Forge: same as {@link #createTexture(Supplier, int, GpuFormat, int, int, int)} but with stencil support */
|
+ /** Forge: same as {@link #createTexture(Supplier, int, GpuFormat, int, int, int, int)} but with stencil support */
|
||||||
|
+ @Override
|
||||||
+ public GpuTexture createTexture(
|
+ public GpuTexture createTexture(
|
||||||
+ final @Nullable Supplier<String> label,
|
+ final @Nullable Supplier<String> label,
|
||||||
+ @GpuTexture.Usage final int usage,
|
+ final @GpuTexture.Usage int usage,
|
||||||
+ final GpuFormat format,
|
+ final GpuFormat format,
|
||||||
+ final int width,
|
+ final int width,
|
||||||
+ final int height,
|
+ final int height,
|
||||||
@@ -15,23 +16,23 @@
|
|||||||
+ final int mipLevels,
|
+ final int mipLevels,
|
||||||
+ final boolean stencil
|
+ final boolean stencil
|
||||||
+ ) {
|
+ ) {
|
||||||
+ this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
|
+ return this.createTexture(this.isDebuggingEnabled() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels, stencil);
|
||||||
+ 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,
|
||||||
final @GpuTexture.Usage int usage,
|
@@ -106,6 +_,22 @@
|
||||||
@@ -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(Supplier, int, GpuFormat, int, int, int)} but with stencil support */
|
+ /** Forge: same as {@link #createTexture(String, int, GpuFormat, int, int, int, int)} but with stencil support */
|
||||||
|
+ @Override
|
||||||
+ public GpuTexture createTexture(
|
+ public GpuTexture createTexture(
|
||||||
+ final @Nullable String label,
|
+ final @Nullable String label,
|
||||||
+ @GpuTexture.Usage final int usage,
|
+ final @GpuTexture.Usage int usage,
|
||||||
+ final GpuFormat format,
|
+ final GpuFormat format,
|
||||||
+ final int width,
|
+ final int width,
|
||||||
+ final int height,
|
+ final int height,
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/SharedConstants.java
|
--- a/net/minecraft/SharedConstants.java
|
||||||
+++ b/net/minecraft/SharedConstants.java
|
+++ b/net/minecraft/SharedConstants.java
|
||||||
@@ -218,6 +_,7 @@
|
@@ -219,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|||||||
@@ -1,15 +1,62 @@
|
|||||||
--- a/net/minecraft/advancements/Advancement.java
|
--- a/net/minecraft/advancements/Advancement.java
|
||||||
+++ b/net/minecraft/advancements/Advancement.java
|
+++ b/net/minecraft/advancements/Advancement.java
|
||||||
@@ -220,7 +_,11 @@
|
@@ -31,11 +_,12 @@
|
||||||
|
Map<String, Criterion<?>> criteria,
|
||||||
|
AdvancementRequirements requirements,
|
||||||
|
boolean sendsTelemetryEvent,
|
||||||
|
- Optional<Component> name
|
||||||
|
+ Optional<Component> name,
|
||||||
|
+ Optional<java.util.List<net.minecraftforge.common.crafting.ConditionalAdvancement>> forgeConditions
|
||||||
|
) {
|
||||||
|
private static final Codec<Map<String, Criterion<?>>> CRITERIA_CODEC = Codec.unboundedMap(Codec.STRING, Criterion.CODEC)
|
||||||
|
.validate(criteria -> criteria.isEmpty() ? DataResult.error(() -> "Advancement criteria cannot be empty") : DataResult.success(criteria));
|
||||||
|
- public static final Codec<Advancement> CODEC = RecordCodecBuilder.<Advancement>create(
|
||||||
|
+ public static final Codec<Advancement> CODEC = net.minecraftforge.common.crafting.ConditionalAdvancement.wrapCodec(RecordCodecBuilder.<Advancement>mapCodec(
|
||||||
|
i -> i.group(
|
||||||
|
Identifier.CODEC.optionalFieldOf("parent").forGetter(Advancement::parent),
|
||||||
|
DisplayInfo.CODEC.optionalFieldOf("display").forGetter(Advancement::display),
|
||||||
|
@@ -49,7 +_,7 @@
|
||||||
|
return new Advancement(parent, display, rewards, criteria, requirements, sendsTelemetryEvent);
|
||||||
|
})
|
||||||
|
)
|
||||||
|
- .validate(Advancement::validate);
|
||||||
|
+ .validate(Advancement::validate));
|
||||||
|
public static final StreamCodec<RegistryFriendlyByteBuf, Advancement> STREAM_CODEC = StreamCodec.composite(
|
||||||
|
Identifier.STREAM_CODEC.apply(ByteBufCodecs::optional),
|
||||||
|
Advancement::parent,
|
||||||
|
@@ -70,9 +_,21 @@
|
||||||
|
final AdvancementRewards rewards,
|
||||||
|
final Map<String, Criterion<?>> criteria,
|
||||||
|
final AdvancementRequirements requirements,
|
||||||
|
+ final boolean sendsTelemetryEvent,
|
||||||
|
+ final Optional<Component> name
|
||||||
|
+ ) {
|
||||||
|
+ this(parent, display, rewards, criteria, requirements, sendsTelemetryEvent, name, Optional.empty());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public Advancement(
|
||||||
|
+ final Optional<Identifier> parent,
|
||||||
|
+ final Optional<DisplayInfo> display,
|
||||||
|
+ final AdvancementRewards rewards,
|
||||||
|
+ final Map<String, Criterion<?>> criteria,
|
||||||
|
+ final AdvancementRequirements requirements,
|
||||||
|
final boolean sendsTelemetryEvent
|
||||||
|
) {
|
||||||
|
- this(parent, display, rewards, Map.copyOf(criteria), requirements, sendsTelemetryEvent, display.map(Advancement::decorateName));
|
||||||
|
+ this(parent, display, rewards, Map.copyOf(criteria), requirements, sendsTelemetryEvent, display.map(Advancement::decorateName), Optional.empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DataResult<Advancement> validate(final Advancement advancement) {
|
||||||
|
@@ -235,7 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public AdvancementHolder save(final Consumer<AdvancementHolder> output, final String name) {
|
public AdvancementHolder save(final BootstrapContext<Advancement> output, final String name) {
|
||||||
- AdvancementHolder advancement = this.build(Identifier.parse(name));
|
- AdvancementHolder advancement = this.build(Identifier.parse(name));
|
||||||
+ return save(output, Identifier.parse(name));
|
+ return save(output, Identifier.parse(name));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public AdvancementHolder save(Consumer<AdvancementHolder> output, Identifier id) {
|
+ public AdvancementHolder save(final BootstrapContext<Advancement> output, final Identifier id) {
|
||||||
+ AdvancementHolder advancement = this.build(id);
|
+ AdvancementHolder advancement = this.build(id);
|
||||||
output.accept(advancement);
|
advancement.register(output);
|
||||||
return advancement;
|
return advancement;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/advancements/AdvancementRewards.java
|
--- a/net/minecraft/advancements/AdvancementRewards.java
|
||||||
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
||||||
@@ -43,6 +_,7 @@
|
@@ -46,6 +_,7 @@
|
||||||
LootParams params = new LootParams.Builder(level)
|
LootParams params = new LootParams.Builder(level)
|
||||||
.withParameter(LootContextParams.THIS_ENTITY, player)
|
.withParameter(LootContextParams.THIS_ENTITY, player)
|
||||||
.withParameter(LootContextParams.ORIGIN, player.position())
|
.withParameter(LootContextParams.ORIGIN, player.position())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Camera.java
|
--- a/net/minecraft/client/Camera.java
|
||||||
+++ b/net/minecraft/client/Camera.java
|
+++ b/net/minecraft/client/Camera.java
|
||||||
@@ -224,11 +_,13 @@
|
@@ -228,11 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
float fov = this.minecraft.options.fov().get().intValue() * Mth.lerp(partialTicks, this.oldFovModifier, this.fovModifier);
|
float fov = this.minecraft.options.fov().get().intValue() * Mth.lerp(partialTicks, this.oldFovModifier, this.fovModifier);
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private float modifyFovBasedOnDeathOrFluid(final float partialTicks, float fov) {
|
private float modifyFovBasedOnDeathOrFluid(final float partialTicks, float fov) {
|
||||||
@@ -337,9 +_,13 @@
|
@@ -341,9 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setRotation(final float yRot, final float xRot) {
|
protected void setRotation(final float yRot, final float xRot) {
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
FORWARDS.rotate(this.rotation, this.forwards);
|
FORWARDS.rotate(this.rotation, this.forwards);
|
||||||
UP.rotate(this.rotation, this.up);
|
UP.rotate(this.rotation, this.up);
|
||||||
LEFT.rotate(this.rotation, this.left);
|
LEFT.rotate(this.rotation, this.left);
|
||||||
@@ -370,6 +_,13 @@
|
@@ -374,6 +_,13 @@
|
||||||
|
|
||||||
public float yRot() {
|
public float yRot() {
|
||||||
return this.yRot;
|
return this.yRot;
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
return this.key.equals(that.key);
|
return this.key.equals(that.key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,11 +_,13 @@
|
@@ -177,11 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Component getTranslatedKeyMessage() {
|
public Component getTranslatedKeyMessage() {
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String saveString() {
|
public String saveString() {
|
||||||
@@ -195,11 +_,94 @@
|
@@ -193,11 +_,94 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void registerMapping(final InputConstants.Key key) {
|
private void registerMapping(final InputConstants.Key key) {
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
--- a/net/minecraft/client/KeyboardHandler.java
|
--- a/net/minecraft/client/KeyboardHandler.java
|
||||||
+++ b/net/minecraft/client/KeyboardHandler.java
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
||||||
@@ -478,7 +_,7 @@
|
@@ -496,7 +_,7 @@
|
||||||
if (screen != null) {
|
if (screen != null) {
|
||||||
try {
|
try {
|
||||||
if (action != 1 && action != 2) {
|
if (action != 1 && action != -1) {
|
||||||
- if (action == 0 && screen.keyReleased(event)) {
|
- if (action == 0 && screen.keyReleased(event)) {
|
||||||
+ if (action == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, event)) {
|
+ if (action == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, event)) {
|
||||||
if (options.keyDebugModifier.matches(event)) {
|
if (options.keyDebugModifier.matches(event)) {
|
||||||
this.usedDebugKeyAsModifier = false;
|
this.usedDebugKeyAsModifier = false;
|
||||||
}
|
}
|
||||||
@@ -487,7 +_,7 @@
|
@@ -505,7 +_,7 @@
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
screen.afterKeyboardAction();
|
screen.afterKeyboardAction();
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
if (this.minecraft.gui.screen() == null) {
|
if (this.minecraft.gui.screen() == null) {
|
||||||
InputConstants.Key key = InputConstants.getKey(event);
|
InputConstants.Key key = InputConstants.getKey(event);
|
||||||
KeyMapping.set(key, false);
|
KeyMapping.set(key, false);
|
||||||
@@ -562,6 +_,7 @@
|
@@ -578,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -570,7 +_,7 @@
|
@@ -586,7 +_,7 @@
|
||||||
Screen screen = this.minecraft.gui.screen();
|
Screen screen = this.minecraft.gui.screen();
|
||||||
if (screen != null && this.minecraft.gui.overlay() == null) {
|
if (screen != null && this.minecraft.gui.overlay() == null) {
|
||||||
try {
|
try {
|
||||||
@@ -34,4 +34,4 @@
|
|||||||
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, event);
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, event);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
CrashReport report = CrashReport.forThrowable(t, "charTyped event handler");
|
CrashReport report = CrashReport.forThrowable(t, "charTyped event handler");
|
||||||
screen.fillCrashDetails(report);
|
CrashReportCategory keyDetails = report.addCategory("Key");
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Minecraft.java
|
--- a/net/minecraft/client/Minecraft.java
|
||||||
+++ b/net/minecraft/client/Minecraft.java
|
+++ b/net/minecraft/client/Minecraft.java
|
||||||
@@ -258,7 +_,7 @@
|
@@ -265,7 +_,7 @@
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -8,8 +8,8 @@
|
|||||||
+public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
|
+public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
|
||||||
private static Minecraft instance;
|
private static Minecraft instance;
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final int MAX_TICKS_PER_UPDATE = 10;
|
private static final SectionCategory TRACY_CURRENT_LEVEL = TracyClient.createSectionCategory("Level");
|
||||||
@@ -410,7 +_,6 @@
|
@@ -420,7 +_,6 @@
|
||||||
}
|
}
|
||||||
}, Util.nonCriticalIoPool());
|
}, Util.nonCriticalIoPool());
|
||||||
LOGGER.info("Setting user: {}", this.user.getName());
|
LOGGER.info("Setting user: {}", this.user.getName());
|
||||||
@@ -17,30 +17,23 @@
|
|||||||
this.demo = gameConfig.game.demo;
|
this.demo = gameConfig.game.demo;
|
||||||
this.allowsMultiplayer = !gameConfig.game.disableMultiplayer;
|
this.allowsMultiplayer = !gameConfig.game.disableMultiplayer;
|
||||||
this.allowsChat = !gameConfig.game.disableChat;
|
this.allowsChat = !gameConfig.game.disableChat;
|
||||||
@@ -547,12 +_,12 @@
|
@@ -568,6 +_,7 @@
|
||||||
LOGGER.error("Couldn't set icon", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // FORGE: Move mouse and keyboard handler setup further below
|
|
||||||
this.mouseHandler = new MouseHandler(this);
|
|
||||||
- this.mouseHandler.setup(this.window);
|
|
||||||
this.keyboardHandler = new KeyboardHandler(this);
|
this.keyboardHandler = new KeyboardHandler(this);
|
||||||
- this.keyboardHandler.setup(this.window);
|
|
||||||
this.options.applyGraphicsPreset(this.options.graphicsPreset().get());
|
this.options.applyGraphicsPreset(this.options.graphicsPreset().get());
|
||||||
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
||||||
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
||||||
this.resourcePackRepository.reload();
|
this.resourcePackRepository.reload();
|
||||||
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
||||||
this.languageManager = new LanguageManager(this.options.languageCode, var1 -> {
|
this.languageManager = new LanguageManager(this, this.options.languageCode, var1 -> {
|
||||||
@@ -630,6 +_,7 @@
|
@@ -645,6 +_,7 @@
|
||||||
ParticleResources particleResources = new ParticleResources();
|
ParticleResources particleResources = new ParticleResources();
|
||||||
this.resourceManager.registerReloadListener(particleResources);
|
this.resourceManager.registerReloadListener(particleResources);
|
||||||
this.particleEngine = new ParticleEngine(this.level, particleResources);
|
this.particleEngine = new ParticleEngine(this.level, particleResources);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(particleResources);
|
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(particleResources);
|
||||||
particleResources.onReload(this.particleEngine::clearParticles);
|
particleResources.onReload(this.particleEngine::clearParticles);
|
||||||
this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.modelManager);
|
this.gameRenderer = new GameRenderer(this, new FirstPersonHandsAndItemsRenderer(this), this.modelManager, this.itemModelResolver);
|
||||||
WindowRenderState windowRenderState = this.gameRenderer.gameRenderState().windowRenderState;
|
this.resourceManager.registerReloadListener(this.gameRenderer);
|
||||||
@@ -647,6 +_,7 @@
|
@@ -663,6 +_,7 @@
|
||||||
this.window.getHeight()
|
this.window.getHeight()
|
||||||
);
|
);
|
||||||
this.levelExtractor = new LevelExtractor(this, this.gameRenderer.gameRenderState().levelRenderState, this.levelRenderer);
|
this.levelExtractor = new LevelExtractor(this, this.gameRenderer.gameRenderState().levelRenderState, this.levelRenderer);
|
||||||
@@ -48,25 +41,15 @@
|
|||||||
this.resourceManager.registerReloadListener(this.levelExtractor);
|
this.resourceManager.registerReloadListener(this.levelExtractor);
|
||||||
this.resourceManager.registerReloadListener(this.levelRenderer.cloudRenderer());
|
this.resourceManager.registerReloadListener(this.levelRenderer.cloudRenderer());
|
||||||
this.gpuWarnlistManager = new GpuWarnlistManager();
|
this.gpuWarnlistManager = new GpuWarnlistManager();
|
||||||
@@ -654,6 +_,9 @@
|
@@ -694,6 +_,7 @@
|
||||||
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
MessageBox.error(message.toString());
|
||||||
this.gui = new Gui(this, new Hud(this), this.gameRenderer.gameRenderState().guiRenderState);
|
|
||||||
this.gui.registerReloadListeners(this.resourceManager);
|
|
||||||
+ // FORGE: Moved keyboard and mouse handler setup below ingame gui creation to prevent NPEs in them.
|
|
||||||
+ this.mouseHandler.setup(this.window);
|
|
||||||
+ this.keyboardHandler.setup(this.window);
|
|
||||||
RealmsClient realmsClient = RealmsClient.getOrCreate(this);
|
|
||||||
this.realmsDataFetcher = new RealmsDataFetcher(realmsClient);
|
|
||||||
RenderSystem.setErrorCallback(this::onFullscreenError);
|
|
||||||
@@ -686,6 +_,7 @@
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
||||||
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
|
||||||
this.window.setAllowCursorChanges(this.options.allowCursorChanges().get());
|
this.window.setAllowCursorChanges(this.options.allowCursorChanges().get());
|
||||||
this.window.setDefaultErrorCallback();
|
this.window.setQuitShortcuts(this.options.quitShortcuts().get());
|
||||||
@@ -710,14 +_,15 @@
|
if (InputQuirks.EMULATE_RIGHT_CLICK_WITH_CTRL_KEY) {
|
||||||
|
@@ -721,14 +_,15 @@
|
||||||
.createReload(Util.backgroundExecutor().forName("resourceLoad"), this, RESOURCE_RELOAD_INITIAL_TASK, packs);
|
.createReload(Util.backgroundExecutor().forName("resourceLoad"), this, RESOURCE_RELOAD_INITIAL_TASK, packs);
|
||||||
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
||||||
GameLoadCookie loadCookie = new GameLoadCookie(realmsClient, gameConfig.quickPlay);
|
GameLoadCookie loadCookie = new GameLoadCookie(realmsClient, gameConfig.quickPlay);
|
||||||
@@ -84,7 +67,7 @@
|
|||||||
this.quickPlayLog = QuickPlayLog.of(gameConfig.quickPlay.logPath());
|
this.quickPlayLog = QuickPlayLog.of(gameConfig.quickPlay.logPath());
|
||||||
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
||||||
this.fpsPieProfiler = new ContinuousProfiler(Util.timeSource(), () -> this.fpsPieRenderTicks, this.framerateLimitTracker::isHeavilyThrottled);
|
this.fpsPieProfiler = new ContinuousProfiler(Util.timeSource(), () -> this.fpsPieRenderTicks, this.framerateLimitTracker::isHeavilyThrottled);
|
||||||
@@ -801,6 +_,7 @@
|
@@ -812,6 +_,7 @@
|
||||||
StringBuilder builder = new StringBuilder("Minecraft");
|
StringBuilder builder = new StringBuilder("Minecraft");
|
||||||
if (checkModStatus().shouldReportAsModified()) {
|
if (checkModStatus().shouldReportAsModified()) {
|
||||||
builder.append("*");
|
builder.append("*");
|
||||||
@@ -92,16 +75,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
builder.append(" ");
|
builder.append(" ");
|
||||||
@@ -824,6 +_,8 @@
|
@@ -835,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private static UserApiService createUserApiService(final YggdrasilAuthenticationService authService, final GameConfig config) {
|
private static UserApiService createUserApiService(final MinecraftServicesDiscoveryService discoveryService, final GameConfig config) {
|
||||||
+ if ("0".equals(config.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
|
+ if ("0".equals(config.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
|
||||||
+ return UserApiService.OFFLINE;
|
+ return UserApiService.OFFLINE;
|
||||||
return config.game.offlineDeveloperMode ? UserApiService.OFFLINE : authService.createUserApiService(config.user.user.getAccessToken());
|
return config.game.offlineDeveloperMode ? UserApiService.OFFLINE : discoveryService.createUserApiService(config.user.user.getAccessToken());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -840,7 +_,7 @@
|
@@ -851,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void rollbackResourcePacks(final Throwable t, final @Nullable GameLoadCookie loadCookie) {
|
private void rollbackResourcePacks(final Throwable t, final @Nullable GameLoadCookie loadCookie) {
|
||||||
@@ -110,33 +93,33 @@
|
|||||||
this.clearResourcePacksOnError(t, null, loadCookie);
|
this.clearResourcePacksOnError(t, null, loadCookie);
|
||||||
} else {
|
} else {
|
||||||
Util.throwAsRuntime(t);
|
Util.throwAsRuntime(t);
|
||||||
@@ -1141,6 +_,7 @@
|
@@ -1148,6 +_,7 @@
|
||||||
Util.shutdownExecutors();
|
FreeTypeUtil.destroy();
|
||||||
this.windowSurface.close();
|
this.windowSurface.close();
|
||||||
RenderSystem.shutdownRenderer();
|
RenderSystem.shutdownRenderer();
|
||||||
+ net.minecraftforge.fml.config.ConfigTracker.forceUnload();
|
+ net.minecraftforge.fml.config.ConfigTracker.forceUnload();
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
LOGGER.error("Shutdown failure!", t);
|
LOGGER.error("Shutdown failure!", t);
|
||||||
throw t;
|
throw t;
|
||||||
@@ -1301,7 +_,9 @@
|
@@ -1305,7 +_,9 @@
|
||||||
profiler.popPush("gpuAsync");
|
profiler.popPush("gpuAsync");
|
||||||
RenderSystem.executePendingTasks();
|
RenderSystem.executePendingTasks();
|
||||||
profiler.pop();
|
profiler.pop();
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
|
||||||
this.gameRenderer.render(this.deltaTracker, advanceGameTime);
|
this.gameRenderer.render();
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
|
||||||
}
|
}
|
||||||
|
|
||||||
profiler.push("present");
|
profiler.push("swapchainBlit");
|
||||||
@@ -1425,6 +_,7 @@
|
@@ -1432,6 +_,7 @@
|
||||||
this.window.setGuiScale(guiScale);
|
this.window.setGuiScale(guiScale);
|
||||||
if (this.gui.screen() != null) {
|
if (this.gui.screen() != null) {
|
||||||
this.gui.screen().resize(this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
this.gui.screen().resize(this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
+ this.gui.resizeLayers(this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
+ this.gui.resizeLayers(this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
}
|
}
|
||||||
|
|
||||||
this.mouseHandler.setIgnoreFirstMove();
|
this.mouseHandler.resyncMousePosition();
|
||||||
@@ -1576,6 +_,7 @@
|
@@ -1595,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
@@ -144,38 +127,35 @@
|
|||||||
this.running = false;
|
this.running = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1599,10 +_,18 @@
|
@@ -1622,9 +_,16 @@
|
||||||
if (down && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
if (down && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
||||||
BlockHitResult blockHit = (BlockHitResult)this.hitResult;
|
BlockHitResult blockHit = (BlockHitResult)this.hitResult;
|
||||||
BlockPos pos = blockHit.getBlockPos();
|
BlockPos pos = blockHit.getBlockPos();
|
||||||
- if (!this.level.getBlockState(pos).isAir()) {
|
- if (!this.level.getBlockState(pos).isAir()) {
|
||||||
+ if (!this.level.isEmptyBlock(pos)) {
|
+ if (!this.level.isEmptyBlock(pos)) {
|
||||||
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.Attack(this.options.keyAttack, InteractionHand.MAIN_HAND);
|
||||||
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
|
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.Attack.BUS.post(inputEvent)) {
|
||||||
+ if (inputEvent.shouldSwingHand()) {
|
+ if (inputEvent.shouldSwingHand()) {
|
||||||
+ this.level.addBreakingBlockEffect(pos, blockHit);
|
+ this.player.swing(InteractionHand.MAIN_HAND, swingAnimation, false);
|
||||||
+ this.player.swing(InteractionHand.MAIN_HAND);
|
|
||||||
+ }
|
+ }
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
Direction direction = blockHit.getDirection();
|
Direction direction = blockHit.getDirection();
|
||||||
- if (this.gameMode.continueDestroyBlock(pos, direction)) {
|
- if (this.gameMode.continueDestroyBlock(pos, direction)) {
|
||||||
- this.level.addBreakingBlockEffect(pos, direction);
|
|
||||||
+ if (this.gameMode.continueDestroyBlock(pos, direction) && inputEvent.shouldSwingHand()) {
|
+ if (this.gameMode.continueDestroyBlock(pos, direction) && inputEvent.shouldSwingHand()) {
|
||||||
+ this.level.addBreakingBlockEffect(pos, blockHit);
|
this.player.swing(InteractionHand.MAIN_HAND, swingAnimation, false);
|
||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.connection.send(ServerboundPunchPacket.INSTANCE);
|
||||||
}
|
}
|
||||||
}
|
@@ -1679,6 +_,8 @@
|
||||||
@@ -1656,6 +_,8 @@
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.Attack(this.options.keyAttack, InteractionHand.MAIN_HAND);
|
||||||
+ if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent))
|
+ if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.Attack.BUS.post(inputEvent))
|
||||||
switch (this.hitResult.getType()) {
|
switch (this.hitResult.getType()) {
|
||||||
case ENTITY:
|
case ENTITY:
|
||||||
AttackRange customItemRange = heldItem.get(DataComponents.ATTACK_RANGE);
|
AttackRange customItemRange = heldItem.get(DataComponents.ATTACK_RANGE);
|
||||||
@@ -1666,7 +_,7 @@
|
@@ -1689,7 +_,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockHitResult blockHit = (BlockHitResult)this.hitResult;
|
BlockHitResult blockHit = (BlockHitResult)this.hitResult;
|
||||||
BlockPos pos = blockHit.getBlockPos();
|
BlockPos pos = blockHit.getBlockPos();
|
||||||
@@ -184,49 +164,53 @@
|
|||||||
this.gameMode.startDestroyBlock(pos, blockHit.getDirection());
|
this.gameMode.startDestroyBlock(pos, blockHit.getDirection());
|
||||||
if (this.level.getBlockState(pos).isAir()) {
|
if (this.level.getBlockState(pos).isAir()) {
|
||||||
endAttack = true;
|
endAttack = true;
|
||||||
@@ -1679,8 +_,10 @@
|
@@ -1702,10 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.player.resetAttackStrengthTicker();
|
this.player.resetAttackStrengthTicker();
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onLeftClickEmpty(this.player);
|
+ net.minecraftforge.event.ForgeEventFactory.onLeftClickEmpty(this.player);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (inputEvent.shouldSwingHand())
|
+ if (inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND, attackAnimation, false);
|
||||||
|
this.player.connection.send(ServerboundPunchPacket.INSTANCE);
|
||||||
|
+ }
|
||||||
return endAttack;
|
return endAttack;
|
||||||
}
|
}
|
||||||
@@ -1696,6 +_,12 @@
|
}
|
||||||
}
|
@@ -1726,6 +_,13 @@
|
||||||
|
}
|
||||||
|
|
||||||
for (InteractionHand hand : InteractionHand.values()) {
|
SwingAnimation swingAnimation = heldItem.getInteractAnimation();
|
||||||
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(1, this.options.keyUse, hand);
|
+
|
||||||
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.UseItem(this.options.keyUse, hand);
|
||||||
+ if (inputEvent.shouldSwingHand()) this.player.swing(hand);
|
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.UseItem.BUS.post(inputEvent)) {
|
||||||
|
+ if (inputEvent.shouldSwingHand()) this.player.swing(hand, swingAnimation, false);
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
ItemStack heldItem = this.player.getItemInHand(hand);
|
if (this.hitResult != null) {
|
||||||
if (!heldItem.isItemEnabled(this.level.enabledFeatures())) {
|
switch (this.hitResult.getType()) {
|
||||||
return;
|
case ENTITY:
|
||||||
@@ -1712,7 +_,7 @@
|
@@ -1737,7 +_,7 @@
|
||||||
|
|
||||||
if (this.player.isWithinEntityInteractionRange(entity, 0.0)
|
if (this.player.isWithinEntityInteractionRange(entity, 0.0)
|
||||||
&& this.gameMode.interact(this.player, entity, entityHit, hand) instanceof InteractionResult.Success success) {
|
&& this.gameMode.interact(this.player, entity, entityHit, hand) instanceof InteractionResult.Success success) {
|
||||||
- if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
- if (success.swingSource() == InteractionResult.SwingSource.PREDICTED) {
|
||||||
+ if (success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
+ if (success.swingSource() == InteractionResult.SwingSource.PREDICTED && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(hand);
|
this.player.swing(hand, swingAnimation, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1724,7 +_,7 @@
|
@@ -1749,7 +_,7 @@
|
||||||
int oldCount = heldItem.getCount();
|
int oldCount = heldItem.getCount();
|
||||||
InteractionResult useResult = this.gameMode.useItemOn(this.player, hand, blockHit);
|
InteractionResult useResult = this.gameMode.useItemOn(this.player, hand, blockHit);
|
||||||
if (useResult instanceof InteractionResult.Success success) {
|
if (useResult instanceof InteractionResult.Success success) {
|
||||||
- if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
- if (success.swingSource() == InteractionResult.SwingSource.PREDICTED) {
|
||||||
+ if (success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
+ if (success.swingSource() == InteractionResult.SwingSource.PREDICTED && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(hand);
|
this.player.swing(hand, swingAnimation, false);
|
||||||
if (!heldItem.isEmpty() && (heldItem.getCount() != oldCount || this.player.hasInfiniteMaterials())) {
|
if (!heldItem.isEmpty() && (heldItem.getCount() != oldCount || this.player.hasInfiniteMaterials())) {
|
||||||
this.gameRenderer.itemInHandRenderer.itemUsed(hand);
|
this.player.itemUsed(hand);
|
||||||
@@ -1740,6 +_,9 @@
|
@@ -1765,6 +_,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -234,9 +218,9 @@
|
|||||||
+ net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, hand);
|
+ net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, hand);
|
||||||
+
|
+
|
||||||
if (!heldItem.isEmpty() && this.gameMode.useItem(this.player, hand) instanceof InteractionResult.Success success) {
|
if (!heldItem.isEmpty() && this.gameMode.useItem(this.player, hand) instanceof InteractionResult.Success success) {
|
||||||
if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
if (success.swingSource() == InteractionResult.SwingSource.PREDICTED) {
|
||||||
this.player.swing(hand);
|
this.player.swing(hand, swingAnimation, false);
|
||||||
@@ -1768,6 +_,8 @@
|
@@ -1793,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
ProfilerFiller profiler = Profiler.get();
|
ProfilerFiller profiler = Profiler.get();
|
||||||
@@ -245,7 +229,7 @@
|
|||||||
profiler.push("gameMode");
|
profiler.push("gameMode");
|
||||||
if (!this.pause && this.level != null) {
|
if (!this.pause && this.level != null) {
|
||||||
this.gameMode.tick();
|
this.gameMode.tick();
|
||||||
@@ -1817,6 +_,7 @@
|
@@ -1845,6 +_,7 @@
|
||||||
|
|
||||||
this.tutorial.tick();
|
this.tutorial.tick();
|
||||||
|
|
||||||
@@ -253,7 +237,7 @@
|
|||||||
try {
|
try {
|
||||||
this.level.tick(() -> true);
|
this.level.tick(() -> true);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
@@ -1830,6 +_,7 @@
|
@@ -1858,6 +_,7 @@
|
||||||
|
|
||||||
throw new ReportedException(report);
|
throw new ReportedException(report);
|
||||||
}
|
}
|
||||||
@@ -261,7 +245,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
profiler.popPush("animateTick");
|
profiler.popPush("animateTick");
|
||||||
@@ -1854,6 +_,7 @@
|
@@ -1882,6 +_,7 @@
|
||||||
profiler.popPush("keyboard");
|
profiler.popPush("keyboard");
|
||||||
this.keyboardHandler.tick();
|
this.keyboardHandler.tick();
|
||||||
profiler.pop();
|
profiler.pop();
|
||||||
@@ -269,7 +253,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isLevelRunningNormally() {
|
private boolean isLevelRunningNormally() {
|
||||||
@@ -2059,6 +_,7 @@
|
@@ -2088,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLevel(final ClientLevel level) {
|
public void setLevel(final ClientLevel level) {
|
||||||
@@ -277,7 +261,7 @@
|
|||||||
this.level = level;
|
this.level = level;
|
||||||
this.updateLevelInEngines(level);
|
this.updateLevelInEngines(level);
|
||||||
}
|
}
|
||||||
@@ -2120,6 +_,7 @@
|
@@ -2149,6 +_,7 @@
|
||||||
IntegratedServer server = this.singleplayerServer;
|
IntegratedServer server = this.singleplayerServer;
|
||||||
this.singleplayerServer = null;
|
this.singleplayerServer = null;
|
||||||
this.gameRenderer.resetData();
|
this.gameRenderer.resetData();
|
||||||
@@ -285,7 +269,7 @@
|
|||||||
this.gameMode = null;
|
this.gameMode = null;
|
||||||
this.narrator.clear();
|
this.narrator.clear();
|
||||||
this.gui.setClientLevelTeardownInProgress(true);
|
this.gui.setClientLevelTeardownInProgress(true);
|
||||||
@@ -2127,6 +_,7 @@
|
@@ -2156,6 +_,7 @@
|
||||||
try {
|
try {
|
||||||
if (this.level != null) {
|
if (this.level != null) {
|
||||||
this.gui.hud.onDisconnected();
|
this.gui.hud.onDisconnected();
|
||||||
@@ -293,7 +277,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.level = null;
|
this.level = null;
|
||||||
@@ -2141,6 +_,7 @@
|
@@ -2171,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
profiler.pop();
|
profiler.pop();
|
||||||
@@ -301,7 +285,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.setScreenAndShow(screen);
|
this.setScreenAndShow(screen);
|
||||||
@@ -2354,6 +_,7 @@
|
@@ -2403,6 +_,7 @@
|
||||||
|
|
||||||
private void pickBlockOrEntity() {
|
private void pickBlockOrEntity() {
|
||||||
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
--- a/net/minecraft/client/MouseHandler.java
|
--- a/net/minecraft/client/MouseHandler.java
|
||||||
+++ b/net/minecraft/client/MouseHandler.java
|
+++ b/net/minecraft/client/MouseHandler.java
|
||||||
@@ -77,6 +_,7 @@
|
@@ -79,6 +_,7 @@
|
||||||
this.activeButton = null;
|
this.activeButton = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(buttonInfo, action)) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(rawButtonInfo, action)) return;
|
||||||
if (this.minecraft.gui.overlay() == null) {
|
if (this.minecraft.gui.overlay() == null) {
|
||||||
if (pressed
|
if (pressed
|
||||||
&& this.minecraft.handleGlobalKeyPress(InputConstants.Type.MOUSE.getOrCreate(buttonInfo.button()), buttonInfo.hasControlDownWithQuirk())) {
|
&& this.minecraft
|
||||||
@@ -101,7 +_,7 @@
|
@@ -104,7 +_,7 @@
|
||||||
&& currentTime - this.lastClick.time() < 250L
|
&& currentTime - this.lastClick.time() < 250L
|
||||||
&& this.lastClick.screen() == screen
|
&& this.lastClick.screen() == screen
|
||||||
&& this.lastClickButton == event.button();
|
&& this.lastClickButton == event.button();
|
||||||
- if (screen.mouseClicked(event, doubleClick)) {
|
- if (screen.mouseClicked(event, doubleClick)) {
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, xm, ym, event, doubleClick)) {
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, xm, ym, event, doubleClick)) {
|
||||||
this.lastClick = new MouseHandler.LastClick(currentTime, screen);
|
this.lastClick = new MouseHandler.LastClick(currentTime, screen);
|
||||||
this.lastClickButton = buttonInfo.button();
|
this.lastClickButton = rawButtonInfo.button();
|
||||||
return;
|
return;
|
||||||
@@ -116,7 +_,7 @@
|
@@ -118,7 +_,7 @@
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@@ -26,15 +26,15 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
@@ -146,6 +_,7 @@
|
@@ -147,6 +_,7 @@
|
||||||
KeyMapping.click(mouseKey);
|
KeyMapping.click(mouseKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(buttonInfo, action);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(rawButtonInfo, action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,7 +_,9 @@
|
@@ -182,7 +_,9 @@
|
||||||
if (this.minecraft.gui.screen() != null) {
|
if (this.minecraft.gui.screen() != null) {
|
||||||
double xm = this.getScaledXPos(this.minecraft.getWindow());
|
double xm = this.getScaledXPos(this.minecraft.getWindow());
|
||||||
double ym = this.getScaledYPos(this.minecraft.getWindow());
|
double ym = this.getScaledYPos(this.minecraft.getWindow());
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
this.minecraft.gui.screen().afterMouseAction();
|
this.minecraft.gui.screen().afterMouseAction();
|
||||||
} else if (this.minecraft.player != null) {
|
} else if (this.minecraft.player != null) {
|
||||||
Vector2i wheelXY = this.scrollWheelHandler.onMouseScroll(scaledXOffset, scaledYOffset);
|
Vector2i wheelXY = this.scrollWheelHandler.onMouseScroll(scaledXOffset, scaledYOffset);
|
||||||
@@ -206,6 +_,7 @@
|
@@ -191,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
int wheel = wheelXY.y == 0 ? -wheelXY.x : wheelXY.y;
|
int wheel = wheelXY.y == 0 ? -wheelXY.x : wheelXY.y;
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
if (this.minecraft.player.isSpectator()) {
|
if (this.minecraft.player.isSpectator()) {
|
||||||
if (this.minecraft.gui.hud.getSpectatorGui().isMenuActive()) {
|
if (this.minecraft.gui.hud.getSpectatorGui().isMenuActive()) {
|
||||||
this.minecraft.gui.hud.getSpectatorGui().onMouseScrolled(-wheel);
|
this.minecraft.gui.hud.getSpectatorGui().onMouseScrolled(-wheel);
|
||||||
@@ -312,7 +_,7 @@
|
@@ -285,7 +_,7 @@
|
||||||
double dy = getScaledYPos(window, this.accumulatedDY);
|
double dy = getScaledYPos(window, this.accumulatedDY);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -61,8 +61,8 @@
|
|||||||
+ net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, new MouseButtonEvent(xm, ym, this.activeButton), dx, dy);
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, new MouseButtonEvent(xm, ym, this.activeButton), dx, dy);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
CrashReport report = CrashReport.forThrowable(t, "mouseDragged event handler");
|
CrashReport report = CrashReport.forThrowable(t, "mouseDragged event handler");
|
||||||
screen.fillCrashDetails(report);
|
CrashReportCategory mouseDetails = report.addCategory("Mouse");
|
||||||
@@ -397,6 +_,14 @@
|
@@ -369,6 +_,14 @@
|
||||||
|
|
||||||
public double ypos() {
|
public double ypos() {
|
||||||
return this.ypos;
|
return this.ypos;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Options.java
|
--- a/net/minecraft/client/Options.java
|
||||||
+++ b/net/minecraft/client/Options.java
|
+++ b/net/minecraft/client/Options.java
|
||||||
@@ -986,6 +_,7 @@
|
@@ -1011,6 +_,7 @@
|
||||||
);
|
);
|
||||||
public boolean syncWrites;
|
public boolean syncWrites;
|
||||||
public boolean startedCleanly = true;
|
public boolean startedCleanly = true;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public static boolean isSoundDeviceDefault(final String deviceName) {
|
public static boolean isSoundDeviceDefault(final String deviceName) {
|
||||||
return deviceName.equals("");
|
return deviceName.equals("");
|
||||||
@@ -1474,6 +_,7 @@
|
@@ -1510,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Options(final Minecraft minecraft, final File workingDirectory) {
|
public Options(final Minecraft minecraft, final File workingDirectory) {
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
this.minecraft = minecraft;
|
this.minecraft = minecraft;
|
||||||
this.optionsFile = new File(workingDirectory, "options.txt");
|
this.optionsFile = new File(workingDirectory, "options.txt");
|
||||||
boolean largeDistances = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
boolean largeDistances = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
||||||
@@ -1624,15 +_,28 @@
|
@@ -1663,20 +_,32 @@
|
||||||
this.startedCleanly = access.process("startedCleanly", this.startedCleanly);
|
this.startedCleanly = access.process("startedCleanly", this.startedCleanly);
|
||||||
access.process("musicToast", this.musicToast);
|
access.process("musicToast", this.musicToast);
|
||||||
access.process("musicFrequency", this.musicFrequency);
|
access.process("musicFrequency", this.musicFrequency);
|
||||||
@@ -31,13 +31,18 @@
|
|||||||
+ String currentValue = keyMapping.saveString() + (keyMapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keyMapping.getKeyModifier() : "");
|
+ String currentValue = keyMapping.saveString() + (keyMapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keyMapping.getKeyModifier() : "");
|
||||||
String newValue = access.process("key_" + keyMapping.getName(), currentValue);
|
String newValue = access.process("key_" + keyMapping.getName(), currentValue);
|
||||||
if (!currentValue.equals(newValue)) {
|
if (!currentValue.equals(newValue)) {
|
||||||
keyMapping.setKey(InputConstants.getKey(newValue));
|
try {
|
||||||
+ if (newValue.indexOf(':') != -1) {
|
- keyMapping.setKey(InputConstants.getKey(newValue));
|
||||||
+ String[] pts = newValue.split(":");
|
+ if (newValue.indexOf(':') != -1) {
|
||||||
+ keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0]));
|
+ String[] pts = newValue.split(":");
|
||||||
+ } else {
|
+ keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0]));
|
||||||
+ keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(newValue));
|
+ } else {
|
||||||
+ }
|
+ keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(newValue));
|
||||||
|
+ }
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
LOGGER.warn("Invalid keyMapping {} = {}, unbinding", keyMapping.getName(), newValue, e);
|
||||||
|
keyMapping.setKey(InputConstants.UNKNOWN);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
@@ -46,7 +51,7 @@
|
|||||||
for (SoundSource source : SoundSource.values()) {
|
for (SoundSource source : SoundSource.values()) {
|
||||||
access.process("soundCategory_" + source.getName(), this.soundSourceVolumes.get(source));
|
access.process("soundCategory_" + source.getName(), this.soundSourceVolumes.get(source));
|
||||||
}
|
}
|
||||||
@@ -1647,6 +_,10 @@
|
@@ -1691,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void load() {
|
public void load() {
|
||||||
@@ -57,7 +62,7 @@
|
|||||||
try {
|
try {
|
||||||
if (!this.optionsFile.exists()) {
|
if (!this.optionsFile.exists()) {
|
||||||
return;
|
return;
|
||||||
@@ -1666,7 +_,8 @@
|
@@ -1710,7 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
final CompoundTag options = this.dataFix(rawOptions);
|
final CompoundTag options = this.dataFix(rawOptions);
|
||||||
@@ -67,7 +72,7 @@
|
|||||||
new Options.FieldAccess() {
|
new Options.FieldAccess() {
|
||||||
private @Nullable String getValue(final String name) {
|
private @Nullable String getValue(final String name) {
|
||||||
Tag tag = options.get(name);
|
Tag tag = options.get(name);
|
||||||
@@ -1748,6 +_,17 @@
|
@@ -1792,6 +_,17 @@
|
||||||
);
|
);
|
||||||
options.getString("fullscreenResolution").ifPresent(fullscreenResolution -> this.fullscreenVideoModeString = fullscreenResolution);
|
options.getString("fullscreenResolution").ifPresent(fullscreenResolution -> this.fullscreenVideoModeString = fullscreenResolution);
|
||||||
KeyMapping.resetMapping();
|
KeyMapping.resetMapping();
|
||||||
@@ -85,7 +90,7 @@
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("Failed to load options", e);
|
LOGGER.error("Failed to load options", e);
|
||||||
}
|
}
|
||||||
@@ -1778,9 +_,11 @@
|
@@ -1821,9 +_,11 @@
|
||||||
public void save() {
|
public void save() {
|
||||||
try (final PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
|
try (final PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
|
||||||
writer.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
|
writer.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
|
||||||
@@ -97,7 +102,7 @@
|
|||||||
writer.print(name);
|
writer.print(name);
|
||||||
writer.print(':');
|
writer.print(':');
|
||||||
}
|
}
|
||||||
@@ -1836,6 +_,12 @@
|
@@ -1879,6 +_,12 @@
|
||||||
if (fullscreenVideoModeString != null) {
|
if (fullscreenVideoModeString != null) {
|
||||||
writer.println("fullscreenResolution:" + fullscreenVideoModeString);
|
writer.println("fullscreenResolution:" + fullscreenVideoModeString);
|
||||||
}
|
}
|
||||||
@@ -110,7 +115,7 @@
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("Failed to save options", e);
|
LOGGER.error("Failed to save options", e);
|
||||||
}
|
}
|
||||||
@@ -1873,6 +_,7 @@
|
@@ -1916,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastOptions() {
|
public void broadcastOptions() {
|
||||||
@@ -118,7 +123,7 @@
|
|||||||
if (this.minecraft.player != null) {
|
if (this.minecraft.player != null) {
|
||||||
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
|
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
|
||||||
}
|
}
|
||||||
@@ -1986,6 +_,23 @@
|
@@ -2029,6 +_,23 @@
|
||||||
|
|
||||||
public static Component genericValueLabel(final Component caption, final int value) {
|
public static Component genericValueLabel(final Component caption, final int value) {
|
||||||
return genericValueLabel(caption, Component.literal(Integer.toString(value)));
|
return genericValueLabel(caption, Component.literal(Integer.toString(value)));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/data/models/ItemModelGenerators.java
|
--- a/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
|
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
@@ -868,6 +_,9 @@
|
@@ -921,6 +_,9 @@
|
||||||
this.declareCustomModelItem(Items.COD);
|
this.declareCustomModelItem(Items.COD);
|
||||||
this.declareCustomModelItem(Items.FEATHER);
|
this.declareCustomModelItem(Items.FEATHER);
|
||||||
this.declareCustomModelItem(Items.LEAD);
|
this.declareCustomModelItem(Items.LEAD);
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
--- a/net/minecraft/client/gui/Gui.java
|
--- a/net/minecraft/client/gui/Gui.java
|
||||||
+++ b/net/minecraft/client/gui/Gui.java
|
+++ b/net/minecraft/client/gui/Gui.java
|
||||||
@@ -64,7 +_,7 @@
|
@@ -67,7 +_,7 @@
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class Gui {
|
-public class Gui {
|
||||||
+public class Gui extends net.minecraftforge.client.gui.overlay.ForgeLayerInstance {
|
+public class Gui extends net.minecraftforge.client.gui.overlay.ForgeLayerInstance {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static final SectionCategory TRACY_CURRENT_SCREEN = TracyClient.createSectionCategory("Current Screen");
|
||||||
private static final Component SOCIAL_INTERACTIONS_NOT_AVAILABLE = Component.translatable("multiplayer.socialInteractions.not_available");
|
private static final Component SOCIAL_INTERACTIONS_NOT_AVAILABLE = Component.translatable("multiplayer.socialInteractions.not_available");
|
||||||
public static final Component SAVING_LEVEL = Component.translatable("menu.savingLevel");
|
@@ -85,6 +_,7 @@
|
||||||
@@ -80,6 +_,7 @@
|
|
||||||
private @Nullable TutorialToast socialInteractionsToast;
|
private @Nullable TutorialToast socialInteractionsToast;
|
||||||
|
|
||||||
public Gui(final Minecraft minecraft, final Hud hud, final GuiRenderState guiRenderState) {
|
public Gui(final Minecraft minecraft, final Hud hud, final GuiRenderState guiRenderState) {
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
this.minecraft = minecraft;
|
this.minecraft = minecraft;
|
||||||
this.hud = hud;
|
this.hud = hud;
|
||||||
this.splashManager = new SplashManager(minecraft.getUser());
|
this.splashManager = new SplashManager(minecraft.getUser());
|
||||||
@@ -175,7 +_,7 @@
|
@@ -174,7 +_,7 @@
|
||||||
profiler.push("screen");
|
profiler.push("screen");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -26,11 +26,13 @@
|
|||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
CrashReport report = CrashReport.forThrowable(t, "Rendering screen");
|
CrashReport report = CrashReport.forThrowable(t, "Rendering screen");
|
||||||
CrashReportCategory category = report.addCategory("Screen render details");
|
CrashReportCategory category = report.addCategory("Screen render details");
|
||||||
@@ -224,12 +_,6 @@
|
@@ -228,14 +_,6 @@
|
||||||
LOGGER.error("setScreen called from non-game thread");
|
this.screenTracySection = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
- if (this.screen != null) {
|
- if (this.screen != null) {
|
||||||
|
- this.screen.clearFocus();
|
||||||
|
- this.minecraft.textInputManager().stopTextInput();
|
||||||
- this.screen.removed();
|
- this.screen.removed();
|
||||||
- } else {
|
- } else {
|
||||||
- this.minecraft.setLastInputType(InputType.NONE);
|
- this.minecraft.setLastInputType(InputType.NONE);
|
||||||
@@ -39,7 +41,7 @@
|
|||||||
if (screen == null) {
|
if (screen == null) {
|
||||||
if (this.clientLevelTeardownInProgress) {
|
if (this.clientLevelTeardownInProgress) {
|
||||||
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
||||||
@@ -248,6 +_,22 @@
|
@@ -254,6 +_,24 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,6 +56,8 @@
|
|||||||
+ if (screen != old) {
|
+ if (screen != old) {
|
||||||
+ if (old != null) {
|
+ if (old != null) {
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old);
|
||||||
|
+ this.screen.clearFocus();
|
||||||
|
+ this.minecraft.textInputManager().stopTextInput();
|
||||||
+ old.removed();
|
+ old.removed();
|
||||||
+ } else {
|
+ } else {
|
||||||
+ this.minecraft.setLastInputType(InputType.NONE);
|
+ this.minecraft.setLastInputType(InputType.NONE);
|
||||||
@@ -62,7 +66,7 @@
|
|||||||
this.screen = screen;
|
this.screen = screen;
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.added();
|
this.screen.added();
|
||||||
@@ -465,5 +_,10 @@
|
@@ -474,5 +_,10 @@
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
||||||
private final Minecraft minecraft;
|
private final Minecraft minecraft;
|
||||||
private final Matrix3x2fStack pose;
|
private final Matrix3x2fStack pose;
|
||||||
@@ -912,6 +_,7 @@
|
@@ -914,6 +_,7 @@
|
||||||
CrashReport report = CrashReport.forThrowable(t, "Rendering item");
|
CrashReport report = CrashReport.forThrowable(t, "Rendering item");
|
||||||
CrashReportCategory category = report.addCategory("Item being rendered");
|
CrashReportCategory category = report.addCategory("Item being rendered");
|
||||||
category.setDetail("Item Type", () -> String.valueOf(itemStack.getItem()));
|
category.setDetail("Item Type", () -> String.valueOf(itemStack.getItem()));
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
category.setDetail("Item Components", () -> String.valueOf(itemStack.getComponents()));
|
category.setDetail("Item Components", () -> String.valueOf(itemStack.getComponents()));
|
||||||
category.setDetail("Item Foil", () -> String.valueOf(itemStack.hasFoil()));
|
category.setDetail("Item Foil", () -> String.valueOf(itemStack.hasFoil()));
|
||||||
throw new ReportedException(report);
|
throw new ReportedException(report);
|
||||||
@@ -938,6 +_,7 @@
|
@@ -940,6 +_,7 @@
|
||||||
this.itemCooldown(itemStack, x, y);
|
this.itemCooldown(itemStack, x, y);
|
||||||
this.itemCount(font, itemStack, x, y, countText);
|
this.itemCount(font, itemStack, x, y, countText);
|
||||||
this.pose.popMatrix();
|
this.pose.popMatrix();
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1106,16 +_,25 @@
|
@@ -1109,16 +_,29 @@
|
||||||
this.setTooltipForNextFrame(this.minecraft.font, formattedCharSequences, DefaultTooltipPositioner.INSTANCE, x, y, false);
|
this.setTooltipForNextFrame(this.minecraft.font, formattedCharSequences, DefaultTooltipPositioner.INSTANCE, x, y, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
public void setTooltipForNextFrame(final Font font, final ItemStack itemStack, final int xo, final int yo) {
|
public void setTooltipForNextFrame(final Font font, final ItemStack itemStack, final int xo, final int yo) {
|
||||||
+ this.tooltipStack = itemStack;
|
+ this.tooltipStack = itemStack;
|
||||||
this.setTooltipForNextFrame(
|
this.setTooltipForNextFrame(
|
||||||
font, Screen.getTooltipFromItem(this.minecraft, itemStack), itemStack.getTooltipImage(), xo, yo, itemStack.get(DataComponents.TOOLTIP_STYLE)
|
font, Screen.getTooltipFromItem(this.minecraft, itemStack), itemStack.getTooltipImage(), xo, yo, itemStack.get(DataComponents.TOOLTIP_STYLE), true
|
||||||
);
|
);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
@@ -43,17 +43,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
+ public void setTooltipForNextFrame(Font font, List<Component> texts, Optional<TooltipComponent> optionalImage, ItemStack stack, int xo, int yo) {
|
+ public void setTooltipForNextFrame(Font font, List<Component> texts, Optional<TooltipComponent> optionalImage, ItemStack stack, int xo, int yo) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.setTooltipForNextFrame(font, texts, optionalImage, stack, xo, yo, false);
|
||||||
+ this.setTooltipForNextFrame(font, texts, optionalImage, xo, yo, stack.get(DataComponents.TOOLTIP_STYLE));
|
+ }
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+
|
||||||
|
+ public void setTooltipForNextFrame(Font font, List<Component> texts, Optional<TooltipComponent> optionalImage, ItemStack stack, int xo, int yo, final boolean extraSpaceAfterFirstLine) {
|
||||||
|
+ this.tooltipStack = stack;
|
||||||
|
+ this.setTooltipForNextFrame(font, texts, optionalImage, xo, yo, stack.get(DataComponents.TOOLTIP_STYLE), extraSpaceAfterFirstLine);
|
||||||
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public void setTooltipForNextFrame(
|
public void setTooltipForNextFrame(
|
||||||
final Font font,
|
final Font font,
|
||||||
final List<Component> texts,
|
final List<Component> texts,
|
||||||
@@ -1124,11 +_,7 @@
|
@@ -1139,11 +_,7 @@
|
||||||
final int yo,
|
final @Nullable Identifier style,
|
||||||
final @Nullable Identifier style
|
final boolean extraSpaceAfterFirstLine
|
||||||
) {
|
) {
|
||||||
- List<ClientTooltipComponent> components = texts.stream()
|
- List<ClientTooltipComponent> components = texts.stream()
|
||||||
- .map(Component::getVisualOrderText)
|
- .map(Component::getVisualOrderText)
|
||||||
@@ -61,10 +65,10 @@
|
|||||||
- .collect(Util.toMutableList());
|
- .collect(Util.toMutableList());
|
||||||
- optionalImage.ifPresent(image -> components.add(components.isEmpty() ? 0 : 1, ClientTooltipComponent.create(image)));
|
- optionalImage.ifPresent(image -> components.add(components.isEmpty() ? 0 : 1, ClientTooltipComponent.create(image)));
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, texts, optionalImage, xo, guiWidth(), guiHeight(), font);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, texts, optionalImage, xo, guiWidth(), guiHeight(), font);
|
||||||
this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, style, false);
|
this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, style, false, extraSpaceAfterFirstLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1156,7 +_,22 @@
|
@@ -1171,7 +_,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo) {
|
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo) {
|
||||||
@@ -88,36 +92,34 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo, final @Nullable Identifier style) {
|
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo, final @Nullable Identifier style) {
|
||||||
@@ -1207,10 +_,16 @@
|
@@ -1235,9 +_,14 @@
|
||||||
) {
|
) {
|
||||||
if (!lines.isEmpty()) {
|
if (!lines.isEmpty()) {
|
||||||
if (this.deferredTooltip == null || replaceExisting) {
|
if (this.deferredTooltip == null || replaceExisting) {
|
||||||
- this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style);
|
- this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style, extraSpaceAfterFirstLine);
|
||||||
+ final var stackContext = this.tooltipStack;
|
+ final var stackContext = this.tooltipStack;
|
||||||
+ this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style, stackContext);
|
+ this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style, extraSpaceAfterFirstLine, stackContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public void tooltip(Font font, List<ClientTooltipComponent> lines, int xo, int yo, ClientTooltipPositioner positioner, @Nullable Identifier style) {
|
|
||||||
+ tooltip(font, lines, xo, yo, positioner, style, ItemStack.EMPTY);
|
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ public void tooltip(Font font, List<ClientTooltipComponent> lines, int xo, int yo, ClientTooltipPositioner positioner, @Nullable Identifier style, boolean extraSpaceAfterFirstLine) {
|
||||||
|
+ tooltip(font, lines, xo, yo, positioner, style, extraSpaceAfterFirstLine, ItemStack.EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
public void tooltip(
|
public void tooltip(
|
||||||
final Font font,
|
@@ -1247,13 +_,16 @@
|
||||||
@@ -1218,13 +_,16 @@
|
|
||||||
final int xo,
|
|
||||||
final int yo,
|
final int yo,
|
||||||
final ClientTooltipPositioner positioner,
|
final ClientTooltipPositioner positioner,
|
||||||
- final @Nullable Identifier style
|
final @Nullable Identifier style,
|
||||||
+ final @Nullable Identifier style,
|
- boolean extraSpaceAfterFirstLine
|
||||||
|
+ boolean extraSpaceAfterFirstLine,
|
||||||
+ ItemStack itemstack
|
+ ItemStack itemstack
|
||||||
) {
|
) {
|
||||||
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(itemstack, this, xo, yo, guiWidth(), guiHeight(), lines, font, positioner, style);
|
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(itemstack, this, xo, yo, guiWidth(), guiHeight(), lines, font, positioner, style);
|
||||||
+ if (preEvent == null) return;
|
+ if (preEvent == null) return;
|
||||||
int textWidth = 0;
|
int textWidth = 0;
|
||||||
int tempHeight = lines.size() == 1 ? -2 : 0;
|
int tempHeight = extraSpaceAfterFirstLine && lines.size() != 1 ? 0 : -2;
|
||||||
|
|
||||||
for (ClientTooltipComponent line : lines) {
|
for (ClientTooltipComponent line : lines) {
|
||||||
- int lineWidth = line.getWidth(font);
|
- int lineWidth = line.getWidth(font);
|
||||||
@@ -125,7 +127,7 @@
|
|||||||
if (lineWidth > textWidth) {
|
if (lineWidth > textWidth) {
|
||||||
textWidth = lineWidth;
|
textWidth = lineWidth;
|
||||||
}
|
}
|
||||||
@@ -1234,25 +_,25 @@
|
@@ -1263,25 +_,25 @@
|
||||||
|
|
||||||
int w = textWidth;
|
int w = textWidth;
|
||||||
int h = tempHeight;
|
int h = tempHeight;
|
||||||
@@ -141,9 +143,9 @@
|
|||||||
for (int i = 0; i < lines.size(); i++) {
|
for (int i = 0; i < lines.size(); i++) {
|
||||||
ClientTooltipComponent line = lines.get(i);
|
ClientTooltipComponent line = lines.get(i);
|
||||||
- line.extractText(this, font, x, localY);
|
- line.extractText(this, font, x, localY);
|
||||||
- localY += line.getHeight(font) + (i == 0 ? 2 : 0);
|
- localY += line.getHeight(font) + (extraSpaceAfterFirstLine && i == 0 ? 2 : 0);
|
||||||
+ line.extractText(this, preEvent.getFont(), x, localY);
|
+ line.extractText(this, preEvent.getFont(), x, localY);
|
||||||
+ localY += line.getHeight(preEvent.getFont()) + (i == 0 ? 2 : 0);
|
+ localY += line.getHeight(preEvent.getFont()) + (extraSpaceAfterFirstLine && i == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
localY = y;
|
localY = y;
|
||||||
@@ -151,13 +153,13 @@
|
|||||||
for (int i = 0; i < lines.size(); i++) {
|
for (int i = 0; i < lines.size(); i++) {
|
||||||
ClientTooltipComponent line = lines.get(i);
|
ClientTooltipComponent line = lines.get(i);
|
||||||
- line.extractImage(font, x, localY, w, h, this);
|
- line.extractImage(font, x, localY, w, h, this);
|
||||||
- localY += line.getHeight(font) + (i == 0 ? 2 : 0);
|
- localY += line.getHeight(font) + (extraSpaceAfterFirstLine && i == 0 ? 2 : 0);
|
||||||
+ line.extractImage(preEvent.getFont(), x, localY, w, h, this);
|
+ line.extractImage(preEvent.getFont(), x, localY, w, h, this);
|
||||||
+ localY += line.getHeight(preEvent.getFont()) + (i == 0 ? 2 : 0);
|
+ localY += line.getHeight(preEvent.getFont()) + (extraSpaceAfterFirstLine && i == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.pose.popMatrix();
|
this.pose.popMatrix();
|
||||||
@@ -1326,6 +_,14 @@
|
@@ -1355,6 +_,14 @@
|
||||||
|
|
||||||
private ActiveTextCollector.Parameters createDefaultTextParameters(final float opacity) {
|
private ActiveTextCollector.Parameters createDefaultTextParameters(final float opacity) {
|
||||||
return new ActiveTextCollector.Parameters(new Matrix3x2f(this.pose), opacity, this.scissorStack.peek());
|
return new ActiveTextCollector.Parameters(new Matrix3x2f(this.pose), opacity, this.scissorStack.peek());
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/Hud.java
|
--- a/net/minecraft/client/gui/Hud.java
|
||||||
+++ b/net/minecraft/client/gui/Hud.java
|
+++ b/net/minecraft/client/gui/Hud.java
|
||||||
@@ -156,7 +_,7 @@
|
@@ -157,7 +_,7 @@
|
||||||
public float vignetteBrightness = 1.0F;
|
public float vignetteBrightness = 1.0F;
|
||||||
private int toolHighlightTimer;
|
private int toolHighlightTimer;
|
||||||
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
private final SubtitleOverlay subtitleOverlay;
|
private final SubtitleOverlay subtitleOverlay;
|
||||||
private final SpectatorGui spectatorGui;
|
private final SpectatorGui spectatorGui;
|
||||||
private final PlayerTabOverlay tabList;
|
private final PlayerTabOverlay tabList;
|
||||||
@@ -198,6 +_,7 @@
|
@@ -199,6 +_,7 @@
|
||||||
() -> new JumpableVehicleBar(minecraft)
|
() -> new JumpableVehicleBar(minecraft)
|
||||||
);
|
);
|
||||||
this.resetTitleTimes();
|
this.resetTitleTimes();
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void registerReloadListeners(final ReloadableResourceManager resourceManager) {
|
public void registerReloadListeners(final ReloadableResourceManager resourceManager) {
|
||||||
@@ -221,6 +_,10 @@
|
@@ -222,6 +_,10 @@
|
||||||
public void extractRenderState(final GuiGraphicsExtractor graphics, final DeltaTracker deltaTracker) {
|
public void extractRenderState(final GuiGraphicsExtractor graphics, final DeltaTracker deltaTracker) {
|
||||||
this.minecraft.gameRenderer.gameRenderState().guiRenderState.isHudHidden = this.isHidden;
|
this.minecraft.gameRenderer.gameRenderState().guiRenderState.isHudHidden = this.isHidden;
|
||||||
if (!(this.minecraft.gui.screen() instanceof LevelLoadingScreen)) {
|
if (!(this.minecraft.gui.screen() instanceof LevelLoadingScreen)) {
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
if (!this.isHidden) {
|
if (!this.isHidden) {
|
||||||
this.extractCameraOverlays(graphics, deltaTracker);
|
this.extractCameraOverlays(graphics, deltaTracker);
|
||||||
this.extractCrosshair(graphics, deltaTracker);
|
this.extractCrosshair(graphics, deltaTracker);
|
||||||
@@ -404,7 +_,7 @@
|
@@ -405,7 +_,7 @@
|
||||||
int mouseX = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
|
int mouseX = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
|
||||||
int mouseY = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
|
int mouseY = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
|
||||||
graphics.nextStratum();
|
graphics.nextStratum();
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -497,6 +_,8 @@
|
@@ -500,6 +_,8 @@
|
||||||
|
|
||||||
for (MobEffectInstance instance : Ordering.natural().reverse().sortedCopy(activeEffects)) {
|
for (MobEffectInstance instance : Ordering.natural().reverse().sortedCopy(activeEffects)) {
|
||||||
Holder<MobEffect> effect = instance.getEffect();
|
Holder<MobEffect> effect = instance.getEffect();
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
if (instance.showIcon()) {
|
if (instance.showIcon()) {
|
||||||
int x = graphics.guiWidth();
|
int x = graphics.guiWidth();
|
||||||
int y = 1;
|
int y = 1;
|
||||||
@@ -527,6 +_,7 @@
|
@@ -530,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
graphics.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(effect), x + 3, y + 3, 18, 18, ARGB.white(alpha));
|
graphics.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(effect), x + 3, y + 3, 18, 18, ARGB.white(alpha));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -629,15 +_,37 @@
|
@@ -632,15 +_,37 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void extractSelectedItemName(final GuiGraphicsExtractor graphics) {
|
public void extractSelectedItemName(final GuiGraphicsExtractor graphics) {
|
||||||
@@ -94,7 +94,7 @@
|
|||||||
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
||||||
y += 14;
|
y += 14;
|
||||||
}
|
}
|
||||||
@@ -648,7 +_,7 @@
|
@@ -651,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (alpha > 0) {
|
if (alpha > 0) {
|
||||||
@@ -103,7 +103,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1216,7 +_,9 @@
|
@@ -1219,7 +_,9 @@
|
||||||
this.toolHighlightTimer = 0;
|
this.toolHighlightTimer = 0;
|
||||||
} else if (this.lastToolHighlight.isEmpty()
|
} else if (this.lastToolHighlight.isEmpty()
|
||||||
|| !selected.is(this.lastToolHighlight.getItem())
|
|| !selected.is(this.lastToolHighlight.getItem())
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/PauseScreen.java
|
--- a/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
|
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
@@ -165,6 +_,7 @@
|
@@ -163,6 +_,7 @@
|
||||||
Button.builder(OPTIONS, var1x -> this.minecraft.gui.setScreen(new OptionsScreen(this, this.minecraft.options, true))).width(204).build(), 2
|
helper.addChild(this.openScreenButton(OPTIONS, () -> new OptionsScreen(this, this.minecraft.options)));
|
||||||
);
|
helper.addChild(this.openScreenButton(WORLD_OPTIONS, () -> new WorldOptionsScreen(this, this.minecraft.level)));
|
||||||
}
|
}
|
||||||
+ helper.addChild(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.gui.setScreen(new net.minecraftforge.client.gui.ModListScreen(this))).width(BUTTON_WIDTH_FULL).build(), 2);
|
+ helper.addChild(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.gui.setScreen(new net.minecraftforge.client.gui.ModListScreen(this))).width(BUTTON_WIDTH_FULL).build(), 2);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/Screen.java
|
--- a/net/minecraft/client/gui/screens/Screen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/Screen.java
|
+++ b/net/minecraft/client/gui/screens/Screen.java
|
||||||
@@ -196,7 +_,7 @@
|
@@ -202,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClose() {
|
public void onClose() {
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(final T widget) {
|
protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(final T widget) {
|
||||||
@@ -327,8 +_,10 @@
|
@@ -333,8 +_,10 @@
|
||||||
this.width = width;
|
this.width = width;
|
||||||
this.height = height;
|
this.height = height;
|
||||||
if (!this.initialized) {
|
if (!this.initialized) {
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
} else {
|
} else {
|
||||||
this.repositionElements();
|
this.repositionElements();
|
||||||
}
|
}
|
||||||
@@ -345,8 +_,10 @@
|
@@ -351,8 +_,10 @@
|
||||||
protected void rebuildWidgets() {
|
protected void rebuildWidgets() {
|
||||||
this.clearWidgets();
|
this.clearWidgets();
|
||||||
this.clearFocus();
|
this.clearFocus();
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void fadeWidgets(final float widgetFade) {
|
protected void fadeWidgets(final float widgetFade) {
|
||||||
@@ -386,6 +_,8 @@
|
@@ -392,6 +_,8 @@
|
||||||
this.extractMenuBackground(graphics);
|
this.extractMenuBackground(graphics);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
this.minecraft.gui.hud.extractDeferredSubtitles();
|
this.minecraft.gui.hud.extractDeferredSubtitles();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -471,6 +_,19 @@
|
@@ -472,6 +_,19 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onFilesDrop(final List<Path> files) {
|
public void onFilesDrop(final List<Path> files) {
|
||||||
@@ -59,4 +59,4 @@
|
|||||||
+ this.children.add(guiEventListener);
|
+ this.children.add(guiEventListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void scheduleNarration(final long delay, final boolean ignoreSuppression) {
|
private void scheduleNarration(final long delay, final boolean ignoreSuppression, final NarrationTrigger narrationTrigger) {
|
||||||
+16
-9
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
@@ -41,6 +_,7 @@
|
@@ -38,6 +_,7 @@
|
||||||
private float fade;
|
private float fade;
|
||||||
private boolean centered;
|
private boolean centered;
|
||||||
private @Nullable AdvancementWidget hovered;
|
private @Nullable AdvancementWidget hovered;
|
||||||
@@ -8,15 +8,22 @@
|
|||||||
|
|
||||||
public AdvancementTab(
|
public AdvancementTab(
|
||||||
final Minecraft minecraft,
|
final Minecraft minecraft,
|
||||||
@@ -62,6 +_,15 @@
|
@@ -60,6 +_,11 @@
|
||||||
this.addWidget(this.root, rootNode.holder());
|
this.addWidget(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public AdvancementTab(Minecraft mc, AdvancementsScreen screen, AdvancementTabType type, int index, int page, AdvancementNode adv, DisplayInfo info) {
|
+ public AdvancementTab(Minecraft mc, AdvancementsScreen screen, AdvancementTabType type, int index, int page, AdvancementWidget root, ItemStackTemplate icon, Component title, Identifier background) {
|
||||||
+ this(mc, screen, type, index, adv, info);
|
+ this(mc, screen, type, index, root, icon, title, background);
|
||||||
+ this.page = page;
|
+ this.page = page;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
public void copyPosition(final AdvancementTab source) {
|
||||||
|
this.scrollX = source.scrollX;
|
||||||
|
this.scrollY = source.scrollY;
|
||||||
|
@@ -70,6 +_,10 @@
|
||||||
|
this.centered = source.centered;
|
||||||
|
}
|
||||||
|
|
||||||
+ public int getPage() {
|
+ public int getPage() {
|
||||||
+ return this.page;
|
+ return this.page;
|
||||||
+ }
|
+ }
|
||||||
@@ -24,14 +31,14 @@
|
|||||||
public AdvancementTabType getType() {
|
public AdvancementTabType getType() {
|
||||||
return this.type;
|
return this.type;
|
||||||
}
|
}
|
||||||
@@ -169,8 +_,8 @@
|
@@ -179,8 +_,8 @@
|
||||||
}
|
Identifier background = rootDisplay.background().get().texturePath();
|
||||||
|
|
||||||
for (AdvancementTabType type : AdvancementTabType.values()) {
|
for (AdvancementTabType type : AdvancementTabType.values()) {
|
||||||
- if (index < type.getMax()) {
|
- if (index < type.getMax()) {
|
||||||
- return new AdvancementTab(minecraft, screen, type, index, root, display.get());
|
- return new AdvancementTab(minecraft, screen, type, index, rootWidget, rootDisplay.icon(), rootDisplay.title(), background);
|
||||||
+ if ((index % AdvancementTabType.MAX_TABS) < type.getMax()) {
|
+ if ((index % AdvancementTabType.MAX_TABS) < type.getMax()) {
|
||||||
+ return new AdvancementTab(minecraft, screen, type, index % AdvancementTabType.MAX_TABS, index / AdvancementTabType.MAX_TABS, root, display.get());
|
+ return new AdvancementTab(minecraft, screen, type, index % AdvancementTabType.MAX_TABS, index / AdvancementTabType.MAX_TABS, rootWidget, rootDisplay.icon(), rootDisplay.title(), background);
|
||||||
}
|
}
|
||||||
|
|
||||||
index -= type.getMax();
|
index -= type.getMax();
|
||||||
+3
-3
@@ -34,10 +34,10 @@
|
|||||||
for (AdvancementTab tab : this.tabs.values()) {
|
for (AdvancementTab tab : this.tabs.values()) {
|
||||||
- if (tab.isMouseOver(xo, yo, event.x(), event.y())) {
|
- if (tab.isMouseOver(xo, yo, event.x(), event.y())) {
|
||||||
+ if (tab.getPage() == tabPage && tab.isMouseOver(xo, yo, event.x(), event.y())) {
|
+ if (tab.getPage() == tabPage && tab.isMouseOver(xo, yo, event.x(), event.y())) {
|
||||||
this.advancements.setSelectedTab(tab.getRootNode().holder(), true);
|
this.advancements.setSelectedTab(tab.getRootAdvancement(), true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -208,10 +_,12 @@
|
@@ -212,10 +_,12 @@
|
||||||
graphics.blit(RenderPipelines.GUI_TEXTURED, WINDOW_LOCATION, this.leftPos, this.topPos, 0.0F, 0.0F, 252, 140, 256, 256);
|
graphics.blit(RenderPipelines.GUI_TEXTURED, WINDOW_LOCATION, this.leftPos, this.topPos, 0.0F, 0.0F, 252, 140, 256, 256);
|
||||||
if (this.tabs.size() > 1) {
|
if (this.tabs.size() > 1) {
|
||||||
for (AdvancementTab tab : this.tabs.values()) {
|
for (AdvancementTab tab : this.tabs.values()) {
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
tab.extractIcon(graphics, this.leftPos, this.topPos);
|
tab.extractIcon(graphics, this.leftPos, this.topPos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,6 +_,7 @@
|
@@ -234,6 +_,7 @@
|
||||||
|
|
||||||
if (this.tabs.size() > 1) {
|
if (this.tabs.size() > 1) {
|
||||||
for (AdvancementTab tab : this.tabs.values()) {
|
for (AdvancementTab tab : this.tabs.values()) {
|
||||||
|
|||||||
Loaded 100 of 680 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user