mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e8942e0a7 | ||
|
|
a02f3f9841 | ||
|
|
c5e462f7d2 | ||
|
|
d1f79d6655 | ||
|
|
9d5e81b1a9 | ||
|
|
a1c275df46 | ||
|
|
4ef7fe8bd8 | ||
|
|
ce8838e721 | ||
|
|
b7e2593d48 | ||
|
|
33d177f02e | ||
|
|
5d2186df63 | ||
|
|
77af36b807 | ||
|
|
54eeca0aed | ||
|
|
3de0566425 | ||
|
|
a5ebf3b645 | ||
|
|
63d0496cc4 | ||
|
|
31f623e794 | ||
|
|
eb001a6382 | ||
|
|
504dcad849 | ||
|
|
81f7f029c3 | ||
|
|
207c1997c9 | ||
|
|
e348ae5b84 | ||
|
|
0f3b8ee830 | ||
|
|
b4b6e48a7a | ||
|
|
d50a3b5ab7 | ||
|
|
88904a1d09 | ||
|
|
b864faf0ef | ||
|
|
c97eabc0c4 | ||
|
|
6ae39c8597 | ||
|
|
dcafb4f633 | ||
|
|
1ea7ce9831 | ||
|
|
674f2efd54 | ||
|
|
02e82c672d | ||
|
|
b25f6e3a7c | ||
|
|
e69b07a54a | ||
|
|
79efe2ac36 | ||
|
|
464483db5b | ||
|
|
f49adb285f | ||
|
|
55862dfd1d | ||
|
|
124b9bd8d3 | ||
|
|
bae3915728 | ||
|
|
b3c2c62c7e | ||
|
|
68698d70c1 | ||
|
|
d55dee9394 | ||
|
|
2d114f2719 | ||
|
|
3e6583af01 | ||
|
|
762f6a7d78 | ||
|
|
3c5a534b7a | ||
|
|
bc62d1693a | ||
|
|
554ead8d4a | ||
|
|
ec5ac91389 | ||
|
|
f63813d929 | ||
|
|
5d4825ac4b | ||
|
|
3024ef7707 | ||
|
|
0d3b488728 | ||
|
|
a01012f20c | ||
|
|
d4e3ef4a22 | ||
|
|
d7293a78dc | ||
|
|
8e4e02e258 | ||
|
|
2f5a6fee48 | ||
|
|
0e74886f8d | ||
|
|
07977ba242 | ||
|
|
a894c244fe | ||
|
|
cf32a799a4 | ||
|
|
0fda1d9393 | ||
|
|
c7f0acbe38 | ||
|
|
9c06c20023 | ||
|
|
041084d1da |
No files matched your search
@@ -3,6 +3,7 @@
|
|||||||
*.patch text eol=lf
|
*.patch text eol=lf
|
||||||
*.java text eol=lf
|
*.java text eol=lf
|
||||||
*.gradle text eol=crlf
|
*.gradle text eol=crlf
|
||||||
|
**/MANIFEST.MF text eol=crlf
|
||||||
*.png binary
|
*.png binary
|
||||||
*.gif binary
|
*.gif binary
|
||||||
*.exe binary
|
*.exe binary
|
||||||
|
|||||||
@@ -41,3 +41,8 @@ src/*/generated/**/.cache/
|
|||||||
|
|
||||||
/ForgeRoot.ipr
|
/ForgeRoot.ipr
|
||||||
/ForgeRoot.iws
|
/ForgeRoot.iws
|
||||||
|
|
||||||
|
# APT stuff
|
||||||
|
/*/.gitignore
|
||||||
|
/*/.factorypath
|
||||||
|
/*/.apt_generated/
|
||||||
+19
-3
@@ -3,6 +3,7 @@ package net.minecraftforge.forge.tasks
|
|||||||
import groovy.transform.CompileStatic
|
import groovy.transform.CompileStatic
|
||||||
import org.gradle.api.provider.Property
|
import org.gradle.api.provider.Property
|
||||||
import org.gradle.api.tasks.Internal
|
import org.gradle.api.tasks.Internal
|
||||||
|
import org.objectweb.asm.Opcodes
|
||||||
import org.objectweb.asm.tree.ClassNode
|
import org.objectweb.asm.tree.ClassNode
|
||||||
import org.objectweb.asm.tree.MethodNode
|
import org.objectweb.asm.tree.MethodNode
|
||||||
|
|
||||||
@@ -12,13 +13,19 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
abstract Property<Closure<Boolean>> getPredicate()
|
||||||
|
|
||||||
private final Set<String> matches = new HashSet<>()
|
private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
protected process(ClassNode parent, MethodNode node) {
|
||||||
for (final current : node.instructions) {
|
for (final current : node.instructions) {
|
||||||
if (predicate.get().call(parent, node, current)) {
|
if (predicate.get().call(parent, node, current)) {
|
||||||
matches.add(parent.name)
|
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
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,6 +34,15 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
@Override
|
@Override
|
||||||
protected Object getData() {
|
protected Object getData() {
|
||||||
return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
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.') }()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+51
-19
@@ -92,18 +92,18 @@ final String MAVEN_PATH = ext.MAVEN_PATH
|
|||||||
final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
|
final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
|
||||||
final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
|
final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
|
||||||
final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
|
final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
|
||||||
final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
|
final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.1:fatjar'
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
||||||
bootstrap { transitive = false }
|
bootstrap { transitive = false }
|
||||||
installer {
|
installer {
|
||||||
extendsFrom(bootstrap)
|
extendsFrom(bootstrap)
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
installerextra {
|
installerextra {
|
||||||
extendsFrom(bootstrap)
|
extendsFrom(bootstrap)
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
api.extendsFrom(installer)
|
api.extendsFrom(installer)
|
||||||
}
|
}
|
||||||
@@ -117,14 +117,14 @@ dependencies {
|
|||||||
bootstrap(libs.securemodules) // Has Union file system in it
|
bootstrap(libs.securemodules) // Has Union file system in it
|
||||||
bootstrap(libs.unsafe) // Needed by securemodules
|
bootstrap(libs.unsafe) // Needed by securemodules
|
||||||
bootstrap(libs.bundles.asm) // Needed by securemodules
|
bootstrap(libs.bundles.asm) // Needed by securemodules
|
||||||
|
|
||||||
implementation(libs.jopt.simple) { version { strictly '5.0.4' } }
|
implementation(libs.jopt.simple)
|
||||||
|
|
||||||
installer(libs.bootstrap)
|
installer(libs.bootstrap)
|
||||||
installer(libs.bootstrap.api) // Needed by securemodules
|
installer(libs.bootstrap.api) // Needed by securemodules
|
||||||
installer(libs.accesstransformers)
|
installer(libs.accesstransformers)
|
||||||
installer(libs.eventbus)
|
installer(libs.eventbus)
|
||||||
installer(libs.typetools) // Dep of EventBus
|
installer(libs.jspecify) // Dep of EventBus
|
||||||
installer(libs.forgespi)
|
installer(libs.forgespi)
|
||||||
installer(libs.coremods)
|
installer(libs.coremods)
|
||||||
installer(libs.nashorn) // Dep of Coremods
|
installer(libs.nashorn) // Dep of Coremods
|
||||||
@@ -147,6 +147,8 @@ dependencies {
|
|||||||
|
|
||||||
runtimeOnly(libs.bootstrap)
|
runtimeOnly(libs.bootstrap)
|
||||||
runtimeOnly(libs.bootstrap.dev)
|
runtimeOnly(libs.bootstrap.dev)
|
||||||
|
|
||||||
|
//annotationProcessor(libs.eventbus.validator)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('extractRangeMap').configure {
|
tasks.named('extractRangeMap').configure {
|
||||||
@@ -209,7 +211,6 @@ patcher {
|
|||||||
'--all',
|
'--all',
|
||||||
'--validate',
|
'--validate',
|
||||||
'--output', rootProject.file('src/main/generated/'),
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
'--validate',
|
|
||||||
'--existing', sourceSets.main.resources.srcDirs[0],
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
'--assetsDir', downloadAssets.output,
|
'--assetsDir', downloadAssets.output,
|
||||||
'--assetIndex', "{asset_index}"
|
'--assetIndex', "{asset_index}"
|
||||||
@@ -227,6 +228,30 @@ patcher {
|
|||||||
'--assetsDir', downloadAssets.output,
|
'--assetsDir', downloadAssets.output,
|
||||||
'--assetIndex', "{asset_index}"
|
'--assetIndex', "{asset_index}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
forge_client_data {
|
||||||
|
args '--launchTarget', 'forge_dev_client_data',
|
||||||
|
'--mod', 'forge',
|
||||||
|
'--all',
|
||||||
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', downloadAssets.output,
|
||||||
|
'--assetIndex', "{asset_index}"
|
||||||
|
}
|
||||||
|
|
||||||
|
forge_client_data_test {
|
||||||
|
source sourceSets.test
|
||||||
|
args '--launchTarget', 'forge_dev',
|
||||||
|
'--launchEntry', 'minecraft/net.minecraft.client.data.Main',
|
||||||
|
'--launchData',
|
||||||
|
'--mod', '.+',
|
||||||
|
'--all',
|
||||||
|
'--output', rootProject.file('src/test/generated/'),
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--assetsDir', downloadAssets.output,
|
||||||
|
'--assetIndex', "{asset_index}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,11 +293,11 @@ tasks.register('downloadCrowdin', Download) {
|
|||||||
tasks.userdevConfig.configure {
|
tasks.userdevConfig.configure {
|
||||||
configurations.installer.allDependencies.forEach {
|
configurations.installer.allDependencies.forEach {
|
||||||
def dep = it.toString()
|
def dep = it.toString()
|
||||||
if (it instanceof ProjectDependency)
|
if (it instanceof ProjectDependency)
|
||||||
dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
|
dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
|
||||||
libraries.add(dep)
|
libraries.add(dep)
|
||||||
}
|
}
|
||||||
|
|
||||||
inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
|
inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
@@ -284,6 +309,13 @@ tasks.userdevConfig.configure {
|
|||||||
args '--assetsDir', '{assets_root}'
|
args '--assetsDir', '{assets_root}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clientData {
|
||||||
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
|
args '--launchTarget', "forge_userdev_client_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
property 'forge.enableGameTest', 'true'
|
property 'forge.enableGameTest', 'true'
|
||||||
@@ -381,13 +413,13 @@ tasks.register('extractInheritance', ExtractInheritance) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
||||||
jar = createJoinedSRG.output
|
jar = createClientOfficial.output
|
||||||
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
||||||
predicate = {
|
predicate = {
|
||||||
parent, node, insn ->
|
parent, node, insn ->
|
||||||
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
||||||
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
||||||
&& insn.name == 'm_6518_'
|
&& insn.name == 'finalizeSpawn'
|
||||||
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -493,7 +525,7 @@ tasks.register('serverShimJar', Jar) {
|
|||||||
from {
|
from {
|
||||||
zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
|
zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
|
||||||
}
|
}
|
||||||
|
|
||||||
attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
|
attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
|
||||||
}
|
}
|
||||||
archiveClassifier = 'shim'
|
archiveClassifier = 'shim'
|
||||||
@@ -586,7 +618,7 @@ tasks.register('checkJarCompatibility', CheckJarCompatibility) {
|
|||||||
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
||||||
|
|
||||||
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
||||||
|
|
||||||
commonLibraries.from(project.configurations.minecraftImplementation)
|
commonLibraries.from(project.configurations.minecraftImplementation)
|
||||||
commonLibraries.from(project.configurations.installer)
|
commonLibraries.from(project.configurations.installer)
|
||||||
}
|
}
|
||||||
@@ -607,11 +639,11 @@ tasks.register('launcherJson', LauncherJson).configure {
|
|||||||
|
|
||||||
tasks.register('installerJson', InstallerJson) {
|
tasks.register('installerJson', InstallerJson) {
|
||||||
icon = rootProject.file('icon.ico')
|
icon = rootProject.file('icon.ico')
|
||||||
|
|
||||||
// Json to install into the client's launcher
|
// Json to install into the client's launcher
|
||||||
dependsOn(launcherJson)
|
dependsOn(launcherJson)
|
||||||
input.from(launcherJson.output)
|
input.from(launcherJson.output)
|
||||||
|
|
||||||
// Download Official Mappings
|
// Download Official Mappings
|
||||||
dependsOn(downloadClientMappings, downloadServerMappings)
|
dependsOn(downloadClientMappings, downloadServerMappings)
|
||||||
input.from(downloadClientMappings.output, downloadServerMappings.output)
|
input.from(downloadClientMappings.output, downloadServerMappings.output)
|
||||||
@@ -1059,7 +1091,7 @@ publishing {
|
|||||||
license gradleutils.pom.Licenses.LGPLv2_1
|
license gradleutils.pom.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
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
|
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.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
options.warnings = false // Shutup deprecated for removal warnings
|
||||||
options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
|
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
|
// Merge the resources and classes into the same directory. We'll need to split them at runtime because
|
||||||
|
|||||||
+31
-6
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
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!
|
||||||
|
|
||||||
| Version | Support |
|
| Version | Support |
|
||||||
|---------| ------------- |
|
|--------------|-----------------------------|
|
||||||
| 1.20.x | Active |
|
| All versions | [Supported][Support-Policy] |
|
||||||
| 1.19.x | Legacy |
|
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
|
|
||||||
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
|
## Required Java Versions
|
||||||
|
|
||||||
|
We require the version of Java that Minecraft requires, which is currently:
|
||||||
|
|
||||||
|
| Minecraft | Java |
|
||||||
|
|---------------|-------------------|
|
||||||
|
| 1.20.6+ | [21][Adoptium-21] |
|
||||||
|
| 1.18 - 1.20.4 | [17][Adoptium-17] |
|
||||||
|
| 1.17.1 | [16][Adoptium-16] |
|
||||||
|
| 1.16.5- | [8][Adoptium-8] |
|
||||||
|
|
||||||
|
**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
|
||||||
|
|
||||||
# Creating Mods
|
# Creating Mods
|
||||||
|
|
||||||
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
||||||
@@ -58,13 +70,25 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
to use and modify. However, it costs money to run such a large project as this, so please consider
|
to use and modify. However, it costs money to run such a large project as this, so please consider
|
||||||
[becoming a patron][Patreon].*
|
[becoming a patron][Patreon].*
|
||||||
|
|
||||||
|
### Thanks
|
||||||
|
[](https://www.yourkit.com/)
|
||||||
|
|
||||||
|
YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
|
||||||
|
|
||||||
[Contributing]: ./CONTRIBUTING.md
|
[Contributing]: ./CONTRIBUTING.md
|
||||||
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
|
|
||||||
|
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
|
||||||
|
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
|
||||||
|
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
|
||||||
|
[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
|
||||||
|
[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
|
||||||
|
|
||||||
[Forum]: https://forums.minecraftforge.net/
|
[Forum]: https://forums.minecraftforge.net/
|
||||||
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
||||||
|
[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
|
||||||
|
|
||||||
[Discord]: https://discord.minecraftforge.net/
|
[Discord]: https://discord.minecraftforge.net/
|
||||||
|
|
||||||
@@ -74,3 +98,4 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
||||||
|
|
||||||
[Patreon]: https://www.patreon.com/LexManos
|
[Patreon]: https://www.patreon.com/LexManos
|
||||||
|
[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/
|
||||||
@@ -10,9 +10,10 @@ plugins {
|
|||||||
apply from: rootProject.file('build_shared.gradle')
|
apply from: rootProject.file('build_shared.gradle')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
|
|
||||||
api(libs.eventbus)
|
api(libs.eventbus)
|
||||||
|
annotationProcessor(libs.eventbus.validator)
|
||||||
|
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(libs.commons.io)
|
implementation(libs.commons.io)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ public class Bindings {
|
|||||||
/**
|
/**
|
||||||
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
||||||
*/
|
*/
|
||||||
public static Supplier<IEventBus> getForgeBus() {
|
public static Supplier<BusGroup> getForgeBus() {
|
||||||
return PROVIDER.getForgeBusSupplier();
|
return PROVIDER.getForgeBusSupplier();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,18 @@ import java.util.function.Supplier;
|
|||||||
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
|
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
|
||||||
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
|
*
|
||||||
|
* @deprecated Historically, this allowed for safe execution of code on the correct side by exploiting a low-level
|
||||||
|
* detail in Java 8, but in newer versions a simple if check is enough.
|
||||||
|
* <br>
|
||||||
|
* For example:
|
||||||
|
* <pre>{@code
|
||||||
|
* if (FMLEnvironment.dist.isClient()) {
|
||||||
|
* // client code here
|
||||||
|
* }
|
||||||
|
* }</pre>
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public final class DistExecutor
|
public final class DistExecutor
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public interface IBindingsProvider {
|
public interface IBindingsProvider {
|
||||||
Supplier<IEventBus> getForgeBusSupplier();
|
Supplier<BusGroup> getForgeBusSupplier();
|
||||||
Supplier<I18NParser> getMessageParser();
|
Supplier<I18NParser> getMessageParser();
|
||||||
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
||||||
}
|
}
|
||||||
@@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -61,14 +59,13 @@ public interface IModLoadingState {
|
|||||||
/**
|
/**
|
||||||
* Builds the transition task for this state with a blank pre-sync and post-sync task.
|
* Builds the transition task for this state with a blank pre-sync and post-sync task.
|
||||||
*
|
*
|
||||||
* @param <T> a type of event fired on the mod-specific event bus
|
|
||||||
* @param syncExecutor a synchronous executor
|
* @param syncExecutor a synchronous executor
|
||||||
* @param parallelExecutor a parallel executor
|
* @param parallelExecutor a parallel executor
|
||||||
* @param progressBar a progress meter for tracking progress
|
* @param progressBar a progress meter for tracking progress
|
||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
||||||
*/
|
*/
|
||||||
default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
default Optional<CompletableFuture<Void>> buildTransition(
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar
|
final ProgressMeter progressBar
|
||||||
@@ -83,7 +80,6 @@ public interface IModLoadingState {
|
|||||||
* Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
|
* Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
|
||||||
* to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
|
* to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
|
||||||
*
|
*
|
||||||
* @param <T> a type of event fired on the mod-specific event bus
|
|
||||||
* @param syncExecutor a synchronous executor
|
* @param syncExecutor a synchronous executor
|
||||||
* @param parallelExecutor a parallel executor
|
* @param parallelExecutor a parallel executor
|
||||||
* @param progressBar a progress meter for tracking progress
|
* @param progressBar a progress meter for tracking progress
|
||||||
@@ -91,7 +87,6 @@ public interface IModLoadingState {
|
|||||||
* @param postSyncTask a function which returns a task to run after event post-dispatch hook
|
* @param postSyncTask a function which returns a task to run after event post-dispatch hook
|
||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
*/
|
*/
|
||||||
<T extends Event & IModBusEvent>
|
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
@@ -20,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
|
|
||||||
public interface IModStateTransition {
|
public interface IModStateTransition {
|
||||||
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
|
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
|
||||||
public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
|
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
|
||||||
|
|
||||||
static IModStateTransition buildNoopTransition() {
|
static IModStateTransition buildNoopTransition() {
|
||||||
return ModStateTransitionHelper.NOOP;
|
return ModStateTransitionHelper.NOOP;
|
||||||
@@ -51,7 +50,7 @@ public interface IModStateTransition {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
|
default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,8 +73,8 @@ public interface IModStateTransition {
|
|||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
|
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
|
||||||
|
|
||||||
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
|
||||||
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
||||||
return fn::apply;
|
return fn::apply;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
@@ -162,5 +161,5 @@ public abstract class ModContainer {
|
|||||||
* Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
|
* Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
|
||||||
* @param e Event to accept
|
* @param e Event to accept
|
||||||
*/
|
*/
|
||||||
protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
|
protected <T extends IModBusEvent> void acceptEvent(T e) {}
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,6 @@
|
|||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
@@ -88,7 +87,7 @@ public class ModLoader {
|
|||||||
this.loadingModList = FMLLoader.getLoadingModList();
|
this.loadingModList = FMLLoader.getLoadingModList();
|
||||||
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
||||||
.flatMap(ModLoadingException::fromEarlyException)
|
.flatMap(ModLoadingException::fromEarlyException)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
||||||
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
@@ -155,11 +154,13 @@ public class ModLoader {
|
|||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
|
var failedBounds = new ArrayList<ForgeFeature.Bound>();
|
||||||
.map(ModInfo::getForgeFeatures)
|
for (var mod : loadingModList.getMods()) {
|
||||||
.flatMap(List::stream)
|
for (var feature : mod.getForgeFeatures()) {
|
||||||
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
|
if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
|
||||||
.toList();
|
failedBounds.add(feature);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!failedBounds.isEmpty()) {
|
if (!failedBounds.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
||||||
@@ -357,49 +358,53 @@ public class ModLoader {
|
|||||||
return completedStates.contains(state);
|
return completedStates.contains(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
|
public <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
|
LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
|
for (var mod : ModList.get().getLoadedMods())
|
||||||
|
mod.acceptEvent(generator.apply(mod));
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEvent(T e) {
|
public <T extends IModBusEvent> void postEvent(T e) {
|
||||||
|
var cls = e.getClass();
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
for (var mod : ModList.get().getLoadedMods())
|
||||||
|
mod.acceptEvent(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
public <T extends IModBusEvent> T postEventWithReturn(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
for (var mod : ModList.get().getLoadedMods())
|
||||||
|
mod.acceptEvent(e);
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
@SuppressWarnings("removal")
|
||||||
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
public <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
||||||
postEventWithWrapInModOrder(event,
|
postEventWithWrapInModOrder(event,
|
||||||
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
||||||
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
public <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> {
|
for (var mod : ModList.get().getLoadedMods()) {
|
||||||
pre.accept(mc, e);
|
pre.accept(mod, e);
|
||||||
mc.acceptEvent(e);
|
mod.acceptEvent(e);
|
||||||
post.accept(mc, e);
|
post.accept(mod, e);
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModLoadingWarning> getWarnings() {
|
public List<ModLoadingWarning> getWarnings() {
|
||||||
@@ -416,7 +421,7 @@ public class ModLoader {
|
|||||||
return runningDataGen;
|
return runningDataGen;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ErroredModContainer extends ModContainer {
|
private static final class ErroredModContainer extends ModContainer {
|
||||||
public ErroredModContainer() {
|
public ErroredModContainer() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -36,7 +34,7 @@ public record ModLoadingState(
|
|||||||
Optional<IModStateTransition> transition
|
Optional<IModStateTransition> transition
|
||||||
) implements IModLoadingState {
|
) implements IModLoadingState {
|
||||||
@Override
|
@Override
|
||||||
public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
public Optional<CompletableFuture<Void>> buildTransition(
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
|
|||||||
@@ -9,15 +9,16 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.CompletionException;
|
import java.util.concurrent.CompletionException;
|
||||||
import java.util.concurrent.CompletionStage;
|
import java.util.concurrent.CompletionStage;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
|
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
@@ -41,7 +42,7 @@ class ModStateTransitionHelper {
|
|||||||
if (t.stream().noneMatch(e -> e.exception() != null)) {
|
if (t.stream().noneMatch(e -> e.exception() != null)) {
|
||||||
return CompletableFuture.completedFuture(null);
|
return CompletableFuture.completedFuture(null);
|
||||||
} else {
|
} else {
|
||||||
final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
|
final var throwables = t.stream().map(FutureResult::exception).filter(Objects::nonNull).toList();
|
||||||
CompletableFuture<Void> cf = new CompletableFuture<>();
|
CompletableFuture<Void> cf = new CompletableFuture<>();
|
||||||
final RuntimeException accumulator = new RuntimeException();
|
final RuntimeException accumulator = new RuntimeException();
|
||||||
cf.completeExceptionally(accumulator);
|
cf.completeExceptionally(accumulator);
|
||||||
@@ -70,13 +71,15 @@ class ModStateTransitionHelper {
|
|||||||
for (var future : futures) {
|
for (var future : futures) {
|
||||||
int i = list.size();
|
int i = list.size();
|
||||||
list.add(null);
|
list.add(null);
|
||||||
results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
|
@SuppressWarnings("unchecked") // Bypass a weird javac error with generic by forcing it to be the exact type we want.
|
||||||
|
var raw = ((CompletableFuture<V>)future);
|
||||||
|
results[i] = raw.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T extends Event & IModBusEvent> void addCompletableFutureTaskForModDispatch(
|
private static <T extends IModBusEvent> void addCompletableFutureTaskForModDispatch(
|
||||||
final IModStateTransition transition,
|
final IModStateTransition transition,
|
||||||
final Executor executor,
|
final Executor executor,
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
final List<CompletableFuture<Void>> completableFutures,
|
||||||
@@ -135,14 +138,14 @@ class ModStateTransitionHelper {
|
|||||||
completableFutures.add(postDispatchHook);
|
completableFutures.add(postDispatchHook);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T extends Event & IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
|
private static <T extends IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
|
||||||
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
|
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
|
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
|
||||||
return hookTyped.apply(executor, eventGenerator);
|
return hookTyped.apply(executor, eventGenerator);
|
||||||
}
|
}
|
||||||
|
|
||||||
static <T extends Event & IModBusEvent> CompletableFuture<Void> build(
|
static <T extends IModBusEvent> CompletableFuture<Void> build(
|
||||||
final IModStateTransition transition,
|
final IModStateTransition transition,
|
||||||
final String name,
|
final String name,
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.apache.commons.io.FilenameUtils;
|
import org.apache.commons.io.FilenameUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -25,9 +26,66 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
|
|||||||
|
|
||||||
public class ConfigFileTypeHandler {
|
public class ConfigFileTypeHandler {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
static final ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
|
|
||||||
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
||||||
|
|
||||||
|
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
|
||||||
|
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
|
||||||
|
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
|
||||||
|
|
||||||
|
private final @Nullable ModConfig.Type type;
|
||||||
|
private @Nullable FileWatcher watcher;
|
||||||
|
|
||||||
|
// exists for bin compat
|
||||||
|
public ConfigFileTypeHandler() {
|
||||||
|
this(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the handler for the given {@link ModConfig.Type}.
|
||||||
|
*
|
||||||
|
* @param type The type to get the handler for
|
||||||
|
* @return The handler
|
||||||
|
*/
|
||||||
|
static ConfigFileTypeHandler get(ModConfig.Type type) {
|
||||||
|
return switch (type) {
|
||||||
|
case CLIENT -> CLIENT;
|
||||||
|
case COMMON -> COMMON;
|
||||||
|
case SERVER -> SERVER;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
|
||||||
|
*
|
||||||
|
* @return The watcher
|
||||||
|
*
|
||||||
|
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
|
||||||
|
*/
|
||||||
|
FileWatcher getWatcher() {
|
||||||
|
if (this.watcher == null) {
|
||||||
|
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
|
||||||
|
this.watcher = new FileWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.watcher;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
|
||||||
|
* {@link FileWatcher#stop()}.
|
||||||
|
*/
|
||||||
|
void stopWatcher() {
|
||||||
|
if (this.watcher == null) return;
|
||||||
|
|
||||||
|
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
|
||||||
|
this.watcher.stop();
|
||||||
|
this.watcher = null;
|
||||||
|
}
|
||||||
|
|
||||||
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
||||||
return (c) -> {
|
return (c) -> {
|
||||||
final Path configPath = configBasePath.resolve(c.getFileName());
|
final Path configPath = configBasePath.resolve(c.getFileName());
|
||||||
@@ -37,7 +95,7 @@ public class ConfigFileTypeHandler {
|
|||||||
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
||||||
writingMode(WritingMode.REPLACE).
|
writingMode(WritingMode.REPLACE).
|
||||||
build();
|
build();
|
||||||
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -46,9 +104,9 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
||||||
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
|
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
||||||
return configData;
|
return configData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -56,9 +114,9 @@ public class ConfigFileTypeHandler {
|
|||||||
public void unload(Path configBasePath, ModConfig config) {
|
public void unload(Path configBasePath, ModConfig config) {
|
||||||
Path configPath = configBasePath.resolve(config.getFileName());
|
Path configPath = configBasePath.resolve(config.getFileName());
|
||||||
try {
|
try {
|
||||||
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
this.getWatcher().removeWatch(configPath);
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,6 +167,11 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
||||||
|
}
|
||||||
|
|
||||||
private record ConfigWatcher(
|
private record ConfigWatcher(
|
||||||
ModConfig modConfig,
|
ModConfig modConfig,
|
||||||
CommentedFileConfig commentedFileConfig,
|
CommentedFileConfig commentedFileConfig,
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ package net.minecraftforge.fml.config;
|
|||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
@@ -52,11 +55,24 @@ public class ConfigTracker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: [FML] This is only called for the server (outside of forceUnload)
|
||||||
|
// rethink config implementation for eventual FML rewrite
|
||||||
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
for (ModConfig config : this.configSets.get(type)) {
|
||||||
closeConfig(config, configBasePath);
|
closeConfig(config, configBasePath);
|
||||||
}
|
}
|
||||||
|
ConfigFileTypeHandler.get(type).stopWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
// If there is a better way to do this, please tell me. Because this is FUCKED
|
||||||
|
public void forceUnload() {
|
||||||
|
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
|
||||||
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
|
||||||
|
this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
|
||||||
|
|
||||||
|
// just in case server watcher is still alive somehow...
|
||||||
|
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.event.InheritableEvent;
|
||||||
import net.minecraftforge.fml.Bindings;
|
import net.minecraftforge.fml.Bindings;
|
||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
@@ -29,7 +29,7 @@ public interface IConfigEvent {
|
|||||||
ModConfig getConfig();
|
ModConfig getConfig();
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
default <T extends Event & IConfigEvent> T self() {
|
default <T extends InheritableEvent & IConfigEvent> T self() {
|
||||||
return (T) this;
|
return (T) this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,7 @@ public class ModConfig
|
|||||||
this.spec = spec;
|
this.spec = spec;
|
||||||
this.fileName = fileName;
|
this.fileName = fileName;
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.configHandler = ConfigFileTypeHandler.TOML;
|
this.configHandler = ConfigFileTypeHandler.get(type);
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.INSTANCE.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,27 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.event;
|
package net.minecraftforge.fml.event;
|
||||||
|
|
||||||
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
|
import net.minecraftforge.eventbus.api.bus.EventBus;
|
||||||
|
import net.minecraftforge.eventbus.api.event.InheritableEvent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
|
* Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
|
||||||
*/
|
*/
|
||||||
public interface IModBusEvent {
|
public interface IModBusEvent extends InheritableEvent {
|
||||||
|
/**
|
||||||
|
* @param modEventBusGroup Obtained from {@link net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup()} or your language provider's equivalent.
|
||||||
|
* @param eventClass The event type you want to get the associated bus for.
|
||||||
|
*/
|
||||||
|
static <T extends IModBusEvent> EventBus<T> getBus(BusGroup modEventBusGroup, Class<T> eventClass) {
|
||||||
|
// Do not copy! Temporary solution until the FML rewrite is complete. May throw in future
|
||||||
|
// without prior notice.
|
||||||
|
//
|
||||||
|
// Mods creating their own events should directly assign the result of the create method to a
|
||||||
|
// static final field in their event class, without wrapping or calling multiple times.
|
||||||
|
//
|
||||||
|
// Mods using existing events should instead use the existing static final BUS field in the
|
||||||
|
// event class (for most events) or getBus(BusGroup) method (for mod bus events).
|
||||||
|
return EventBus.create(modEventBusGroup, eventClass);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -28,7 +28,7 @@ java {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
implementation(libs.bundles.lwjgl)
|
implementation(libs.bundles.lwjgl)
|
||||||
|
|||||||
+11
-12
@@ -90,7 +90,12 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
// 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 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 ScheduledExecutorService renderScheduler;
|
private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
||||||
|
final var thread = Executors.defaultThreadFactory().newThread(r);
|
||||||
|
thread.setName("EarlyDisplay");
|
||||||
|
thread.setDaemon(true);
|
||||||
|
return thread;
|
||||||
|
});
|
||||||
private int fbWidth;
|
private int fbWidth;
|
||||||
private int fbHeight;
|
private int fbHeight;
|
||||||
private int fbScale;
|
private int fbScale;
|
||||||
@@ -149,7 +154,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
||||||
|
|
||||||
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
|
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
|
||||||
performanceInfo = new PerformanceInfo();
|
performanceInfo = new PerformanceInfo();
|
||||||
return start(mcVersion, forgeVersion);
|
return start(mcVersion, forgeVersion);
|
||||||
}
|
}
|
||||||
@@ -238,7 +243,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
var date = Calendar.getInstance();
|
var date = Calendar.getInstance();
|
||||||
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
||||||
this.elements.add(0, RenderElement.squir());
|
this.elements.addFirst(RenderElement.squir());
|
||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
@@ -287,12 +292,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
* Start the window and Render Thread; we're ready to go.
|
* Start the window and Render Thread; we're ready to go.
|
||||||
*/
|
*/
|
||||||
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
||||||
renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
|
||||||
final var thread = Executors.defaultThreadFactory().newThread(r);
|
|
||||||
thread.setName("EarlyDisplay");
|
|
||||||
thread.setDaemon(true);
|
|
||||||
return thread;
|
|
||||||
});
|
|
||||||
initWindow(mcVersion);
|
initWindow(mcVersion);
|
||||||
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
||||||
return this::periodicTick;
|
return this::periodicTick;
|
||||||
@@ -304,7 +303,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return this.glVersion;
|
return this.glVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void crashElegantly(String errorDetails) {
|
private static void crashElegantly(String errorDetails) {
|
||||||
StringBuilder msgBuilder = new StringBuilder(2000);
|
StringBuilder msgBuilder = new StringBuilder(2000);
|
||||||
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
||||||
msgBuilder.append("\n\n");
|
msgBuilder.append("\n\n");
|
||||||
@@ -512,7 +511,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.winY = y;
|
this.winY = y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
||||||
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
||||||
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
||||||
int error = glfwGetError(pointerbuffer);
|
int error = glfwGetError(pointerbuffer);
|
||||||
@@ -640,7 +639,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
this.elements.addFirst(RenderElement.mojang(textureId, framecount));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|||||||
+4
-5
@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
|
|||||||
import java.lang.management.MemoryUsage;
|
import java.lang.management.MemoryUsage;
|
||||||
|
|
||||||
public class PerformanceInfo {
|
public class PerformanceInfo {
|
||||||
|
private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
|
||||||
|
|
||||||
private final boolean showCPUUsage;
|
private final boolean showCPUUsage;
|
||||||
private final OperatingSystemMXBean osBean;
|
private final OperatingSystemMXBean osBean;
|
||||||
private final MemoryMXBean memoryBean;
|
|
||||||
|
|
||||||
private float memory;
|
private float memory;
|
||||||
private String text;
|
private String text;
|
||||||
@@ -24,15 +24,14 @@ public class PerformanceInfo {
|
|||||||
PerformanceInfo() {
|
PerformanceInfo() {
|
||||||
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
||||||
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
||||||
memoryBean = ManagementFactory.getMemoryMXBean();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void update() {
|
void update() {
|
||||||
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
|
final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
|
||||||
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
||||||
|
|
||||||
if (!showCPUUsage) {
|
if (!showCPUUsage) {
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
|
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ public class PerformanceInfo {
|
|||||||
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
|
text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
|
||||||
}
|
}
|
||||||
|
|
||||||
String text() {
|
String text() {
|
||||||
|
|||||||
+30
-39
@@ -22,8 +22,8 @@ public class RenderElement {
|
|||||||
static int globalAlpha = 255;
|
static int globalAlpha = 255;
|
||||||
private int retireCount;
|
private int retireCount;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
interface Renderer {
|
interface Renderer {
|
||||||
|
|
||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
||||||
|
|
||||||
default Renderer then(Renderer r) {
|
default Renderer then(Renderer r) {
|
||||||
@@ -38,6 +38,9 @@ public class RenderElement {
|
|||||||
interface TextureRenderer {
|
interface TextureRenderer {
|
||||||
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
|
@FunctionalInterface
|
||||||
interface Initializer extends Supplier<Renderer> {}
|
interface Initializer extends Supplier<Renderer> {}
|
||||||
|
|
||||||
@@ -56,11 +59,18 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public RenderElement(final Initializer rendererInitializer) {
|
public RenderElement(final Initializer rendererInitializer) {
|
||||||
this.bb = new SimpleBufferBuilder(1);
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
this.renderer = rendererInitializer.get();
|
this.renderer = rendererInitializer.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RenderElement(Renderer renderer) {
|
||||||
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
|
this.renderer = renderer;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean render(DisplayContext ctx, int count) {
|
public boolean render(DisplayContext ctx, int count) {
|
||||||
this.renderer.accept(bb, ctx, count);
|
this.renderer.accept(bb, ctx, count);
|
||||||
return this.retireCount == 0 || this.retireCount < count;
|
return this.retireCount == 0 || this.retireCount < count;
|
||||||
@@ -75,7 +85,7 @@ public class RenderElement {
|
|||||||
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
||||||
for (int i = messages.size() - 1; i >= 0; i--) {
|
for (int i = messages.size() - 1; i >= 0; i--) {
|
||||||
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
||||||
final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
||||||
if (fade <0.01f) continue;
|
if (fade <0.01f) continue;
|
||||||
Message msg = pair.message();
|
Message msg = pair.message();
|
||||||
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
||||||
@@ -84,19 +94,9 @@ public class RenderElement {
|
|||||||
|
|
||||||
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
||||||
}
|
}
|
||||||
public static RenderElement monag() {
|
|
||||||
return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
|
|
||||||
var size = 256;
|
|
||||||
var x0 = (ctx.width() - 2 * size) / 2;
|
|
||||||
var y0 = 64;
|
|
||||||
QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
|
|
||||||
QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
|
|
||||||
}));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RenderElement mojang(final int textureId, final int frameStart) {
|
public static RenderElement mojang(final int textureId, final int frameStart) {
|
||||||
return new RenderElement(()->(bb, ctx, frame) -> {
|
return new RenderElement((bb, ctx, frame) -> {
|
||||||
var size = 256 * ctx.scale();
|
var size = 256 * ctx.scale();
|
||||||
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
||||||
var y0 = 64 * ctx.scale() + 32;
|
var y0 = 64 * ctx.scale() + 32;
|
||||||
@@ -148,11 +148,11 @@ public class RenderElement {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
public static RenderElement progressBars(SimpleFont font) {
|
public static RenderElement progressBars(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RenderElement performanceBar(SimpleFont font) {
|
public static RenderElement performanceBar(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
||||||
@@ -187,10 +187,10 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
private static float[] indeterminateBar(int frame, boolean isActive) {
|
private static float[] indeterminateBar(int frame, boolean isActive) {
|
||||||
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
||||||
return new float[] {0f,1f};
|
return new float[] { 0f, 1f };
|
||||||
} else {
|
} else {
|
||||||
var progress = frame % 100;
|
int progress = frame % 100;
|
||||||
return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
|
return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,8 +249,8 @@ public class RenderElement {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
||||||
return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
return (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
||||||
@@ -264,14 +264,13 @@ public class RenderElement {
|
|||||||
private static TextGenerator text(int x, int y, String text, int colour) {
|
private static TextGenerator text(int x, int y, String text, int colour) {
|
||||||
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
||||||
}
|
}
|
||||||
private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
|
||||||
return ()->{
|
private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
||||||
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
return (bb, ctx, frame) -> {
|
return (bb, ctx, frame) -> {
|
||||||
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
||||||
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,21 +280,13 @@ public class RenderElement {
|
|||||||
bb.draw();
|
bb.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public static float clamp(float num, float min, float max) {
|
public static float clamp(float num, float min, float max) {
|
||||||
if (num < min) {
|
return Math.clamp(num, min, max);
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int clamp(int num, int min, int max) {
|
public static int clamp(int num, int min, int max) {
|
||||||
if (num < min) {
|
return Math.min(max, Math.max(num, min));
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int hsvToRGB(float hue, float saturation, float value) {
|
public static int hsvToRGB(float hue, float saturation, float value) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class SimpleFont {
|
|||||||
private final int textureNumber;
|
private final int textureNumber;
|
||||||
private final int lineSpacing;
|
private final int lineSpacing;
|
||||||
private final int descent;
|
private final int descent;
|
||||||
private final int GLYPH_COUNT = 127-32;
|
private static final int GLYPH_COUNT = 127 - 32;
|
||||||
private final Glyph[] glyphs;
|
private final Glyph[] glyphs;
|
||||||
|
|
||||||
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
||||||
@@ -120,7 +120,7 @@ public class SimpleFont {
|
|||||||
case '\n', '\t' -> 0;
|
case '\n', '\t' -> 0;
|
||||||
case ' ' -> glyphs[0].charwidth();
|
case ' ' -> glyphs[0].charwidth();
|
||||||
default -> {
|
default -> {
|
||||||
if (c - 32 < this.GLYPH_COUNT && c > 32) {
|
if (c - 32 < GLYPH_COUNT && c > 32) {
|
||||||
yield this.glyphs[c - 32].charwidth();
|
yield this.glyphs[c - 32].charwidth();
|
||||||
} else {
|
} else {
|
||||||
yield 0;
|
yield 0;
|
||||||
@@ -151,7 +151,7 @@ public class SimpleFont {
|
|||||||
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
||||||
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
||||||
default -> {
|
default -> {
|
||||||
if (c-32 < font.GLYPH_COUNT && c > 32) {
|
if (c-32 < GLYPH_COUNT && c > 32) {
|
||||||
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
||||||
}
|
}
|
||||||
yield pos;
|
yield pos;
|
||||||
|
|||||||
+23
-3
@@ -5,6 +5,7 @@ plugins {
|
|||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
id 'net.minecraftforge.licenser'
|
||||||
id 'net.minecraftforge.gradleutils'
|
id 'net.minecraftforge.gradleutils'
|
||||||
|
alias(libs.plugins.apt)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
apply from: rootProject.file('build_shared.gradle')
|
||||||
@@ -12,7 +13,7 @@ apply from: rootProject.file('build_shared.gradle')
|
|||||||
configurations.forEach{ it.transitive = false }
|
configurations.forEach{ it.transitive = false }
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
|
|
||||||
api(libs.bundles.asm) // Needed by all the black magic
|
api(libs.bundles.asm) // Needed by all the black magic
|
||||||
api(libs.forgespi)
|
api(libs.forgespi)
|
||||||
@@ -36,10 +37,11 @@ dependencies {
|
|||||||
implementation(libs.terminalconsoleappender)
|
implementation(libs.terminalconsoleappender)
|
||||||
implementation(libs.jimfs)
|
implementation(libs.jimfs)
|
||||||
|
|
||||||
|
// 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)
|
implementation(libs.log4j.core)
|
||||||
annotationProcessor(libs.bundles.log4j)
|
annotationProcessor(libs.bundles.log4j)
|
||||||
|
|
||||||
testCompileOnly(libs.nulls)
|
testCompileOnly(libs.jetbrains.annotations)
|
||||||
testRuntimeOnly(libs.bootstrap)
|
testRuntimeOnly(libs.bootstrap)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +87,7 @@ publishing {
|
|||||||
license PomUtils.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
@@ -102,5 +104,23 @@ tasks.register('writeForgeVersionJson') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('generateResources').configure {
|
tasks.named('generateResources').configure {
|
||||||
|
dependsOn('eclipseJdt')
|
||||||
|
dependsOn('eclipseJdtApt')
|
||||||
|
dependsOn('eclipseFactorypath')
|
||||||
dependsOn('writeForgeVersionJson')
|
dependsOn('writeForgeVersionJson')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
eclipse {
|
||||||
|
classpath {
|
||||||
|
// 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
|
||||||
|
//defaultOutputDir = file('bin/main')
|
||||||
|
file.whenMerged {
|
||||||
|
entries.each { entry ->
|
||||||
|
if (entry.kind == 'output' && entry.hasProperty('path'))
|
||||||
|
entry.path = 'bin/main'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+8
-1
@@ -50,7 +50,14 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
return isEmpty ? NAY : YAY;
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+24
-3
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
|
|||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -35,6 +36,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
||||||
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
||||||
).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
||||||
|
private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
|
||||||
|
.map(it -> it.replace('.', '/'))
|
||||||
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
||||||
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
||||||
|
|
||||||
@@ -47,9 +51,26 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
// Let's skip processing classes that definitely don't have object holders
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
|
||||||
|
// Forge classes that aren't in the debug package (that package is used for tests)
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// Vanilla classes that don't have object holders
|
||||||
|
if (internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
|
||||||
|
if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean hasHolder(List<AnnotationNode> lst) {
|
private static boolean hasHolder(List<AnnotationNode> lst) {
|
||||||
|
|||||||
@@ -48,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -59,15 +65,14 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
|
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
|
||||||
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
Type array = Type.getType("[" + classType.getDescriptor());
|
Type array = Type.getType("[" + classType.getDescriptor());
|
||||||
String arrayDesc = array.getDescriptor();
|
String arrayDesc = array.getDescriptor();
|
||||||
|
|
||||||
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
||||||
|
|
||||||
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Static methods named "create" with first argument as a string
|
//Static methods named "create" with first argument as a string
|
||||||
List<MethodNode> candidates = classNode.methods.stream()
|
List<MethodNode> candidates = classNode.methods.stream()
|
||||||
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
||||||
|
|||||||
@@ -6,14 +6,13 @@
|
|||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
public class BackgroundWaiter {
|
public class BackgroundWaiter {
|
||||||
private static final ExecutorService runner = Executors.newSingleThreadExecutor();
|
|
||||||
|
|
||||||
public static void runAndTick(Runnable r, Runnable tick) {
|
public static void runAndTick(Runnable r, Runnable tick) {
|
||||||
|
var runner = Executors.newSingleThreadExecutor();
|
||||||
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
||||||
final Future<?> work = runner.submit(r);
|
final Future<?> work = runner.submit(r);
|
||||||
do {
|
do {
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ public class FMLLoader {
|
|||||||
|
|
||||||
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
||||||
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
||||||
/*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus");
|
|
||||||
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
||||||
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
|
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
|
||||||
LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
|
LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.api.*;
|
import cpw.mods.modlauncher.api.*;
|
||||||
import joptsimple.OptionSpecBuilder;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.Environment;
|
import net.minecraftforge.forgespi.Environment;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -19,7 +18,6 @@ import java.util.List;
|
|||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
|
|
||||||
public class FMLServiceProvider implements ITransformationService {
|
public class FMLServiceProvider implements ITransformationService {
|
||||||
|
|||||||
@@ -40,6 +40,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
return "runtimedistcleaner";
|
return "runtimedistcleaner";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
||||||
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
||||||
var changed = false;
|
var changed = false;
|
||||||
@@ -198,14 +213,6 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
|
||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
|
||||||
return isEmpty ? NAY : YAY;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class LambdaGatherer extends MethodVisitor {
|
private static class LambdaGatherer extends MethodVisitor {
|
||||||
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
||||||
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
||||||
|
|||||||
@@ -18,9 +18,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
||||||
|
|||||||
-1
@@ -9,7 +9,6 @@ import cpw.mods.modlauncher.api.LamdbaExceptionUtils.Supplier_WithExceptions;
|
|||||||
import net.minecraftforge.fml.loading.StringUtils;
|
import net.minecraftforge.fml.loading.StringUtils;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|||||||
+4
-4
@@ -43,10 +43,10 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
|
|||||||
mods.set("modId", "minecraft");
|
mods.set("modId", "minecraft");
|
||||||
mods.set("version", FMLLoader.versionInfo().mcVersion());
|
mods.set("version", FMLLoader.versionInfo().mcVersion());
|
||||||
mods.set("displayName", "Minecraft");
|
mods.set("displayName", "Minecraft");
|
||||||
mods.set("logoFile", "mcplogo.png");
|
//mods.set("logoFile", "mcplogo.png");
|
||||||
mods.set("credits", "Mojang, deobfuscated by MCP");
|
//mods.set("credits", "Mojang, deobfuscated by MCP");
|
||||||
mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs");
|
//mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs");
|
||||||
mods.set("description", "Minecraft, decompiled and deobfuscated with MCP technology");
|
mods.set("description", "The base Minecraft game, published by Mojang decompiled and deobfuscated by Forge");
|
||||||
conf.set("mods", List.of(mods));
|
conf.set("mods", List.of(mods));
|
||||||
|
|
||||||
var configWrapper = new NightConfigWrapper(conf);
|
var configWrapper = new NightConfigWrapper(conf);
|
||||||
|
|||||||
-1
@@ -17,7 +17,6 @@ import java.io.IOException;
|
|||||||
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.Comparator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ record Scanner(ModFile fileToScan, ModFileScanData result) {
|
|||||||
try (InputStream in = Files.newInputStream(path)) {
|
try (InputStream in = Files.newInputStream(path)) {
|
||||||
ModClassVisitor mcv = new ModClassVisitor();
|
ModClassVisitor mcv = new ModClassVisitor();
|
||||||
ClassReader cr = new ClassReader(in);
|
ClassReader cr = new ClassReader(in);
|
||||||
cr.accept(mcv, 0);
|
cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||||
mcv.buildData(result.getClasses(), result.getAnnotations());
|
mcv.buildData(result.getClasses(), result.getAnnotations());
|
||||||
} catch (IOException | IllegalArgumentException e) {
|
} catch (IOException | IllegalArgumentException e) {
|
||||||
// mark path bad
|
// mark path bad
|
||||||
|
|||||||
@@ -81,6 +81,10 @@ class ArgumentList {
|
|||||||
.toArray(String[]::new);
|
.toArray(String[]::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean has(String key) {
|
||||||
|
return this.values.containsKey(key);
|
||||||
|
}
|
||||||
|
|
||||||
public boolean hasValue(String key) {
|
public boolean hasValue(String key) {
|
||||||
return getOrDefault(key, null) != null;
|
return getOrDefault(key, null) != null;
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-4
@@ -22,6 +22,10 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
|
|||||||
super(type, prefix);
|
super(type, prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected CommonDevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override public String getNaming() { return "mcp"; }
|
@Override public String getNaming() { return "mcp"; }
|
||||||
@Override public boolean isProduction() { return false; }
|
@Override public boolean isProduction() { return false; }
|
||||||
|
|
||||||
@@ -29,13 +33,35 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
|
|||||||
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
||||||
super.preLaunch(arguments, layer);
|
super.preLaunch(arguments, layer);
|
||||||
|
|
||||||
|
var args = ArgumentList.from(arguments);
|
||||||
|
|
||||||
|
if (this.module == null) {
|
||||||
|
var entry = args.get("launchEntry");
|
||||||
|
if (entry == null)
|
||||||
|
throw new IllegalArgumentException("When using " + this.name() + " launch target you must specify a --launchEntry argument");
|
||||||
|
|
||||||
|
args.remove("launchEntry");
|
||||||
|
|
||||||
|
int idx = entry.indexOf('/');
|
||||||
|
if (idx == -1) {
|
||||||
|
this.module = "minecraft";
|
||||||
|
this.main = entry;
|
||||||
|
} else {
|
||||||
|
this.module = entry.substring(0, idx);
|
||||||
|
this.main = entry.substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.has("launchData")) {
|
||||||
|
args.remove("launchData");
|
||||||
|
this.isData = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (getDist().isDedicatedServer())
|
if (getDist().isDedicatedServer())
|
||||||
return arguments;
|
return args.getArguments();
|
||||||
|
|
||||||
if (isData())
|
if (isData())
|
||||||
return arguments;
|
return args.getArguments();
|
||||||
|
|
||||||
var args = ArgumentList.from(arguments);
|
|
||||||
|
|
||||||
String username = args.get("username");
|
String username = args.get("username");
|
||||||
if (username != null) { // Replace '#' placeholders with random numbers
|
if (username != null) { // Replace '#' placeholders with random numbers
|
||||||
|
|||||||
+19
-8
@@ -29,17 +29,27 @@ import java.util.List;
|
|||||||
public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
||||||
protected static final Logger LOGGER = LogUtils.getLogger();
|
protected static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
protected final LaunchType type;
|
private final String name;
|
||||||
private final String prefix;
|
protected Dist dist = Dist.CLIENT;
|
||||||
|
protected boolean isData = false;
|
||||||
|
protected String module;
|
||||||
|
protected String main;
|
||||||
|
|
||||||
protected CommonLaunchHandler(LaunchType type, String prefix) {
|
protected CommonLaunchHandler(LaunchType type, String prefix) {
|
||||||
this.type = type;
|
this(prefix + type.name());
|
||||||
this.prefix = prefix;
|
this.dist = type.dist();
|
||||||
|
this.isData = type.data();
|
||||||
|
this.module = type.module();
|
||||||
|
this.main = type.main();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public String name() { return this.prefix + this.type.name(); }
|
protected CommonLaunchHandler(String name) {
|
||||||
public Dist getDist() { return this.type.dist(); }
|
this.name = name;
|
||||||
public boolean isData() { return this.type.data(); }
|
}
|
||||||
|
|
||||||
|
@Override public String name() { return this.name; }
|
||||||
|
public Dist getDist() { return this.dist; }
|
||||||
|
public boolean isData() { return this.isData; }
|
||||||
public boolean isProduction() { return false; }
|
public boolean isProduction() { return false; }
|
||||||
public abstract String getNaming();
|
public abstract String getNaming();
|
||||||
|
|
||||||
@@ -66,11 +76,12 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
|
protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
|
||||||
return () -> runTarget(this.type.module(), this.type.main(), arguments, gameLayer);
|
return () -> runTarget(this.module, this.main, arguments, gameLayer);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
|
protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
|
||||||
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
||||||
|
protected static final LaunchType CLIENT_DATA = new LaunchType("client_data", "minecraft", "net.minecraft.client.data.Main", Dist.CLIENT, true);
|
||||||
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
||||||
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
||||||
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
||||||
|
|||||||
+18
-4
@@ -14,12 +14,14 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(type, "forge_dev_");
|
super(type, "forge_dev_");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ForgeDevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Path> getMinecraftPaths() {
|
public List<Path> getMinecraftPaths() {
|
||||||
|
// The client extra jar is on the classpath we can try locating it using the .mcassetsroot which vanilla uses for loading data
|
||||||
// The extra jar is on the classpath, so try and pull it out of the legacy classpath
|
var extra = getPathFromResource("assets/.mcassetsroot");
|
||||||
var legacyCP = findClassPath();
|
|
||||||
var extra = findJarOnClasspath(legacyCP, "client-extra");
|
|
||||||
// Minecraft is an exploded directory, so find it.
|
// Minecraft is an exploded directory, so find it.
|
||||||
var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
|
var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
|
||||||
var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
||||||
@@ -39,6 +41,12 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class ClientData extends ForgeDevLaunchHandler {
|
||||||
|
public ClientData() {
|
||||||
|
super(CLIENT_DATA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeDevLaunchHandler {
|
public static final class Data extends ForgeDevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
@@ -56,4 +64,10 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class Custom extends ForgeDevLaunchHandler {
|
||||||
|
public Custom() {
|
||||||
|
super("forge_dev");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+17
-4
@@ -8,17 +8,18 @@ package net.minecraftforge.fml.loading.targets;
|
|||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.BiPredicate;
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
||||||
private ForgeUserdevLaunchHandler(LaunchType type) {
|
private ForgeUserdevLaunchHandler(LaunchType type) {
|
||||||
super(type, "forge_userdev_");
|
super(type, "forge_userdev_");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ForgeUserdevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Path> getMinecraftPaths() {
|
public List<Path> getMinecraftPaths() {
|
||||||
var legacyCP = findClassPath();
|
var legacyCP = findClassPath();
|
||||||
@@ -26,7 +27,7 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
|
|
||||||
// Minecraft is extra jar {resources} + forge jar {patches}
|
// Minecraft is extra jar {resources} + forge jar {patches}
|
||||||
// The MC extra and forge jars are on the classpath, so try and pull them out
|
// The MC extra and forge jars are on the classpath, so try and pull them out
|
||||||
var extra = findJarOnClasspath(legacyCP, "client-extra");
|
var extra = findJarOnClasspath(legacyCP, "client-extra"); // This should be "client-" + vers.mcAndMCPVersion() + "-extra" but FG6 qwerks
|
||||||
var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
|
var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
|
||||||
// We need to filter the forge jar to just MC code
|
// We need to filter the forge jar to just MC code
|
||||||
var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
|
var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
|
||||||
@@ -39,6 +40,12 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class ClientData extends ForgeUserdevLaunchHandler {
|
||||||
|
public ClientData() {
|
||||||
|
super(CLIENT_DATA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeUserdevLaunchHandler {
|
public static final class Data extends ForgeUserdevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
@@ -56,4 +63,10 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class Custom extends ForgeUserdevLaunchHandler {
|
||||||
|
public Custom() {
|
||||||
|
super("forge_userdev");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
@@ -4,12 +4,16 @@ net.minecraftforge.fml.loading.targets.ForgeProdLaunchHandler$Server
|
|||||||
|
|
||||||
# Mod Developers
|
# Mod Developers
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ClientData
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Custom
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest
|
||||||
|
|
||||||
#Working on Forge itself
|
#Working on Forge itself
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ClientData
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Custom
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
SPDX-License-Identifier: LGPL-2.1-only
|
SPDX-License-Identifier: LGPL-2.1-only
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
|
<Configuration status="warn" shutdownHook="disable">
|
||||||
<filters>
|
<filters>
|
||||||
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
|
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
|
||||||
<MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
|
<MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
|
||||||
|
|||||||
+7
-7
@@ -1,17 +1,17 @@
|
|||||||
# 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=-Xmx3G
|
org.gradle.jvmargs=-Xmx6G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
JAVA_VERSION=21
|
JAVA_VERSION=21
|
||||||
MC_VERSION=1.21.3
|
MC_VERSION=1.21.6
|
||||||
MC_NEXT_VERSION=1.22
|
MC_NEXT_VERSION=1.22
|
||||||
MCP_VERSION=20241025.112443
|
MCP_VERSION=20250618.020446
|
||||||
MAPPING_CHANNEL=official
|
MAPPING_CHANNEL=official
|
||||||
MAPPING_VERSION=1.21.3
|
MAPPING_VERSION=1.21.6
|
||||||
|
|
||||||
// Set to true before the first build of a new MC version, so we don't do compatibility checks
|
# Set to true before the first build of a new MC version, so we don't do compatibility checks
|
||||||
CHECK_COMPATIBILITY=false
|
CHECK_COMPATIBILITY=false
|
||||||
// Set to true to allow for fuzzy patching. Useful during updateing
|
# Set to true to allow for fuzzy patching. Useful during updateing
|
||||||
UPDATING=false
|
UPDATING=false
|
||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# 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
|
||||||
|
|
||||||
# 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
|
||||||
@@ -130,10 +131,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -198,11 +202,11 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
Vendored
+10
-10
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ plugins {
|
|||||||
apply from: rootProject.file('build_shared.gradle')
|
apply from: rootProject.file('build_shared.gradle')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
implementation(libs.unsafe)
|
implementation(libs.unsafe)
|
||||||
|
|||||||
@@ -12,9 +12,10 @@ import java.lang.annotation.Target;
|
|||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.Bindings;
|
import net.minecraftforge.fml.Bindings;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
|
import org.jspecify.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This defines a Mod to FML.
|
* This defines a Mod to FML.
|
||||||
@@ -24,12 +25,11 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
|||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target(ElementType.TYPE)
|
@Target(ElementType.TYPE)
|
||||||
public @interface Mod
|
public @interface Mod {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* The unique mod identifier for this mod.
|
* The unique mod identifier for this mod.
|
||||||
* <b>Required to be lowercased in the english locale for compatibility. Will be truncated to 64 characters long.</b>
|
* <b>Required to be lowercased in the English locale for compatibility. Will be truncated to 64 characters long.</b>
|
||||||
*
|
* <br>
|
||||||
* This will be used to identify your mod for third parties (other mods), it will be used to identify your mod for registries such as block and item registries.
|
* This will be used to identify your mod for third parties (other mods), it will be used to identify your mod for registries such as block and item registries.
|
||||||
* By default, you will have a resource domain that matches the modid. All these uses require that constraints are imposed on the format of the modid.
|
* By default, you will have a resource domain that matches the modid. All these uses require that constraints are imposed on the format of the modid.
|
||||||
*/
|
*/
|
||||||
@@ -61,32 +61,40 @@ public @interface Mod
|
|||||||
String modid() default "";
|
String modid() default "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specify an alternative bus to listen to
|
* Specify an alternative bus to listen to.
|
||||||
|
* <br>
|
||||||
|
* If you know all listeners in this class are for a specific bus, you can set it here to speed up registration.
|
||||||
*
|
*
|
||||||
* @return the bus you wish to listen to
|
* @return the bus you wish to listen to
|
||||||
*/
|
*/
|
||||||
Bus bus() default Bus.FORGE;
|
Bus bus() default Bus.BOTH;
|
||||||
|
|
||||||
enum Bus {
|
enum Bus {
|
||||||
/**
|
/**
|
||||||
* The main Forge Event Bus.
|
* The main BusGroup that most game events are fired on.
|
||||||
*
|
|
||||||
* <p>See {@code MinecraftForge#EVENT_BUS}</p>
|
|
||||||
*/
|
*/
|
||||||
FORGE(Bindings.getForgeBus()),
|
FORGE(Bindings.getForgeBus()),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The mod specific Event bus.
|
* The mod-specific event BusGroup, usually for mod lifecycle events.
|
||||||
* @see FMLJavaModLoadingContext#getModEventBus()
|
* @see FMLJavaModLoadingContext#getModBusGroup()
|
||||||
*/
|
*/
|
||||||
MOD(()-> FMLJavaModLoadingContext.get().getModEventBus());
|
MOD(()-> FMLJavaModLoadingContext.get().getModBusGroup()),
|
||||||
|
|
||||||
private final Supplier<IEventBus> busSupplier;
|
/**
|
||||||
|
* Both the {@link #FORGE} and {@link #MOD} buses. This is slower to register events in your class but
|
||||||
|
* allows you to listen to events from different BusGroup types without needing separate classes annotated
|
||||||
|
* with {@link EventBusSubscriber}.
|
||||||
|
*/
|
||||||
|
BOTH(() -> null);
|
||||||
|
|
||||||
Bus(final Supplier<IEventBus> eventBusSupplier) {
|
private final Supplier<@Nullable BusGroup> busSupplier;
|
||||||
|
|
||||||
|
Bus(Supplier<@Nullable BusGroup> eventBusSupplier) {
|
||||||
this.busSupplier = eventBusSupplier;
|
this.busSupplier = eventBusSupplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Supplier<IEventBus> bus() {
|
public Supplier<@Nullable BusGroup> bus() {
|
||||||
return busSupplier;
|
return busSupplier;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+333
-4
@@ -7,22 +7,40 @@ package net.minecraftforge.fml.javafmlmod;
|
|||||||
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
|
import net.minecraftforge.eventbus.api.bus.CancellableEventBus;
|
||||||
|
import net.minecraftforge.eventbus.api.bus.EventBus;
|
||||||
|
import net.minecraftforge.eventbus.api.event.characteristic.Cancellable;
|
||||||
|
import net.minecraftforge.eventbus.api.listener.EventListener;
|
||||||
|
import net.minecraftforge.eventbus.api.listener.ObjBooleanBiConsumer;
|
||||||
|
import net.minecraftforge.eventbus.api.listener.Priority;
|
||||||
|
import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
|
||||||
|
import net.minecraftforge.eventbus.internal.Event;
|
||||||
import net.minecraftforge.fml.Logging;
|
import net.minecraftforge.fml.Logging;
|
||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
|
||||||
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData;
|
import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData.EnumData;
|
import net.minecraftforge.forgespi.language.ModFileScanData.EnumData;
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||||
|
import net.minecraftforge.unsafe.UnsafeHacks;
|
||||||
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 org.jspecify.annotations.Nullable;
|
||||||
import org.objectweb.asm.Type;
|
import org.objectweb.asm.Type;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.lang.invoke.LambdaMetafactory;
|
||||||
import java.util.List;
|
import java.lang.invoke.MethodHandle;
|
||||||
import java.util.Objects;
|
import java.lang.invoke.MethodHandles;
|
||||||
|
import java.lang.invoke.MethodType;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.lang.reflect.Modifier;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Predicate;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -75,7 +93,7 @@ public class AutomaticEventSubscriber {
|
|||||||
if (Objects.equals(mod.getModId(), modId) && sides.contains(FMLEnvironment.dist)) {
|
if (Objects.equals(mod.getModId(), modId) && sides.contains(FMLEnvironment.dist)) {
|
||||||
try {
|
try {
|
||||||
LOGGER.debug(Logging.LOADING, "Auto-subscribing {} to {}", data.clazz().getClassName(), busTarget);
|
LOGGER.debug(Logging.LOADING, "Auto-subscribing {} to {}", data.clazz().getClassName(), busTarget);
|
||||||
busTarget.bus().get().register(Class.forName(data.clazz().getClassName(), true, loader));
|
EventBusSubscriberLogic.register(busTarget.bus().get(), Class.forName(data.clazz().getClassName(), true, loader));
|
||||||
} catch (ClassNotFoundException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
LOGGER.fatal(Logging.LOADING, "Failed to load mod class {} for @EventBusSubscriber annotation", data.clazz(), e);
|
LOGGER.fatal(Logging.LOADING, "Failed to load mod class {} for @EventBusSubscriber annotation", data.clazz(), e);
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
@@ -88,4 +106,315 @@ public class AutomaticEventSubscriber {
|
|||||||
private static <R> R value(AnnotationData data, String key, R value) {
|
private static <R> R value(AnnotationData data, String key, R value) {
|
||||||
return (R)data.annotationData().getOrDefault(key, value);
|
return (R)data.annotationData().getOrDefault(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is mostly a carbon copy of EventBus 7's internal EventListenerFactory, with some changes to support adding
|
||||||
|
* to different BusGroups based on the event type, among other things.
|
||||||
|
*/
|
||||||
|
private static final class EventBusSubscriberLogic {
|
||||||
|
private EventBusSubscriberLogic() {}
|
||||||
|
|
||||||
|
private static final boolean STRICT_RUNTIME_CHECKS = Boolean.getBoolean("eventbus.api.strictRuntimeChecks");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If true, performs exhaustive validation on bulk registration to aid debugging.
|
||||||
|
*/
|
||||||
|
private static final boolean STRICT_REGISTRATION_CHECKS = STRICT_RUNTIME_CHECKS || Boolean.getBoolean("eventbus.api.strictRegistrationChecks");
|
||||||
|
|
||||||
|
private static final MethodType RETURNS_CONSUMER = MethodType.methodType(Consumer.class);
|
||||||
|
private static final MethodType RETURNS_PREDICATE = MethodType.methodType(Predicate.class);
|
||||||
|
private static final MethodType RETURNS_MONITOR = MethodType.methodType(ObjBooleanBiConsumer.class);
|
||||||
|
|
||||||
|
/** The method type of the {@link Consumer} functional interface ({@code void accept(Object)}) */
|
||||||
|
private static final MethodType CONSUMER_FI_TYPE = MethodType.methodType(void.class, Object.class);
|
||||||
|
|
||||||
|
/** The method type of the {@link Predicate} functional interface ({@code boolean test(Object)}) */
|
||||||
|
private static final MethodType PREDICATE_FI_TYPE = CONSUMER_FI_TYPE.changeReturnType(boolean.class);
|
||||||
|
|
||||||
|
/** The method type of the {@link ObjBooleanBiConsumer} functional interface ({@code void accept(Object, boolean)}) */
|
||||||
|
private static final MethodType MONITOR_FI_TYPE = MethodType.methodType(void.class, Object.class, boolean.class);
|
||||||
|
|
||||||
|
public static void register(@Nullable BusGroup busGroup, Class<?> listenerClass) {
|
||||||
|
if (STRICT_REGISTRATION_CHECKS) registerStrict(busGroup, listenerClass);
|
||||||
|
else registerLenient(busGroup, listenerClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||||
|
public static void registerLenient(@Nullable BusGroup busGroup, Class<?> listenerClass) {
|
||||||
|
Method[] declaredMethods = listenerClass.getDeclaredMethods();
|
||||||
|
if (declaredMethods.length == 0)
|
||||||
|
throw new IllegalArgumentException("No declared methods found in " + listenerClass);
|
||||||
|
|
||||||
|
Class<?> firstValidListenerEventType = null;
|
||||||
|
|
||||||
|
int listenersCount = 0;
|
||||||
|
for (var method : declaredMethods) {
|
||||||
|
if (!Modifier.isStatic(method.getModifiers()))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int paramCount = method.getParameterCount();
|
||||||
|
if (paramCount == 0 || paramCount > 2)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
Class<?> returnType = method.getReturnType();
|
||||||
|
if (returnType != void.class && returnType != boolean.class)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!method.isAnnotationPresent(SubscribeEvent.class))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
Class<?>[] parameterTypes = method.getParameterTypes();
|
||||||
|
if (!Event.class.isAssignableFrom(parameterTypes[0]))
|
||||||
|
throw new IllegalArgumentException("First parameter of a @SubscribeEvent method must be an event");
|
||||||
|
|
||||||
|
Class<? extends Event> eventType = (Class<? extends Event>) parameterTypes[0];
|
||||||
|
var subscribeEventAnnotation = method.getAnnotation(SubscribeEvent.class);
|
||||||
|
|
||||||
|
registerListener(busGroup, paramCount, returnType, eventType, subscribeEventAnnotation, method);
|
||||||
|
listenersCount++;
|
||||||
|
|
||||||
|
if (firstValidListenerEventType == null)
|
||||||
|
firstValidListenerEventType = eventType;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (listenersCount == 0)
|
||||||
|
throw new IllegalArgumentException("No listeners found in " + listenerClass);
|
||||||
|
else if (firstValidListenerEventType == null)
|
||||||
|
throw new IllegalArgumentException("No valid listeners found in " + listenerClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings({"unchecked"})
|
||||||
|
public static void registerStrict(BusGroup busGroup, Class<?> listenerClass) {
|
||||||
|
Class<? extends Event> firstValidListenerEventType = null;
|
||||||
|
|
||||||
|
Method[] declaredMethods = listenerClass.getDeclaredMethods();
|
||||||
|
if (declaredMethods.length == 0) {
|
||||||
|
var errMsg = "No declared methods found in " + listenerClass.getName();
|
||||||
|
var superClass = listenerClass.getSuperclass();
|
||||||
|
if (superClass != null && superClass != Record.class && superClass != Enum.class) {
|
||||||
|
errMsg += ". Note that listener inheritance is not supported. " +
|
||||||
|
"If you are trying to inherit listeners, please use @Override and @SubscribeEvent on the method in the subclass.";
|
||||||
|
}
|
||||||
|
throw fail(listenerClass, errMsg);
|
||||||
|
}
|
||||||
|
|
||||||
|
int listenersCount = 0;
|
||||||
|
for (var method : declaredMethods) {
|
||||||
|
var hasSubscribeEvent = method.isAnnotationPresent(SubscribeEvent.class);
|
||||||
|
int paramCount = method.getParameterCount();
|
||||||
|
|
||||||
|
if (hasSubscribeEvent && (paramCount == 0 || paramCount > 2))
|
||||||
|
throw fail(method, "Invalid number of parameters: " + paramCount + " (expected 1 or 2)");
|
||||||
|
|
||||||
|
if (paramCount == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
Class<?> returnType = method.getReturnType();
|
||||||
|
Class<?>[] parameterTypes = method.getParameterTypes();
|
||||||
|
var firstParamExtendsEvent = Event.class.isAssignableFrom(parameterTypes[0]);
|
||||||
|
|
||||||
|
if (!hasSubscribeEvent && firstParamExtendsEvent)
|
||||||
|
throw fail(method, "Missing @SubscribeEvent annotation");
|
||||||
|
|
||||||
|
if (hasSubscribeEvent) {
|
||||||
|
var firstParamExtendsCancellable = Cancellable.class.isAssignableFrom(parameterTypes[0]);
|
||||||
|
var subscribeEventAnnotation = method.getAnnotation(SubscribeEvent.class);
|
||||||
|
var isMonitoringPriority = subscribeEventAnnotation.priority() == Priority.MONITOR;
|
||||||
|
|
||||||
|
if (!firstParamExtendsEvent)
|
||||||
|
throw fail(method, "First parameter of a @SubscribeEvent method must be an event");
|
||||||
|
|
||||||
|
var eventType = (Class<? extends Event>) parameterTypes[0];
|
||||||
|
|
||||||
|
if (returnType != void.class && returnType != boolean.class)
|
||||||
|
throw fail(method, "Invalid return type: " + returnType.getName() + " (expected void or boolean)");
|
||||||
|
|
||||||
|
if (!Modifier.isStatic(method.getModifiers()))
|
||||||
|
throw fail(method, "Listener method needs to be static");
|
||||||
|
|
||||||
|
if (isMonitoringPriority && (returnType == boolean.class || subscribeEventAnnotation.alwaysCancelling()))
|
||||||
|
throw fail(method, "Monitoring listeners cannot cancel events");
|
||||||
|
|
||||||
|
if (paramCount == 2) {
|
||||||
|
if (!firstParamExtendsCancellable)
|
||||||
|
throw fail(method, "Cancellation-aware monitoring listeners are only valid for cancellable events");
|
||||||
|
|
||||||
|
if (!boolean.class.isAssignableFrom(parameterTypes[1]))
|
||||||
|
throw fail(method, "Second parameter of a cancellation-aware monitoring listener must be a boolean");
|
||||||
|
|
||||||
|
if (!isMonitoringPriority)
|
||||||
|
throw fail(method, "Cancellation-aware monitoring listeners must have a priority of MONITOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!firstParamExtendsCancellable) {
|
||||||
|
if (subscribeEventAnnotation.alwaysCancelling())
|
||||||
|
throw fail(method, "Always cancelling listeners are only valid for cancellable events");
|
||||||
|
|
||||||
|
if (returnType == boolean.class)
|
||||||
|
throw fail(method, "Return type boolean is only valid for cancellable events");
|
||||||
|
}
|
||||||
|
|
||||||
|
registerListener(busGroup, paramCount, returnType, eventType, subscribeEventAnnotation, method);
|
||||||
|
listenersCount++;
|
||||||
|
|
||||||
|
if (firstValidListenerEventType == null)
|
||||||
|
firstValidListenerEventType = eventType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (listenersCount == 0)
|
||||||
|
throw fail(listenerClass, "No listeners found");
|
||||||
|
else if (firstValidListenerEventType == null)
|
||||||
|
throw fail(listenerClass, "No valid listeners found");
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||||
|
private static EventListener registerListener(@Nullable BusGroup busGroup,
|
||||||
|
int paramCount, Class<?> returnType, Class<? extends Event> eventType,
|
||||||
|
SubscribeEvent subscribeEventAnnotation, Method method) {
|
||||||
|
if (busGroup == null) {
|
||||||
|
busGroup = IModBusEvent.class.isAssignableFrom(eventType)
|
||||||
|
? FMLJavaModLoadingContext.get().getModBusGroup()
|
||||||
|
: BusGroup.DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine the listener type from its parameters and return type
|
||||||
|
if (paramCount == 1) {
|
||||||
|
var priority = subscribeEventAnnotation.priority();
|
||||||
|
if (returnType == void.class) {
|
||||||
|
if (Cancellable.class.isAssignableFrom(eventType)) {
|
||||||
|
// Consumer<Event & Cancellable>
|
||||||
|
var eventBus = CancellableEventBus.create(busGroup, (Class) eventType);
|
||||||
|
if (subscribeEventAnnotation.alwaysCancelling()) {
|
||||||
|
return eventBus.addListener(priority, true, createConsumer(method));
|
||||||
|
} else {
|
||||||
|
return eventBus.addListener(priority, createConsumer(method));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Consumer<Event>
|
||||||
|
return EventBus.create(busGroup, eventType)
|
||||||
|
.addListener(priority, createConsumer(method));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Predicate<Event & EventCharacteristic.Cancellable>
|
||||||
|
if (!Cancellable.class.isAssignableFrom(eventType))
|
||||||
|
throw fail(method, "Return type boolean is only valid for cancellable events");
|
||||||
|
|
||||||
|
if (subscribeEventAnnotation.alwaysCancelling())
|
||||||
|
throw new IllegalArgumentException("Always cancelling listeners must have a void return type");
|
||||||
|
|
||||||
|
return CancellableEventBus.create(busGroup, (Class) eventType)
|
||||||
|
.addListener(priority, createPredicate(method));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// ObjBooleanBiConsumer<Event & Cancellable>
|
||||||
|
if (returnType != void.class)
|
||||||
|
throw new IllegalArgumentException("Cancellation-aware monitoring listeners must have a void return type");
|
||||||
|
|
||||||
|
if (subscribeEventAnnotation.alwaysCancelling())
|
||||||
|
throw new IllegalArgumentException("Monitoring listeners cannot cancel events");
|
||||||
|
|
||||||
|
return CancellableEventBus.create(busGroup, (Class) eventType).addListener(createMonitor(method));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IllegalArgumentException fail(Class<?> listenerClass, String reason) {
|
||||||
|
return new IllegalArgumentException("Failed to register " + listenerClass.getName() + ": " + reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IllegalArgumentException fail(Method mtd, String reason) {
|
||||||
|
return new IllegalArgumentException("Failed to register " + mtd.getDeclaringClass().getName() + "." + mtd.getName() + ": " + reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <T extends Event> Consumer<T> createConsumer(Method callback) {
|
||||||
|
var factoryMH = getOrMakeFactory(callback, RETURNS_CONSUMER, CONSUMER_FI_TYPE, "accept");
|
||||||
|
|
||||||
|
try {
|
||||||
|
return (Consumer<T>) factoryMH.invokeExact();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw makeRuntimeException(callback, e);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
throw new RuntimeException(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <T extends Event> Predicate<T> createPredicate(Method callback) {
|
||||||
|
var factoryMH = getOrMakeFactory(callback, RETURNS_PREDICATE, PREDICATE_FI_TYPE, "test");
|
||||||
|
|
||||||
|
try {
|
||||||
|
return (Predicate<T>) factoryMH.invokeExact();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw makeRuntimeException(callback, e);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
throw new RuntimeException(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <T extends Event> ObjBooleanBiConsumer<T> createMonitor(Method callback) {
|
||||||
|
var factoryMH = getOrMakeFactory(callback, RETURNS_MONITOR, MONITOR_FI_TYPE, "accept");
|
||||||
|
|
||||||
|
try {
|
||||||
|
return (ObjBooleanBiConsumer<T>) factoryMH.invokeExact();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw makeRuntimeException(callback, e);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
throw new RuntimeException(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static MethodHandle getOrMakeFactory(Method callback, MethodType factoryReturnType,
|
||||||
|
MethodType fiMethodType, String fiMethodName) {
|
||||||
|
return makeFactory(callback, factoryReturnType, fiMethodType, fiMethodName);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static MethodHandle makeFactory(Method callback,
|
||||||
|
MethodType factoryReturnType,
|
||||||
|
MethodType fiMethodType, String fiMethodName) {
|
||||||
|
final class DodgyLookup {
|
||||||
|
private DodgyLookup() {}
|
||||||
|
private static final MethodHandles.Lookup INSTANCE;
|
||||||
|
static {
|
||||||
|
try {
|
||||||
|
var lookupField = MethodHandles.Lookup.class.getDeclaredField("IMPL_LOOKUP");
|
||||||
|
UnsafeHacks.setAccessible(lookupField);
|
||||||
|
INSTANCE = (MethodHandles.Lookup) lookupField.get(null);
|
||||||
|
} catch (NoSuchFieldException | IllegalAccessException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
var callbackDeclaredClass = callback.getDeclaringClass();
|
||||||
|
var lookup = DodgyLookup.INSTANCE.in(callbackDeclaredClass);
|
||||||
|
var mh = lookup.unreflect(callback);
|
||||||
|
|
||||||
|
return LambdaMetafactory.metafactory(
|
||||||
|
lookup, fiMethodName, factoryReturnType, fiMethodType, mh, mh.type()
|
||||||
|
).getTarget();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw makeRuntimeException(callback, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static RuntimeException makeRuntimeException(Method callback, Exception e) {
|
||||||
|
return switch (e) {
|
||||||
|
case IllegalAccessException iae -> {
|
||||||
|
var errMsg = "Failed to create listener";
|
||||||
|
if (!Modifier.isPublic(callback.getModifiers()))
|
||||||
|
errMsg += " - is it public?";
|
||||||
|
|
||||||
|
yield new RuntimeException(errMsg, iae);
|
||||||
|
}
|
||||||
|
case NullPointerException npe -> new RuntimeException(
|
||||||
|
"Failed to create listener - was given a non-static method without an instance to invoke it with",
|
||||||
|
npe
|
||||||
|
);
|
||||||
|
default -> new RuntimeException("Failed to create listener", e);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+13
-9
@@ -5,14 +5,13 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.javafmlmod;
|
package net.minecraftforge.fml.javafmlmod;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
import net.minecraftforge.fml.ModLoadingContext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use the context provided by your language loader in your mod's constructor
|
* Use the context provided by your language loader in your mod's constructor
|
||||||
*/
|
*/
|
||||||
public class FMLJavaModLoadingContext extends ModLoadingContext
|
public class FMLJavaModLoadingContext extends ModLoadingContext {
|
||||||
{
|
|
||||||
private final FMLModContainer container;
|
private final FMLModContainer container;
|
||||||
|
|
||||||
FMLJavaModLoadingContext(FMLModContainer container) {
|
FMLJavaModLoadingContext(FMLModContainer container) {
|
||||||
@@ -20,11 +19,10 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The mod's event bus, to allow subscription to Mod specific events
|
* @return The mod's event bus group, to allow subscription to Mod specific events
|
||||||
*/
|
*/
|
||||||
public IEventBus getModEventBus()
|
public BusGroup getModBusGroup() {
|
||||||
{
|
return container.getModBusGroup();
|
||||||
return container.getEventBus();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,9 +37,15 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
|
|||||||
* Helper to get the right instance from the {@link ModLoadingContext} correctly.
|
* Helper to get the right instance from the {@link ModLoadingContext} correctly.
|
||||||
* @return The FMLJavaMod language specific extension from the ModLoadingContext
|
* @return The FMLJavaMod language specific extension from the ModLoadingContext
|
||||||
*
|
*
|
||||||
* @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
|
* @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor. For example: {@snippet :
|
||||||
|
* @Mod("examplemod")
|
||||||
|
* public final class ExampleMod {
|
||||||
|
* public ExampleMod(FMLJavaModLoadingContext context) {
|
||||||
|
* // Use context from the param instead of FMLJavaModLoadingContext.get() or ModLoadingContext.get()
|
||||||
|
* }
|
||||||
|
* }}
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public static FMLJavaModLoadingContext get() {
|
public static FMLJavaModLoadingContext get() {
|
||||||
return ModLoadingContext.get().extension();
|
return ModLoadingContext.get().extension();
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-16
@@ -5,11 +5,8 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.javafmlmod;
|
package net.minecraftforge.fml.javafmlmod;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.EventBusErrorMessage;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.eventbus.api.BusBuilder;
|
import net.minecraftforge.eventbus.api.bus.EventBus;
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
|
||||||
import net.minecraftforge.eventbus.api.IEventListener;
|
|
||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.ModLoadingException;
|
import net.minecraftforge.fml.ModLoadingException;
|
||||||
import net.minecraftforge.fml.ModLoadingStage;
|
import net.minecraftforge.fml.ModLoadingStage;
|
||||||
@@ -36,7 +33,7 @@ public class FMLModContainer extends ModContainer {
|
|||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static final Marker LOADING = MarkerManager.getMarker("LOADING");
|
private static final Marker LOADING = MarkerManager.getMarker("LOADING");
|
||||||
private final ModFileScanData scanResults;
|
private final ModFileScanData scanResults;
|
||||||
private final IEventBus eventBus;
|
private final BusGroup eventBusGroup;
|
||||||
private Object modInstance;
|
private Object modInstance;
|
||||||
private final Class<?> modClass;
|
private final Class<?> modClass;
|
||||||
private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
|
private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
|
||||||
@@ -46,7 +43,7 @@ public class FMLModContainer extends ModContainer {
|
|||||||
LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
|
LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
|
||||||
this.scanResults = modFileScanResults;
|
this.scanResults = modFileScanResults;
|
||||||
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
||||||
this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
this.eventBusGroup = BusGroup.create("modBusFor" + info.getModId());
|
||||||
this.contextExtension = () -> context;
|
this.contextExtension = () -> context;
|
||||||
try {
|
try {
|
||||||
var moduleName = info.getOwningFile().moduleName();
|
var moduleName = info.getOwningFile().moduleName();
|
||||||
@@ -128,10 +125,6 @@ public class FMLModContainer extends ModContainer {
|
|||||||
implAddExportsOrOpens.invoke(target, pkg, reader, open, /*syncVM*/true);
|
implAddExportsOrOpens.invoke(target, pkg, reader, open, /*syncVM*/true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
|
|
||||||
LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void constructMod() {
|
private void constructMod() {
|
||||||
try {
|
try {
|
||||||
LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
|
LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
|
||||||
@@ -173,15 +166,17 @@ public class FMLModContainer extends ModContainer {
|
|||||||
return modInstance;
|
return modInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEventBus getEventBus() {
|
public BusGroup getModBusGroup() {
|
||||||
return this.eventBus;
|
return this.eventBusGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected <T extends Event & IModBusEvent> void acceptEvent(final T e) {
|
protected <T extends IModBusEvent> void acceptEvent(final T e) {
|
||||||
try {
|
try {
|
||||||
LOGGER.trace(LOADING, "Firing event for modid {} : {}", this.getModId(), e);
|
LOGGER.trace(LOADING, "Firing event for modid {} : {}", this.getModId(), e);
|
||||||
this.eventBus.post(e);
|
@SuppressWarnings("unchecked")
|
||||||
|
var eventBus = (EventBus<T>) IModBusEvent.getBus(eventBusGroup, e.getClass());
|
||||||
|
eventBus.post(e);
|
||||||
LOGGER.trace(LOADING, "Fired event for modid {} : {}", this.getModId(), e);
|
LOGGER.trace(LOADING, "Fired event for modid {} : {}", this.getModId(), e);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
LOGGER.error(LOADING,"Caught exception during event {} dispatch for modid {}", e, this.getModId(), t);
|
LOGGER.error(LOADING,"Caught exception during event {} dispatch for modid {}", e, this.getModId(), t);
|
||||||
@@ -190,8 +185,10 @@ public class FMLModContainer extends ModContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||||
public void dispatchConfigEvent(IConfigEvent event) {
|
public void dispatchConfigEvent(IConfigEvent event) {
|
||||||
this.eventBus.post(event.self());
|
var eventBus = (EventBus) EventBus.create(eventBusGroup, event.self().getClass());
|
||||||
|
eventBus.post(event.self());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ java {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
|
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
|
|||||||
+6
-15
@@ -6,41 +6,32 @@
|
|||||||
package net.minecraftforge.fml.lowcodemod;
|
package net.minecraftforge.fml.lowcodemod;
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.IExtensionPoint;
|
import net.minecraftforge.fml.IExtensionPoint;
|
||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.Objects;
|
public class LowCodeModContainer extends ModContainer {
|
||||||
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
|
||||||
|
|
||||||
public class LowCodeModContainer extends ModContainer
|
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final Object modInstance;
|
private final Object modInstance;
|
||||||
|
|
||||||
public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
|
public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer) {
|
||||||
{
|
|
||||||
super(info);
|
super(info);
|
||||||
LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId());
|
LOGGER.debug(LogMarkers.LOADING, "Creating LowCodeModContainer for {}", info.getModId());
|
||||||
this.modInstance = new Object();
|
this.modInstance = new Object();
|
||||||
this.contextExtension = () -> null;
|
this.contextExtension = () -> null;
|
||||||
this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
|
this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(Object mod)
|
public boolean matches(Object mod) {
|
||||||
{
|
|
||||||
return mod == modInstance;
|
return mod == modInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getMod()
|
public Object getMod() {
|
||||||
{
|
|
||||||
return modInstance;
|
return modInstance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,7 +10,7 @@ plugins {
|
|||||||
apply from: rootProject.file('build_shared.gradle')
|
apply from: rootProject.file('build_shared.gradle')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly(libs.jetbrains.annotations)
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
}
|
}
|
||||||
|
|||||||
+43
-23
@@ -2,7 +2,7 @@ plugins {
|
|||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'idea'
|
id 'idea'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
|
id 'net.minecraftforge.gradle' version '[6.0.36,6.2)'
|
||||||
}
|
}
|
||||||
|
|
||||||
version = mod_version
|
version = mod_version
|
||||||
@@ -22,17 +22,13 @@ minecraft {
|
|||||||
// official MCVersion Official field/method names from Mojang mapping files
|
// official MCVersion Official field/method names from Mojang mapping files
|
||||||
// parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official
|
// parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official
|
||||||
//
|
//
|
||||||
// You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
|
|
||||||
// See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
|
|
||||||
//
|
|
||||||
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
|
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
|
||||||
// Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
|
// Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
|
||||||
//
|
//
|
||||||
// Use non-default mappings at your own risk. They may not always work.
|
|
||||||
// Simply re-run your setup task after changing the mappings to update your workspace.
|
// Simply re-run your setup task after changing the mappings to update your workspace.
|
||||||
mappings channel: mapping_channel, version: mapping_version
|
mappings channel: mapping_channel, version: mapping_version
|
||||||
|
|
||||||
// Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
|
// Forge 1.20.6 and newer use official mappings at runtime, so we shouldn't reobf from official to SRG
|
||||||
reobf = false
|
reobf = false
|
||||||
|
|
||||||
// When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
|
// When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
|
||||||
@@ -50,8 +46,7 @@ minecraft {
|
|||||||
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
|
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
|
||||||
// generateRunFolders = true
|
// generateRunFolders = true
|
||||||
|
|
||||||
// This property enables access transformers for use in development.
|
// This property enables access transformers for use in development, applied to the Minecraft artifact.
|
||||||
// They will be applied to the Minecraft artifact.
|
|
||||||
// The access transformer file can be anywhere in the project.
|
// The access transformer file can be anywhere in the project.
|
||||||
// However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
|
// However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
|
||||||
// This default location is a best practice to automatically put the file in the right place in the final jar.
|
// This default location is a best practice to automatically put the file in the right place in the final jar.
|
||||||
@@ -65,17 +60,18 @@ minecraft {
|
|||||||
configureEach {
|
configureEach {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
// Recommended logging data for a userdev environment
|
// Optional additional logging. The markers can be added/remove as needed, separated by commas.
|
||||||
// The markers can be added/remove as needed separated by commas.
|
|
||||||
// "SCAN": For mods scan.
|
// "SCAN": For mods scan.
|
||||||
// "REGISTRIES": For firing of registry events.
|
// "REGISTRIES": For firing of registry events.
|
||||||
// "REGISTRYDUMP": For getting the contents of all registries.
|
// "REGISTRYDUMP": For getting the contents of all registries.
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
// property 'forge.logging.markers', 'REGISTRIES'
|
||||||
|
|
||||||
// Recommended logging level for the console
|
|
||||||
// You can set various levels here.
|
|
||||||
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
|
// Recommended for development - enables more descriptive errors at the cost of slower startup and registration.
|
||||||
|
property 'eventbus.api.strictRuntimeChecks', 'true'
|
||||||
|
|
||||||
|
// arg "-mixin.config=${mod_id}.mixins.json"
|
||||||
}
|
}
|
||||||
|
|
||||||
client {
|
client {
|
||||||
@@ -110,7 +106,26 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// Put repositories for dependencies here
|
// Put repositories for dependencies here
|
||||||
// ForgeGradle automatically adds the Forge maven and Maven Central for you
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
name = 'Forge'
|
||||||
|
url = 'https://maven.minecraftforge.net'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = 'Minecraft libraries'
|
||||||
|
url = 'https://libraries.minecraft.net'
|
||||||
|
}
|
||||||
|
exclusiveContent {
|
||||||
|
forRepository {
|
||||||
|
maven {
|
||||||
|
name = 'Sponge'
|
||||||
|
url = 'https://repo.spongepowered.org/repository/maven-public'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter {
|
||||||
|
includeGroupAndSubgroups('org.spongepowered')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
|
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
|
||||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
|
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
|
||||||
@@ -127,6 +142,11 @@ dependencies {
|
|||||||
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
|
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
|
||||||
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
||||||
|
|
||||||
|
// Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor
|
||||||
|
// to improve performance in production environments. This line is required to enable said compile-time validation
|
||||||
|
// in your development environment, helping you catch issues early.
|
||||||
|
annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.7'
|
||||||
|
|
||||||
// Example mod dependency with JEI
|
// Example mod dependency with JEI
|
||||||
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
|
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
|
||||||
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
|
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
|
||||||
@@ -141,16 +161,13 @@ dependencies {
|
|||||||
// For more info:
|
// For more info:
|
||||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||||
|
|
||||||
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
|
|
||||||
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This block of code expands all declared replace properties in the specified resource targets.
|
// This block of code expands all declared replace properties in the specified resource targets.
|
||||||
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
|
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
|
||||||
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
|
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
|
||||||
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
||||||
tasks.named('processResources', ProcessResources).configure {
|
tasks.named('processResources', ProcessResources) {
|
||||||
var replaceProperties = [
|
var replaceProperties = [
|
||||||
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
|
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
|
||||||
forge_version: forge_version, forge_version_range: forge_version_range,
|
forge_version: forge_version, forge_version_range: forge_version_range,
|
||||||
@@ -166,7 +183,7 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Example for how to get properties into the manifest for reading at runtime.
|
// Example for how to get properties into the manifest for reading at runtime.
|
||||||
tasks.named('jar', Jar).configure {
|
tasks.named('jar', Jar) {
|
||||||
manifest {
|
manifest {
|
||||||
attributes([
|
attributes([
|
||||||
'Specification-Title' : mod_id,
|
'Specification-Title' : mod_id,
|
||||||
@@ -176,6 +193,7 @@ tasks.named('jar', Jar).configure {
|
|||||||
'Implementation-Version' : project.jar.archiveVersion,
|
'Implementation-Version' : project.jar.archiveVersion,
|
||||||
'Implementation-Vendor' : mod_authors
|
'Implementation-Vendor' : mod_authors
|
||||||
])
|
])
|
||||||
|
// attributes['MixinConfigs'] = "${mod_id}.mixins.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,6 +215,9 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IntelliJ no longer downloads javadocs and sources by default, this tells Gradle to force IntelliJ to do it.
|
||||||
|
idea.module { downloadJavadoc = downloadSources = true }
|
||||||
|
|
||||||
eclipse {
|
eclipse {
|
||||||
// Run everytime eclipse builds the code
|
// Run everytime eclipse builds the code
|
||||||
//autoBuildTasks genEclipseRuns
|
//autoBuildTasks genEclipseRuns
|
||||||
@@ -204,8 +225,7 @@ eclipse {
|
|||||||
synchronizationTasks 'genEclipseRuns'
|
synchronizationTasks 'genEclipseRuns'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge the resources and classes into the same directory.
|
// Merge the resources and classes into the same directory, because Java expects modules to be in a single directory.
|
||||||
// This is done because java expects modules to be in a single directory.
|
|
||||||
// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
|
// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
|
||||||
// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
|
// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
|
||||||
sourceSets.each {
|
sourceSets.each {
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
# 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=-Xmx3G
|
org.gradle.jvmargs=-Xmx5G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
|
# In the case that Gradle needs to fork to recompile, this will set the memory for that process.
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.recompile.fork=true
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.recompile.fork.args=-Xmx5G
|
||||||
|
|
||||||
|
# Opts-out of ForgeGradle automatically adding mavenCentral(), Forge's maven and MC libs maven to the repositories block
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.attach=false
|
||||||
|
|
||||||
|
|
||||||
## Environment Properties
|
## Environment Properties
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -9,5 +9,5 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
|
@@ -132,6 +_,9 @@
|
||||||
|
GlStateManager._colorMask(true, true, true, true);
|
||||||
|
GlStateManager._clear(16384);
|
||||||
|
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
|
||||||
|
+ // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
|
||||||
|
+ if (p_394273_.isStencilEnabled())
|
||||||
|
+ GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0);
|
||||||
|
GlStateManager._glBindFramebuffer(36160, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
|
@@ -23,6 +_,14 @@
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public class GlDebug {
|
||||||
|
+ /**
|
||||||
|
+ * TODO: [Forge][Rendering][VEN] Expose this in the configs
|
||||||
|
+ * <p>
|
||||||
|
+ * Will enable synchronous OpenGL debug logging, which means the message will be sent from the call that
|
||||||
|
+ * would have caused the error. Additionally, enables printing a stacktrace when and where this occurs.
|
||||||
|
+ */
|
||||||
|
+ private static final boolean PRINT_STACKTRACE_ON_ERROR = Boolean.getBoolean("forge.printGLStackOnError");
|
||||||
|
+
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static final int CIRCULAR_LOG_SIZE = 10;
|
||||||
|
private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10);
|
||||||
|
@@ -105,6 +_,8 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.info("OpenGL debug message: {}", gldebug$logentry);
|
||||||
|
+ // TODO: [VEN] Trim the stack trace
|
||||||
|
+ if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getLastOpenGlDebugMessages() {
|
||||||
|
@@ -121,6 +_,7 @@
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public static GlDebug enableDebugCallback(int p_394351_, boolean p_393026_, Set<String> p_393339_) {
|
||||||
|
+ p_393026_ |= PRINT_STACKTRACE_ON_ERROR;
|
||||||
|
if (p_394351_ <= 0) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
|
@@ -88,8 +_,15 @@
|
||||||
|
public GpuTexture createTexture(
|
||||||
|
@Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_
|
||||||
|
) {
|
||||||
|
+ return createTexture(p_397830_, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(
|
||||||
|
+ @Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_, boolean stencil
|
||||||
|
+ ) {
|
||||||
|
return this.createTexture(
|
||||||
|
- this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_
|
||||||
|
+ this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, stencil
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -97,6 +_,15 @@
|
||||||
|
public GpuTexture createTexture(
|
||||||
|
@Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_
|
||||||
|
) {
|
||||||
|
+ return createTexture(p_394142_, p_395535_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(
|
||||||
|
+ @Nullable String p_394142_, int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_, boolean stencil
|
||||||
|
+ ) {
|
||||||
|
+ // Forge: stencil rendering is only for depth
|
||||||
|
+ stencil &= p_394951_.hasDepthAspect();
|
||||||
|
if (p_406483_ < 1) {
|
||||||
|
throw new IllegalArgumentException("mipLevels must be at least 1");
|
||||||
|
} else if (p_408015_ < 1) {
|
||||||
|
@@ -147,11 +_,14 @@
|
||||||
|
GlStateManager._texImage2D(
|
||||||
|
k,
|
||||||
|
l,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
|
||||||
|
GlConst.toGlInternalId(p_394951_),
|
||||||
|
p_393944_ >> l,
|
||||||
|
p_392329_ >> l,
|
||||||
|
0,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
|
||||||
|
GlConst.toGlExternalId(p_394951_),
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
|
||||||
|
GlConst.toGlType(p_394951_),
|
||||||
|
null
|
||||||
|
);
|
||||||
|
@@ -162,11 +_,14 @@
|
||||||
|
GlStateManager._texImage2D(
|
||||||
|
j,
|
||||||
|
i1,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
|
||||||
|
GlConst.toGlInternalId(p_394951_),
|
||||||
|
p_393944_ >> i1,
|
||||||
|
p_392329_ >> i1,
|
||||||
|
0,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
|
||||||
|
GlConst.toGlExternalId(p_394951_),
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
|
||||||
|
GlConst.toGlType(p_394951_),
|
||||||
|
null
|
||||||
|
);
|
||||||
|
@@ -179,7 +_,7 @@
|
||||||
|
} else if (j1 != 0) {
|
||||||
|
throw new IllegalStateException("OpenGL error " + j1);
|
||||||
|
} else {
|
||||||
|
- GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i);
|
||||||
|
+ GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i, stencil);
|
||||||
|
this.debugLabels.applyLabel(gltexture);
|
||||||
|
return gltexture;
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
|
@@ -89,6 +_,11 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public static boolean _isBlendEnabled() {
|
||||||
|
+ RenderSystem.assertOnRenderThread();
|
||||||
|
+ return BLEND.mode.enabled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public static void _disableBlend() {
|
||||||
|
RenderSystem.assertOnRenderThread();
|
||||||
|
BLEND.mode.disable();
|
||||||
|
@@ -404,9 +_,17 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Stores the last values sent into glMultiTexCoord2f */
|
||||||
|
+ public static float lastBrightnessX = 0.0f;
|
||||||
|
+ public static float lastBrightnessY = 0.0f;
|
||||||
|
+
|
||||||
|
public static void _texParameter(int p_393876_, int p_397998_, int p_396741_) {
|
||||||
|
RenderSystem.assertOnRenderThread();
|
||||||
|
GL11.glTexParameteri(p_393876_, p_397998_, p_396741_);
|
||||||
|
+ if (p_393876_ == GL13.GL_TEXTURE1) {
|
||||||
|
+ lastBrightnessX = p_397998_;
|
||||||
|
+ lastBrightnessY = p_396741_;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int _getTexLevelParameter(int p_393352_, int p_397204_, int p_396319_) {
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
@@ -19,8 +_,13 @@
|
||||||
|
private int views;
|
||||||
|
|
||||||
|
protected GlTexture(int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_) {
|
||||||
|
+ this(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_, p_408889_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected GlTexture(int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_, boolean stencil) {
|
||||||
|
super(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_);
|
||||||
|
this.id = p_408889_;
|
||||||
|
+ this.stencilEnabled = stencil;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -93,6 +_,16 @@
|
||||||
|
public void setTextureFilter(FilterMode p_394977_, FilterMode p_397175_, boolean p_393558_) {
|
||||||
|
super.setTextureFilter(p_394977_, p_397175_, p_393558_);
|
||||||
|
this.modesDirty = true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ /* FORGE START */
|
||||||
|
+
|
||||||
|
+ private final boolean stencilEnabled;
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isStencilEnabled() {
|
||||||
|
+ return this.stencilEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@@ -1,28 +1,18 @@
|
|||||||
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
@@ -96,7 +_,10 @@
|
@@ -92,7 +_,7 @@
|
||||||
GlStateManager._texParameter(3553, 34892, 0);
|
this.width = p_83951_;
|
||||||
GlStateManager._texParameter(3553, 10242, 33071);
|
this.height = p_83952_;
|
||||||
GlStateManager._texParameter(3553, 10243, 33071);
|
|
||||||
+ if (!stencilEnabled)
|
|
||||||
GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
|
|
||||||
+ else
|
|
||||||
+ GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.setFilterMode(9728, true);
|
|
||||||
@@ -108,6 +_,7 @@
|
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
|
||||||
if (this.useDepth) {
|
if (this.useDepth) {
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
- this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1);
|
||||||
+ if (stencilEnabled) GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
+ this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1, this.stencilEnabled);
|
||||||
}
|
this.depthTextureView = gpudevice.createTextureView(this.depthTexture);
|
||||||
|
this.depthTexture.setTextureFilter(FilterMode.NEAREST, false);
|
||||||
this.checkStatus();
|
this.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
|
||||||
@@ -229,5 +_,26 @@
|
@@ -166,5 +_,26 @@
|
||||||
|
@Nullable
|
||||||
public int getDepthTextureId() {
|
public GpuTextureView getDepthTextureView() {
|
||||||
return this.depthBufferId;
|
return this.depthTextureView;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private boolean stencilEnabled = false;
|
+ private boolean stencilEnabled = false;
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
|
||||||
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
|
||||||
@@ -94,6 +_,11 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public static boolean _isBlendEnabled() {
|
|
||||||
+ RenderSystem.assertOnRenderThread();
|
|
||||||
+ return BLEND.mode.enabled;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static void _disableBlend() {
|
|
||||||
RenderSystem.assertOnRenderThread();
|
|
||||||
BLEND.mode.disable();
|
|
||||||
@@ -519,9 +_,17 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Stores the last values sent into glMultiTexCoord2f */
|
|
||||||
+ public static float lastBrightnessX = 0.0f;
|
|
||||||
+ public static float lastBrightnessY = 0.0f;
|
|
||||||
+
|
|
||||||
public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
|
|
||||||
RenderSystem.assertOnRenderThreadOrInit();
|
|
||||||
GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
|
|
||||||
+ if (p_84161_ == GL13.GL_TEXTURE1) {
|
|
||||||
+ lastBrightnessX = p_84162_;
|
|
||||||
+ lastBrightnessY = p_84163_;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
|
|
||||||
@@ -16,9 +16,9 @@
|
|||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
GLFW.glfwMakeContextCurrent(this.window);
|
this.setMode();
|
||||||
GL.createCapabilities();
|
this.refreshFramebufferSize();
|
||||||
@@ -267,6 +_,9 @@
|
@@ -266,6 +_,9 @@
|
||||||
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
||||||
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
||||||
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- a/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
|
+++ b/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
|
@@ -26,7 +_,17 @@
|
||||||
|
@Nullable Supplier<String> p_394357_, int p_395623_, TextureFormat p_395807_, int p_395802_, int p_396157_, int p_408810_, int p_407070_
|
||||||
|
);
|
||||||
|
|
||||||
|
+ /** Forge: same as {@link #createTexture(Supplier, int, TextureFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable Supplier<String> p_394357_, int p_395623_, TextureFormat p_395807_, int p_395802_, int p_396157_, int p_408810_, int p_407070_, boolean stencil) {
|
||||||
|
+ return this.createTexture(p_394357_, p_395623_, p_395807_, p_395802_, p_396157_, p_408810_, p_407070_);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
GpuTexture createTexture(@Nullable String p_391798_, int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_);
|
||||||
|
+
|
||||||
|
+ /** Forge: same as {@link #createTexture(String, int, TextureFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable String p_391798_, int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_, boolean stencil) {
|
||||||
|
+ return this.createTexture(p_391798_, p_391800_, p_393333_, p_395600_, p_394065_, p_408732_, p_407125_);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
GpuTextureView createTextureView(GpuTexture p_409045_);
|
||||||
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
--- a/com/mojang/blaze3d/systems/RenderSystem.java
|
|
||||||
+++ b/com/mojang/blaze3d/systems/RenderSystem.java
|
|
||||||
@@ -196,6 +_,11 @@
|
|
||||||
GlStateManager._depthMask(p_69459_);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public static boolean isBlendEnabled() {
|
|
||||||
+ assertOnRenderThread();
|
|
||||||
+ return GlStateManager._isBlendEnabled();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static void enableBlend() {
|
|
||||||
assertOnRenderThread();
|
|
||||||
GlStateManager._enableBlend();
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
@@ -6,7 +_,7 @@
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@DontObfuscate
|
||||||
|
-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,11 +1,11 @@
|
|||||||
--- 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
|
||||||
@@ -14,7 +_,7 @@
|
@@ -15,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3fc;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class PoseStack {
|
-public class PoseStack {
|
||||||
+public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
|
+public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
|
||||||
private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
|
private final List<PoseStack.Pose> poses = new ArrayList<>(16);
|
||||||
Matrix4f matrix4f = new Matrix4f();
|
private int lastIndex;
|
||||||
Matrix3f matrix3f = new Matrix3f();
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -15,7 +_,7 @@
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
|
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
|
||||||
|
|
||||||
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
|
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
|
||||||
@@ -133,9 +_,11 @@
|
@@ -135,9 +_,11 @@
|
||||||
|
|
||||||
int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
|
int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
|
||||||
int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
|
int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
@@ -14,7 +_,7 @@
|
@@ -18,7 +_,7 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@DontObfuscate
|
||||||
-public class VertexFormat {
|
-public class VertexFormat {
|
||||||
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
|
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
|
||||||
public static final int UNKNOWN_ELEMENT = -1;
|
public static final int UNKNOWN_ELEMENT = -1;
|
||||||
private final List<VertexFormatElement> elements;
|
private final List<VertexFormatElement> elements;
|
||||||
private final List<String> names;
|
private final List<String> names;
|
||||||
@@ -23,6 +_,7 @@
|
@@ -29,6 +_,7 @@
|
||||||
private final int[] offsetsByElement = new int[32];
|
private GpuBuffer immediateDrawVertexBuffer;
|
||||||
@Nullable
|
@Nullable
|
||||||
private VertexBuffer immediateDrawVertexBuffer;
|
private GpuBuffer immediateDrawIndexBuffer;
|
||||||
+ private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
|
+ private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
|
||||||
|
|
||||||
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
||||||
this.elements = p_343616_;
|
this.elements = p_343616_;
|
||||||
@@ -35,6 +_,11 @@
|
@@ -41,6 +_,11 @@
|
||||||
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
||||||
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
||||||
}
|
}
|
||||||
@@ -29,13 +29,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static VertexFormat.Builder builder() {
|
public static VertexFormat.Builder builder() {
|
||||||
@@ -141,6 +_,9 @@
|
@@ -138,6 +_,9 @@
|
||||||
|
|
||||||
return vertexbuffer;
|
return this.immediateDrawIndexBuffer;
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
||||||
+ public int getOffset(int index) { return offsetsByElement[index]; }
|
+ public int getOffset(int index) { return offsetsByElement[index]; }
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public static class Builder {
|
@DontObfuscate
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
--- a/com/mojang/math/Transformation.java
|
--- a/com/mojang/math/Transformation.java
|
||||||
+++ b/com/mojang/math/Transformation.java
|
+++ b/com/mojang/math/Transformation.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -14,7 +_,7 @@
|
||||||
import org.joml.Quaternionf;
|
import org.joml.Quaternionf;
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
-public final class Transformation {
|
-public final class Transformation {
|
||||||
+public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
|
+public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
|
||||||
private final Matrix4f matrix;
|
private final Matrix4fc matrix;
|
||||||
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
|
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
|
||||||
p_269604_ -> p_269604_.group(
|
p_269604_ -> p_269604_.group(
|
||||||
@@ -169,5 +_,19 @@
|
@@ -174,5 +_,19 @@
|
||||||
vector3f1.lerp(p_175938_.getScale(), p_175939_);
|
vector3f1.lerp(p_175938_.getScale(), p_175939_);
|
||||||
quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
|
quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
|
||||||
return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
|
return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
|
||||||
|
|||||||
@@ -34,4 +34,4 @@
|
|||||||
+ this.stackTrace = t.getStackTrace();
|
+ this.stackTrace = t.getStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
|
public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, BlockState p_178954_) {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/SharedConstants.java
|
--- a/net/minecraft/SharedConstants.java
|
||||||
+++ b/net/minecraft/SharedConstants.java
|
+++ b/net/minecraft/SharedConstants.java
|
||||||
@@ -170,6 +_,7 @@
|
@@ -175,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
--- a/net/minecraft/Util.java
|
--- a/net/minecraft/Util.java
|
||||||
+++ b/net/minecraft/Util.java
|
+++ b/net/minecraft/Util.java
|
||||||
@@ -264,7 +_,7 @@
|
@@ -268,7 +_,7 @@
|
||||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().dataVersion().version()))
|
||||||
.getChoiceType(p_137552_, p_137553_);
|
.getChoiceType(p_137552_, p_137553_);
|
||||||
} catch (IllegalArgumentException illegalargumentexception) {
|
} catch (IllegalArgumentException illegalargumentexception) {
|
||||||
- LOGGER.error("No data fixer registered for {}", p_137553_);
|
- LOGGER.error("No data fixer registered for {}", p_137553_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/advancements/Advancement.java
|
--- a/net/minecraft/advancements/Advancement.java
|
||||||
+++ b/net/minecraft/advancements/Advancement.java
|
+++ b/net/minecraft/advancements/Advancement.java
|
||||||
@@ -214,7 +_,11 @@
|
@@ -226,7 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
|
public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
--- a/net/minecraft/advancements/AdvancementRewards.java
|
--- a/net/minecraft/advancements/AdvancementRewards.java
|
||||||
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
||||||
@@ -41,6 +_,7 @@
|
@@ -43,6 +_,7 @@
|
||||||
LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
|
LootParams lootparams = new LootParams.Builder(serverlevel)
|
||||||
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
||||||
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
||||||
+ .withLuck(p_9990_.getLuck())
|
+ .withLuck(p_9990_.getLuck())
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -120,9 +_,13 @@
|
@@ -133,9 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setRotation(float p_90573_, float p_90574_) {
|
protected void setRotation(float p_90573_, float p_90574_) {
|
||||||
@@ -15,7 +15,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);
|
||||||
@@ -238,6 +_,13 @@
|
@@ -251,6 +_,13 @@
|
||||||
|
|
||||||
public float getPartialTickTime() {
|
public float getPartialTickTime() {
|
||||||
return this.partialTickTime;
|
return this.partialTickTime;
|
||||||
@@ -28,4 +28,4 @@
|
|||||||
+ return this.level.getBlockState(this.blockPosition).getStateAtViewpoint(this.level, this.blockPosition, this.position);
|
+ return this.level.getBlockState(this.blockPosition).getStateAtViewpoint(this.level, this.blockPosition, this.position);
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@Override
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/KeyMapping.java
|
--- a/net/minecraft/client/KeyMapping.java
|
||||||
+++ b/net/minecraft/client/KeyMapping.java
|
+++ b/net/minecraft/client/KeyMapping.java
|
||||||
@@ -14,9 +_,9 @@
|
@@ -15,9 +_,9 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
private static final Set<String> CATEGORIES = Sets.newHashSet();
|
private static final Set<String> CATEGORIES = Sets.newHashSet();
|
||||||
public static final String CATEGORY_MOVEMENT = "key.categories.movement";
|
public static final String CATEGORY_MOVEMENT = "key.categories.movement";
|
||||||
public static final String CATEGORY_MISC = "key.categories.misc";
|
public static final String CATEGORY_MISC = "key.categories.misc";
|
||||||
@@ -42,14 +_,14 @@
|
@@ -43,14 +_,14 @@
|
||||||
private int clickCount;
|
private int clickCount;
|
||||||
|
|
||||||
public static void click(InputConstants.Key p_90836_) {
|
public static void click(InputConstants.Key p_90836_) {
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
if (keymapping != null) {
|
if (keymapping != null) {
|
||||||
keymapping.setDown(p_90839_);
|
keymapping.setDown(p_90839_);
|
||||||
}
|
}
|
||||||
@@ -100,7 +_,7 @@
|
@@ -101,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDown() {
|
public boolean isDown() {
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getCategory() {
|
public String getCategory() {
|
||||||
@@ -136,7 +_,16 @@
|
@@ -137,7 +_,16 @@
|
||||||
public int compareTo(KeyMapping p_90841_) {
|
public int compareTo(KeyMapping p_90841_) {
|
||||||
return this.category.equals(p_90841_.category)
|
return this.category.equals(p_90841_.category)
|
||||||
? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
|
? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<Component> createNameSupplier(String p_90843_) {
|
public static Supplier<Component> createNameSupplier(String p_90843_) {
|
||||||
@@ -145,6 +_,20 @@
|
@@ -146,6 +_,20 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean same(KeyMapping p_90851_) {
|
public boolean same(KeyMapping p_90851_) {
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
return this.key.equals(p_90851_.key);
|
return this.key.equals(p_90851_.key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,11 +_,13 @@
|
@@ -164,11 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Component getTranslatedKeyMessage() {
|
public Component getTranslatedKeyMessage() {
|
||||||
@@ -92,10 +92,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String saveString() {
|
public String saveString() {
|
||||||
@@ -176,5 +_,88 @@
|
@@ -182,5 +_,88 @@
|
||||||
|
@Nullable
|
||||||
public void setDown(boolean p_90846_) {
|
public static KeyMapping get(String p_378660_) {
|
||||||
this.isDown = p_90846_;
|
return ALL.get(p_378660_);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
|
+ private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/KeyboardHandler.java
|
--- a/net/minecraft/client/KeyboardHandler.java
|
||||||
+++ b/net/minecraft/client/KeyboardHandler.java
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
||||||
@@ -424,12 +_,12 @@
|
@@ -440,12 +_,12 @@
|
||||||
if (screen != null) {
|
if (screen != null) {
|
||||||
try {
|
try {
|
||||||
if (p_90897_ != 1 && p_90897_ != 2) {
|
if (p_90897_ != 1 && p_90897_ != 2) {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -505,6 +_,7 @@
|
@@ -504,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -514,10 +_,10 @@
|
@@ -513,10 +_,10 @@
|
||||||
if (screen != null && this.minecraft.getOverlay() == null) {
|
if (screen != null && this.minecraft.getOverlay() == null) {
|
||||||
try {
|
try {
|
||||||
if (Character.isBmpCodePoint(p_90891_)) {
|
if (Character.isBmpCodePoint(p_90891_)) {
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -253,7 +_,7 @@
|
@@ -256,7 +_,7 @@
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
static Minecraft instance;
|
static Minecraft instance;
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
||||||
@@ -433,7 +_,6 @@
|
@@ -435,7 +_,6 @@
|
||||||
}
|
}
|
||||||
}, Util.nonCriticalIoPool());
|
}, Util.nonCriticalIoPool());
|
||||||
LOGGER.info("Setting user: {}", this.user.getName());
|
LOGGER.info("Setting user: {}", this.user.getName());
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
this.demo = p_91084_.game.demo;
|
this.demo = p_91084_.game.demo;
|
||||||
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
||||||
this.allowsChat = !p_91084_.game.disableChat;
|
this.allowsChat = !p_91084_.game.disableChat;
|
||||||
@@ -480,15 +_,15 @@
|
@@ -486,10 +_,9 @@
|
||||||
LOGGER.error("Couldn't set icon", (Throwable)ioexception);
|
LOGGER.error("Couldn't set icon", (Throwable)ioexception);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,24 +26,26 @@
|
|||||||
- this.mouseHandler.setup(this.window.getWindow());
|
- this.mouseHandler.setup(this.window.getWindow());
|
||||||
this.keyboardHandler = new KeyboardHandler(this);
|
this.keyboardHandler = new KeyboardHandler(this);
|
||||||
- this.keyboardHandler.setup(this.window.getWindow());
|
- this.keyboardHandler.setup(this.window.getWindow());
|
||||||
RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
|
RenderSystem.initRenderer(
|
||||||
|
this.window.getWindow(),
|
||||||
|
this.options.glDebugVerbosity,
|
||||||
|
@@ -500,6 +_,7 @@
|
||||||
|
LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
|
||||||
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
|
|
||||||
this.mainRenderTarget.clear();
|
|
||||||
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, p_340763_ -> {
|
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
|
||||||
@@ -562,6 +_,7 @@
|
@@ -578,6 +_,7 @@
|
||||||
);
|
this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
|
||||||
this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
|
this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
|
||||||
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
||||||
this.resourceManager.registerReloadListener(this.particleEngine);
|
this.resourceManager.registerReloadListener(this.particleEngine);
|
||||||
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
||||||
this.resourceManager.registerReloadListener(this.paintingTextures);
|
this.resourceManager.registerReloadListener(this.paintingTextures);
|
||||||
@@ -577,6 +_,9 @@
|
@@ -593,6 +_,9 @@
|
||||||
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
||||||
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
||||||
this.gui = new Gui(this);
|
this.gui = new Gui(this);
|
||||||
@@ -51,17 +53,17 @@
|
|||||||
+ this.mouseHandler.setup(this.window.getWindow());
|
+ this.mouseHandler.setup(this.window.getWindow());
|
||||||
+ this.keyboardHandler.setup(this.window.getWindow());
|
+ this.keyboardHandler.setup(this.window.getWindow());
|
||||||
this.debugRenderer = new DebugRenderer(this);
|
this.debugRenderer = new DebugRenderer(this);
|
||||||
RealmsClient realmsclient = RealmsClient.create(this);
|
RealmsClient realmsclient = RealmsClient.getOrCreate(this);
|
||||||
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
||||||
@@ -600,6 +_,7 @@
|
@@ -626,6 +_,7 @@
|
||||||
this.options.fullscreen().set(this.window.isFullscreen());
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
||||||
this.window.updateVsync(this.options.enableVsync().get());
|
this.window.updateVsync(this.options.enableVsync().get());
|
||||||
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
||||||
this.window.setDefaultErrorCallback();
|
this.window.setDefaultErrorCallback();
|
||||||
@@ -620,16 +_,17 @@
|
@@ -648,16 +_,17 @@
|
||||||
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
||||||
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
||||||
this.setOverlay(
|
this.setOverlay(
|
||||||
@@ -69,20 +71,20 @@
|
|||||||
- this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
- this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
||||||
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
|
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
|
||||||
+ () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
+ () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
||||||
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
||||||
this.selfTest();
|
this.selfTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.reloadStateTracker.finishReload();
|
this.reloadStateTracker.finishReload();
|
||||||
this.onResourceLoadFinished(minecraft$gameloadcookie);
|
this.onResourceLoadFinished(minecraft$gameloadcookie);
|
||||||
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
|
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
|
||||||
}), false
|
}), false
|
||||||
- )
|
- )
|
||||||
+ ).get()
|
+ ).get()
|
||||||
);
|
);
|
||||||
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
|
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.logPath());
|
||||||
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
||||||
@@ -724,6 +_,7 @@
|
@@ -759,6 +_,7 @@
|
||||||
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
||||||
if (checkModStatus().shouldReportAsModified()) {
|
if (checkModStatus().shouldReportAsModified()) {
|
||||||
stringbuilder.append("*");
|
stringbuilder.append("*");
|
||||||
@@ -90,7 +92,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
stringbuilder.append(" ");
|
stringbuilder.append(" ");
|
||||||
@@ -747,6 +_,8 @@
|
@@ -782,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
||||||
@@ -99,7 +101,7 @@
|
|||||||
return p_193587_.user.user.getType() != User.Type.MSA
|
return p_193587_.user.user.getType() != User.Type.MSA
|
||||||
? UserApiService.OFFLINE
|
? UserApiService.OFFLINE
|
||||||
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
||||||
@@ -757,7 +_,7 @@
|
@@ -792,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
||||||
@@ -108,7 +110,7 @@
|
|||||||
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
||||||
} else {
|
} else {
|
||||||
Util.throwAsRuntime(p_91240_);
|
Util.throwAsRuntime(p_91240_);
|
||||||
@@ -1043,12 +_,6 @@
|
@@ -1078,12 +_,6 @@
|
||||||
LOGGER.error("setScreen called from non-game thread");
|
LOGGER.error("setScreen called from non-game thread");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,7 +123,7 @@
|
|||||||
if (p_91153_ == null && this.clientLevelTeardownInProgress) {
|
if (p_91153_ == null && 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");
|
||||||
} else {
|
} else {
|
||||||
@@ -1062,6 +_,23 @@
|
@@ -1097,6 +_,23 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,7 +147,15 @@
|
|||||||
this.screen = p_91153_;
|
this.screen = p_91153_;
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.added();
|
this.screen.added();
|
||||||
@@ -1215,9 +_,11 @@
|
@@ -1180,6 +_,7 @@
|
||||||
|
FreeTypeUtil.destroy();
|
||||||
|
Util.shutdownExecutors();
|
||||||
|
RenderSystem.getDevice().close();
|
||||||
|
+ net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload();
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
LOGGER.error("Shutdown failure!", throwable);
|
||||||
|
throw throwable;
|
||||||
|
@@ -1248,9 +_,11 @@
|
||||||
this.mouseHandler.handleAccumulatedMovement();
|
this.mouseHandler.handleAccumulatedMovement();
|
||||||
profilerfiller.pop();
|
profilerfiller.pop();
|
||||||
if (!this.noRender) {
|
if (!this.noRender) {
|
||||||
@@ -157,8 +167,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
profilerfiller.push("blit");
|
profilerfiller.push("blit");
|
||||||
@@ -1339,10 +_,12 @@
|
@@ -1379,10 +_,12 @@
|
||||||
this.window.setGuiScale((double)i);
|
this.window.setGuiScale(i);
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
+ net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
@@ -170,7 +180,7 @@
|
|||||||
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mouseHandler.setIgnoreFirstMove();
|
this.mouseHandler.setIgnoreFirstMove();
|
||||||
}
|
}
|
||||||
@@ -1483,6 +_,7 @@
|
@@ -1520,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
@@ -178,14 +188,14 @@
|
|||||||
this.running = false;
|
this.running = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1511,10 +_,18 @@
|
@@ -1547,10 +_,18 @@
|
||||||
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
- if (!this.level.getBlockState(blockpos).isAir()) {
|
- if (!this.level.getBlockState(blockpos).isAir()) {
|
||||||
+ if (!this.level.isEmptyBlock(blockpos)) {
|
+ if (!this.level.isEmptyBlock(blockpos)) {
|
||||||
+ var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
||||||
+ if (inputEvent.isCanceled()) {
|
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
|
||||||
+ if (inputEvent.shouldSwingHand()) {
|
+ if (inputEvent.shouldSwingHand()) {
|
||||||
+ this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
|
+ this.particleEngine.addBlockHitEffects(blockpos, blockhitresult);
|
||||||
+ this.player.swing(InteractionHand.MAIN_HAND);
|
+ this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
@@ -200,16 +210,16 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1542,6 +_,8 @@
|
@@ -1578,6 +_,8 @@
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
+ var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
|
||||||
+ if (!inputEvent.isCanceled())
|
+ if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent))
|
||||||
switch (this.hitResult.getType()) {
|
switch (this.hitResult.getType()) {
|
||||||
case ENTITY:
|
case ENTITY:
|
||||||
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
||||||
@@ -1549,7 +_,7 @@
|
@@ -1585,7 +_,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
@@ -218,7 +228,7 @@
|
|||||||
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
||||||
if (this.level.getBlockState(blockpos).isAir()) {
|
if (this.level.getBlockState(blockpos).isAir()) {
|
||||||
flag = true;
|
flag = true;
|
||||||
@@ -1562,8 +_,10 @@
|
@@ -1598,8 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.player.resetAttackStrengthTicker();
|
this.player.resetAttackStrengthTicker();
|
||||||
@@ -229,12 +239,12 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
@@ -1579,6 +_,12 @@
|
@@ -1615,6 +_,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
for (InteractionHand interactionhand : InteractionHand.values()) {
|
for (InteractionHand interactionhand : InteractionHand.values()) {
|
||||||
+ var inputEvent = net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(1, this.options.keyUse, interactionhand);
|
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(1, this.options.keyUse, interactionhand);
|
||||||
+ if (inputEvent.isCanceled()) {
|
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
|
||||||
+ if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand);
|
+ if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand);
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
@@ -242,7 +252,7 @@
|
|||||||
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
||||||
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
||||||
return;
|
return;
|
||||||
@@ -1599,7 +_,7 @@
|
@@ -1635,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
|
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
|
||||||
@@ -251,16 +261,16 @@
|
|||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1611,7 +_,7 @@
|
@@ -1647,7 +_,7 @@
|
||||||
int i = itemstack.getCount();
|
int i = itemstack.getCount();
|
||||||
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
||||||
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
|
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
|
||||||
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
|
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
|
||||||
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
||||||
@@ -1627,6 +_,9 @@
|
@@ -1663,6 +_,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,7 +280,7 @@
|
|||||||
if (!itemstack.isEmpty()
|
if (!itemstack.isEmpty()
|
||||||
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
|
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
|
||||||
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
@@ -1656,6 +_,8 @@
|
@@ -1692,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
ProfilerFiller profilerfiller = Profiler.get();
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
@@ -279,7 +289,7 @@
|
|||||||
profilerfiller.push("gui");
|
profilerfiller.push("gui");
|
||||||
this.chatListener.tick();
|
this.chatListener.tick();
|
||||||
this.gui.tick(this.pause);
|
this.gui.tick(this.pause);
|
||||||
@@ -1745,6 +_,7 @@
|
@@ -1778,6 +_,7 @@
|
||||||
|
|
||||||
this.tutorial.tick();
|
this.tutorial.tick();
|
||||||
|
|
||||||
@@ -287,7 +297,7 @@
|
|||||||
try {
|
try {
|
||||||
this.level.tick(() -> true);
|
this.level.tick(() -> true);
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -1758,6 +_,7 @@
|
@@ -1791,6 +_,7 @@
|
||||||
|
|
||||||
throw new ReportedException(crashreport1);
|
throw new ReportedException(crashreport1);
|
||||||
}
|
}
|
||||||
@@ -295,7 +305,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
profilerfiller.popPush("animateTick");
|
profilerfiller.popPush("animateTick");
|
||||||
@@ -1782,6 +_,7 @@
|
@@ -1815,6 +_,7 @@
|
||||||
profilerfiller.popPush("keyboard");
|
profilerfiller.popPush("keyboard");
|
||||||
this.keyboardHandler.tick();
|
this.keyboardHandler.tick();
|
||||||
profilerfiller.pop();
|
profilerfiller.pop();
|
||||||
@@ -303,7 +313,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isLevelRunningNormally() {
|
private boolean isLevelRunningNormally() {
|
||||||
@@ -1983,6 +_,7 @@
|
@@ -2031,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
||||||
@@ -311,7 +321,7 @@
|
|||||||
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
||||||
this.level = p_91157_;
|
this.level = p_91157_;
|
||||||
this.updateLevelInEngines(p_91157_);
|
this.updateLevelInEngines(p_91157_);
|
||||||
@@ -2020,6 +_,7 @@
|
@@ -2068,6 +_,7 @@
|
||||||
IntegratedServer integratedserver = this.singleplayerServer;
|
IntegratedServer integratedserver = this.singleplayerServer;
|
||||||
this.singleplayerServer = null;
|
this.singleplayerServer = null;
|
||||||
this.gameRenderer.resetData();
|
this.gameRenderer.resetData();
|
||||||
@@ -319,7 +329,7 @@
|
|||||||
this.gameMode = null;
|
this.gameMode = null;
|
||||||
this.narrator.clear();
|
this.narrator.clear();
|
||||||
this.clientLevelTeardownInProgress = true;
|
this.clientLevelTeardownInProgress = true;
|
||||||
@@ -2027,6 +_,7 @@
|
@@ -2075,6 +_,7 @@
|
||||||
try {
|
try {
|
||||||
this.updateScreenAndTick(p_335030_);
|
this.updateScreenAndTick(p_335030_);
|
||||||
if (this.level != null) {
|
if (this.level != null) {
|
||||||
@@ -327,7 +337,7 @@
|
|||||||
if (integratedserver != null) {
|
if (integratedserver != null) {
|
||||||
ProfilerFiller profilerfiller = Profiler.get();
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
profilerfiller.push("waitForServer");
|
profilerfiller.push("waitForServer");
|
||||||
@@ -2040,6 +_,7 @@
|
@@ -2088,6 +_,7 @@
|
||||||
|
|
||||||
this.gui.onDisconnected();
|
this.gui.onDisconnected();
|
||||||
this.isLocalServer = false;
|
this.isLocalServer = false;
|
||||||
@@ -335,40 +345,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.level = null;
|
this.level = null;
|
||||||
@@ -2187,6 +_,7 @@
|
@@ -2236,6 +_,7 @@
|
||||||
|
|
||||||
private void pickBlock() {
|
private void pickBlock() {
|
||||||
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInputPickBlock(this.options.keyPickItem)) return;
|
||||||
boolean flag = this.player.getAbilities().instabuild;
|
boolean flag = Screen.hasControlDown();
|
||||||
BlockEntity blockentity = null;
|
switch (this.hitResult) {
|
||||||
HitResult.Type hitresult$type = this.hitResult.getType();
|
case BlockHitResult blockhitresult:
|
||||||
@@ -2199,7 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Block block = blockstate.getBlock();
|
|
||||||
- itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
|
|
||||||
+ itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
|
|
||||||
if (itemstack.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -2213,7 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Entity entity = ((EntityHitResult)this.hitResult).getEntity();
|
|
||||||
- itemstack = entity.getPickResult();
|
|
||||||
+ itemstack = entity.getPickedResult(this.hitResult);
|
|
||||||
if (itemstack == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -2818,6 +_,10 @@
|
|
||||||
@Nullable
|
|
||||||
public static String getLauncherBrand() {
|
|
||||||
return System.getProperty("minecraft.launcher.brand");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public ItemColors getItemColors() {
|
|
||||||
+ return this.itemColors;
|
|
||||||
}
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/MouseHandler.java
|
--- a/net/minecraft/client/MouseHandler.java
|
||||||
+++ b/net/minecraft/client/MouseHandler.java
|
+++ b/net/minecraft/client/MouseHandler.java
|
||||||
@@ -85,6 +_,7 @@
|
@@ -90,6 +_,7 @@
|
||||||
this.activeButton = -1;
|
this.activeButton = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
if (this.minecraft.getOverlay() == null) {
|
if (this.minecraft.getOverlay() == null) {
|
||||||
if (this.minecraft.screen == null) {
|
if (this.minecraft.screen == null) {
|
||||||
if (!this.mouseGrabbed && flag) {
|
if (!this.mouseGrabbed && flag) {
|
||||||
@@ -98,7 +_,7 @@
|
@@ -103,7 +_,7 @@
|
||||||
screen.afterMouseAction();
|
screen.afterMouseAction();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -112,7 +_,7 @@
|
@@ -116,7 +_,7 @@
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@@ -26,18 +26,18 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
@@ -147,6 +_,7 @@
|
@@ -150,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onScroll(long p_91527_, double p_91528_, double p_91529_) {
|
public void fillMousePositionDetails(CrashReportCategory p_398230_, Window p_398216_) {
|
||||||
@@ -160,7 +_,9 @@
|
@@ -189,7 +_,9 @@
|
||||||
if (this.minecraft.screen != null) {
|
if (this.minecraft.screen != null) {
|
||||||
double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
|
double d3 = this.getScaledXPos(this.minecraft.getWindow());
|
||||||
double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d4 = this.getScaledYPos(this.minecraft.getWindow());
|
||||||
- this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
|
- this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
|
||||||
+ if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
|
+ if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
this.minecraft.screen.afterMouseAction();
|
this.minecraft.screen.afterMouseAction();
|
||||||
} else if (this.minecraft.player != null) {
|
} else if (this.minecraft.player != null) {
|
||||||
Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
|
Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
|
||||||
@@ -169,6 +_,7 @@
|
@@ -198,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
|
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
|
||||||
@@ -53,8 +53,8 @@
|
|||||||
if (this.minecraft.player.isSpectator()) {
|
if (this.minecraft.player.isSpectator()) {
|
||||||
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
||||||
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
|
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
|
||||||
@@ -274,7 +_,7 @@
|
@@ -303,7 +_,7 @@
|
||||||
double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d5 = getScaledYPos(window, this.accumulatedDY);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
- screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
|
- screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
|
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
|
||||||
screen.fillCrashDetails(crashreport1);
|
screen.fillCrashDetails(crashreport1);
|
||||||
@@ -349,6 +_,14 @@
|
@@ -393,6 +_,14 @@
|
||||||
|
|
||||||
public double ypos() {
|
public double ypos() {
|
||||||
return this.ypos;
|
return this.ypos;
|
||||||
|
|||||||
@@ -1,16 +1,24 @@
|
|||||||
--- a/net/minecraft/client/Options.java
|
--- a/net/minecraft/client/Options.java
|
||||||
+++ b/net/minecraft/client/Options.java
|
+++ b/net/minecraft/client/Options.java
|
||||||
@@ -698,7 +_,8 @@
|
@@ -671,7 +_,8 @@
|
||||||
},
|
},
|
||||||
new OptionInstance.LazyEnum<>(
|
new OptionInstance.LazyEnum<>(
|
||||||
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
||||||
- p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
- p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
||||||
+ // FORGE: fix incorrect string comparison - PR #8767
|
+ // FORGE: fix incorrect string comparison - PR #8767
|
||||||
+ p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
+ p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
||||||
? Optional.empty()
|
? Optional.empty()
|
||||||
: Optional.of(p_232011_),
|
: Optional.of(p_232011_),
|
||||||
Codec.STRING
|
Codec.STRING
|
||||||
@@ -1079,6 +_,7 @@
|
@@ -705,6 +_,7 @@
|
||||||
|
);
|
||||||
|
public boolean syncWrites;
|
||||||
|
public boolean startedCleanly = true;
|
||||||
|
+ private final Map<String, String> unknownKeys = new java.util.HashMap<>();
|
||||||
|
|
||||||
|
public OptionInstance<Boolean> darkMojangStudiosBackground() {
|
||||||
|
return this.darkMojangStudiosBackground;
|
||||||
|
@@ -1088,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Options(Minecraft p_92138_, File p_92139_) {
|
public Options(Minecraft p_92138_, File p_92139_) {
|
||||||
@@ -18,15 +26,16 @@
|
|||||||
this.minecraft = p_92138_;
|
this.minecraft = p_92138_;
|
||||||
this.optionsFile = new File(p_92139_, "options.txt");
|
this.optionsFile = new File(p_92139_, "options.txt");
|
||||||
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
||||||
@@ -1210,12 +_,22 @@
|
@@ -1222,15 +_,28 @@
|
||||||
p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
|
this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly);
|
||||||
this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
|
p_168428_.process("showNowPlayingToast", this.showNowPlayingToast);
|
||||||
p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
|
p_168428_.process("musicFrequency", this.musicFrequency);
|
||||||
+ processOptionsForge(p_168428_);
|
+ processOptionsKeysOnly(p_168428_);
|
||||||
|
+ processOptionsEnd(p_168428_);
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
+ // FORGE: split off to allow reloading options after mod loading is done
|
+ // FORGE: split off to allow reloading keys after mod loading is done
|
||||||
+ private void processOptionsForge(Options.FieldAccess p_168428_) {
|
+ private void processOptionsKeysOnly(Options.FieldAccess p_168428_) {
|
||||||
for (KeyMapping keymapping : this.keyMappings) {
|
for (KeyMapping keymapping : this.keyMappings) {
|
||||||
- String s = keymapping.saveString();
|
- String s = keymapping.saveString();
|
||||||
+ String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
|
+ String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
|
||||||
@@ -41,8 +50,13 @@
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
+ }
|
||||||
|
|
||||||
@@ -1233,6 +_,10 @@
|
+ private void processOptionsEnd(Options.FieldAccess p_168428_) {
|
||||||
|
for (SoundSource soundsource : SoundSource.values()) {
|
||||||
|
p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource));
|
||||||
|
}
|
||||||
|
@@ -1245,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void load() {
|
public void load() {
|
||||||
@@ -53,17 +67,60 @@
|
|||||||
try {
|
try {
|
||||||
if (!this.optionsFile.exists()) {
|
if (!this.optionsFile.exists()) {
|
||||||
return;
|
return;
|
||||||
@@ -1260,7 +_,8 @@
|
@@ -1269,7 +_,8 @@
|
||||||
}
|
this.graphicsMode.set(isTrue(optional.get()) ? GraphicsStatus.FANCY : GraphicsStatus.FAST);
|
||||||
}
|
}
|
||||||
|
|
||||||
- this.processOptions(
|
- this.processOptions(
|
||||||
+ java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
|
+ java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions;
|
||||||
+ processor.accept(
|
+ processor.accept(
|
||||||
new Options.FieldAccess() {
|
new Options.FieldAccess() {
|
||||||
@Nullable
|
@Nullable
|
||||||
private String getValueOrNull(String p_168459_) {
|
private String getValue(String p_394210_) {
|
||||||
@@ -1451,6 +_,7 @@
|
@@ -1350,6 +_,17 @@
|
||||||
|
);
|
||||||
|
compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_);
|
||||||
|
KeyMapping.resetMapping();
|
||||||
|
+
|
||||||
|
+ if (limited) {
|
||||||
|
+ this.unknownKeys.clear();
|
||||||
|
+ } else {
|
||||||
|
+ var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet());
|
||||||
|
+ for (var entry : compoundtag1.entrySet()) {
|
||||||
|
+ if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey()))
|
||||||
|
+ this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
} catch (Exception exception) {
|
||||||
|
LOGGER.error("Failed to load options", (Throwable)exception);
|
||||||
|
}
|
||||||
|
@@ -1377,9 +_,11 @@
|
||||||
|
public void save() {
|
||||||
|
try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
|
||||||
|
printwriter.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
|
||||||
|
+ var seen = new java.util.HashSet<String>();
|
||||||
|
this.processOptions(
|
||||||
|
new Options.FieldAccess() {
|
||||||
|
public void writePrefix(String p_168491_) {
|
||||||
|
+ seen.add(p_168491_);
|
||||||
|
printwriter.print(p_168491_);
|
||||||
|
printwriter.print(':');
|
||||||
|
}
|
||||||
|
@@ -1435,6 +_,12 @@
|
||||||
|
if (s != null) {
|
||||||
|
printwriter.println("fullscreenResolution:" + s);
|
||||||
|
}
|
||||||
|
+ // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config.
|
||||||
|
+ for (var entry : this.unknownKeys.entrySet()) {
|
||||||
|
+ if (!seen.contains(entry.getKey()))
|
||||||
|
+ printwriter.println(entry.getKey() + ":" + entry.getValue());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
} catch (Exception exception) {
|
||||||
|
LOGGER.error("Failed to save options", (Throwable)exception);
|
||||||
|
}
|
||||||
|
@@ -1473,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastOptions() {
|
public void broadcastOptions() {
|
||||||
@@ -71,7 +128,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());
|
||||||
}
|
}
|
||||||
@@ -1564,6 +_,23 @@
|
@@ -1586,6 +_,23 @@
|
||||||
|
|
||||||
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
||||||
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
||||||
|
|||||||
@@ -1,30 +1,32 @@
|
|||||||
--- a/net/minecraft/client/Screenshot.java
|
--- a/net/minecraft/client/Screenshot.java
|
||||||
+++ b/net/minecraft/client/Screenshot.java
|
+++ b/net/minecraft/client/Screenshot.java
|
||||||
@@ -54,14 +_,24 @@
|
@@ -43,6 +_,13 @@
|
||||||
file2 = new File(file1, p_92307_);
|
file2 = new File(file1, p_92297_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(nativeimage, file2);
|
+ var event = new net.minecraftforge.client.event.ScreenshotEvent(p_389141_, file2);
|
||||||
+ if (event.isCanceled()) {
|
+ if (net.minecraftforge.client.event.ScreenshotEvent.BUS.post(event)) {
|
||||||
+ p_92311_.accept(event.getCancelMessage());
|
+ p_92301_.accept(event.getCancelMessage());
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+ final File target = event.getScreenshotFile();
|
+ final File target = event.getScreenshotFile();
|
||||||
+
|
+
|
||||||
Util.ioPool()
|
Util.ioPool()
|
||||||
.execute(
|
.execute(
|
||||||
() -> {
|
() -> {
|
||||||
try {
|
@@ -50,10 +_,13 @@
|
||||||
- nativeimage.writeToFile(file2);
|
NativeImage $$4x = p_389141_;
|
||||||
- Component component = Component.literal(file2.getName())
|
|
||||||
+ nativeimage.writeToFile(target);
|
try {
|
||||||
+ Component component = Component.literal(target.getName())
|
- p_389141_.writeToFile(file2);
|
||||||
.withStyle(ChatFormatting.UNDERLINE)
|
- Component component = Component.literal(file2.getName())
|
||||||
- .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file2.getAbsolutePath())));
|
+ p_389141_.writeToFile(target);
|
||||||
+ .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, target.getAbsolutePath())));
|
+ Component component = Component.literal(target.getName())
|
||||||
+ if (event.getResultMessage() != null)
|
.withStyle(ChatFormatting.UNDERLINE)
|
||||||
+ p_92311_.accept(event.getResultMessage());
|
.withStyle(p_389149_ -> p_389149_.withClickEvent(new ClickEvent.OpenFile(file2.getAbsoluteFile())));
|
||||||
+ else
|
+ if (event.getResultMessage() != null)
|
||||||
p_92311_.accept(Component.translatable("screenshot.success", component));
|
+ p_92301_.accept(event.getResultMessage());
|
||||||
} catch (Exception exception) {
|
+ else
|
||||||
LOGGER.warn("Couldn't save screenshot", (Throwable)exception);
|
p_92301_.accept(Component.translatable("screenshot.success", component));
|
||||||
|
} catch (Throwable throwable1) {
|
||||||
|
if (p_389141_ != null) {
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
--- a/net/minecraft/client/color/block/BlockColors.java
|
--- a/net/minecraft/client/color/block/BlockColors.java
|
||||||
+++ b/net/minecraft/client/color/block/BlockColors.java
|
+++ b/net/minecraft/client/color/block/BlockColors.java
|
||||||
@@ -29,7 +_,8 @@
|
@@ -30,7 +_,8 @@
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public class BlockColors {
|
|
||||||
private static final int DEFAULT = -1;
|
private static final int DEFAULT = -1;
|
||||||
|
public static final int LILY_PAD_IN_WORLD = -14647248;
|
||||||
|
public static final int LILY_PAD_DEFAULT = -9321636;
|
||||||
- private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
|
- private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
|
||||||
+ // Forge: Use registry delegate as non-Vanilla block ids are not constant
|
+ // Forge: Use registry delegate as non-Vanilla block ids are not constant
|
||||||
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
|
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
|
||||||
private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
|
private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
|
||||||
|
|
||||||
public static BlockColors createDefault() {
|
public static BlockColors createDefault() {
|
||||||
@@ -91,11 +_,12 @@
|
@@ -95,11 +_,12 @@
|
||||||
}, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
}, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
||||||
blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
||||||
blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
|
blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
if (blockcolor != null) {
|
if (blockcolor != null) {
|
||||||
return blockcolor.getColor(p_92583_, null, null, 0);
|
return blockcolor.getColor(p_92583_, null, null, 0);
|
||||||
} else {
|
} else {
|
||||||
@@ -105,13 +_,15 @@
|
@@ -109,13 +_,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
|
public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
--- a/net/minecraft/client/color/item/ItemColors.java
|
|
||||||
+++ b/net/minecraft/client/color/item/ItemColors.java
|
|
||||||
@@ -26,7 +_,8 @@
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public class ItemColors {
|
|
||||||
private static final int DEFAULT = -1;
|
|
||||||
- private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
|
|
||||||
+ // Forge: Use registry delegate as non-Vanilla item ids are not constant
|
|
||||||
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
|
|
||||||
|
|
||||||
public static ItemColors createDefault(BlockColors p_92684_) {
|
|
||||||
ItemColors itemcolors = new ItemColors();
|
|
||||||
@@ -101,17 +_,20 @@
|
|
||||||
(p_357654_, p_357655_) -> p_357655_ == 0 ? -1 : ARGB.opaque(p_357654_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
|
|
||||||
Items.FILLED_MAP
|
|
||||||
);
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
|
|
||||||
return itemcolors;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getColor(ItemStack p_92677_, int p_92678_) {
|
|
||||||
- ItemColor itemcolor = this.itemColors.byId(BuiltInRegistries.ITEM.getId(p_92677_.getItem()));
|
|
||||||
+ ItemColor itemcolor = this.itemColors.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.getItem()));
|
|
||||||
return itemcolor == null ? -1 : itemcolor.getColor(p_92677_, p_92678_);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Item} */
|
|
||||||
+ @Deprecated
|
|
||||||
public void register(ItemColor p_92690_, ItemLike... p_92691_) {
|
|
||||||
for (ItemLike itemlike : p_92691_) {
|
|
||||||
- this.itemColors.addMapping(p_92690_, Item.getId(itemlike.asItem()));
|
|
||||||
+ this.itemColors.put(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(itemlike.asItem()), p_92690_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
--- a/net/minecraft/client/data/Main.java
|
||||||
|
+++ b/net/minecraft/client/data/Main.java
|
||||||
|
@@ -31,13 +_,18 @@
|
||||||
|
OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
|
||||||
|
OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
|
||||||
|
OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
|
||||||
|
+ OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
|
||||||
|
+ var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
|
||||||
|
OptionSet optionset = optionparser.parse(p_375526_);
|
||||||
|
- if (!optionset.has(optionspec) && optionset.hasOptions()) {
|
||||||
|
+ if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
|
||||||
|
+ var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
|
||||||
|
Path path = Paths.get(optionspec3.value(optionset));
|
||||||
|
boolean flag = optionset.has(optionspec2);
|
||||||
|
boolean flag1 = flag || optionset.has(optionspec1);
|
||||||
|
Bootstrap.bootStrap();
|
||||||
|
ClientBootstrap.bootstrap();
|
||||||
|
+ if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true))
|
||||||
|
+ return;
|
||||||
|
DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
|
||||||
|
addClientProviders(datagenerator, flag1);
|
||||||
|
datagenerator.run();
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
|
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
|
@@ -870,6 +_,9 @@
|
||||||
|
this.declareCustomModelItem(Items.COD);
|
||||||
|
this.declareCustomModelItem(Items.FEATHER);
|
||||||
|
this.declareCustomModelItem(Items.LEAD);
|
||||||
|
+ // moved from validate to here, because it's just vanilla default blocks
|
||||||
|
+ if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
|
||||||
|
+ collector.generateDefaultBlockModels();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
--- a/net/minecraft/client/data/models/ModelProvider.java
|
||||||
|
+++ b/net/minecraft/client/data/models/ModelProvider.java
|
||||||
|
@@ -45,11 +_,11 @@
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<?> run(CachedOutput p_376268_) {
|
||||||
|
- ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector();
|
||||||
|
- ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector();
|
||||||
|
+ ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems);
|
||||||
|
+ ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
|
||||||
|
ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector();
|
||||||
|
- new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
- new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
+ getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
+ getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
modelprovider$blockstategeneratorcollector.validate();
|
||||||
|
modelprovider$iteminfocollector.finalizeAndValidate();
|
||||||
|
return CompletableFuture.allOf(
|
||||||
|
@@ -59,6 +_,22 @@
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ protected Stream<Block> getKnownBlocks() {
|
||||||
|
+ return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected Stream<Item> getKnownItems() {
|
||||||
|
+ return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
|
||||||
|
+ return new BlockModelGenerators(blocks, items, models);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
|
||||||
|
+ return new ItemModelGenerators(items, models);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public final String getName() {
|
||||||
|
return "Model Definitions";
|
||||||
|
@@ -67,6 +_,15 @@
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
|
||||||
|
private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
|
||||||
|
+ private final Supplier<Stream<Block>> known;
|
||||||
|
+
|
||||||
|
+ public BlockStateGeneratorCollector() {
|
||||||
|
+ this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace())));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) {
|
||||||
|
+ this.known = known;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
public void accept(BlockModelDefinitionGenerator p_393399_) {
|
||||||
|
Block block = p_393399_.block();
|
||||||
|
@@ -77,7 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void validate() {
|
||||||
|
- Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true);
|
||||||
|
+ Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder);
|
||||||
|
List<ResourceLocation> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value()))
|
||||||
|
.map(p_378200_ -> p_378200_.key().location())
|
||||||
|
.toList();
|
||||||
|
@@ -97,6 +_,15 @@
|
||||||
|
public static class ItemInfoCollector implements ItemModelOutput {
|
||||||
|
private final Map<Item, ClientItem> itemInfos = new HashMap<>();
|
||||||
|
private final Map<Item, Item> copies = new HashMap<>();
|
||||||
|
+ private final Supplier<Stream<Item>> known;
|
||||||
|
+
|
||||||
|
+ public ItemInfoCollector() {
|
||||||
|
+ this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace())));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public ItemInfoCollector(Supplier<Stream<Item>> known) {
|
||||||
|
+ this.known = known;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void accept(Item p_376450_, ItemModel.Unbaked p_378513_) {
|
||||||
|
@@ -115,7 +_,7 @@
|
||||||
|
this.copies.put(p_376965_, p_377438_);
|
||||||
|
}
|
||||||
|
|
||||||
|
- public void finalizeAndValidate() {
|
||||||
|
+ public void generateDefaultBlockModels() {
|
||||||
|
BuiltInRegistries.ITEM.forEach(p_378629_ -> {
|
||||||
|
if (!this.copies.containsKey(p_378629_)) {
|
||||||
|
if (p_378629_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) {
|
||||||
|
@@ -124,6 +_,8 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
+ }
|
||||||
|
+ public void finalizeAndValidate() {
|
||||||
|
this.copies.forEach((p_376289_, p_375718_) -> {
|
||||||
|
ClientItem clientitem = this.itemInfos.get(p_375718_);
|
||||||
|
if (clientitem == null) {
|
||||||
|
@@ -132,8 +_,8 @@
|
||||||
|
this.register(p_376289_, clientitem);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
- List<ResourceLocation> list = BuiltInRegistries.ITEM
|
||||||
|
- .listElements()
|
||||||
|
+ List<ResourceLocation> list = known.get()
|
||||||
|
+ .map(item -> item.builtInRegistryHolder())
|
||||||
|
.filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value()))
|
||||||
|
.map(p_378591_ -> p_378591_.key().location())
|
||||||
|
.toList();
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
--- a/net/minecraft/client/gui/Font.java
|
--- a/net/minecraft/client/gui/Font.java
|
||||||
+++ b/net/minecraft/client/gui/Font.java
|
+++ b/net/minecraft/client/gui/Font.java
|
||||||
@@ -33,7 +_,7 @@
|
@@ -32,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class Font {
|
-public class Font {
|
||||||
+public class Font implements net.minecraftforge.client.extensions.IForgeFont {
|
+public class Font implements net.minecraftforge.client.extensions.IForgeFont {
|
||||||
private static final float EFFECT_DEPTH = 0.01F;
|
private static final float EFFECT_DEPTH = 0.001F;
|
||||||
private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
|
private static final float OVER_EFFECT_DEPTH = 0.001F;
|
||||||
public static final int ALPHA_CUTOFF = 8;
|
private static final float UNDER_EFFECT_DEPTH = -0.001F;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- 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
|
||||||
@@ -147,7 +_,7 @@
|
@@ -151,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,16 +9,16 @@
|
|||||||
private final SubtitleOverlay subtitleOverlay;
|
private final SubtitleOverlay subtitleOverlay;
|
||||||
private final SpectatorGui spectatorGui;
|
private final SpectatorGui spectatorGui;
|
||||||
private final PlayerTabOverlay tabList;
|
private final PlayerTabOverlay tabList;
|
||||||
@@ -345,7 +_,7 @@
|
@@ -377,7 +_,7 @@
|
||||||
Window window = this.minecraft.getWindow();
|
int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
|
||||||
int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
|
int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
|
||||||
int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
|
p_329202_.nextStratum();
|
||||||
- this.chat.render(p_329202_, this.tickCount, i, j, false);
|
- this.chat.render(p_329202_, this.tickCount, i, j, false);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
|
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,6 +_,8 @@
|
@@ -472,6 +_,8 @@
|
||||||
|
|
||||||
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
||||||
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
||||||
@@ -27,15 +27,15 @@
|
|||||||
if (mobeffectinstance.showIcon()) {
|
if (mobeffectinstance.showIcon()) {
|
||||||
int k = p_282812_.guiWidth();
|
int k = p_282812_.guiWidth();
|
||||||
int l = 1;
|
int l = 1;
|
||||||
@@ -473,6 +_,7 @@
|
@@ -502,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue;
|
+ if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue;
|
||||||
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
p_282812_.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(holder), k + 3, l + 3, 18, 18, ARGB.white(f));
|
||||||
int l1 = k;
|
}
|
||||||
int k1 = l;
|
}
|
||||||
@@ -623,6 +_,10 @@
|
@@ -598,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
Profiler.get().push("selectedItemName");
|
Profiler.get().push("selectedItemName");
|
||||||
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
||||||
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
||||||
@@ -630,9 +_,13 @@
|
@@ -605,9 +_,13 @@
|
||||||
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
||||||
k += 14;
|
k += 14;
|
||||||
}
|
}
|
||||||
@@ -643,7 +_,7 @@
|
@@ -618,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (l > 0) {
|
if (l > 0) {
|
||||||
@@ -71,8 +71,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1152,7 +_,7 @@
|
@@ -1148,7 +_,7 @@
|
||||||
ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
|
ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
|
||||||
if (itemstack.isEmpty()) {
|
if (itemstack.isEmpty()) {
|
||||||
this.toolHighlightTimer = 0;
|
this.toolHighlightTimer = 0;
|
||||||
- } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
|
- } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
|
||||||
|
|||||||
@@ -1,160 +1,129 @@
|
|||||||
--- a/net/minecraft/client/gui/GuiGraphics.java
|
--- a/net/minecraft/client/gui/GuiGraphics.java
|
||||||
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
||||||
@@ -53,7 +_,7 @@
|
@@ -72,7 +_,7 @@
|
||||||
import org.joml.Vector2ic;
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class GuiGraphics {
|
-public class GuiGraphics {
|
||||||
+public class GuiGraphics implements net.minecraftforge.client.extensions.IForgeGuiGraphics {
|
+public class GuiGraphics implements net.minecraftforge.client.extensions.IForgeGuiGraphics {
|
||||||
public static final float MAX_GUI_Z = 10000.0F;
|
|
||||||
public static final float MIN_GUI_Z = -10000.0F;
|
|
||||||
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
||||||
@@ -227,6 +_,11 @@
|
private final Minecraft minecraft;
|
||||||
}
|
private final Matrix3x2fStack pose;
|
||||||
|
@@ -870,6 +_,7 @@
|
||||||
public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
|
|
||||||
+ return this.drawString(p_283343_, p_281896_, (float)p_283569_, (float)p_283418_, p_281560_, p_282130_);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Forge: Add float variant for x,y coordinates
|
|
||||||
+ public int drawString(Font p_283343_, @Nullable String p_281896_, float p_283569_, float p_283418_, int p_281560_, boolean p_282130_) {
|
|
||||||
return p_281896_ == null
|
|
||||||
? 0
|
|
||||||
: p_283343_.drawInBatch(
|
|
||||||
@@ -248,6 +_,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
|
|
||||||
+ return this.drawString(p_282636_, p_281596_, (float)p_281586_, (float)p_282816_, p_281743_, p_282394_);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Forge: Add float variant for x,y coordinates
|
|
||||||
+ public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
|
|
||||||
return p_282636_.drawInBatch(
|
|
||||||
p_281596_,
|
|
||||||
(float)p_281586_,
|
|
||||||
@@ -872,6 +_,7 @@
|
|
||||||
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
||||||
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
||||||
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
|
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_283653_.getItem()));
|
||||||
+ crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(p_281675_.getItem())));
|
+ crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(p_283653_.getItem())));
|
||||||
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
|
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_283653_.getComponents()));
|
||||||
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
|
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_283653_.hasFoil()));
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport);
|
||||||
@@ -892,13 +_,24 @@
|
@@ -888,6 +_,7 @@
|
||||||
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
|
|
||||||
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
|
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
|
||||||
this.pose.popPose();
|
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
|
||||||
|
this.pose.popMatrix();
|
||||||
+ net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
|
+ net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
|
||||||
+ private ItemStack tooltipStack = ItemStack.EMPTY;
|
|
||||||
|
|
||||||
public void renderTooltip(Font p_282308_, ItemStack p_282781_, int p_282687_, int p_282292_) {
|
@@ -899,21 +_,30 @@
|
||||||
+ this.tooltipStack = p_282781_;
|
this.setTooltipForNextFrame(this.minecraft.font, p_407686_, DefaultTooltipPositioner.INSTANCE, p_410475_, p_407139_, false);
|
||||||
this.renderTooltip(
|
}
|
||||||
p_282308_, Screen.getTooltipFromItem(this.minecraft, p_282781_), p_282781_.getTooltipImage(), p_282687_, p_282292_, p_282781_.get(DataComponents.TOOLTIP_STYLE)
|
|
||||||
|
+ private ItemStack tooltipStack = ItemStack.EMPTY;
|
||||||
|
+
|
||||||
|
public void setTooltipForNextFrame(Font p_408152_, ItemStack p_410145_, int p_410585_, int p_408354_) {
|
||||||
|
+ this.tooltipStack = p_410145_;
|
||||||
|
this.setTooltipForNextFrame(
|
||||||
|
p_408152_, Screen.getTooltipFromItem(this.minecraft, p_410145_), p_410145_.getTooltipImage(), p_410585_, p_408354_, p_410145_.get(DataComponents.TOOLTIP_STYLE)
|
||||||
);
|
);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTooltipForNextFrame(Font p_407170_, List<Component> p_407123_, Optional<TooltipComponent> p_409349_, int p_406573_, int p_409911_) {
|
||||||
|
this.setTooltipForNextFrame(p_407170_, p_407123_, p_409349_, p_406573_, p_409911_, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public void setTooltipForNextFrame(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
|
||||||
|
+ this.tooltipStack = stack;
|
||||||
|
+ this.setTooltipForNextFrame(font, textComponents, tooltipComponent, mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE));
|
||||||
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderTooltip(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
|
public void setTooltipForNextFrame(
|
||||||
+ this.tooltipStack = stack;
|
Font p_407847_, List<Component> p_408847_, Optional<TooltipComponent> p_410489_, int p_409369_, int p_407472_, @Nullable ResourceLocation p_410303_
|
||||||
+ this.renderTooltip(font, textComponents, tooltipComponent, mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE));
|
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
|
|
||||||
@@ -908,8 +_,7 @@
|
|
||||||
public void renderTooltip(
|
|
||||||
Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
|
|
||||||
) {
|
) {
|
||||||
- List<ClientTooltipComponent> list = p_368544_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
|
- List<ClientTooltipComponent> list = p_408847_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
|
||||||
- p_362815_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
|
- p_410489_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
|
||||||
+ List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_368544_, p_362815_, p_366300_, guiWidth(), guiHeight(), p_362491_);
|
+ List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_408847_, p_410489_, p_409369_, guiWidth(), guiHeight(), p_407847_);
|
||||||
this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
|
this.setTooltipForNextFrameInternal(p_407847_, list, p_409369_, p_407472_, DefaultTooltipPositioner.INSTANCE, p_410303_, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -922,7 +_,22 @@
|
@@ -926,7 +_,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
|
public void setComponentTooltipForNextFrame(Font p_406239_, List<Component> p_410275_, int p_410594_, int p_409343_) {
|
||||||
- this.renderComponentTooltip(p_282739_, p_281832_, p_282191_, p_282446_, null);
|
- this.setComponentTooltipForNextFrame(p_406239_, p_410275_, p_410594_, p_409343_, null);
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_281832_, p_282191_, guiWidth(), guiHeight(), p_282739_);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_410275_, p_410594_, guiWidth(), guiHeight(), p_406239_);
|
||||||
+ this.renderTooltipInternal(p_282739_, components, p_282191_, p_282446_, DefaultTooltipPositioner.INSTANCE, null);
|
+ this.setTooltipForNextFrameInternal(p_406239_, components, p_410594_, p_409343_, DefaultTooltipPositioner.INSTANCE, null, false);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
|
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.tooltipStack = stack;
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
|
||||||
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
|
+ this.setTooltipForNextFrameInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null, false);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
|
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.tooltipStack = stack;
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
|
||||||
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
|
+ this.setTooltipForNextFrameInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null, false);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
|
public void setComponentTooltipForNextFrame(Font p_408650_, List<Component> p_407512_, int p_406019_, int p_408123_, @Nullable ResourceLocation p_409993_) {
|
||||||
@@ -964,11 +_,13 @@
|
@@ -989,11 +_,13 @@
|
||||||
@Nullable ResourceLocation p_368234_
|
ClientTooltipPositioner p_409451_,
|
||||||
|
@Nullable ResourceLocation p_409298_
|
||||||
) {
|
) {
|
||||||
if (!p_282615_.isEmpty()) {
|
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283678_, p_281696_, guiWidth(), guiHeight(), p_282716_, p_283128_, p_409451_);
|
||||||
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283230_, p_283417_, guiWidth(), guiHeight(), p_282615_, p_282675_, p_282442_);
|
+ if (preEvent == null) return;
|
||||||
+ if (preEvent.isCanceled()) return;
|
int i = 0;
|
||||||
int i = 0;
|
int j = p_282716_.size() == 1 ? -2 : 0;
|
||||||
int j = p_282615_.size() == 1 ? -2 : 0;
|
|
||||||
|
|
||||||
for (ClientTooltipComponent clienttooltipcomponent : p_282615_) {
|
for (ClientTooltipComponent clienttooltipcomponent : p_282716_) {
|
||||||
- int k = clienttooltipcomponent.getWidth(p_282675_);
|
- int k = clienttooltipcomponent.getWidth(p_283128_);
|
||||||
+ int k = clienttooltipcomponent.getWidth(preEvent.getFont());
|
+ int k = clienttooltipcomponent.getWidth(preEvent.getFont());
|
||||||
if (k > i) {
|
if (k > i) {
|
||||||
i = k;
|
i = k;
|
||||||
}
|
|
||||||
@@ -978,18 +_,19 @@
|
|
||||||
|
|
||||||
int i2 = i;
|
|
||||||
int j2 = j;
|
|
||||||
- Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283230_, p_283417_, i, j);
|
|
||||||
+ Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i2, j2);
|
|
||||||
int l = vector2ic.x();
|
|
||||||
int i1 = vector2ic.y();
|
|
||||||
this.pose.pushPose();
|
|
||||||
int j1 = 400;
|
|
||||||
- TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, p_368234_);
|
|
||||||
+ var background_event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282615_, p_368234_);
|
|
||||||
+ TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, background_event.getBackground());
|
|
||||||
this.pose.translate(0.0F, 0.0F, 400.0F);
|
|
||||||
int k1 = i1;
|
|
||||||
|
|
||||||
for (int l1 = 0; l1 < p_282615_.size(); l1++) {
|
|
||||||
ClientTooltipComponent clienttooltipcomponent1 = p_282615_.get(l1);
|
|
||||||
- clienttooltipcomponent1.renderText(p_282675_, l, k1, this.pose.last().pose(), this.bufferSource);
|
|
||||||
+ clienttooltipcomponent1.renderText(preEvent.getFont(), l, k1, this.pose.last().pose(), this.bufferSource);
|
|
||||||
k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
|
|
||||||
}
|
}
|
||||||
|
@@ -1003,16 +_,17 @@
|
||||||
|
|
||||||
@@ -997,7 +_,7 @@
|
int l1 = i;
|
||||||
|
int i2 = j;
|
||||||
|
- Vector2ic vector2ic = p_409451_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283678_, p_281696_, i, j);
|
||||||
|
+ Vector2ic vector2ic = p_409451_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i, j);
|
||||||
|
int l = vector2ic.x();
|
||||||
|
int i1 = vector2ic.y();
|
||||||
|
this.pose.pushMatrix();
|
||||||
|
- TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, p_409298_);
|
||||||
|
+ var background_event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282716_, p_409298_);
|
||||||
|
+ TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, background_event.getBackground());
|
||||||
|
int j1 = i1;
|
||||||
|
|
||||||
for (int k2 = 0; k2 < p_282615_.size(); k2++) {
|
for (int k1 = 0; k1 < p_282716_.size(); k1++) {
|
||||||
ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
|
ClientTooltipComponent clienttooltipcomponent1 = p_282716_.get(k1);
|
||||||
- clienttooltipcomponent2.renderImage(p_282675_, l, k1, i2, j2, this);
|
- clienttooltipcomponent1.renderText(this, p_283128_, l, j1);
|
||||||
+ clienttooltipcomponent2.renderImage(preEvent.getFont(), l, k1, i2, j2, this);
|
+ clienttooltipcomponent1.renderText(this, preEvent.getFont(), l, j1);
|
||||||
k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
|
j1 += clienttooltipcomponent1.getHeight(p_283128_) + (k1 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1054,6 +_,10 @@
|
@@ -1020,7 +_,7 @@
|
||||||
}
|
|
||||||
}
|
for (int j2 = 0; j2 < p_282716_.size(); j2++) {
|
||||||
|
ClientTooltipComponent clienttooltipcomponent2 = p_282716_.get(j2);
|
||||||
|
- clienttooltipcomponent2.renderImage(p_283128_, l, j1, l1, i2, this);
|
||||||
|
+ clienttooltipcomponent2.renderImage(preEvent.getFont(), l, j1, l1, i2, this);
|
||||||
|
j1 += clienttooltipcomponent2.getHeight(p_283128_) + (j2 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public MultiBufferSource.BufferSource getBufferSource() {
|
|
||||||
+ return this.bufferSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void drawSpecial(Consumer<MultiBufferSource> p_367429_) {
|
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
--- a/net/minecraft/client/gui/components/AbstractButton.java
|
--- a/net/minecraft/client/gui/components/AbstractButton.java
|
||||||
+++ b/net/minecraft/client/gui/components/AbstractButton.java
|
+++ b/net/minecraft/client/gui/components/AbstractButton.java
|
||||||
@@ -39,7 +_,7 @@
|
@@ -38,7 +_,7 @@
|
||||||
this.getHeight(),
|
this.getHeight(),
|
||||||
ARGB.white(this.alpha)
|
ARGB.white(this.alpha)
|
||||||
);
|
);
|
||||||
- int i = this.active ? 16777215 : 10526880;
|
- int i = ARGB.color(this.alpha, this.active ? -1 : -6250336);
|
||||||
+ int i = getFGColor();
|
+ int i = getFGColor();
|
||||||
this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
|
this.renderString(p_281670_, minecraft.font, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
@@ -259,6 +_,25 @@
|
@@ -236,6 +_,25 @@
|
||||||
this.focused = p_93693_;
|
this.focused = p_93693_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
+
|
+
|
||||||
+ public int getFGColor() {
|
+ public int getFGColor() {
|
||||||
+ if (packedFGColor != UNSET_FG_COLOR) return packedFGColor;
|
+ if (packedFGColor != UNSET_FG_COLOR) return packedFGColor;
|
||||||
+ return this.active ? 16777215 : 10526880; // White : Light Grey
|
+ return net.minecraft.util.ARGB.color(this.alpha, this.active ? -1 : -6250336); // White : Light Grey
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void setFGColor(int color) {
|
+ public void setFGColor(int color) {
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
--- a/net/minecraft/client/gui/components/BossHealthOverlay.java
|
--- a/net/minecraft/client/gui/components/BossHealthOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
|
+++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
|
||||||
@@ -66,13 +_,16 @@
|
@@ -67,13 +_,16 @@
|
||||||
|
|
||||||
for (LerpingBossEvent lerpingbossevent : this.events.values()) {
|
for (LerpingBossEvent lerpingbossevent : this.events.values()) {
|
||||||
int k = i / 2 - 91;
|
int k = i / 2 - 91;
|
||||||
+ var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(p_283175_, this.minecraft.getWindow(), lerpingbossevent, k, j, 10 + this.minecraft.font.lineHeight);
|
+ var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(p_283175_, this.minecraft.getWindow(), lerpingbossevent, k, j, 10 + this.minecraft.font.lineHeight);
|
||||||
+ if (!event.isCanceled()) {
|
+ if (event != null) {
|
||||||
this.drawBar(p_283175_, k, j, lerpingbossevent);
|
this.drawBar(p_283175_, k, j, lerpingbossevent);
|
||||||
Component component = lerpingbossevent.getName();
|
Component component = lerpingbossevent.getName();
|
||||||
int l = this.minecraft.font.width(component);
|
int l = this.minecraft.font.width(component);
|
||||||
int i1 = i / 2 - l / 2;
|
int i1 = i / 2 - l / 2;
|
||||||
int j1 = j - 9;
|
int j1 = j - 9;
|
||||||
p_283175_.drawString(this.minecraft.font, component, i1, j1, 16777215);
|
p_283175_.drawString(this.minecraft.font, component, i1, j1, -1);
|
||||||
- j += 10 + 9;
|
- j += 10 + 9;
|
||||||
+ }
|
+ }
|
||||||
+ j += event.getIncrement();
|
+ j += event.getIncrement();
|
||||||
|
|||||||
Loaded 100 of 1182 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user