mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0717f5765 | ||
|
|
b3703dac1d | ||
|
|
11e74bf8d3 | ||
|
|
dc0da958e0 | ||
|
|
defeedd11d | ||
|
|
756731a61f | ||
|
|
fd1b206cf2 | ||
|
|
dfe1f9240c | ||
|
|
f2c46fc2c1 | ||
|
|
9cb47ed7b7 | ||
|
|
1f321b8bd2 | ||
|
|
b1c37c25b5 | ||
|
|
f1a52f7326 | ||
|
|
9e54667efa | ||
|
|
8383a0ebac | ||
|
|
43850be0f6 | ||
|
|
729cc6ab55 | ||
|
|
92998b1c32 | ||
|
|
babb17f2ad | ||
|
|
85d0c98e6b | ||
|
|
dfcdb4f010 | ||
|
|
85c3ffffd1 | ||
|
|
f090e53e55 | ||
|
|
c1e29d2dfc | ||
|
|
b2d42fa577 | ||
|
|
1b5c118ec2 | ||
|
|
d399884186 | ||
|
|
091cc791b6 | ||
|
|
c921aeec50 | ||
|
|
f4aea1d8df | ||
|
|
ad271df245 | ||
|
|
39dc348f8b | ||
|
|
75eedc04a1 | ||
|
|
81f99b0116 | ||
|
|
f0a7a457bb | ||
|
|
cf454b7da8 | ||
|
|
afcce7d4e7 | ||
|
|
d4a2fbffa3 | ||
|
|
4b61de2088 | ||
|
|
bc2d0d1b25 | ||
|
|
e2c1da98be | ||
|
|
0f6d11b1ee | ||
|
|
340d332e19 | ||
|
|
56f19dd53d | ||
|
|
1fe420e4ab | ||
|
|
945209c283 | ||
|
|
3e5c3cabd5 | ||
|
|
b0f5a13f52 | ||
|
|
15fe8441f0 | ||
|
|
babef71616 | ||
|
|
1dd18ca27c | ||
|
|
65c7390874 | ||
|
|
fe3ad3b8f2 | ||
|
|
d05e76f7c4 | ||
|
|
bfa97bf097 | ||
|
|
469e9a6c1a | ||
|
|
58456c85af | ||
|
|
7fe5b02ef3 | ||
|
|
184392e02e | ||
|
|
d25a5466db | ||
|
|
b5073c10ef | ||
|
|
16bc7cf783 | ||
|
|
2d714f034f |
No files matched your search
Vendored
-125
@@ -1,125 +0,0 @@
|
|||||||
@Library('forge-shared-library')_
|
|
||||||
|
|
||||||
pipeline {
|
|
||||||
options {
|
|
||||||
disableConcurrentBuilds()
|
|
||||||
}
|
|
||||||
agent {
|
|
||||||
docker {
|
|
||||||
image 'gradle:7-jdk16'
|
|
||||||
//args '-v forgegc:/home/gradle/.gradle_cache/'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
|
|
||||||
DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
|
|
||||||
DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
|
|
||||||
JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('notify_start') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
discordSend(
|
|
||||||
title: "${DISCORD_PREFIX} Started",
|
|
||||||
successful: true,
|
|
||||||
result: 'ABORTED', //White border
|
|
||||||
thumbnail: JENKINS_HEAD,
|
|
||||||
webhookURL: DISCORD_WEBHOOK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
stage('pull_cache') {
|
|
||||||
steps {
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/'
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/'
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
stage('setup') {
|
|
||||||
steps {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
|
|
||||||
}
|
|
||||||
script {
|
|
||||||
env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "^version:" | cut -d" " -f2').trim()
|
|
||||||
env.FMLONLY_VERSION = sh(returnStdout: true, script: './gradlew :fmlonly:properties -q | grep "^version:" | cut -d" " -f2').trim()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('changelog') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
writeChangelog(currentBuild, 'build/changelog.txt')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('publish') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
CROWDIN = credentials('forge-crowdin')
|
|
||||||
KEYSTORE = credentials('forge-jenkins-keystore-old')
|
|
||||||
KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
|
|
||||||
KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false
|
|
||||||
build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:fmlonly ${env.FMLONLY_VERSION} latest")], propagate: false, wait: false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
|
|
||||||
when {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
CROWDIN = credentials('forge-crowdin')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
post {
|
|
||||||
always {
|
|
||||||
script {
|
|
||||||
archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
|
|
||||||
|
|
||||||
if (env.CHANGE_ID == null) { // This is unset for non-PRs
|
|
||||||
discordSend(
|
|
||||||
title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
|
|
||||||
description: '```\n' + getChanges(currentBuild) + '\n```',
|
|
||||||
successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
|
|
||||||
result: currentBuild.currentResult,
|
|
||||||
thumbnail: JENKINS_HEAD,
|
|
||||||
webhookURL: DISCORD_WEBHOOK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+109
-56
@@ -1,3 +1,4 @@
|
|||||||
|
import de.undercouch.gradle.tasks.download.Download
|
||||||
import groovy.json.JsonBuilder
|
import groovy.json.JsonBuilder
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
@@ -16,12 +17,13 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.cadixdev.licenser' version '0.6.1'
|
id 'org.cadixdev.licenser' version '0.6.1'
|
||||||
id 'com.github.ben-manes.versions' version '0.36.0'
|
id 'com.github.ben-manes.versions' version '0.46.0'
|
||||||
id 'net.minecraftforge.gradleutils' version '2.+'
|
id 'net.minecraftforge.gradleutils' version '[2.2,2.3)'
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'de.undercouch.download' version '5.1.3'
|
id 'idea'
|
||||||
id 'net.minecraftforge.gradle.patcher' version '[5.1.50,5.2.0)' apply false
|
id 'de.undercouch.download' version '5.4.0'
|
||||||
id 'net.minecraftforge.gradle.mcp' version '[5.1.50,5.2.0)' apply false
|
id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
|
||||||
|
id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
Util.init() //Init all our extension methods!
|
Util.init() //Init all our extension methods!
|
||||||
@@ -42,13 +44,13 @@ ext {
|
|||||||
MCP_VERSION = '20220805.130853'
|
MCP_VERSION = '20220805.130853'
|
||||||
SPI_VERSION = '6.0.0'
|
SPI_VERSION = '6.0.0'
|
||||||
ACCESSTRANSFORMERS_VERSION = '8.0.4'
|
ACCESSTRANSFORMERS_VERSION = '8.0.4'
|
||||||
COREMODS_VERSION = '5.0.1'
|
COREMODS_VERSION = '5.2.4'
|
||||||
EVENTBUS_VERSION = '6.0.3'
|
EVENTBUS_VERSION = '6.0.3'
|
||||||
MODLAUNCHER_VERSION = '10.0.8'
|
MODLAUNCHER_VERSION = '10.0.8'
|
||||||
SECUREJARHANDLER_VERSION = '2.1.4'
|
SECUREJARHANDLER_VERSION = '2.1.4'
|
||||||
BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
|
BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
|
||||||
ASM_VERSION = '9.3'
|
ASM_VERSION = '9.7.1'
|
||||||
INSTALLER_VERSION = '2.1.+'
|
INSTALLER_VERSION = '2.2.+'
|
||||||
MIXIN_VERSION = '0.8.5'
|
MIXIN_VERSION = '0.8.5'
|
||||||
TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
|
TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
|
||||||
JLINE_VERSION = '3.12.+'
|
JLINE_VERSION = '3.12.+'
|
||||||
@@ -60,7 +62,7 @@ ext {
|
|||||||
// These versions should be kept in sync with the version manifest JSON
|
// These versions should be kept in sync with the version manifest JSON
|
||||||
// To use a version newer than the version manifest JSON, the dependency must be added to the installer configuration
|
// To use a version newer than the version manifest JSON, the dependency must be added to the installer configuration
|
||||||
MOJANG_LOGGING_VERSION = '1.0.0'
|
MOJANG_LOGGING_VERSION = '1.0.0'
|
||||||
LOG4J_VERSION = '2.17.0'
|
LOG4J_VERSION = '2.19.0'
|
||||||
GUAVA_VERSION = '31.0.1-jre'
|
GUAVA_VERSION = '31.0.1-jre'
|
||||||
GSON_VERSION = '2.8.9'
|
GSON_VERSION = '2.8.9'
|
||||||
APACHE_COMMONS_LANG3_VERSION = '3.12.0'
|
APACHE_COMMONS_LANG3_VERSION = '3.12.0'
|
||||||
@@ -74,7 +76,7 @@ ext {
|
|||||||
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
||||||
|
|
||||||
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.1.1:fatjar'
|
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.1.1:fatjar'
|
||||||
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
|
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.1'
|
||||||
JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
|
JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
|
||||||
FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
|
FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
|
||||||
MIN_TAG_FOR_CHANGELOG = '41.0'
|
MIN_TAG_FOR_CHANGELOG = '41.0'
|
||||||
@@ -95,7 +97,7 @@ def extraTxts = [
|
|||||||
rootProject.tasks.createChangelog.outputFile
|
rootProject.tasks.createChangelog.outputFile
|
||||||
]
|
]
|
||||||
|
|
||||||
task downloadVersionManifest(type: Download) {
|
tasks.register('downloadVersionManifest', Download) {
|
||||||
src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
|
src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'
|
||||||
dest file('build/versions/version_manifest.json')
|
dest file('build/versions/version_manifest.json')
|
||||||
useETag 'all'
|
useETag 'all'
|
||||||
@@ -210,46 +212,53 @@ project(':mcp') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
project(':clean') {
|
if (!System.env.TEAMCITY_VERSION) {
|
||||||
evaluationDependsOn(':mcp')
|
project(':clean') {
|
||||||
apply plugin: 'net.minecraftforge.gradle.patcher'
|
evaluationDependsOn(':mcp')
|
||||||
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
|
apply plugin: 'net.minecraftforge.gradle.patcher'
|
||||||
|
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
|
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
patcher {
|
patcher {
|
||||||
parent = project(':mcp')
|
parent = project(':mcp')
|
||||||
mcVersion = MC_VERSION
|
mcVersion = MC_VERSION
|
||||||
patchedSrc = file('src/main/java')
|
patchedSrc = file('src/main/java')
|
||||||
|
|
||||||
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
clean_client {
|
clean_client {
|
||||||
client true
|
client true
|
||||||
taskName 'clean_client'
|
taskName 'clean_client'
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
ideaModule "${rootProject.name}.${project.name}.main"
|
||||||
|
|
||||||
main 'net.minecraft.client.main.Main'
|
main 'net.minecraft.client.main.Main'
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
args '--gameDir', '.'
|
args '--gameDir', '.'
|
||||||
args '--version', MC_VERSION
|
args '--version', MC_VERSION
|
||||||
args '--assetsDir', downloadAssets.output
|
args '--assetsDir', downloadAssets.output
|
||||||
args '--assetIndex', '{asset_index}'
|
args '--assetIndex', '{asset_index}'
|
||||||
args '--accessToken', '0'
|
args '--accessToken', '0'
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_server {
|
||||||
|
client false
|
||||||
|
taskName 'clean_server'
|
||||||
|
ideaModule "${rootProject.name}.${project.name}.main"
|
||||||
|
|
||||||
|
main 'net.minecraft.server.Main'
|
||||||
|
workingDirectory project.file('run')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
clean_server {
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
client false
|
compileJava {
|
||||||
taskName 'clean_server'
|
dependsOn 'extractMapped'
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.server.Main'
|
|
||||||
workingDirectory project.file('run')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -285,9 +294,14 @@ def sharedDeps = {
|
|||||||
installer "org.jline:jline-reader:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
|
installer "org.jline:jline-reader:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
|
||||||
installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
|
installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
|
||||||
installer "org.spongepowered:mixin:${MIXIN_VERSION}"
|
installer "org.spongepowered:mixin:${MIXIN_VERSION}"
|
||||||
installer 'org.openjdk.nashorn:nashorn-core:15.3'
|
installer 'org.openjdk.nashorn:nashorn-core:15.4'
|
||||||
installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
|
installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
|
||||||
installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
|
installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
|
||||||
|
installer "org.apache.logging.log4j:log4j-slf4j-impl:${LOG4J_VERSION}" // Bumped for CoreMods
|
||||||
|
installer "org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}" // Bumped for CoreMods
|
||||||
|
installer "org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}" // Bumped for CoreMods
|
||||||
|
installer 'net.java.dev.jna:jna:5.12.1'
|
||||||
|
installer 'net.java.dev.jna:jna-platform:5.12.1'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
installer 'org.lwjgl:lwjgl:3.2.2'
|
installer 'org.lwjgl:lwjgl:3.2.2'
|
||||||
@@ -338,7 +352,7 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
|
prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
|
||||||
artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk"
|
artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:fatjar"
|
||||||
changing = true
|
changing = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -446,7 +460,7 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
// SecureJarHandler bootstrap values.
|
// SecureJarHandler bootstrap values.
|
||||||
run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
|
run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
|
||||||
// FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
|
// FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
|
||||||
run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar'
|
run.property 'mergeModules', 'jna-5.12.1.jar,jna-platform-5.12.1.jar'
|
||||||
if (userdevRuns.contains(run)) {
|
if (userdevRuns.contains(run)) {
|
||||||
run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
|
run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
|
||||||
run.jvmArgs '-p', '{modules}'
|
run.jvmArgs '-p', '{modules}'
|
||||||
@@ -869,10 +883,15 @@ project(':fmlonly') {
|
|||||||
|
|
||||||
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
||||||
afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
|
afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
|
||||||
|
|
||||||
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
|
compileJava {
|
||||||
|
dependsOn 'extractMapped'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
project(':forge') {
|
project(':forge') {
|
||||||
evaluationDependsOn(':clean')
|
evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
|
||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
apply plugin: 'net.minecraftforge.gradle.patcher'
|
apply plugin: 'net.minecraftforge.gradle.patcher'
|
||||||
apply plugin: 'org.cadixdev.licenser'
|
apply plugin: 'org.cadixdev.licenser'
|
||||||
@@ -946,13 +965,19 @@ project(':forge') {
|
|||||||
|
|
||||||
patcher {
|
patcher {
|
||||||
excs.from file("$rootDir/src/main/resources/forge.exc")
|
excs.from file("$rootDir/src/main/resources/forge.exc")
|
||||||
parent = project(':clean')
|
parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
|
||||||
patches = file("$rootDir/patches/minecraft")
|
patches = file("$rootDir/patches/minecraft")
|
||||||
patchedSrc = file('src/main/java')
|
patchedSrc = file('src/main/java')
|
||||||
srgPatches = true
|
srgPatches = true
|
||||||
accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
|
accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
|
||||||
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
|
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
|
||||||
|
|
||||||
|
// the clean project provides these. if we're not using it, we need to provide them ourselves
|
||||||
|
if (System.env.TEAMCITY_VERSION) {
|
||||||
|
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
||||||
|
mcVersion = MC_VERSION
|
||||||
|
}
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
forge_client {
|
forge_client {
|
||||||
property 'eventbus.checkTypesOnDispatch', 'true'
|
property 'eventbus.checkTypesOnDispatch', 'true'
|
||||||
@@ -1130,9 +1155,12 @@ project(':forge') {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
task crowdin(type: Crowdin) {
|
tasks.register('downloadCrowdin', Download) {
|
||||||
key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
|
src 'https://files.minecraftforge.net/crowdin.zip'
|
||||||
//TODO: Merge our english.json?
|
dest file('build/crowdin.zip')
|
||||||
|
useETag 'all'
|
||||||
|
onlyIfModified true
|
||||||
|
quiet true
|
||||||
}
|
}
|
||||||
|
|
||||||
sharedFmlonlyForge.call(project)
|
sharedFmlonlyForge.call(project)
|
||||||
@@ -1241,6 +1269,14 @@ project(':forge') {
|
|||||||
dependsOn 'setupCheckJarCompatibility'
|
dependsOn 'setupCheckJarCompatibility'
|
||||||
|
|
||||||
baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output }
|
baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output }
|
||||||
|
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
||||||
|
|
||||||
|
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
||||||
|
concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile })
|
||||||
|
|
||||||
|
commonLibraries.from(project.configurations.minecraftImplementation)
|
||||||
|
commonLibraries.from(project.configurations.installer)
|
||||||
|
commonLibraries.from(project.configurations.moduleonly)
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks, checkPatches, checkLicenses]){}
|
task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks, checkPatches, checkLicenses]){}
|
||||||
@@ -1502,9 +1538,12 @@ project(':forge') {
|
|||||||
from extraTxts
|
from extraTxts
|
||||||
|
|
||||||
// add crowdin locales
|
// add crowdin locales
|
||||||
from { crowdin.output.present && crowdin.output.get().asFile.exists() ? zipTree(crowdin.output) : null}
|
from zipTree(downloadCrowdin.dest).matching {
|
||||||
dependsOn crowdin
|
include 'assets/forge/lang/*.json'
|
||||||
duplicatesStrategy = 'exclude'
|
}
|
||||||
|
|
||||||
|
dependsOn downloadCrowdin
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
|
||||||
doFirst {
|
doFirst {
|
||||||
MANIFESTS.each{ pkg, values ->
|
MANIFESTS.each{ pkg, values ->
|
||||||
@@ -1549,7 +1588,7 @@ project(':forge') {
|
|||||||
exclude it
|
exclude it
|
||||||
}
|
}
|
||||||
filter(ReplaceTokens, tokens: [
|
filter(ReplaceTokens, tokens: [
|
||||||
FORGE_VERSION: project.version,
|
FORGE_VERSION: FORGE_VERSION,
|
||||||
FORGE_GROUP: project.group,
|
FORGE_GROUP: project.group,
|
||||||
FORGE_NAME: project.name,
|
FORGE_NAME: project.name,
|
||||||
MC_VERSION: MC_VERSION,
|
MC_VERSION: MC_VERSION,
|
||||||
@@ -1692,11 +1731,17 @@ project(':forge') {
|
|||||||
tasks.withType(JavaCompile).configureEach {
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
|
compileJava {
|
||||||
|
dependsOn 'extractMapped'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//evaluationDependsOnChildren()
|
//evaluationDependsOnChildren()
|
||||||
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
||||||
dependsOn ':clean:extractMapped'
|
if (!System.env.TEAMCITY_VERSION)
|
||||||
|
dependsOn ':clean:extractMapped'
|
||||||
if (symlinkValid)
|
if (symlinkValid)
|
||||||
dependsOn ':fmlonly:extractMapped'
|
dependsOn ':fmlonly:extractMapped'
|
||||||
dependsOn ':forge:extractMapped'
|
dependsOn ':forge:extractMapped'
|
||||||
@@ -1712,4 +1757,12 @@ if (System.env.TEAMCITY_VERSION) {
|
|||||||
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
|
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
// IntelliJ IDEA does not do this by itself anymore...
|
||||||
|
downloadJavadoc = true
|
||||||
|
downloadSources = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -4,8 +4,8 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'org.ow2.asm:asm:9.3'
|
implementation 'org.ow2.asm:asm:9.5'
|
||||||
implementation 'org.ow2.asm:asm-tree:9.3'
|
implementation 'org.ow2.asm:asm-tree:9.5'
|
||||||
implementation 'net.minecraftforge:srgutils:0.4.+'
|
implementation 'net.minecraftforge:srgutils:0.5.+'
|
||||||
implementation 'commons-io:commons-io:2.8.0'
|
implementation 'commons-io:commons-io:2.12.0'
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,7 @@ import groovy.json.JsonBuilder
|
|||||||
import org.gradle.api.DefaultTask
|
import org.gradle.api.DefaultTask
|
||||||
import org.gradle.api.file.RegularFileProperty
|
import org.gradle.api.file.RegularFileProperty
|
||||||
import org.gradle.api.tasks.InputFile
|
import org.gradle.api.tasks.InputFile
|
||||||
import org.gradle.api.tasks.OutputFile
|
import org.gradle.api.tasks.Internal
|
||||||
import org.gradle.api.tasks.TaskAction
|
import org.gradle.api.tasks.TaskAction
|
||||||
import org.objectweb.asm.ClassReader
|
import org.objectweb.asm.ClassReader
|
||||||
import org.objectweb.asm.Opcodes
|
import org.objectweb.asm.Opcodes
|
||||||
@@ -17,7 +17,9 @@ import java.util.zip.ZipInputStream
|
|||||||
|
|
||||||
abstract class BytecodeFinder extends DefaultTask {
|
abstract class BytecodeFinder extends DefaultTask {
|
||||||
@InputFile abstract RegularFileProperty getJar()
|
@InputFile abstract RegularFileProperty getJar()
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
// It should be fine to mark the output as internal as we want to control when we run it anyways.
|
||||||
|
// This also shuts Gradle 8 up about implicit task dependencies.
|
||||||
|
@Internal abstract RegularFileProperty getOutput()
|
||||||
|
|
||||||
BytecodeFinder() {
|
BytecodeFinder() {
|
||||||
output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
|
output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
|
||||||
|
|||||||
+1
-8
@@ -18,6 +18,7 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
|
|||||||
onlyIf {
|
onlyIf {
|
||||||
inputVersion.getOrNull() != null
|
inputVersion.getOrNull() != null
|
||||||
}
|
}
|
||||||
|
outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
|
||||||
|
|
||||||
baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
|
baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
|
||||||
}
|
}
|
||||||
@@ -31,17 +32,9 @@ abstract class SetupCheckJarCompatibility extends DefaultTask {
|
|||||||
}.toArray(Dependency[]::new))
|
}.toArray(Dependency[]::new))
|
||||||
|
|
||||||
project.tasks.named('checkJarCompatibility') {
|
project.tasks.named('checkJarCompatibility') {
|
||||||
baseLibraries.from(project.tasks.createJoinedSRG.output)
|
|
||||||
baseLibraries.from(project.provider {
|
baseLibraries.from(project.provider {
|
||||||
fmlLibs.resolvedConfiguration.lenientConfiguration.files
|
fmlLibs.resolvedConfiguration.lenientConfiguration.files
|
||||||
})
|
})
|
||||||
|
|
||||||
inputJar = project.tasks.reobfJar.output
|
|
||||||
concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile })
|
|
||||||
|
|
||||||
commonLibraries.from(project.configurations.minecraftImplementation)
|
|
||||||
commonLibraries.from(project.configurations.installer)
|
|
||||||
commonLibraries.from(project.configurations.moduleonly)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
|
def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
|
||||||
|
|||||||
@@ -74,14 +74,6 @@ public class Util {
|
|||||||
if (!checkExists(url)) {
|
if (!checkExists(url)) {
|
||||||
url = "https://maven.minecraftforge.net/${path}"
|
url = "https://maven.minecraftforge.net/${path}"
|
||||||
}
|
}
|
||||||
//TODO remove when Mojang launcher is updated
|
|
||||||
if (!classifiers && art.classifier != null) {
|
|
||||||
//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
|
|
||||||
// However, keep the path normal so that our mirror system works.
|
|
||||||
art.version = "${art.version}-${art.classifier}"
|
|
||||||
art.classifier = null
|
|
||||||
art.extension = 'jar'
|
|
||||||
}
|
|
||||||
ret[key] = [
|
ret[key] = [
|
||||||
name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
|
name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
|
||||||
downloads: [
|
downloads: [
|
||||||
|
|||||||
+40
-14
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[](https://files.minecraftforge.net)
|
[](https://files.minecraftforge.net)
|
||||||
[](https://files.minecraftforge.net) [](https://discord.gg/UvedJ9m) [](https://www.patreon.com/LexManos)
|
)](https://files.minecraftforge.net) [][Discord] [](https://www.patreon.com/LexManos)
|
||||||
|
|
||||||
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.19.x | Active |
|
| All versions | [Supported][Support-Policy] |
|
||||||
| 1.18.x | LTS |
|
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -29,24 +28,35 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
into your vanilla launcher environment, where you can then create a new
|
into your vanilla launcher environment, where you can then create a new
|
||||||
profile using that version and play the game!
|
profile using that version and play the game!
|
||||||
|
|
||||||
For support and questions, visit [the Support Forum](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/) or [the Forge Discord server](https://discord.gg/forge).
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
|
## 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](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
|
[See the "Getting Started" section in the Forge Documentation](https://docs.minecraftforge.net/en/1.19.2/gettingstarted/).
|
||||||
|
|
||||||
# Contribute to Forge
|
# Contribute to Forge
|
||||||
|
|
||||||
If you wish to actually inspect Forge, submit PRs or otherwise work
|
If you wish to actually inspect Forge, submit PRs or otherwise work
|
||||||
with Forge itself, you're in the right place!
|
with Forge itself, you're in the right place!
|
||||||
|
|
||||||
[See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
|
[See the guide to setting up a Forge workspace](https://docs.minecraftforge.net/en/1.19.2/forgedev/).
|
||||||
|
|
||||||
### Pull requests
|
### Pull requests
|
||||||
|
|
||||||
[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
|
[See the "Making Changes and Pull Requests" section in the Forge documentation](https://docs.minecraftforge.net/en/1.19.2/forgedev/#making-changes-and-pull-requests).
|
||||||
|
|
||||||
Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
|
Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
|
||||||
|
|
||||||
@@ -61,6 +71,22 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
[becoming a patron](https://www.patreon.com/LexManos).*
|
[becoming a patron](https://www.patreon.com/LexManos).*
|
||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
[Forum]: https://www.minecraftforge.net/forum/
|
|
||||||
[Discord]: https://discord.gg/UvedJ9m
|
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
|
||||||
[Documentation]: https://mcforge.readthedocs.io
|
[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/
|
||||||
|
[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/
|
||||||
|
|
||||||
|
[Documentation]: https://docs.minecraftforge.net/en/1.19.2/
|
||||||
|
[Getting-Started]: https://docs.minecraftforge.net/en/1.19.2/gettingstarted/
|
||||||
|
[ForgeDev]: https://docs.minecraftforge.net/en/1.19.2/forgedev/
|
||||||
|
[Pull-Requests]: https://docs.minecraftforge.net/en/1.19.2/forgedev/#making-changes-and-pull-requests
|
||||||
|
|
||||||
|
[Patreon]: https://www.patreon.com/LexManos
|
||||||
@@ -5,36 +5,36 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
|
|
||||||
|
import java.util.ServiceConfigurationError;
|
||||||
import java.util.ServiceLoader;
|
import java.util.ServiceLoader;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class Bindings {
|
public class Bindings {
|
||||||
private static final Bindings INSTANCE = new Bindings();
|
private Bindings() {}
|
||||||
|
|
||||||
private final IBindingsProvider provider;
|
/**
|
||||||
|
* The provider of the bindings
|
||||||
private Bindings() {
|
* @implNote May also throw a {@link ServiceConfigurationError}
|
||||||
final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
|
*/
|
||||||
if (providers.size() != 1) {
|
private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
|
||||||
throw new IllegalStateException("Could not find bindings provider");
|
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
||||||
}
|
|
||||||
this.provider = providers.get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
||||||
|
*/
|
||||||
public static Supplier<IEventBus> getForgeBus() {
|
public static Supplier<IEventBus> getForgeBus() {
|
||||||
return INSTANCE.provider.getForgeBusSupplier();
|
return PROVIDER.getForgeBusSupplier();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<I18NParser> getMessageParser() {
|
public static Supplier<I18NParser> getMessageParser() {
|
||||||
return INSTANCE.provider.getMessageParser();
|
return PROVIDER.getMessageParser();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
||||||
return INSTANCE.provider.getConfigConfiguration();
|
return PROVIDER.getConfigConfiguration();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -95,5 +95,24 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
@SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
|
@SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
|
||||||
record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
|
record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
|
||||||
public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
|
public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ignores any version information coming from the server - use for server only mods
|
||||||
|
*/
|
||||||
|
public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ignores all information and provides no information
|
||||||
|
*/
|
||||||
|
public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
|
||||||
|
* instead of a {@link Supplier}.
|
||||||
|
* <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
|
||||||
|
*/
|
||||||
|
public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
this(() -> version, remoteVersionTest);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,7 @@ 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;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
@@ -20,6 +21,7 @@ import java.util.Optional;
|
|||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
@@ -57,15 +59,16 @@ public abstract class ModContainer
|
|||||||
this.modInfo = info;
|
this.modInfo = info;
|
||||||
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
||||||
|
|
||||||
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
|
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
|
||||||
|
.orElseGet(() -> (Boolean) info.getOwningFile().getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE) ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
|
||||||
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
|
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
|
||||||
case "MATCH_VERSION" -> // default displaytest checks for version string match
|
case "MATCH_VERSION" -> // default displaytest checks for version string match
|
||||||
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
|
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
|
||||||
(incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
|
(incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
|
||||||
case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
|
case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
|
||||||
() -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (incoming, isNetwork) -> true);
|
IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
|
||||||
case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
|
case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
|
||||||
() -> new IExtensionPoint.DisplayTest(() -> "", (incoming, isNetwork) -> true);
|
IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
|
||||||
case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
|
case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
|
||||||
default -> // any other value throws an exception
|
default -> // any other value throws an exception
|
||||||
throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
|
throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
|
||||||
@@ -142,6 +145,22 @@ public abstract class ModContainer
|
|||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
||||||
|
registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
||||||
|
registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
public void addConfig(final ModConfig modConfig) {
|
public void addConfig(final ModConfig modConfig) {
|
||||||
configs.put(modConfig.getType(), modConfig);
|
configs.put(modConfig.getType(), modConfig);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,38 +8,54 @@ package net.minecraftforge.fml;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.fml.config.IConfigSpec;
|
import net.minecraftforge.fml.config.IConfigSpec;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class ModLoadingContext
|
public class ModLoadingContext
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
||||||
|
private ModContainer activeContainer;
|
||||||
private Object languageExtension;
|
private Object languageExtension;
|
||||||
private ModLoadingStage stage;
|
private ModLoadingStage stage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use the context provided by your language loader in your mod's constructor.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public static ModLoadingContext get() {
|
public static ModLoadingContext get() {
|
||||||
return context.get();
|
return context.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer activeContainer;
|
/**
|
||||||
|
* @deprecated Going to be moved to ForgeHooks for internal use.
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public void setActiveContainer(final ModContainer container) {
|
public void setActiveContainer(final ModContainer container) {
|
||||||
this.activeContainer = container;
|
this.activeContainer = container;
|
||||||
this.languageExtension = container == null ? null : container.contextExtension.get();
|
this.languageExtension = container == null ? null : container.contextExtension.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Going to be moved to ForgeHooks for internal use.
|
||||||
|
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public ModContainer getActiveContainer() {
|
public ModContainer getActiveContainer() {
|
||||||
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public String getActiveNamespace() {
|
public String getActiveNamespace() {
|
||||||
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ModContainer getContainer() {
|
||||||
|
return getActiveContainer();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register an {@link IExtensionPoint} with the mod container.
|
* Register an {@link IExtensionPoint} with the mod container.
|
||||||
* @param point The extension point to register
|
* @param point The extension point to register
|
||||||
@@ -47,29 +63,67 @@ public class ModLoadingContext
|
|||||||
* @param <T> The type signature of the extension operator
|
* @param <T> The type signature of the extension operator
|
||||||
*/
|
*/
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
||||||
getActiveContainer().registerExtensionPoint(point, extension);
|
getContainer().registerExtensionPoint(point, extension);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
|
||||||
|
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
||||||
|
getContainer().registerDisplayTest(() -> displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
|
||||||
|
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
||||||
|
getContainer().registerDisplayTest(displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
|
||||||
|
* creates the DisplayTest instance for you using the provided parameters.</p>
|
||||||
|
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
|
||||||
|
* creates the DisplayTest instance for you using the provided parameters.</p>
|
||||||
|
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
||||||
if (spec.isEmpty())
|
if (spec.isEmpty())
|
||||||
{
|
{
|
||||||
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
||||||
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
|
getContainer().addConfig(new ModConfig(type, spec, getContainer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
|
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
|
||||||
if (spec.isEmpty())
|
if (spec.isEmpty())
|
||||||
{
|
{
|
||||||
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
||||||
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
|
getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+30
-9
@@ -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,7 +36,11 @@ 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.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
||||||
private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
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 int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
@@ -46,13 +51,30 @@ 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")
|
||||||
|
&& !internalName.equals("net/minecraftforge/common/crafting/ConditionalRecipe"))
|
||||||
|
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 boolean hasHolder(List<AnnotationNode> lst)
|
private boolean hasHolder(List<AnnotationNode> lst) {
|
||||||
{
|
|
||||||
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
|
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,10 +97,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
{
|
{
|
||||||
final AtomicBoolean changes = new AtomicBoolean();
|
final AtomicBoolean changes = new AtomicBoolean();
|
||||||
//Must be public static finals, and non-array objects
|
//Must be public static finals, and non-array objects
|
||||||
final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
|
||||||
|
|
||||||
//Fix Annotated Fields before injecting from class level
|
//Fix Annotated Fields before injecting from class level
|
||||||
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
|
classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
|
||||||
{
|
{
|
||||||
int prev = f.access;
|
int prev = f.access;
|
||||||
f.access &= ~Opcodes.ACC_FINAL; //Strip final
|
f.access &= ~Opcodes.ACC_FINAL; //Strip final
|
||||||
@@ -88,7 +109,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
|
|
||||||
if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
|
if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
|
||||||
{
|
{
|
||||||
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
|
classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
|
||||||
{
|
{
|
||||||
int prev = f.access;
|
int prev = f.access;
|
||||||
f.access &= ~Opcodes.ACC_FINAL;
|
f.access &= ~Opcodes.ACC_FINAL;
|
||||||
|
|||||||
@@ -66,6 +66,9 @@ public class FMLLoader
|
|||||||
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
|
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Allows us to communicate properties with other services through ModLauncher
|
||||||
|
setupBlackboardKeys();
|
||||||
|
|
||||||
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
|
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
|
||||||
LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
|
LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
|
||||||
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
|
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
|
||||||
@@ -127,6 +130,12 @@ public class FMLLoader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void setupBlackboardKeys() {
|
||||||
|
LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
|
||||||
|
var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
|
||||||
|
Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
|
||||||
|
}
|
||||||
|
|
||||||
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
|
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
|
||||||
{
|
{
|
||||||
final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
|
final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
|
||||||
|
|||||||
@@ -11,11 +11,17 @@ import net.minecraftforge.forgespi.language.IModInfo;
|
|||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static java.util.stream.Collectors.*;
|
import static java.util.stream.Collectors.groupingBy;
|
||||||
|
import static java.util.stream.Collectors.joining;
|
||||||
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class UniqueModListBuilder
|
public class UniqueModListBuilder
|
||||||
{
|
{
|
||||||
@@ -66,28 +72,34 @@ public class UniqueModListBuilder
|
|||||||
|
|
||||||
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
||||||
// We can't handle this
|
// We can't handle this
|
||||||
final List<IModInfo> dupedMods = modIds.values().stream()
|
final List<String> dupedModErrors = modIds.values().stream()
|
||||||
.filter(modInfos -> modInfos.size() > 1)
|
.filter(modInfos -> modInfos.size() > 1)
|
||||||
.map(modInfos -> modInfos.get(0))
|
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
|
||||||
.toList();
|
mods.get(0).getModId(),
|
||||||
|
mods.stream()
|
||||||
|
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
|
||||||
|
)).toList();
|
||||||
|
|
||||||
if (!dupedMods.isEmpty()) {
|
if (!dupedModErrors.isEmpty()) {
|
||||||
final List<EarlyLoadingException.ExceptionData> duplicateModErrors = dupedMods.stream()
|
LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
|
||||||
.map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedmod", dm, Objects.toString(dm)))
|
throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
|
||||||
.toList();
|
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
||||||
throw new EarlyLoadingException("Duplicate mods found", null, duplicateModErrors);
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModFile> dupedLibs = versionedLibIds.values().stream()
|
final List<String> dupedLibErrors = versionedLibIds.values().stream()
|
||||||
.filter(modFiles -> modFiles.size() > 1)
|
.filter(modFiles -> modFiles.size() > 1)
|
||||||
.map(modFiles -> modFiles.get(0))
|
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
||||||
.toList();
|
getModId(mods.get(0)),
|
||||||
|
mods.stream()
|
||||||
|
.map(modFile -> modFile.getFileName()).collect(joining(", "))
|
||||||
|
)).toList();
|
||||||
|
|
||||||
if (!dupedLibs.isEmpty()) {
|
if (!dupedLibErrors.isEmpty()) {
|
||||||
final List<EarlyLoadingException.ExceptionData> duplicateLibErrors = dupedLibs.stream()
|
LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
|
||||||
.map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedlib.versioned", dm, Objects.toString(dm)))
|
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
|
||||||
.toList();
|
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
||||||
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, duplicateLibErrors);
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collect unique mod files by module name. This will be used for deduping purposes
|
// Collect unique mod files by module name. This will be used for deduping purposes
|
||||||
|
|||||||
+7
-2
@@ -34,18 +34,23 @@ public abstract class AbstractModProvider implements IModProvider
|
|||||||
protected static final String MANIFEST = "META-INF/MANIFEST.MF";
|
protected static final String MANIFEST = "META-INF/MANIFEST.MF";
|
||||||
|
|
||||||
protected IModLocator.ModFileOrException createMod(Path... path) {
|
protected IModLocator.ModFileOrException createMod(Path... path) {
|
||||||
|
return this.createMod(getDefaultJarModType(), path);
|
||||||
|
}
|
||||||
|
|
||||||
|
// FORGE: Backporting artifact, the defaultType must be the first parameter since path is varargs
|
||||||
|
protected IModLocator.ModFileOrException createMod(String defaultType, Path... path) {
|
||||||
var mjm = new ModJarMetadata();
|
var mjm = new ModJarMetadata();
|
||||||
var sj = SecureJar.from(
|
var sj = SecureJar.from(
|
||||||
Manifest::new,
|
Manifest::new,
|
||||||
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
||||||
(root, p) -> true,
|
null,
|
||||||
path
|
path
|
||||||
);
|
);
|
||||||
|
|
||||||
IModFile mod;
|
IModFile mod;
|
||||||
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
||||||
if (type == null) {
|
if (type == null) {
|
||||||
type = getDefaultJarModType();
|
type = defaultType;
|
||||||
}
|
}
|
||||||
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ public class ExplodedDirectoryLocator implements IModLocator {
|
|||||||
explodedMods.forEach(explodedMod ->
|
explodedMods.forEach(explodedMod ->
|
||||||
ModJarMetadata.buildFile(this,
|
ModJarMetadata.buildFile(this,
|
||||||
jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
|
jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(),
|
||||||
(a,b) -> true,
|
null,
|
||||||
explodedMod.paths().toArray(Path[]::new))
|
explodedMod.paths().toArray(Path[]::new))
|
||||||
.ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
|
.ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString())));
|
||||||
return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
|
return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList();
|
||||||
|
|||||||
+8
-1
@@ -81,7 +81,14 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
|
|||||||
final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
|
final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
|
||||||
final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
|
final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
|
||||||
final Path pathInFS = zipFS.getPath("/");
|
final Path pathInFS = zipFS.getPath("/");
|
||||||
return Optional.of(createMod(pathInFS).file());
|
final IModFile.Type parentType = file.getType();
|
||||||
|
final String modType;
|
||||||
|
if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
|
||||||
|
modType = IModFile.Type.LIBRARY.name();
|
||||||
|
} else {
|
||||||
|
modType = IModFile.Type.GAMELIBRARY.name();
|
||||||
|
}
|
||||||
|
return Optional.of(createMod(modType, pathInFS).file());
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
+20
-1
@@ -12,6 +12,7 @@ import cpw.mods.modlauncher.Launcher;
|
|||||||
import cpw.mods.modlauncher.api.IModuleLayerManager;
|
import cpw.mods.modlauncher.api.IModuleLayerManager;
|
||||||
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException;
|
import net.minecraftforge.fml.loading.EarlyLoadingException;
|
||||||
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
import net.minecraftforge.fml.loading.UniqueModListBuilder;
|
import net.minecraftforge.fml.loading.UniqueModListBuilder;
|
||||||
import net.minecraftforge.fml.loading.progress.StartupMessageManager;
|
import net.minecraftforge.fml.loading.progress.StartupMessageManager;
|
||||||
@@ -20,6 +21,7 @@ import net.minecraftforge.forgespi.language.IModFileInfo;
|
|||||||
import net.minecraftforge.forgespi.locating.IDependencyLocator;
|
import net.minecraftforge.forgespi.locating.IDependencyLocator;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
import net.minecraftforge.forgespi.locating.IModLocator;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -67,6 +69,7 @@ public class ModDiscoverer {
|
|||||||
boolean successfullyLoadedMods = true;
|
boolean successfullyLoadedMods = true;
|
||||||
List<IModFileInfo> brokenFiles = new ArrayList<>();
|
List<IModFileInfo> brokenFiles = new ArrayList<>();
|
||||||
|
|
||||||
|
boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
|
||||||
//Loop all mod locators to get the prime mods to load from.
|
//Loop all mod locators to get the prime mods to load from.
|
||||||
for (IModLocator locator : modLocatorList) {
|
for (IModLocator locator : modLocatorList) {
|
||||||
try {
|
try {
|
||||||
@@ -84,8 +87,24 @@ public class ModDiscoverer {
|
|||||||
if (!badModFiles.isEmpty()) {
|
if (!badModFiles.isEmpty()) {
|
||||||
LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
|
LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
|
||||||
brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
|
brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
|
||||||
|
locatedFiles.removeAll(badModFiles);
|
||||||
}
|
}
|
||||||
locatedFiles.removeAll(badModFiles);
|
|
||||||
|
if (distIsDedicatedServer) {
|
||||||
|
var clientOnlyModFiles = locatedFiles.stream()
|
||||||
|
.filter(file -> {
|
||||||
|
// some mod files can have null infos, like javafml, mclanguage, lowcode, and fmlcore
|
||||||
|
@Nullable var info = file.getModFileInfo();
|
||||||
|
|
||||||
|
return info != null && (Boolean) info.getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE);
|
||||||
|
})
|
||||||
|
.toList();
|
||||||
|
if (!clientOnlyModFiles.isEmpty()) {
|
||||||
|
LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
|
||||||
|
locatedFiles.removeAll(clientOnlyModFiles);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
|
LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
|
||||||
handleLocatedFiles(loadedFiles, locatedFiles);
|
handleLocatedFiles(loadedFiles, locatedFiles);
|
||||||
} catch (InvalidModFileException imfe) {
|
} catch (InvalidModFileException imfe) {
|
||||||
|
|||||||
+18
-1
@@ -43,6 +43,10 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
|
|||||||
private final String license;
|
private final String license;
|
||||||
private final List<String> usesServices;
|
private final List<String> usesServices;
|
||||||
|
|
||||||
|
public static final String CLIENT_SIDE_ONLY_PROP = "__FORGE_clientSideOnly";
|
||||||
|
|
||||||
|
private static final Map<String, Object> CLIENT_SIDE_ONLY_MAP = Map.of(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
|
||||||
|
|
||||||
ModFileInfo(final ModFile modFile, final IConfigurable config)
|
ModFileInfo(final ModFile modFile, final IConfigurable config)
|
||||||
{
|
{
|
||||||
this.modFile = modFile;
|
this.modFile = modFile;
|
||||||
@@ -56,8 +60,21 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
|
|||||||
this.license = config.<String>getConfigElement("license")
|
this.license = config.<String>getConfigElement("license")
|
||||||
.orElse("");
|
.orElse("");
|
||||||
this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
|
this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
|
||||||
|
boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly").orElse(false);
|
||||||
this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());
|
this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());
|
||||||
this.properties = config.<Map<String, Object>>getConfigElement("properties").orElse(Collections.emptyMap());
|
|
||||||
|
var maybeProps = config.<Map<String, Object>>getConfigElement("properties");
|
||||||
|
if (clientSideOnly) {
|
||||||
|
if (maybeProps.isPresent()) {
|
||||||
|
this.properties = new HashMap<>(maybeProps.get());
|
||||||
|
this.properties.put(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
|
||||||
|
} else {
|
||||||
|
this.properties = CLIENT_SIDE_ONLY_MAP;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.properties = maybeProps.orElse(Collections.emptyMap());
|
||||||
|
}
|
||||||
|
|
||||||
this.modFile.setFileProperties(this.properties);
|
this.modFile.setFileProperties(this.properties);
|
||||||
this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
|
this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
|
||||||
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
|
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
|
||||||
|
|||||||
@@ -69,7 +69,9 @@ public class ModInfo implements IModInfo, IConfigurable
|
|||||||
.map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
|
.map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
|
||||||
.map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION);
|
.map(DefaultArtifactVersion::new).orElse(DEFAULT_VERSION);
|
||||||
this.displayName = config.<String>getConfigElement("displayName").orElse(this.modId);
|
this.displayName = config.<String>getConfigElement("displayName").orElse(this.modId);
|
||||||
this.description = config.<String>getConfigElement("description").orElse("MISSING DESCRIPTION");
|
this.description = config.<String>getConfigElement("description")
|
||||||
|
.orElse("MISSING DESCRIPTION")
|
||||||
|
.replace("\r\n", "\n").stripIndent();
|
||||||
|
|
||||||
this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
|
this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
|
||||||
.orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")).orElse(null)));
|
.orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile")).orElse(null)));
|
||||||
@@ -196,7 +198,7 @@ public class ModInfo implements IModInfo, IConfigurable
|
|||||||
private final boolean mandatory;
|
private final boolean mandatory;
|
||||||
private final Ordering ordering;
|
private final Ordering ordering;
|
||||||
private final DependencySide side;
|
private final DependencySide side;
|
||||||
private Optional<URL> referralUrl;
|
private final Optional<URL> referralUrl;
|
||||||
|
|
||||||
public ModVersion(final IModInfo owner, final IConfigurable config) {
|
public ModVersion(final IModInfo owner, final IConfigurable config) {
|
||||||
this.owner = owner;
|
this.owner = owner;
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ public final class ModJarMetadata implements JarMetadata {
|
|||||||
// TODO: Remove helper functions to cleanup api
|
// TODO: Remove helper functions to cleanup api
|
||||||
@Deprecated(forRemoval = true, since="1.18")
|
@Deprecated(forRemoval = true, since="1.18")
|
||||||
static IModFile buildFile(IModLocator locator, Path... files) {
|
static IModFile buildFile(IModLocator locator, Path... files) {
|
||||||
return buildFile(locator, j->true, (a,b) -> true, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
|
return buildFile(locator, j->true, null, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Remove helper functions to cleanup api
|
// TODO: Remove helper functions to cleanup api
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class Scanner {
|
|||||||
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
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler {
|
|||||||
var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
|
var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
|
||||||
var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
|
var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion());
|
||||||
|
|
||||||
return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
|
return new LocatedPaths(mcstream.build().toList(), null, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
|
protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods);
|
||||||
|
|||||||
+6
@@ -43,12 +43,18 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler {
|
|||||||
}, mcextra
|
}, mcextra
|
||||||
);
|
);
|
||||||
BiPredicate<String, String> filter = (path, base) -> true;
|
BiPredicate<String, String> filter = (path, base) -> true;
|
||||||
|
final BiPredicate<String, String> alwaysTrueFilter = filter;
|
||||||
|
|
||||||
var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
|
var mcstream = Stream.<Path>builder().add(mc).add(mcextra_filtered.getRootPath());
|
||||||
var modstream = Stream.<List<Path>>builder();
|
var modstream = Stream.<List<Path>>builder();
|
||||||
|
|
||||||
filter = processMCStream(vers, mcstream, filter, modstream);
|
filter = processMCStream(vers, mcstream, filter, modstream);
|
||||||
|
|
||||||
|
// Ensure backwards compatibility if anything overrides processMCStream()
|
||||||
|
// and expects the default always true filter by only changing it to null afterwards if left unchanged.
|
||||||
|
if (filter == alwaysTrueFilter)
|
||||||
|
filter = null;
|
||||||
|
|
||||||
var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
|
var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion());
|
||||||
var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
|
var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion());
|
||||||
var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
|
var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion());
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -80,13 +80,10 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
# 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"'
|
|
||||||
|
|
||||||
# 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
|
||||||
@@ -143,12 +140,16 @@ fi
|
|||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
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.
|
||||||
|
# shellcheck disable=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
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=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
|
||||||
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command;
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
|||||||
Vendored
+1
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
|||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
|||||||
+8
-1
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.javafmlmod;
|
|||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
import net.minecraftforge.fml.ModLoadingContext;
|
||||||
|
|
||||||
public class FMLJavaModLoadingContext
|
public class FMLJavaModLoadingContext extends ModLoadingContext
|
||||||
{
|
{
|
||||||
private final FMLModContainer container;
|
private final FMLModContainer container;
|
||||||
|
|
||||||
@@ -24,11 +24,18 @@ public class FMLJavaModLoadingContext
|
|||||||
return container.getEventBus();
|
return container.getEventBus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FMLModContainer getContainer() {
|
||||||
|
return container;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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(forRemoval = true, since = "1.21.1")
|
||||||
public static FMLJavaModLoadingContext get() {
|
public static FMLJavaModLoadingContext get() {
|
||||||
return ModLoadingContext.get().extension();
|
return ModLoadingContext.get().extension();
|
||||||
}
|
}
|
||||||
|
|||||||
+17
-3
@@ -21,6 +21,9 @@ import org.apache.logging.log4j.Logger;
|
|||||||
import org.apache.logging.log4j.Marker;
|
import org.apache.logging.log4j.Marker;
|
||||||
import org.apache.logging.log4j.MarkerManager;
|
import org.apache.logging.log4j.MarkerManager;
|
||||||
|
|
||||||
|
import java.lang.reflect.Constructor;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
public class FMLModContainer extends ModContainer
|
public class FMLModContainer extends ModContainer
|
||||||
@@ -31,6 +34,7 @@ public class FMLModContainer extends ModContainer
|
|||||||
private final IEventBus eventBus;
|
private final IEventBus eventBus;
|
||||||
private Object modInstance;
|
private Object modInstance;
|
||||||
private final Class<?> modClass;
|
private final Class<?> modClass;
|
||||||
|
private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
|
||||||
|
|
||||||
public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
|
public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
|
||||||
{
|
{
|
||||||
@@ -40,8 +44,7 @@ public class FMLModContainer extends ModContainer
|
|||||||
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
||||||
this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
||||||
this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
|
this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
|
||||||
final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
|
this.contextExtension = () -> context;
|
||||||
this.contextExtension = () -> contextExtension;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow();
|
var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow();
|
||||||
@@ -65,11 +68,22 @@ public class FMLModContainer extends ModContainer
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
|
LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
|
||||||
this.modInstance = modClass.getDeclaredConstructor().newInstance();
|
Constructor<?> constructor;
|
||||||
|
try {
|
||||||
|
constructor = modClass.getDeclaredConstructor(context.getClass());
|
||||||
|
} catch (NoSuchMethodException | SecurityException exception) {
|
||||||
|
constructor = modClass.getDeclaredConstructor();
|
||||||
|
}
|
||||||
|
this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
|
||||||
LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
|
LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
|
||||||
}
|
}
|
||||||
catch (Throwable e)
|
catch (Throwable e)
|
||||||
{
|
{
|
||||||
|
// When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the
|
||||||
|
// actual exception from the mod loading error screen.
|
||||||
|
if (e instanceof InvocationTargetException wrapped)
|
||||||
|
e = Objects.requireNonNullElse(wrapped.getCause(), e); // unwrap the exception
|
||||||
|
|
||||||
LOGGER.error(LOADING,"Failed to create mod instance. ModID: {}, class {}", getModId(), modClass.getName(), e);
|
LOGGER.error(LOADING,"Failed to create mod instance. ModID: {}, class {}", getModId(), modClass.getName(), e);
|
||||||
throw new ModLoadingException(modInfo, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmod", e, modClass);
|
throw new ModLoadingException(modInfo, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmod", e, modClass);
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -16,14 +16,14 @@ Step 1: Open your command-line and browse to the folder where you extracted the
|
|||||||
|
|
||||||
Step 2: You're left with a choice.
|
Step 2: You're left with a choice.
|
||||||
If you prefer to use Eclipse:
|
If you prefer to use Eclipse:
|
||||||
1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
|
1. Run the following command: `./gradlew genEclipseRuns`
|
||||||
2. Open Eclipse, Import > Existing Gradle Project > Select Folder
|
2. Open Eclipse, Import > Existing Gradle Project > Select Folder
|
||||||
or run `gradlew eclipse` to generate the project.
|
or run `gradlew eclipse` to generate the project.
|
||||||
|
|
||||||
If you prefer to use IntelliJ:
|
If you prefer to use IntelliJ:
|
||||||
1. Open IDEA, and import project.
|
1. Open IDEA, and import project.
|
||||||
2. Select your build.gradle file and have it import.
|
2. Select your build.gradle file and have it import.
|
||||||
3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
|
3. Run the following command: `./gradlew genIntellijRuns`
|
||||||
4. Refresh the Gradle Project in IDEA if required.
|
4. Refresh the Gradle Project in IDEA if required.
|
||||||
|
|
||||||
If at any point you are missing libraries in your IDE, or you've run into problems you can
|
If at any point you are missing libraries in your IDE, or you've run into problems you can
|
||||||
@@ -40,7 +40,7 @@ https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
|
|||||||
|
|
||||||
Additional Resources:
|
Additional Resources:
|
||||||
=========================
|
=========================
|
||||||
Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/
|
Community Documentation: https://docs.minecraftforge.net/en/1.19.2/gettingstarted/
|
||||||
LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0
|
LexManos' Install Video: https://youtu.be/8VEdtQLuLO0
|
||||||
Forge Forum: https://forums.minecraftforge.net/
|
Forge Forums: https://forums.minecraftforge.net/
|
||||||
Forge Discord: https://discord.gg/UvedJ9m
|
Forge Discord: https://discord.minecraftforge.net/
|
||||||
+95
-71
@@ -1,12 +1,16 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
|
id 'idea'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle' version '5.1.+'
|
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
|
||||||
}
|
}
|
||||||
|
|
||||||
version = '1.0'
|
version = mod_version
|
||||||
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
group = mod_group_id
|
||||||
archivesBaseName = 'modid'
|
|
||||||
|
base {
|
||||||
|
archivesName = mod_id
|
||||||
|
}
|
||||||
|
|
||||||
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
|
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
@@ -26,14 +30,36 @@ minecraft {
|
|||||||
//
|
//
|
||||||
// Use non-default mappings at your own risk. They may not always work.
|
// 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
|
||||||
|
|
||||||
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
|
// 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.
|
||||||
|
// In most cases, it is not necessary to enable.
|
||||||
|
// enableEclipsePrepareRuns = true
|
||||||
|
// enableIdeaPrepareRuns = true
|
||||||
|
|
||||||
|
// This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
|
||||||
|
// It is REQUIRED to be set to true for this template to function.
|
||||||
|
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
||||||
|
copyIdeResources = true
|
||||||
|
|
||||||
|
// When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
|
||||||
|
// The folder name can be set on a run configuration using the "folderName" property.
|
||||||
|
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
|
||||||
|
// generateRunFolders = true
|
||||||
|
|
||||||
|
// This property enables access transformers for use in development.
|
||||||
|
// They will be applied to the Minecraft artifact.
|
||||||
|
// 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.
|
||||||
|
// This default location is a best practice to automatically put the file in the right place in the final jar.
|
||||||
|
// See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
|
||||||
|
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
|
|
||||||
// Default run configurations.
|
// Default run configurations.
|
||||||
// These can be tweaked, removed, or duplicated as needed.
|
// These can be tweaked, removed, or duplicated as needed.
|
||||||
runs {
|
runs {
|
||||||
client {
|
// applies to all the run configs below
|
||||||
|
configureEach {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
// Recommended logging data for a userdev environment
|
// Recommended logging data for a userdev environment
|
||||||
@@ -49,65 +75,38 @@ minecraft {
|
|||||||
property 'forge.logging.console.level', 'debug'
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
|
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
|
||||||
property 'forge.enabledGameTestNamespaces', 'examplemod'
|
property 'forge.enabledGameTestNamespaces', mod_id
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
examplemod {
|
"${mod_id}" {
|
||||||
source sourceSets.main
|
source sourceSets.main
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
client {
|
||||||
|
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
|
||||||
|
property 'forge.enabledGameTestNamespaces', mod_id
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
workingDirectory project.file('run')
|
property 'forge.enabledGameTestNamespaces', mod_id
|
||||||
|
args '--nogui'
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
property 'forge.enabledGameTestNamespaces', 'examplemod'
|
|
||||||
|
|
||||||
mods {
|
|
||||||
examplemod {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This run config launches GameTestServer and runs all registered gametests, then exits.
|
// This run config launches GameTestServer and runs all registered gametests, then exits.
|
||||||
// By default, the server will crash when no gametests are provided.
|
// By default, the server will crash when no gametests are provided.
|
||||||
// The gametest system is also enabled by default for other run configs under the /test command.
|
// The gametest system is also enabled by default for other run configs under the /test command.
|
||||||
gameTestServer {
|
gameTestServer {
|
||||||
workingDirectory project.file('run')
|
property 'forge.enabledGameTestNamespaces', mod_id
|
||||||
|
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
property 'forge.enabledGameTestNamespaces', 'examplemod'
|
|
||||||
|
|
||||||
mods {
|
|
||||||
examplemod {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data {
|
data {
|
||||||
workingDirectory project.file('run')
|
// example of overriding the workingDirectory set in configureEach above
|
||||||
|
workingDirectory project.file('run-data')
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
|
||||||
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
|
||||||
|
|
||||||
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
|
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
|
||||||
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
|
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
|
||||||
|
|
||||||
mods {
|
|
||||||
examplemod {
|
|
||||||
source sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -126,48 +125,73 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
|
// Specify the version of Minecraft to use.
|
||||||
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
|
// Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
|
||||||
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
// The "userdev" classifier will be requested and setup by ForgeGradle.
|
||||||
minecraft '@FORGE_GROUP@:@FORGE_NAME@:@FORGE_VERSION@'
|
// If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
|
||||||
|
// 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}"
|
||||||
|
|
||||||
// Real mod deobf dependency examples - these get remapped to your current mappings
|
// Real mod deobf dependency examples - these get remapped to your current mappings
|
||||||
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
|
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
|
||||||
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
|
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
|
||||||
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
|
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
|
||||||
|
|
||||||
// Examples using mod jars from ./libs
|
// Example mod dependency using a mod jar from ./libs with a flat dir repository
|
||||||
|
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
|
||||||
|
// The group id is ignored when searching -- in this case, it is "blank"
|
||||||
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
|
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
|
||||||
|
|
||||||
// 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
|
||||||
}
|
}
|
||||||
|
|
||||||
// Example for how to get properties into the manifest for reading at runtime.
|
// This block of code expands all declared replace properties in the specified resource targets.
|
||||||
jar {
|
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
|
||||||
manifest {
|
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
|
||||||
attributes([
|
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
||||||
"Specification-Title" : "examplemod",
|
tasks.named('processResources', ProcessResources).configure {
|
||||||
"Specification-Vendor" : "examplemodsareus",
|
var replaceProperties = [
|
||||||
"Specification-Version" : "1", // We are version 1 of ourselves
|
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
|
||||||
"Implementation-Title" : project.name,
|
forge_version: forge_version, forge_version_range: forge_version_range,
|
||||||
"Implementation-Version" : project.jar.archiveVersion,
|
loader_version_range: loader_version_range,
|
||||||
"Implementation-Vendor" : "examplemodsareus",
|
mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
|
||||||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
mod_authors: mod_authors, mod_description: mod_description,
|
||||||
])
|
]
|
||||||
|
inputs.properties replaceProperties
|
||||||
|
|
||||||
|
filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
|
||||||
|
expand replaceProperties + [project: project]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Example configuration to allow publishing using the maven-publish plugin
|
// Example for how to get properties into the manifest for reading at runtime.
|
||||||
// This is the preferred method to reobfuscate your jar file
|
tasks.named('jar', Jar).configure {
|
||||||
jar.finalizedBy('reobfJar')
|
manifest {
|
||||||
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
|
attributes([
|
||||||
// publish.dependsOn('reobfJar')
|
'Specification-Title' : mod_id,
|
||||||
|
'Specification-Vendor' : mod_authors,
|
||||||
|
'Specification-Version' : '1', // We are version 1 of ourselves
|
||||||
|
'Implementation-Title' : project.name,
|
||||||
|
'Implementation-Version' : project.jar.archiveVersion,
|
||||||
|
'Implementation-Vendor' : mod_authors,
|
||||||
|
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is the preferred method to reobfuscate your jar file
|
||||||
|
finalizedBy 'reobfJar'
|
||||||
|
}
|
||||||
|
|
||||||
|
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
|
||||||
|
// tasks.named('publish').configure {
|
||||||
|
// dependsOn 'reobfJar'
|
||||||
|
// }
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
mavenJava(MavenPublication) {
|
register('mavenJava', MavenPublication) {
|
||||||
artifact jar
|
artifact jar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+56
-1
@@ -1,4 +1,59 @@
|
|||||||
# 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=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
|
|
||||||
|
## Environment Properties
|
||||||
|
|
||||||
|
# The Minecraft version must agree with the Forge version to get a valid artifact
|
||||||
|
minecraft_version=@MC_VERSION@
|
||||||
|
# The Minecraft version range can use any release version of Minecraft as bounds.
|
||||||
|
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
|
||||||
|
# as they do not follow standard versioning conventions.
|
||||||
|
minecraft_version_range=[@MC_VERSION@,@MC_NEXT_VERSION@)
|
||||||
|
# The Forge version must agree with the Minecraft version to get a valid artifact
|
||||||
|
forge_version=@FORGE_VERSION@
|
||||||
|
# The Forge version range can use any version of Forge as bounds or match the loader version range
|
||||||
|
forge_version_range=[@FORGE_SPEC_VERSION@,)
|
||||||
|
# The loader version range can only use the major version of Forge/FML as bounds
|
||||||
|
loader_version_range=[@FORGE_SPEC_VERSION@,)
|
||||||
|
# The mapping channel to use for mappings.
|
||||||
|
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
|
||||||
|
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
|
||||||
|
#
|
||||||
|
# | Channel | Version | |
|
||||||
|
# |-----------|----------------------|--------------------------------------------------------------------------------|
|
||||||
|
# | 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 |
|
||||||
|
#
|
||||||
|
# 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 Minecraft Forge.
|
||||||
|
# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
|
||||||
|
mapping_channel=@MAPPING_CHANNEL@
|
||||||
|
# The mapping version to query from the mapping channel.
|
||||||
|
# This must match the format required by the mapping channel.
|
||||||
|
mapping_version=@MAPPING_VERSION@
|
||||||
|
|
||||||
|
|
||||||
|
## Mod Properties
|
||||||
|
|
||||||
|
# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
|
||||||
|
# Must match the String constant located in the main mod class annotated with @Mod.
|
||||||
|
mod_id=examplemod
|
||||||
|
# The human-readable display name for the mod.
|
||||||
|
mod_name=Example Mod
|
||||||
|
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||||
|
mod_license=All Rights Reserved
|
||||||
|
# The mod version. See https://semver.org/
|
||||||
|
mod_version=1.0.0
|
||||||
|
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
||||||
|
# This should match the base package used for the mod sources.
|
||||||
|
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
mod_group_id=com.example.examplemod
|
||||||
|
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
|
||||||
|
mod_authors=YourNameHere, OtherNameHere
|
||||||
|
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
|
||||||
|
mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
|
||||||
+9
-2
@@ -1,6 +1,13 @@
|
|||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
maven {
|
||||||
|
name = 'MinecraftForge'
|
||||||
|
url = 'https://maven.minecraftforge.net/'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package com.example.examplemod;
|
||||||
|
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraftforge.common.ForgeConfigSpec;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
import net.minecraftforge.fml.event.config.ModConfigEvent;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
|
||||||
|
// Demonstrates how to use Forge's config APIs
|
||||||
|
@Mod.EventBusSubscriber(modid = ExampleMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
|
||||||
|
public class Config
|
||||||
|
{
|
||||||
|
private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
|
||||||
|
|
||||||
|
private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
|
||||||
|
.comment("Whether to log the dirt block on common setup")
|
||||||
|
.define("logDirtBlock", true);
|
||||||
|
|
||||||
|
private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER
|
||||||
|
.comment("A magic number")
|
||||||
|
.defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE);
|
||||||
|
|
||||||
|
public static final ForgeConfigSpec.ConfigValue<String> MAGIC_NUMBER_INTRODUCTION = BUILDER
|
||||||
|
.comment("What you want the introduction message to be for the magic number")
|
||||||
|
.define("magicNumberIntroduction", "The magic number is... ");
|
||||||
|
|
||||||
|
// a list of strings that are treated as resource locations for items
|
||||||
|
private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
|
||||||
|
.comment("A list of items to log on common setup.")
|
||||||
|
.defineListAllowEmpty(Collections.singletonList("items"), () -> List.of("minecraft:iron_ingot"), Config::validateItemName);
|
||||||
|
|
||||||
|
static final ForgeConfigSpec SPEC = BUILDER.build();
|
||||||
|
|
||||||
|
public static boolean logDirtBlock;
|
||||||
|
public static int magicNumber;
|
||||||
|
public static String magicNumberIntroduction;
|
||||||
|
public static Set<Item> items;
|
||||||
|
|
||||||
|
private static boolean validateItemName(final Object obj)
|
||||||
|
{
|
||||||
|
return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
static void onLoad(final ModConfigEvent event)
|
||||||
|
{
|
||||||
|
logDirtBlock = LOG_DIRT_BLOCK.get();
|
||||||
|
magicNumber = MAGIC_NUMBER.get();
|
||||||
|
magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
|
||||||
|
|
||||||
|
// convert the list of strings into a set of items
|
||||||
|
items = ITEM_STRINGS.get().stream()
|
||||||
|
.map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@ import net.minecraftforge.eventbus.api.IEventBus;
|
|||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.InterModComms;
|
import net.minecraftforge.fml.InterModComms;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||||
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
|
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
|
||||||
@@ -44,9 +45,9 @@ public class ExampleMod
|
|||||||
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
|
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
|
||||||
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
|
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
|
||||||
|
|
||||||
public ExampleMod()
|
public ExampleMod(FMLJavaModLoadingContext context)
|
||||||
{
|
{
|
||||||
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
IEventBus modEventBus = context.getModEventBus();
|
||||||
|
|
||||||
// Register the commonSetup method for modloading
|
// Register the commonSetup method for modloading
|
||||||
modEventBus.addListener(this::commonSetup);
|
modEventBus.addListener(this::commonSetup);
|
||||||
@@ -58,13 +59,22 @@ public class ExampleMod
|
|||||||
|
|
||||||
// Register ourselves for server and other game events we are interested in
|
// Register ourselves for server and other game events we are interested in
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
|
|
||||||
|
// Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
|
||||||
|
context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void commonSetup(final FMLCommonSetupEvent event)
|
private void commonSetup(final FMLCommonSetupEvent event)
|
||||||
{
|
{
|
||||||
// Some common setup code
|
// Some common setup code
|
||||||
LOGGER.info("HELLO FROM COMMON SETUP");
|
LOGGER.info("HELLO FROM COMMON SETUP");
|
||||||
LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
|
|
||||||
|
if (Config.logDirtBlock)
|
||||||
|
LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
|
||||||
|
|
||||||
|
LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber);
|
||||||
|
|
||||||
|
Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// You can use SubscribeEvent and let the Event Bus discover methods to call
|
// You can use SubscribeEvent and let the Event Bus discover methods to call
|
||||||
|
|||||||
@@ -6,65 +6,62 @@
|
|||||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
modLoader="javafml" #mandatory
|
modLoader="javafml" #mandatory
|
||||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||||
loaderVersion="[@FORGE_SPEC_VERSION@,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||||
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
||||||
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||||
license="All rights reserved"
|
license="${mod_license}"
|
||||||
# A URL to refer people to when problems occur with this mod
|
# A URL to refer people to when problems occur with this mod
|
||||||
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
||||||
|
# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
|
||||||
|
# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
|
||||||
|
#clientSideOnly=true #optional - defaults to false if absent
|
||||||
# A list of mods - how many allowed here is determined by the individual mod loader
|
# A list of mods - how many allowed here is determined by the individual mod loader
|
||||||
[[mods]] #mandatory
|
[[mods]] #mandatory
|
||||||
# The modid of the mod
|
# The modid of the mod
|
||||||
modId="examplemod" #mandatory
|
modId="${mod_id}" #mandatory
|
||||||
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
|
# The version number of the mod
|
||||||
# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
|
version="${mod_version}" #mandatory
|
||||||
# see the associated build.gradle script for how to populate this completely automatically during a build
|
# A display name for the mod
|
||||||
version="${file.jarVersion}" #mandatory
|
displayName="${mod_name}" #mandatory
|
||||||
# A display name for the mod
|
# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
|
||||||
displayName="Example Mod" #mandatory
|
|
||||||
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
|
|
||||||
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
|
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
|
||||||
# A URL for the "homepage" for this mod, displayed in the mod UI
|
# A URL for the "homepage" for this mod, displayed in the mod UI
|
||||||
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
|
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
|
||||||
# A file name (in the root of the mod JAR) containing a logo for display
|
# A file name (in the root of the mod JAR) containing a logo for display
|
||||||
logoFile="examplemod.png" #optional
|
#logoFile="examplemod.png" #optional
|
||||||
# A text field displayed in the mod UI
|
# A text field displayed in the mod UI
|
||||||
credits="Thanks for this example mod goes to Java" #optional
|
#credits="" #optional
|
||||||
# A text field displayed in the mod UI
|
# A text field displayed in the mod UI
|
||||||
authors="Love, Cheese and small house plants" #optional
|
authors="${mod_authors}" #optional
|
||||||
# Display Test controls the display for your mod in the server connection screen
|
# Display Test controls the display for your mod in the server connection screen
|
||||||
# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
|
# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
|
||||||
# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
|
# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
|
||||||
# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
|
# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
|
||||||
# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
|
# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
|
||||||
# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
|
# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
|
||||||
#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
|
#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
|
||||||
|
|
||||||
# The description text for the mod (multi line!) (#mandatory)
|
# The description text for the mod (multi line!) (#mandatory)
|
||||||
description='''
|
description='''${mod_description}'''
|
||||||
This is a long form description of the mod. You can write whatever you want here
|
|
||||||
|
|
||||||
Have some lorem ipsum.
|
|
||||||
|
|
||||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
|
||||||
'''
|
|
||||||
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
|
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
|
||||||
[[dependencies.examplemod]] #optional
|
[[dependencies.${mod_id}]] #optional
|
||||||
# the modid of the dependency
|
# the modid of the dependency
|
||||||
modId="forge" #mandatory
|
modId="forge" #mandatory
|
||||||
# Does this dependency have to exist - if not, ordering below must be specified
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
mandatory=true #mandatory
|
mandatory=true #mandatory
|
||||||
# The version range of the dependency
|
# The version range of the dependency
|
||||||
versionRange="[@FORGE_SPEC_VERSION@,)" #mandatory
|
versionRange="${forge_version_range}" #mandatory
|
||||||
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
|
||||||
ordering="NONE"
|
# BEFORE - This mod is loaded BEFORE the dependency
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# AFTER - This mod is loaded AFTER the dependency
|
||||||
side="BOTH"
|
ordering="NONE"
|
||||||
|
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
|
||||||
|
side="BOTH"
|
||||||
# Here's another dependency
|
# Here's another dependency
|
||||||
[[dependencies.examplemod]]
|
[[dependencies.${mod_id}]]
|
||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
||||||
versionRange="[@MC_VERSION@,@MC_NEXT_VERSION@)"
|
versionRange="${minecraft_version_range}"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="BOTH"
|
side="BOTH"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"pack": {
|
"pack": {
|
||||||
"description": "examplemod resources",
|
"description": "${mod_id} resources",
|
||||||
"pack_format": 9,
|
"pack_format": 9,
|
||||||
"forge:resource_pack_format": 9,
|
"forge:resource_pack_format": 9,
|
||||||
"forge:data_pack_format": 10
|
"forge:data_pack_format": 10
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/CrashReport.java
|
--- a/net/minecraft/CrashReport.java
|
||||||
+++ b/net/minecraft/CrashReport.java
|
+++ b/net/minecraft/CrashReport.java
|
||||||
@@ -57,14 +_,8 @@
|
@@ -57,14 +_,9 @@
|
||||||
if (this.f_127506_ != null && this.f_127506_.length > 0) {
|
if (this.f_127506_ != null && this.f_127506_.length > 0) {
|
||||||
p_127520_.append("-- Head --\n");
|
p_127520_.append("-- Head --\n");
|
||||||
p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
|
p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
- p_127520_.append("\n");
|
- p_127520_.append("\n");
|
||||||
|
+ p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.f_127501_, this.f_127506_));
|
||||||
+ p_127520_.append("Stacktrace:");
|
+ p_127520_.append("Stacktrace:");
|
||||||
+ p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
|
+ p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.f_127506_));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -342,6 +342,22 @@
|
|||||||
this.f_91026_.m_6180_("gui");
|
this.f_91026_.m_6180_("gui");
|
||||||
this.f_240378_.m_240688_();
|
this.f_240378_.m_240688_();
|
||||||
this.f_91065_.m_193832_(this.f_91012_);
|
this.f_91065_.m_193832_(this.f_91012_);
|
||||||
|
@@ -1749,6 +_,7 @@
|
||||||
|
|
||||||
|
this.f_91005_.m_120596_();
|
||||||
|
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.f_91073_, () -> true);
|
||||||
|
try {
|
||||||
|
this.f_91073_.m_104726_(() -> {
|
||||||
|
return true;
|
||||||
|
@@ -1764,6 +_,7 @@
|
||||||
|
|
||||||
|
throw new ReportedException(crashreport);
|
||||||
|
}
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.f_91073_, () -> true);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.f_91026_.m_6182_("animateTick");
|
||||||
@@ -1783,6 +_,8 @@
|
@@ -1783,6 +_,8 @@
|
||||||
this.f_91026_.m_6182_("keyboard");
|
this.f_91026_.m_6182_("keyboard");
|
||||||
this.f_91068_.m_90931_();
|
this.f_91068_.m_90931_();
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/client/gui/screens/ConnectScreen.java
|
||||||
|
+++ b/net/minecraft/client/gui/screens/ConnectScreen.java
|
||||||
|
@@ -73,6 +_,8 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!optional.isPresent()) {
|
||||||
|
+ ConnectScreen.f_95683_.error("Couldn't connect to server: Unknown host \"{}\"", p_169266_.m_171863_());
|
||||||
|
+ net.minecraftforge.network.DualStackUtils.logInitialPreferences();
|
||||||
|
p_169265_.execute(() -> {
|
||||||
|
p_169265_.m_91152_(new DisconnectedScreen(ConnectScreen.this.f_95686_, CommonComponents.f_130661_, ConnectScreen.f_169260_));
|
||||||
|
});
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
--- a/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
|
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
|
@@ -77,9 +_,10 @@
|
||||||
|
this.f_96541_.m_91152_(new SocialInteractionsScreen());
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
+ this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 - 16, 204, 20, Component.m_237115_("fml.menu.mods"), modButton -> this.f_96541_.m_91152_(new net.minecraftforge.client.gui.ModListScreen(this))));
|
||||||
|
|
||||||
|
Component component = this.f_96541_.m_91090_() ? Component.m_237115_("menu.returnToMenu") : Component.m_237115_("menu.disconnect");
|
||||||
|
- this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 120 + -16, 204, 20, component, (p_96315_) -> {
|
||||||
|
+ this.m_142416_(new Button(this.f_96543_ / 2 - 102, this.f_96544_ / 4 + 144 + -16, 204, 20, component, (p_96315_) -> {
|
||||||
|
boolean flag = this.f_96541_.m_91090_();
|
||||||
|
boolean flag1 = this.f_96541_.m_91294_();
|
||||||
|
p_96315_.f_93623_ = false;
|
||||||
@@ -30,3 +30,12 @@
|
|||||||
this.m_241119_(p_241518_, p_241542_.m_237220_());
|
this.m_241119_(p_241518_, p_241542_.m_237220_());
|
||||||
this.m_240498_(p_241510_, p_241542_.m_241109_());
|
this.m_240498_(p_241510_, p_241542_.m_241109_());
|
||||||
this.f_240659_ = Util.m_137550_();
|
this.f_240659_ = Util.m_137550_();
|
||||||
|
@@ -263,6 +_,8 @@
|
||||||
|
|
||||||
|
public void m_240494_(Component p_240522_, boolean p_240642_) {
|
||||||
|
if (!this.f_240348_.f_91066_.m_231833_().m_231551_() || !this.f_240348_.m_91246_(this.m_240473_(p_240522_))) {
|
||||||
|
+ p_240522_ = net.minecraftforge.client.ForgeHooksClient.onClientSystemChat(p_240522_, p_240642_);
|
||||||
|
+ if (p_240522_ == null) return;
|
||||||
|
if (p_240642_) {
|
||||||
|
this.f_240348_.f_91065_.m_93063_(p_240522_, false);
|
||||||
|
} else {
|
||||||
@@ -8,7 +8,14 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -289,6 +_,8 @@
|
@@ -283,12 +_,15 @@
|
||||||
|
|
||||||
|
public boolean m_108700_(boolean p_108701_) {
|
||||||
|
ServerboundPlayerActionPacket.Action serverboundplayeractionpacket$action = p_108701_ ? ServerboundPlayerActionPacket.Action.DROP_ALL_ITEMS : ServerboundPlayerActionPacket.Action.DROP_ITEM;
|
||||||
|
+ if (m_6117_() && m_7655_() == InteractionHand.MAIN_HAND && (p_108701_ || m_21211_().m_41613_() == 1)) m_5810_(); // Forge: fix MC-231097 on the clientside
|
||||||
|
ItemStack itemstack = this.m_150109_().m_182403_(p_108701_);
|
||||||
|
this.f_108617_.m_104955_(new ServerboundPlayerActionPacket(serverboundplayeractionpacket$action, BlockPos.f_121853_, Direction.DOWN));
|
||||||
|
return !itemstack.m_41619_();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void m_240287_(String p_240288_, @Nullable Component p_240289_) {
|
public void m_240287_(String p_240288_, @Nullable Component p_240289_) {
|
||||||
|
|||||||
@@ -52,16 +52,23 @@
|
|||||||
public static RenderType m_109279_(ItemStack p_109280_, boolean p_109281_) {
|
public static RenderType m_109279_(ItemStack p_109280_, boolean p_109281_) {
|
||||||
Item item = p_109280_.m_41720_();
|
Item item = p_109280_.m_41720_();
|
||||||
if (item instanceof BlockItem) {
|
if (item instanceof BlockItem) {
|
||||||
@@ -351,8 +_,73 @@
|
@@ -351,11 +_,79 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RenderType m_109287_(FluidState p_109288_) {
|
public static RenderType m_109287_(FluidState p_109288_) {
|
||||||
- RenderType rendertype = f_109276_.get(p_109288_.m_76152_());
|
- RenderType rendertype = f_109276_.get(p_109288_.m_76152_());
|
||||||
+ RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.m_76152_()));
|
+ RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.m_76152_()));
|
||||||
return rendertype != null ? rendertype : RenderType.m_110451_();
|
return rendertype != null ? rendertype : RenderType.m_110451_();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void m_109291_(boolean p_109292_) {
|
||||||
|
f_109277_ = p_109292_;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ // FORGE START
|
+ /** Forge: Check if we are running in {@linkplain net.minecraft.client.Minecraft#useFancyGraphics() fancy graphics} to account for fast graphics render types */
|
||||||
|
+ public static boolean isFancy() {
|
||||||
|
+ return f_109277_;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110457_());
|
+ private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110457_());
|
||||||
+ private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110451_());
|
+ private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110451_());
|
||||||
@@ -79,7 +86,7 @@
|
|||||||
+ });
|
+ });
|
||||||
+
|
+
|
||||||
+ /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
|
+ /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
|
||||||
+ @Deprecated(forRemoval = true, since = "1.19")
|
+ @Deprecated(since = "1.21.4", forRemoval = true)
|
||||||
+ public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
|
+ public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
|
||||||
+ Block block = state.m_60734_();
|
+ Block block = state.m_60734_();
|
||||||
+ if (block instanceof LeavesBlock) {
|
+ if (block instanceof LeavesBlock) {
|
||||||
@@ -90,20 +97,20 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
||||||
+ @Deprecated(forRemoval = true, since = "1.19")
|
+ @Deprecated(since = "1.21.4", forRemoval = true)
|
||||||
+ public static void setRenderLayer(Block block, RenderType type) {
|
+ public static void setRenderLayer(Block block, RenderType type) {
|
||||||
+ com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
|
+ com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
|
||||||
+ setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
|
+ setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
||||||
+ @Deprecated(forRemoval = true, since = "1.19")
|
+ @Deprecated(since = "1.21.4", forRemoval = true)
|
||||||
+ public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
|
+ public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
|
||||||
+ setRenderLayer(block, createSetFromPredicate(predicate));
|
+ setRenderLayer(block, createSetFromPredicate(predicate));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
|
||||||
+ @Deprecated(forRemoval = true, since = "1.19")
|
+ @Deprecated(since = "1.21.4", forRemoval = true)
|
||||||
+ public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
|
+ public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
|
||||||
+ checkClientLoading();
|
+ checkClientLoading();
|
||||||
+ BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
|
+ BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
|
||||||
@@ -125,5 +132,4 @@
|
|||||||
+ private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) {
|
+ private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) {
|
||||||
+ return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110506_().stream().filter(predicate).toArray(RenderType[]::new));
|
+ return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110506_().stream().filter(predicate).toArray(RenderType[]::new));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public static void m_109291_(boolean p_109292_) {
|
|
||||||
+2
-1
@@ -1,10 +1,11 @@
|
|||||||
--- a/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
|
--- a/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
|
||||||
+++ b/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
|
+++ b/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
|
||||||
@@ -39,6 +_,7 @@
|
@@ -39,6 +_,8 @@
|
||||||
map.put("particle", p_111672_.m_111477_("particle") ? Either.left(p_111672_.m_111480_("particle")) : map.get("layer0"));
|
map.put("particle", p_111672_.m_111477_("particle") ? Either.left(p_111672_.m_111480_("particle")) : map.get("layer0"));
|
||||||
BlockModel blockmodel = new BlockModel((ResourceLocation)null, list, map, false, p_111672_.m_111479_(), p_111672_.m_111491_(), p_111672_.m_111484_());
|
BlockModel blockmodel = new BlockModel((ResourceLocation)null, list, map, false, p_111672_.m_111479_(), p_111672_.m_111491_(), p_111672_.m_111484_());
|
||||||
blockmodel.f_111416_ = p_111672_.f_111416_;
|
blockmodel.f_111416_ = p_111672_.f_111416_;
|
||||||
+ blockmodel.customData.copyFrom(p_111672_.customData);
|
+ blockmodel.customData.copyFrom(p_111672_.customData);
|
||||||
|
+ blockmodel.customData.setGui3d(false);
|
||||||
return blockmodel;
|
return blockmodel;
|
||||||
}
|
}
|
||||||
|
|
||||||
+4
-2
@@ -1,13 +1,15 @@
|
|||||||
--- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
|
--- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
|
||||||
+++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
|
+++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
|
||||||
@@ -34,7 +_,9 @@
|
@@ -34,7 +_,11 @@
|
||||||
p_114637_.m_85836_();
|
p_114637_.m_85836_();
|
||||||
BlockPos blockpos = new BlockPos(p_114634_.m_20185_(), p_114634_.m_20191_().f_82292_, p_114634_.m_20189_());
|
BlockPos blockpos = new BlockPos(p_114634_.m_20185_(), p_114634_.m_20191_().f_82292_, p_114634_.m_20189_());
|
||||||
p_114637_.m_85837_(-0.5D, 0.0D, -0.5D);
|
p_114637_.m_85837_(-0.5D, 0.0D, -0.5D);
|
||||||
- this.f_234617_.m_110937_().m_234379_(level, this.f_234617_.m_110910_(blockstate), blockstate, blockpos, p_114637_, p_114638_.m_6299_(ItemBlockRenderTypes.m_109293_(blockstate)), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_);
|
- this.f_234617_.m_110937_().m_234379_(level, this.f_234617_.m_110910_(blockstate), blockstate, blockpos, p_114637_, p_114638_.m_6299_(ItemBlockRenderTypes.m_109293_(blockstate)), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_);
|
||||||
+ var model = this.f_234617_.m_110910_(blockstate);
|
+ var model = this.f_234617_.m_110910_(blockstate);
|
||||||
+ for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY))
|
+ for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY)) {
|
||||||
|
+ renderType = net.minecraftforge.client.RenderTypeHelper.getMovingBlockRenderType(renderType);
|
||||||
+ this.f_234617_.m_110937_().tesselateBlock(level, model, blockstate, blockpos, p_114637_, p_114638_.m_6299_(renderType), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_, net.minecraftforge.client.model.data.ModelData.EMPTY, renderType);
|
+ this.f_234617_.m_110937_().tesselateBlock(level, model, blockstate, blockpos, p_114637_, p_114638_.m_6299_(renderType), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_, net.minecraftforge.client.model.data.ModelData.EMPTY, renderType);
|
||||||
|
+ }
|
||||||
p_114637_.m_85849_();
|
p_114637_.m_85849_();
|
||||||
super.m_7392_(p_114634_, p_114635_, p_114636_, p_114637_, p_114638_, p_114639_);
|
super.m_7392_(p_114634_, p_114635_, p_114636_, p_114637_, p_114638_, p_114639_);
|
||||||
}
|
}
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
int j1 = Mth.m_14173_(i1);
|
int j1 = Mth.m_14173_(i1);
|
||||||
- int k1;
|
- int k1;
|
||||||
+ int k1 = p_118311_;
|
+ int k1 = p_118311_;
|
||||||
+ if (false) // FORGE: do not lower the mipmap level
|
+ if (net.minecraftforge.common.ForgeConfig.CLIENT.allowMipmapLowering()) // FORGE: do not lower the mipmap level
|
||||||
if (j1 < p_118311_) {
|
if (j1 < p_118311_) {
|
||||||
f_118261_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_118265_, p_118311_, j1, i1);
|
f_118261_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_118265_, p_118311_, j1, i1);
|
||||||
k1 = j1;
|
k1 = j1;
|
||||||
|
|||||||
+88
-12
@@ -1,39 +1,81 @@
|
|||||||
--- a/net/minecraft/client/resources/model/SimpleBakedModel.java
|
--- a/net/minecraft/client/resources/model/SimpleBakedModel.java
|
||||||
+++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
|
+++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
|
||||||
@@ -26,8 +_,17 @@
|
@@ -26,8 +_,44 @@
|
||||||
protected final TextureAtlasSprite f_119485_;
|
protected final TextureAtlasSprite f_119485_;
|
||||||
protected final ItemTransforms f_119486_;
|
protected final ItemTransforms f_119486_;
|
||||||
protected final ItemOverrides f_119487_;
|
protected final ItemOverrides f_119487_;
|
||||||
|
+ /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
|
||||||
+ protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
|
+ protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
|
||||||
|
+ /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
|
||||||
|
+ protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
|
||||||
|
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
|
||||||
+ protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
|
+ protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
|
||||||
|
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
|
||||||
|
+ protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
|
||||||
|
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
|
||||||
+ protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
|
+ protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
|
||||||
|
+ /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
|
||||||
|
+ protected final boolean isRenderingCutout;
|
||||||
|
|
||||||
+ /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
|
+ /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
|
||||||
+ @Deprecated
|
+ @Deprecated
|
||||||
public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
|
public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
|
||||||
+ this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
+ this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup for fast graphics} **/
|
||||||
|
+ @Deprecated(forRemoval = true, since = "1.21.4")
|
||||||
+ public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
|
+ public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
|
||||||
|
+ this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Constructor with {@link net.minecraftforge.client.RenderTypeGroup RenderTypeGroup} for fancy and fast graphics. Preferred over {@link net.minecraft.client.renderer.ItemBlockRenderTypes#setRenderLayer(net.minecraft.world.level.block.Block, net.minecraft.client.renderer.RenderType) ItemBlockRenderTypes.setRenderLayer(Block, RenderType)}. */
|
||||||
|
+ public SimpleBakedModel(
|
||||||
|
+ List<BakedQuad> p_119489_,
|
||||||
|
+ Map<Direction, List<BakedQuad>> p_119490_,
|
||||||
|
+ boolean p_119491_,
|
||||||
|
+ boolean p_119492_,
|
||||||
|
+ boolean p_119493_,
|
||||||
|
+ TextureAtlasSprite p_119494_,
|
||||||
|
+ ItemTransforms p_119495_,
|
||||||
|
+ ItemOverrides p_119496_,
|
||||||
|
+ net.minecraftforge.client.RenderTypeGroup renderTypes,
|
||||||
|
+ net.minecraftforge.client.RenderTypeGroup renderTypesFast
|
||||||
|
+ ) {
|
||||||
this.f_119480_ = p_119489_;
|
this.f_119480_ = p_119489_;
|
||||||
this.f_119481_ = p_119490_;
|
this.f_119481_ = p_119490_;
|
||||||
this.f_119482_ = p_119491_;
|
this.f_119482_ = p_119491_;
|
||||||
@@ -36,6 +_,9 @@
|
@@ -36,6 +_,15 @@
|
||||||
this.f_119485_ = p_119494_;
|
this.f_119485_ = p_119494_;
|
||||||
this.f_119486_ = p_119495_;
|
this.f_119486_ = p_119495_;
|
||||||
this.f_119487_ = p_119496_;
|
this.f_119487_ = p_119496_;
|
||||||
+ this.blockRenderTypes = !renderTypes.isEmpty() ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
|
+
|
||||||
+ this.itemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entity()) : null;
|
+ boolean hasRenderTypes = renderTypes != null && !renderTypes.isEmpty();
|
||||||
+ this.fabulousItemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entityFabulous()) : null;
|
+ boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
|
||||||
|
+ this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
|
||||||
|
+ this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
|
||||||
|
+ this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
|
||||||
|
+ this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
|
||||||
|
+ this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
|
||||||
|
+ this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110463_() || renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110457_());
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<BakedQuad> m_213637_(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) {
|
public List<BakedQuad> m_213637_(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) {
|
||||||
@@ -70,6 +_,25 @@
|
@@ -70,6 +_,40 @@
|
||||||
return this.f_119487_;
|
return this.f_119487_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.m_110451_());
|
||||||
|
+ private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.m_110451_());
|
||||||
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) {
|
+ public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) {
|
||||||
|
+ if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
|
||||||
|
+ if (blockRenderTypesFast != null)
|
||||||
|
+ return blockRenderTypesFast;
|
||||||
|
+ if (isRenderingCutout && state.m_60734_() instanceof net.minecraft.world.level.block.LeavesBlock)
|
||||||
|
+ return SOLID_BLOCK;
|
||||||
|
+ }
|
||||||
+ if (blockRenderTypes != null)
|
+ if (blockRenderTypes != null)
|
||||||
+ return blockRenderTypes;
|
+ return blockRenderTypes;
|
||||||
+ return BakedModel.super.getRenderTypes(state, rand, data);
|
+ return BakedModel.super.getRenderTypes(state, rand, data);
|
||||||
@@ -42,11 +84,17 @@
|
|||||||
+ @Override
|
+ @Override
|
||||||
+ public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
|
+ public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
|
||||||
+ if (!fabulous) {
|
+ if (!fabulous) {
|
||||||
|
+ if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
|
||||||
|
+ if (itemRenderTypesFast != null)
|
||||||
|
+ return itemRenderTypesFast;
|
||||||
|
+ if (isRenderingCutout && itemStack.m_41720_() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.m_40614_() instanceof net.minecraft.world.level.block.LeavesBlock)
|
||||||
|
+ return SOLID_BLOCK_ITEM;
|
||||||
|
+ }
|
||||||
+ if (itemRenderTypes != null)
|
+ if (itemRenderTypes != null)
|
||||||
+ return itemRenderTypes;
|
+ return itemRenderTypes;
|
||||||
+ } else {
|
+ } else {
|
||||||
+ if (fabulousItemRenderTypes != null)
|
+ if (fabulousItemRenderTypes != null)
|
||||||
+ return fabulousItemRenderTypes;
|
+ return fabulousItemRenderTypes;
|
||||||
+ }
|
+ }
|
||||||
+ return BakedModel.super.getRenderTypes(itemStack, fabulous);
|
+ return BakedModel.super.getRenderTypes(itemStack, fabulous);
|
||||||
+ }
|
+ }
|
||||||
@@ -54,22 +102,50 @@
|
|||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public static class Builder {
|
public static class Builder {
|
||||||
private final List<BakedQuad> f_119508_ = Lists.newArrayList();
|
private final List<BakedQuad> f_119508_ = Lists.newArrayList();
|
||||||
@@ -116,11 +_,17 @@
|
@@ -116,11 +_,45 @@
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
|
+ /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
|
||||||
+ @Deprecated
|
+ @Deprecated
|
||||||
public BakedModel m_119533_() {
|
public BakedModel m_119533_() {
|
||||||
+ return build(net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
+ return build(net.minecraftforge.client.RenderTypeGroup.EMPTY, net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Builds with the render type to be used for this model, which will be used for any graphics setting.
|
||||||
|
+ * <p>
|
||||||
|
+ * If you need to set a specific render type for
|
||||||
|
+ * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}, consider using
|
||||||
|
+ * {@link #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
|
||||||
|
+ * renderTypes(RenderTypeGroup, RenderTypeGroup)} instead which allows choosing render types for both fancy and
|
||||||
|
+ * fast graphics.
|
||||||
|
+ *
|
||||||
|
+ * @apiNote If this model is for {@linkplain net.minecraft.world.level.block.LeavesBlock leaves} and if the
|
||||||
|
+ * given render type is either {@linkplain net.minecraft.client.renderer.RenderType#cutout() cutout} or
|
||||||
|
+ * {@linkplain net.minecraft.client.renderer.RenderType#cutoutMipped() cutout mipped}, it will be overridden
|
||||||
|
+ * with {@linkplain net.minecraft.client.renderer.RenderType#solid() solid} when fast graphics is enabled.
|
||||||
|
+ * @see #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
|
||||||
|
+ * renderTypes(RenderTypeGroup, RenderTypeGroup)
|
||||||
|
+ */
|
||||||
+ public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) {
|
+ public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) {
|
||||||
|
+ return this.build(renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Builds with the render types to be used for this model: one for
|
||||||
|
+ * {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} and one for
|
||||||
|
+ * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
|
||||||
|
+ *
|
||||||
|
+ * @see #build(net.minecraftforge.client.RenderTypeGroup)
|
||||||
|
+ */
|
||||||
|
+ public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes, net.minecraftforge.client.RenderTypeGroup renderTypesFast) {
|
||||||
if (this.f_119512_ == null) {
|
if (this.f_119512_ == null) {
|
||||||
throw new RuntimeException("Missing particle!");
|
throw new RuntimeException("Missing particle!");
|
||||||
} else {
|
} else {
|
||||||
- return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_);
|
- return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_);
|
||||||
+ return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes);
|
+ // Forge: Account for render types in model JSONs
|
||||||
|
+ return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes, renderTypesFast);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,14 @@
|
|||||||
--- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
--- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
||||||
+++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
+++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
||||||
|
@@ -343,7 +_,7 @@
|
||||||
|
DispensibleContainerItem dispensiblecontaineritem = (DispensibleContainerItem)p_123562_.m_41720_();
|
||||||
|
BlockPos blockpos = p_123561_.m_7961_().m_121945_(p_123561_.m_6414_().m_61143_(DispenserBlock.f_52659_));
|
||||||
|
Level level = p_123561_.m_7727_();
|
||||||
|
- if (dispensiblecontaineritem.m_142073_((Player)null, level, blockpos, (BlockHitResult)null)) {
|
||||||
|
+ if (dispensiblecontaineritem.emptyContents((Player)null, level, blockpos, (BlockHitResult)null, p_123562_)) {
|
||||||
|
dispensiblecontaineritem.m_142131_((Player)null, level, p_123562_, blockpos);
|
||||||
|
return new ItemStack(Items.f_42446_);
|
||||||
|
} else {
|
||||||
@@ -402,9 +_,10 @@
|
@@ -402,9 +_,10 @@
|
||||||
level.m_46597_(blockpos, BaseFireBlock.m_49245_(level, blockpos));
|
level.m_46597_(blockpos, BaseFireBlock.m_49245_(level, blockpos));
|
||||||
level.m_142346_((Entity)null, GameEvent.f_157797_, blockpos);
|
level.m_142346_((Entity)null, GameEvent.f_157797_, blockpos);
|
||||||
|
|||||||
@@ -42,8 +42,9 @@
|
|||||||
if (!list1.isEmpty()) {
|
if (!list1.isEmpty()) {
|
||||||
throw new IllegalArgumentException(String.format(Locale.ROOT, "Couldn't define tag %s as it is missing following references: %s", p_236449_, list1.stream().map(Objects::toString).collect(Collectors.joining(","))));
|
throw new IllegalArgumentException(String.format(Locale.ROOT, "Couldn't define tag %s as it is missing following references: %s", p_236449_, list1.stream().map(Objects::toString).collect(Collectors.joining(","))));
|
||||||
} else {
|
} else {
|
||||||
JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, false)).getOrThrow(false, f_126541_::error);
|
- JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, false)).getOrThrow(false, f_126541_::error);
|
||||||
- Path path = this.f_236439_.m_236048_(p_236449_);
|
- Path path = this.f_236439_.m_236048_(p_236449_);
|
||||||
|
+ JsonElement jsonelement = TagFile.f_215958_.encodeStart(JsonOps.INSTANCE, new TagFile(list, p_236450_.isReplace())).getOrThrow(false, f_126541_::error);
|
||||||
+ Path path = this.getPath(p_236449_);
|
+ Path path = this.getPath(p_236449_);
|
||||||
+ if (path == null) return; // Forge: Allow running this data provider without writing it. Recipe provider needs valid tags.
|
+ if (path == null) return; // Forge: Allow running this data provider without writing it. Recipe provider needs valid tags.
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,26 @@
|
|||||||
--- a/net/minecraft/resources/ResourceLocation.java
|
--- a/net/minecraft/resources/ResourceLocation.java
|
||||||
+++ b/net/minecraft/resources/ResourceLocation.java
|
+++ b/net/minecraft/resources/ResourceLocation.java
|
||||||
|
@@ -38,14 +_,20 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /** @deprecated Forge: Consider using {@link #parse(String)} instead, as Mojang made this constructor private in 1.21 */
|
||||||
|
+ @Deprecated(forRemoval = true, since = "1.20.6")
|
||||||
|
public ResourceLocation(String p_135809_) {
|
||||||
|
this(m_135832_(p_135809_, ':'));
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /** @deprecated Forge: Consider using {@link #fromNamespaceAndPath(String, String)} instead, as Mojang made this constructor private in 1.21 */
|
||||||
|
+ @Deprecated(forRemoval = true, since = "1.20.6")
|
||||||
|
public ResourceLocation(String p_135811_, String p_135812_) {
|
||||||
|
this(new String[]{p_135811_, p_135812_});
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /** @deprecated Forge: Consider using {@link #bySeparator(String, char)} instead, as Mojang removed this method in 1.21 */
|
||||||
|
+ @Deprecated(forRemoval = true, since = "1.20.6")
|
||||||
|
public static ResourceLocation m_135822_(String p_135823_, char p_135824_) {
|
||||||
|
return new ResourceLocation(m_135832_(p_135823_, p_135824_));
|
||||||
|
}
|
||||||
@@ -125,6 +_,12 @@
|
@@ -125,6 +_,12 @@
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
@@ -13,3 +34,101 @@
|
|||||||
public String m_179910_() {
|
public String m_179910_() {
|
||||||
return this.toString().replace('/', '_').replace(':', '_');
|
return this.toString().replace('/', '_').replace(':', '_');
|
||||||
}
|
}
|
||||||
|
@@ -203,5 +_,97 @@
|
||||||
|
public JsonElement serialize(ResourceLocation p_135855_, Type p_135856_, JsonSerializationContext p_135857_) {
|
||||||
|
return new JsonPrimitive(p_135855_.toString());
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // FORGE: BACKPORTS FROM 1.21
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String, String)}. */
|
||||||
|
+ public static ResourceLocation fromNamespaceAndPath(String namespace, String path) {
|
||||||
|
+ return new ResourceLocation(namespace, path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String)}. */
|
||||||
|
+ public static ResourceLocation parse(String location) {
|
||||||
|
+ return new ResourceLocation(location);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Forge: This is a backported method from 1.21, and acts as an alternative to using {@link #parse(String)}. If you
|
||||||
|
+ * know for sure you are going to be using the {@linkplain #DEFAULT_NAMESPACE default namespace}
|
||||||
|
+ * ({@code "minecraft"}), use this.
|
||||||
|
+ */
|
||||||
|
+ public static ResourceLocation withDefaultNamespace(String path) {
|
||||||
|
+ return new ResourceLocation(f_179908_, assertValidPath(f_179908_, path), null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #of(String, char)}. */
|
||||||
|
+ public static ResourceLocation bySeparator(String location, char separator) {
|
||||||
|
+ return m_135822_(location, separator);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Forge: This is a backported method from 1.21, and is the same as {@link #bySeparator(String, char)} but returns
|
||||||
|
+ * {@code null} if a resource location cannot be created.
|
||||||
|
+ */
|
||||||
|
+ public static @Nullable ResourceLocation tryBySeparator(String location, char separator) {
|
||||||
|
+ int i = location.indexOf(separator);
|
||||||
|
+ if (i >= 0) {
|
||||||
|
+ String s = location.substring(i + 1);
|
||||||
|
+ if (!m_135841_(s)) {
|
||||||
|
+ return null;
|
||||||
|
+ } else if (i != 0) {
|
||||||
|
+ String s1 = location.substring(0, i);
|
||||||
|
+ return m_135843_(s1) ? new ResourceLocation(s1, s, null) : null;
|
||||||
|
+ } else {
|
||||||
|
+ return new ResourceLocation(f_179908_, s, null);
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ return m_135841_(location) ? new ResourceLocation(f_179908_, location, null) : null;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // FORGE: BACKPORTS FROM 1.19.3
|
||||||
|
+
|
||||||
|
+ /** Forge: Dummy for {@link #ResourceLocation(String, String, ForgeDummy)} */
|
||||||
|
+ private interface ForgeDummy { }
|
||||||
|
+
|
||||||
|
+ /** Forge: Backported constructor from 1.19.3, which skips additional validations. */
|
||||||
|
+ private ResourceLocation(String namespace, String path, @Nullable ForgeDummy dummy) {
|
||||||
|
+ this.f_135804_ = namespace;
|
||||||
|
+ this.f_135805_ = path;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: Backported method from 1.19.3 to handle path assertion without needing to use the constructor. */
|
||||||
|
+ private static String assertValidPath(String namespace, String path) {
|
||||||
|
+ if (!m_135841_(path)) {
|
||||||
|
+ throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + namespace + ":" + path);
|
||||||
|
+ } else {
|
||||||
|
+ return path;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.19.3, can be used to quickly create a new resource location with a different path. */
|
||||||
|
+ public ResourceLocation withPath(String path) {
|
||||||
|
+ return new ResourceLocation(this.f_135804_, assertValidPath(this.f_135804_, path), null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.19.3, can be used to quickly create a new resource location with a modified path. */
|
||||||
|
+ public ResourceLocation withPath(java.util.function.UnaryOperator<String> pathFunction) {
|
||||||
|
+ return this.withPath(pathFunction.apply(this.f_135805_));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.19.3, can be used to quickly create a new resource location with a prefixed path. */
|
||||||
|
+ public ResourceLocation withPrefix(String prefix) {
|
||||||
|
+ return this.withPath(prefix + this.f_135805_);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.19.3, can be used to quickly create a new resource location with a suffixed path. */
|
||||||
|
+ public ResourceLocation withSuffix(String suffix) {
|
||||||
|
+ return this.withPath(this.f_135805_ + suffix);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** Forge: This is a backported method from 1.19.3, can be used to quickly create a language key with a prefix and a suffix. */
|
||||||
|
+ public String toLanguageKey(String prefix, String suffix) {
|
||||||
|
+ return this.m_214296_(prefix) + "." + suffix;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,15 @@
|
|||||||
--- a/net/minecraft/server/Bootstrap.java
|
--- a/net/minecraft/server/Bootstrap.java
|
||||||
+++ b/net/minecraft/server/Bootstrap.java
|
+++ b/net/minecraft/server/Bootstrap.java
|
||||||
@@ -53,6 +_,8 @@
|
@@ -53,6 +_,13 @@
|
||||||
DispenseItemBehavior.m_123402_();
|
DispenseItemBehavior.m_123402_();
|
||||||
CauldronInteraction.m_175649_();
|
CauldronInteraction.m_175649_();
|
||||||
Registry.m_206101_();
|
Registry.m_206101_();
|
||||||
+ net.minecraftforge.registries.GameData.vanillaSnapshot();
|
+ net.minecraftforge.registries.GameData.vanillaSnapshot();
|
||||||
|
+ // Forge: Hacky fix to ensure that NetworkConstants is loaded before mods are constructed.
|
||||||
|
+ // Many older mods use network internals that shouldn't be used, yet are exposed so they get used anyways.
|
||||||
|
+ // This can cause class-loading issues with ForgeMod loading NetworkConstants and HandshakeResolver.
|
||||||
|
+ // To ensure that doesn't happen, we load it here and now. This is not an issue in 1.20.2 and newer.
|
||||||
|
+ net.minecraftforge.network.NetworkHooks.init();
|
||||||
+ if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context
|
+ if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context
|
||||||
m_135890_();
|
m_135890_();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/server/commands/SummonCommand.java
|
||||||
|
+++ b/net/minecraft/server/commands/SummonCommand.java
|
||||||
|
@@ -55,6 +_,7 @@
|
||||||
|
throw f_138810_.create();
|
||||||
|
} else {
|
||||||
|
if (p_138825_ && entity instanceof Mob) {
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((Mob)entity, p_138821_.m_81372_(), (float)entity.m_20185_(), (float)entity.m_20186_(), (float)entity.m_20189_(), null, MobSpawnType.COMMAND))
|
||||||
|
((Mob)entity).m_6518_(p_138821_.m_81372_(), p_138821_.m_81372_().m_6436_(entity.m_20183_()), MobSpawnType.COMMAND, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -84,6 +84,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -646,6 +_,7 @@
|
||||||
|
return Registry.f_122826_.m_7981_(p_8648_.m_6095_()).toString();
|
||||||
|
});
|
||||||
|
profilerfiller.m_6174_("tickNonPassenger");
|
||||||
|
+ if (p_8648_.canUpdate())
|
||||||
|
p_8648_.m_8119_();
|
||||||
|
this.m_46473_().m_7238_();
|
||||||
|
|
||||||
@@ -665,6 +_,7 @@
|
@@ -665,6 +_,7 @@
|
||||||
return Registry.f_122826_.m_7981_(p_8664_.m_6095_()).toString();
|
return Registry.f_122826_.m_7981_(p_8664_.m_6095_()).toString();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -289,12 +289,13 @@
|
|||||||
public TextFilter m_8967_() {
|
public TextFilter m_8967_() {
|
||||||
return this.f_8939_;
|
return this.f_8939_;
|
||||||
}
|
}
|
||||||
@@ -1534,11 +_,13 @@
|
@@ -1534,11 +_,14 @@
|
||||||
|
|
||||||
public boolean m_182294_(boolean p_182295_) {
|
public boolean m_182294_(boolean p_182295_) {
|
||||||
Inventory inventory = this.m_150109_();
|
Inventory inventory = this.m_150109_();
|
||||||
+ ItemStack selected = inventory.m_36056_();
|
+ ItemStack selected = inventory.m_36056_();
|
||||||
+ if (selected.m_41619_() || !selected.onDroppedByPlayer(this)) return false;
|
+ if (selected.m_41619_() || !selected.onDroppedByPlayer(this)) return false;
|
||||||
|
+ if (m_6117_() && m_7655_() == InteractionHand.MAIN_HAND && (p_182295_ || selected.m_41613_() == 1)) m_5810_(); // Forge: fix MC-231097 on the serverside
|
||||||
ItemStack itemstack = inventory.m_182403_(p_182295_);
|
ItemStack itemstack = inventory.m_182403_(p_182295_);
|
||||||
this.f_36096_.m_182417_(inventory, inventory.f_35977_).ifPresent((p_182293_) -> {
|
this.f_36096_.m_182417_(inventory, inventory.f_35977_).ifPresent((p_182293_) -> {
|
||||||
this.f_36096_.m_150404_(p_182293_, inventory.m_36056_());
|
this.f_36096_.m_150404_(p_182293_, inventory.m_36056_());
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
public PackRepository(Pack.PackConstructor p_10502_, RepositorySource... p_10503_) {
|
public PackRepository(Pack.PackConstructor p_10502_, RepositorySource... p_10503_) {
|
||||||
this.f_10500_ = p_10502_;
|
this.f_10500_ = p_10502_;
|
||||||
- this.f_10497_ = ImmutableSet.copyOf(p_10503_);
|
- this.f_10497_ = ImmutableSet.copyOf(p_10503_);
|
||||||
+ this.f_10497_ = new java.util.HashSet<>(java.util.Arrays.asList(p_10503_));
|
+ this.f_10497_ = new java.util.LinkedHashSet<>(List.of(p_10503_)); //Forge: This needs to be a mutable set, so that we can add to it later on.
|
||||||
}
|
}
|
||||||
|
|
||||||
public PackRepository(PackType p_143890_, RepositorySource... p_143891_) {
|
public PackRepository(PackType p_143890_, RepositorySource... p_143891_) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
private final List<TagEntry> f_215897_ = new ArrayList<>();
|
private final List<TagEntry> f_215897_ = new ArrayList<>();
|
||||||
|
|
||||||
public static TagBuilder m_215899_() {
|
public static TagBuilder m_215899_() {
|
||||||
@@ -34,5 +_,16 @@
|
@@ -34,5 +_,21 @@
|
||||||
|
|
||||||
public TagBuilder m_215909_(ResourceLocation p_215910_) {
|
public TagBuilder m_215909_(ResourceLocation p_215910_) {
|
||||||
return this.m_215902_(TagEntry.m_215953_(p_215910_));
|
return this.m_215902_(TagEntry.m_215953_(p_215910_));
|
||||||
@@ -34,5 +34,10 @@
|
|||||||
+ // FORGE: Shorthand version of replace(true)
|
+ // FORGE: Shorthand version of replace(true)
|
||||||
+ public TagBuilder replace() {
|
+ public TagBuilder replace() {
|
||||||
+ return replace(true);
|
+ return replace(true);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // FORGE: Is this tag set to replace or not?
|
||||||
|
+ public boolean isReplace() {
|
||||||
|
+ return this.replace;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/net/minecraft/util/SpawnUtil.java
|
||||||
|
+++ b/net/minecraft/util/SpawnUtil.java
|
||||||
|
@@ -24,7 +_,8 @@
|
||||||
|
if (p_216406_.m_6857_().m_61937_(blockpos$mutableblockpos) && m_216398_(p_216406_, p_216410_, blockpos$mutableblockpos, p_216411_)) {
|
||||||
|
T t = p_216404_.m_20655_(p_216406_, (CompoundTag)null, (Component)null, (Player)null, blockpos$mutableblockpos, p_216405_, false, false);
|
||||||
|
if (t != null) {
|
||||||
|
- if (t.m_5545_(p_216406_, p_216405_) && t.m_6914_(p_216406_)) {
|
||||||
|
+ int res = net.minecraftforge.common.ForgeHooks.canEntitySpawn(t, p_216406_, t.m_20185_(), t.m_20186_(), t.m_20189_(), null, p_216405_);
|
||||||
|
+ if (res == 1 || (res == 0 && t.m_5545_(p_216406_, p_216405_) && t.m_6914_(p_216406_))) {
|
||||||
|
p_216406_.m_47205_(t);
|
||||||
|
return Optional.of(t);
|
||||||
|
}
|
||||||
@@ -33,14 +33,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -326,6 +_,7 @@
|
@@ -351,6 +_,7 @@
|
||||||
public T m_20600_(ServerLevel p_20601_, @Nullable CompoundTag p_20602_, @Nullable Component p_20603_, @Nullable Player p_20604_, BlockPos p_20605_, MobSpawnType p_20606_, boolean p_20607_, boolean p_20608_) {
|
Mob mob = (Mob)t;
|
||||||
T t = this.m_20655_(p_20601_, p_20602_, p_20603_, p_20604_, p_20605_, p_20606_, p_20607_, p_20608_);
|
mob.f_20885_ = mob.m_146908_();
|
||||||
if (t != null) {
|
mob.f_20883_ = mob.m_146908_();
|
||||||
+ if (t instanceof net.minecraft.world.entity.Mob && net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((net.minecraft.world.entity.Mob) t, p_20601_, p_20605_.m_123341_(), p_20605_.m_123342_(), p_20605_.m_123343_(), null, p_20606_)) return null;
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, p_20656_, (float) mob.m_20185_(), (float) mob.m_20186_(), (float) mob.m_20189_(), null, p_20661_))
|
||||||
p_20601_.m_47205_(t);
|
mob.m_6518_(p_20656_, p_20656_.m_6436_(mob.m_20183_()), p_20661_, (SpawnGroupData)null, p_20657_);
|
||||||
}
|
mob.m_8032_();
|
||||||
|
}
|
||||||
@@ -543,14 +_,23 @@
|
@@ -543,14 +_,23 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -560,7 +560,7 @@
|
|||||||
ItemStack itemstack = this.m_21120_(p_21159_);
|
ItemStack itemstack = this.m_21120_(p_21159_);
|
||||||
if (!itemstack.m_41619_() && !this.m_6117_()) {
|
if (!itemstack.m_41619_() && !this.m_6117_()) {
|
||||||
+ int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.m_41779_());
|
+ int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.m_41779_());
|
||||||
+ if (duration <= 0) return;
|
+ if (duration < net.minecraftforge.common.ForgeConfig.SERVER.getUseItemDuration()) return;
|
||||||
this.f_20935_ = itemstack;
|
this.f_20935_ = itemstack;
|
||||||
- this.f_20936_ = itemstack.m_41779_();
|
- this.f_20936_ = itemstack.m_41779_();
|
||||||
+ this.f_20936_ = duration;
|
+ this.f_20936_ = duration;
|
||||||
@@ -708,7 +708,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
||||||
+ if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_()) {
|
||||||
+ if (facing == null) return handlers[2].cast();
|
+ if (facing == null) return handlers[2].cast();
|
||||||
+ else if (facing.m_122434_().m_122478_()) return handlers[0].cast();
|
+ else if (facing.m_122434_().m_122478_()) return handlers[0].cast();
|
||||||
+ else if (facing.m_122434_().m_122479_()) return handlers[1].cast();
|
+ else if (facing.m_122434_().m_122479_()) return handlers[1].cast();
|
||||||
|
|||||||
@@ -1,5 +1,14 @@
|
|||||||
--- a/net/minecraft/world/entity/Mob.java
|
--- a/net/minecraft/world/entity/Mob.java
|
||||||
+++ b/net/minecraft/world/entity/Mob.java
|
+++ b/net/minecraft/world/entity/Mob.java
|
||||||
|
@@ -116,6 +_,8 @@
|
||||||
|
private CompoundTag f_21359_;
|
||||||
|
private BlockPos f_21360_ = BlockPos.f_121853_;
|
||||||
|
private float f_21341_ = -1.0F;
|
||||||
|
+ @Nullable
|
||||||
|
+ private MobSpawnType spawnType;
|
||||||
|
|
||||||
|
protected Mob(EntityType<? extends Mob> p_21368_, Level p_21369_) {
|
||||||
|
super(p_21368_, p_21369_);
|
||||||
@@ -210,7 +_,11 @@
|
@@ -210,7 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -13,6 +22,31 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean m_6549_(EntityType<?> p_21399_) {
|
public boolean m_6549_(EntityType<?> p_21399_) {
|
||||||
|
@@ -408,6 +_,9 @@
|
||||||
|
p_21484_.m_128379_("NoAI", this.m_21525_());
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (this.spawnType != null) {
|
||||||
|
+ p_21484_.m_128359_("forge:spawn_type", this.spawnType.name());
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
public void m_7378_(CompoundTag p_21450_) {
|
||||||
|
@@ -460,6 +_,14 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
this.m_21557_(p_21450_.m_128471_("NoAI"));
|
||||||
|
+
|
||||||
|
+ if (p_21450_.m_128441_("forge:spawn_type")) {
|
||||||
|
+ try {
|
||||||
|
+ this.spawnType = MobSpawnType.valueOf(p_21450_.m_128461_("forge:spawn_type"));
|
||||||
|
+ } catch (Exception ex) {
|
||||||
|
+ p_21450_.m_128473_("forge:spawn_type");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void m_7625_(DamageSource p_21389_, boolean p_21390_) {
|
||||||
@@ -499,9 +_,9 @@
|
@@ -499,9 +_,9 @@
|
||||||
public void m_8107_() {
|
public void m_8107_() {
|
||||||
super.m_8107_();
|
super.m_8107_();
|
||||||
@@ -39,7 +73,26 @@
|
|||||||
if (entity != null) {
|
if (entity != null) {
|
||||||
double d0 = entity.m_20280_(this);
|
double d0 = entity.m_20280_(this);
|
||||||
int i = this.m_6095_().m_20674_().m_21611_();
|
int i = this.m_6095_().m_20674_().m_21611_();
|
||||||
@@ -1374,13 +_,23 @@
|
@@ -990,6 +_,10 @@
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * <p>Calls to this method should be accompanied by firing the {@link net.minecraftforge.event.entity.living.LivingSpawnEvent.SpecialSpawn SpecialSpawn} event via {@link net.minecraftforge.event.ForgeEventFactory#doSpecialSpawn}.</p>
|
||||||
|
+ * Additionally, if you override this method, you should ensure you either call super, or manually set {@link #spawnType} from your override.
|
||||||
|
+ */
|
||||||
|
@Nullable
|
||||||
|
public SpawnGroupData m_6518_(ServerLevelAccessor p_21434_, DifficultyInstance p_21435_, MobSpawnType p_21436_, @Nullable SpawnGroupData p_21437_, @Nullable CompoundTag p_21438_) {
|
||||||
|
RandomSource randomsource = p_21434_.m_213780_();
|
||||||
|
@@ -1000,6 +_,7 @@
|
||||||
|
this.m_21559_(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ this.spawnType = p_21436_;
|
||||||
|
return p_21437_;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1374,15 +_,25 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,11 +109,30 @@
|
|||||||
this.m_20256_(this.m_20184_().m_82520_(0.0D, 0.3D, 0.0D));
|
this.m_20256_(this.m_20184_().m_82520_(0.0D, 0.3D, 0.0D));
|
||||||
}
|
}
|
||||||
|
|
||||||
+ }
|
}
|
||||||
+
|
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void jumpInFluid(net.minecraftforge.fluids.FluidType type) {
|
+ public void jumpInFluid(net.minecraftforge.fluids.FluidType type) {
|
||||||
+ this.jumpInLiquidInternal(() -> super.jumpInFluid(type));
|
+ this.jumpInLiquidInternal(() -> super.jumpInFluid(type));
|
||||||
}
|
+ }
|
||||||
|
+
|
||||||
public void m_147272_() {
|
public void m_147272_() {
|
||||||
|
this.f_21345_.m_148096_();
|
||||||
|
this.m_6274_().m_147343_();
|
||||||
|
@@ -1404,5 +_,16 @@
|
||||||
|
|
||||||
|
public Iterable<BlockPos> m_238383_() {
|
||||||
|
return ImmutableSet.of(new BlockPos(this.m_20191_().f_82288_, (double)this.m_146904_(), this.m_20191_().f_82290_), new BlockPos(this.m_20191_().f_82288_, (double)this.m_146904_(), this.m_20191_().f_82293_), new BlockPos(this.m_20191_().f_82291_, (double)this.m_146904_(), this.m_20191_().f_82290_), new BlockPos(this.m_20191_().f_82291_, (double)this.m_146904_(), this.m_20191_().f_82293_));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * {@return the type of spawn that created this mob, if applicable}
|
||||||
|
+ * If it could not be determined, this will return null.
|
||||||
|
+ * <p>
|
||||||
|
+ * This is set via {@link Mob#finalizeSpawn}, so you should not call this from within that method, and instead use the parameter.
|
||||||
|
+ */
|
||||||
|
+ @Nullable
|
||||||
|
+ public final MobSpawnType getSpawnType() {
|
||||||
|
+ return this.spawnType;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
||||||
+ if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && itemHandler != null)
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && itemHandler != null && this.m_6084_())
|
||||||
+ return itemHandler.cast();
|
+ return itemHandler.cast();
|
||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/world/entity/monster/Strider.java
|
||||||
|
+++ b/net/minecraft/world/entity/monster/Strider.java
|
||||||
|
@@ -418,6 +_,7 @@
|
||||||
|
|
||||||
|
private SpawnGroupData m_33881_(ServerLevelAccessor p_33882_, DifficultyInstance p_33883_, Mob p_33884_, @Nullable SpawnGroupData p_33885_) {
|
||||||
|
p_33884_.m_7678_(this.m_20185_(), this.m_20186_(), this.m_20189_(), this.m_146908_(), 0.0F);
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(p_33884_, p_33882_, (float)p_33884_.m_20185_(), (float)p_33884_.m_20186_(), (float)p_33884_.m_20189_(), null, MobSpawnType.JOCKEY))
|
||||||
|
p_33884_.m_6518_(p_33882_, p_33883_, MobSpawnType.JOCKEY, p_33885_, (CompoundTag)null);
|
||||||
|
p_33884_.m_7998_(this, true);
|
||||||
|
return new AgeableMob.AgeableMobGroupData(0.0F);
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
--- a/net/minecraft/world/entity/npc/CatSpawner.java
|
--- a/net/minecraft/world/entity/npc/CatSpawner.java
|
||||||
+++ b/net/minecraft/world/entity/npc/CatSpawner.java
|
+++ b/net/minecraft/world/entity/npc/CatSpawner.java
|
||||||
@@ -86,8 +_,9 @@
|
@@ -86,8 +_,11 @@
|
||||||
if (cat == null) {
|
if (cat == null) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
+ cat.m_20035_(p_35334_, 0.0F, 0.0F); // Fix MC-147659: Some witch huts spawn the incorrect cat
|
+ cat.m_20035_(p_35334_, 0.0F, 0.0F); // Fix MC-147659: Some witch huts spawn the incorrect cat
|
||||||
+ if(net.minecraftforge.common.ForgeHooks.canEntitySpawn(cat, p_35335_, p_35334_.m_123341_(), p_35334_.m_123342_(), p_35334_.m_123343_(), null, MobSpawnType.NATURAL) == -1) return 0;
|
+ // Note: This call to canEntitySpawn is erroneous, it is only provided for backwards compatibility.
|
||||||
|
+ if (net.minecraftforge.common.ForgeHooks.canEntitySpawn(cat, p_35335_, p_35334_.m_123341_(), p_35334_.m_123342_(), p_35334_.m_123343_(), null, MobSpawnType.NATURAL) == -1) return 0;
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(cat, p_35335_, p_35334_.m_123341_(), p_35334_.m_123342_(), p_35334_.m_123343_(), null, MobSpawnType.NATURAL))
|
||||||
cat.m_6518_(p_35335_, p_35335_.m_6436_(p_35334_), MobSpawnType.NATURAL, (SpawnGroupData)null, (CompoundTag)null);
|
cat.m_6518_(p_35335_, p_35335_.m_6436_(p_35334_), MobSpawnType.NATURAL, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
- cat.m_20035_(p_35334_, 0.0F, 0.0F);
|
- cat.m_20035_(p_35334_, 0.0F, 0.0F);
|
||||||
p_35335_.m_47205_(cat);
|
p_35335_.m_47205_(cat);
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
--- a/net/minecraft/world/entity/npc/VillagerTrades.java
|
||||||
|
+++ b/net/minecraft/world/entity/npc/VillagerTrades.java
|
||||||
|
@@ -151,6 +_,7 @@
|
||||||
|
private final int f_35667_;
|
||||||
|
|
||||||
|
public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
|
||||||
|
+ if (false) // FORGE: Modders can add custom villager types, so remove this validation
|
||||||
|
Registry.f_122868_.m_123024_().filter((p_35680_) -> {
|
||||||
|
return !p_35672_.containsKey(p_35680_);
|
||||||
|
}).findAny().ifPresent((p_35677_) -> {
|
||||||
|
@@ -165,7 +_,9 @@
|
||||||
|
@Nullable
|
||||||
|
public MerchantOffer m_213663_(Entity p_219685_, RandomSource p_219686_) {
|
||||||
|
if (p_219685_ instanceof VillagerDataHolder) {
|
||||||
|
- ItemStack itemstack = new ItemStack(this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_()), this.f_35665_);
|
||||||
|
+ Item item = this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_());
|
||||||
|
+ if (item == null) return null; // FORGE: Account for modded villager types by returning null if there is no trade
|
||||||
|
+ ItemStack itemstack = new ItemStack(item, this.f_35665_);
|
||||||
|
return new MerchantOffer(itemstack, new ItemStack(Items.f_42616_), this.f_35666_, this.f_35667_, 0.05F);
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/net/minecraft/world/entity/npc/VillagerType.java
|
||||||
|
+++ b/net/minecraft/world/entity/npc/VillagerType.java
|
||||||
|
@@ -66,4 +_,9 @@
|
||||||
|
public static VillagerType m_204073_(Holder<Biome> p_204074_) {
|
||||||
|
return p_204074_.m_203543_().map(f_35827_::get).orElse(f_35821_);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /** FORGE: Registers the VillagerType that will spawn in the given biome. This method should be called during FMLCommonSetupEvent using event.enqueueWork() */
|
||||||
|
+ public static void registerBiomeType(ResourceKey<Biome> biomeKey, VillagerType villagerType) {
|
||||||
|
+ f_35827_.put(biomeKey, villagerType);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -135,14 +135,23 @@
|
|||||||
if (!this.f_19853_.f_46443_) {
|
if (!this.f_19853_.f_46443_) {
|
||||||
this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_()));
|
this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_()));
|
||||||
}
|
}
|
||||||
@@ -887,6 +_,7 @@
|
@@ -885,10 +_,15 @@
|
||||||
|
if (p_36383_ >= 3.0F) {
|
||||||
|
int i = 1 + Mth.m_14143_(p_36383_);
|
||||||
InteractionHand interactionhand = this.m_7655_();
|
InteractionHand interactionhand = this.m_7655_();
|
||||||
|
+ // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
|
||||||
|
+ ItemStack currentItem = this.f_20935_;
|
||||||
this.f_20935_.m_41622_(i, this, (p_219739_) -> {
|
this.f_20935_.m_41622_(i, this, (p_219739_) -> {
|
||||||
p_219739_.m_21190_(interactionhand);
|
p_219739_.m_21190_(interactionhand);
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand);
|
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand);
|
||||||
|
+ if (this.f_20935_ == currentItem) this.m_5810_(); // Forge: fix MC-168573
|
||||||
});
|
});
|
||||||
if (this.f_20935_.m_41619_()) {
|
- if (this.f_20935_.m_41619_()) {
|
||||||
|
+ // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
|
||||||
|
+ if (currentItem.m_41619_()) {
|
||||||
if (interactionhand == InteractionHand.MAIN_HAND) {
|
if (interactionhand == InteractionHand.MAIN_HAND) {
|
||||||
|
this.m_8061_(EquipmentSlot.MAINHAND, ItemStack.f_41583_);
|
||||||
|
} else {
|
||||||
@@ -905,10 +_,13 @@
|
@@ -905,10 +_,13 @@
|
||||||
|
|
||||||
protected void m_6475_(DamageSource p_36312_, float p_36313_) {
|
protected void m_6475_(DamageSource p_36312_, float p_36313_) {
|
||||||
@@ -443,7 +452,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
||||||
+ if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_()) {
|
||||||
+ if (facing == null) return playerJoinedHandler.cast();
|
+ if (facing == null) return playerJoinedHandler.cast();
|
||||||
+ else if (facing.m_122434_().m_122478_()) return playerMainHandler.cast();
|
+ else if (facing.m_122434_().m_122478_()) return playerMainHandler.cast();
|
||||||
+ else if (facing.m_122434_().m_122479_()) return playerEquipmentHandler.cast();
|
+ else if (facing.m_122434_().m_122479_()) return playerEquipmentHandler.cast();
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
||||||
+ if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_())
|
||||||
+ return itemHandler.cast();
|
+ return itemHandler.cast();
|
||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.core.Direction facing) {
|
||||||
+ if (this.m_6084_() && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && this.m_6084_())
|
||||||
+ return itemHandler.cast();
|
+ return itemHandler.cast();
|
||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -67,6 +67,17 @@
|
|||||||
if (!ItemStack.m_41728_(itemstack, itemstack1)) {
|
if (!ItemStack.m_41728_(itemstack, itemstack1)) {
|
||||||
this.f_39559_.m_6836_(0, ItemStack.f_41583_);
|
this.f_39559_.m_6836_(0, ItemStack.f_41583_);
|
||||||
this.m_38946_();
|
this.m_38946_();
|
||||||
|
@@ -163,6 +_,10 @@
|
||||||
|
itemstack2 = flag3 ? itemstack : itemstack1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Forge: Skip the repair if the result would give an item stack with a count not normally obtainable
|
||||||
|
+ if (j > itemstack2.m_41741_())
|
||||||
|
+ this.f_39559_.m_6836_(0, ItemStack.f_41583_);
|
||||||
|
+ else
|
||||||
|
this.f_39559_.m_6836_(0, this.m_39579_(itemstack2, i, j));
|
||||||
|
}
|
||||||
|
|
||||||
@@ -175,7 +_,7 @@
|
@@ -175,7 +_,7 @@
|
||||||
|
|
||||||
for(Map.Entry<Enchantment, Integer> entry : map.entrySet()) {
|
for(Map.Entry<Enchantment, Integer> entry : map.entrySet()) {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
ItemStack itemstack = p_40529_.m_43722_();
|
ItemStack itemstack = p_40529_.m_43722_();
|
||||||
Optional<BlockState> optional3 = Optional.empty();
|
Optional<BlockState> optional3 = Optional.empty();
|
||||||
if (optional.isPresent()) {
|
if (optional.isPresent()) {
|
||||||
@@ -71,9 +_,20 @@
|
@@ -71,9 +_,25 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,5 +34,10 @@
|
|||||||
+ @Override
|
+ @Override
|
||||||
+ public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) {
|
+ public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) {
|
||||||
+ return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction);
|
+ return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean canDisableShield(ItemStack stack, ItemStack shield, net.minecraft.world.entity.LivingEntity entity, net.minecraft.world.entity.LivingEntity attacker) {
|
||||||
|
+ return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -38,15 +38,44 @@
|
|||||||
p_40704_.m_5496_(p_150709_, 1.0F, 1.0F);
|
p_40704_.m_5496_(p_150709_, 1.0F, 1.0F);
|
||||||
});
|
});
|
||||||
p_40703_.m_142346_(p_40704_, GameEvent.f_157816_, blockpos);
|
p_40703_.m_142346_(p_40704_, GameEvent.f_157816_, blockpos);
|
||||||
@@ -72,7 +_,7 @@
|
@@ -72,8 +_,8 @@
|
||||||
return InteractionResultHolder.m_19100_(itemstack);
|
return InteractionResultHolder.m_19100_(itemstack);
|
||||||
} else {
|
} else {
|
||||||
BlockState blockstate = p_40703_.m_8055_(blockpos);
|
BlockState blockstate = p_40703_.m_8055_(blockpos);
|
||||||
- BlockPos blockpos2 = blockstate.m_60734_() instanceof LiquidBlockContainer && this.f_40687_ == Fluids.f_76193_ ? blockpos : blockpos1;
|
- BlockPos blockpos2 = blockstate.m_60734_() instanceof LiquidBlockContainer && this.f_40687_ == Fluids.f_76193_ ? blockpos : blockpos1;
|
||||||
|
- if (this.m_142073_(p_40704_, p_40703_, blockpos2, blockhitresult)) {
|
||||||
+ BlockPos blockpos2 = canBlockContainFluid(p_40703_, blockpos, blockstate) ? blockpos : blockpos1;
|
+ BlockPos blockpos2 = canBlockContainFluid(p_40703_, blockpos, blockstate) ? blockpos : blockpos1;
|
||||||
if (this.m_142073_(p_40704_, p_40703_, blockpos2, blockhitresult)) {
|
+ if (this.emptyContents(p_40704_, p_40703_, blockpos2, blockhitresult, itemstack)) {
|
||||||
this.m_142131_(p_40704_, p_40703_, itemstack, blockpos2);
|
this.m_142131_(p_40704_, p_40703_, itemstack, blockpos2);
|
||||||
if (p_40704_ instanceof ServerPlayer) {
|
if (p_40704_ instanceof ServerPlayer) {
|
||||||
|
CriteriaTriggers.f_10591_.m_59469_((ServerPlayer)p_40704_, blockpos2, itemstack);
|
||||||
|
@@ -98,7 +_,12 @@
|
||||||
|
public void m_142131_(@Nullable Player p_150711_, Level p_150712_, ItemStack p_150713_, BlockPos p_150714_) {
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Deprecated //Forge: use the ItemStack sensitive version
|
||||||
|
public boolean m_142073_(@Nullable Player p_150716_, Level p_150717_, BlockPos p_150718_, @Nullable BlockHitResult p_150719_) {
|
||||||
|
+ return this.emptyContents(p_150716_, p_150717_, p_150718_, p_150719_, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean emptyContents(@Nullable Player p_150716_, Level p_150717_, BlockPos p_150718_, @Nullable BlockHitResult p_150719_, @Nullable ItemStack container) {
|
||||||
|
if (!(this.f_40687_ instanceof FlowingFluid)) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
@@ -107,8 +_,12 @@
|
||||||
|
Material material = blockstate.m_60767_();
|
||||||
|
boolean flag = blockstate.m_60722_(this.f_40687_);
|
||||||
|
boolean flag1 = blockstate.m_60795_() || flag || block instanceof LiquidBlockContainer && ((LiquidBlockContainer)block).m_6044_(p_150717_, p_150718_, blockstate, this.f_40687_);
|
||||||
|
+ java.util.Optional<net.minecraftforge.fluids.FluidStack> containedFluidStack = java.util.Optional.ofNullable(container).flatMap(net.minecraftforge.fluids.FluidUtil::getFluidContained);
|
||||||
|
if (!flag1) {
|
||||||
|
- return p_150719_ != null && this.m_142073_(p_150716_, p_150717_, p_150719_.m_82425_().m_121945_(p_150719_.m_82434_()), (BlockHitResult)null);
|
||||||
|
+ return p_150719_ != null && this.emptyContents(p_150716_, p_150717_, p_150719_.m_82425_().m_121945_(p_150719_.m_82434_()), (BlockHitResult)null, container);
|
||||||
|
+ } else if (containedFluidStack.isPresent() && this.f_40687_.getFluidType().isVaporizedOnPlacement(p_150717_, p_150718_, containedFluidStack.get())) {
|
||||||
|
+ this.f_40687_.getFluidType().onVaporize(p_150716_, p_150717_, p_150718_, containedFluidStack.get());
|
||||||
|
+ return true;
|
||||||
|
} else if (p_150717_.m_6042_().f_63857_() && this.f_40687_.m_205067_(FluidTags.f_13131_)) {
|
||||||
|
int i = p_150718_.m_123341_();
|
||||||
|
int j = p_150718_.m_123342_();
|
||||||
@@ -120,7 +_,7 @@
|
@@ -120,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +107,7 @@
|
|||||||
+ private final java.util.function.Supplier<? extends Fluid> fluidSupplier;
|
+ private final java.util.function.Supplier<? extends Fluid> fluidSupplier;
|
||||||
+ public Fluid getFluid() { return fluidSupplier.get(); }
|
+ public Fluid getFluid() { return fluidSupplier.get(); }
|
||||||
+
|
+
|
||||||
+ private boolean canBlockContainFluid(Level worldIn, BlockPos posIn, BlockState blockstate)
|
+ protected boolean canBlockContainFluid(Level worldIn, BlockPos posIn, BlockState blockstate)
|
||||||
+ {
|
+ {
|
||||||
+ return blockstate.m_60734_() instanceof LiquidBlockContainer && ((LiquidBlockContainer)blockstate.m_60734_()).m_6044_(worldIn, posIn, blockstate, this.f_40687_);
|
+ return blockstate.m_60734_() instanceof LiquidBlockContainer && ((LiquidBlockContainer)blockstate.m_60734_()).m_6044_(worldIn, posIn, blockstate, this.f_40687_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/net/minecraft/world/item/BundleItem.java
|
||||||
|
+++ b/net/minecraft/world/item/BundleItem.java
|
||||||
|
@@ -40,7 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean m_142207_(ItemStack p_150733_, Slot p_150734_, ClickAction p_150735_, Player p_150736_) {
|
||||||
|
- if (p_150735_ != ClickAction.SECONDARY) {
|
||||||
|
+ if (p_150733_.m_41613_() != 1 || p_150735_ != ClickAction.SECONDARY) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
ItemStack itemstack = p_150734_.m_7993_();
|
||||||
|
@@ -62,6 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean m_142305_(ItemStack p_150742_, ItemStack p_150743_, Slot p_150744_, ClickAction p_150745_, Player p_150746_, SlotAccess p_150747_) {
|
||||||
|
+ if (p_150742_.m_41613_() != 1) return false;
|
||||||
|
if (p_150745_ == ClickAction.SECONDARY && p_150744_.m_150651_(p_150746_)) {
|
||||||
|
if (p_150743_.m_41619_()) {
|
||||||
|
m_150780_(p_150742_).ifPresent((p_186347_) -> {
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
--- a/net/minecraft/world/item/DispensibleContainerItem.java
|
||||||
|
+++ b/net/minecraft/world/item/DispensibleContainerItem.java
|
||||||
|
@@ -6,9 +_,10 @@
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
|
||||||
|
-public interface DispensibleContainerItem {
|
||||||
|
+public interface DispensibleContainerItem extends net.minecraftforge.common.extensions.IForgeDispensibleContainerItem {
|
||||||
|
default void m_142131_(@Nullable Player p_150817_, Level p_150818_, ItemStack p_150819_, BlockPos p_150820_) {
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Deprecated //Forge: use the ItemStack sensitive version
|
||||||
|
boolean m_142073_(@Nullable Player p_150821_, Level p_150822_, BlockPos p_150823_, @Nullable BlockHitResult p_150824_);
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/world/level/BaseSpawner.java
|
--- a/net/minecraft/world/level/BaseSpawner.java
|
||||||
+++ b/net/minecraft/world/level/BaseSpawner.java
|
+++ b/net/minecraft/world/level/BaseSpawner.java
|
||||||
@@ -127,11 +_,15 @@
|
@@ -127,10 +_,15 @@
|
||||||
entity.m_7678_(entity.m_20185_(), entity.m_20186_(), entity.m_20189_(), randomsource.m_188501_() * 360.0F, 0.0F);
|
entity.m_7678_(entity.m_20185_(), entity.m_20186_(), entity.m_20189_(), randomsource.m_188501_() * 360.0F, 0.0F);
|
||||||
if (entity instanceof Mob) {
|
if (entity instanceof Mob) {
|
||||||
Mob mob = (Mob)entity;
|
Mob mob = (Mob)entity;
|
||||||
@@ -11,11 +11,11 @@
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ // Fire this early so mods can react to mobs that vanilla normally ignores.
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, p_151312_, (float)entity.m_20185_(), (float)entity.m_20186_(), (float)entity.m_20189_(), this, MobSpawnType.SPAWNER))
|
||||||
if (this.f_45444_.m_186567_().m_128440_() == 1 && this.f_45444_.m_186567_().m_128425_("id", 8)) {
|
if (this.f_45444_.m_186567_().m_128440_() == 1 && this.f_45444_.m_186567_().m_128425_("id", 8)) {
|
||||||
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, (LevelAccessor)p_151312_, (float)entity.m_20185_(), (float)entity.m_20186_(), (float)entity.m_20189_(), this, MobSpawnType.SPAWNER))
|
|
||||||
((Mob)entity).m_6518_(p_151312_, p_151312_.m_6436_(entity.m_20183_()), MobSpawnType.SPAWNER, (SpawnGroupData)null, (CompoundTag)null);
|
((Mob)entity).m_6518_(p_151312_, p_151312_.m_6436_(entity.m_20183_()), MobSpawnType.SPAWNER, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -275,4 +_,12 @@
|
@@ -275,4 +_,12 @@
|
||||||
public double m_45474_() {
|
public double m_45474_() {
|
||||||
return this.f_45446_;
|
return this.f_45446_;
|
||||||
|
|||||||
@@ -23,8 +23,8 @@
|
|||||||
mob.m_7678_(d0, (double)i, d1, p_47040_.f_46441_.m_188501_() * 360.0F, 0.0F);
|
mob.m_7678_(d0, (double)i, d1, p_47040_.f_46441_.m_188501_() * 360.0F, 0.0F);
|
||||||
- if (m_46991_(p_47040_, mob, d2)) {
|
- if (m_46991_(p_47040_, mob, d2)) {
|
||||||
+ int canSpawn = net.minecraftforge.common.ForgeHooks.canEntitySpawn(mob, p_47040_, d0, i, d1, null, MobSpawnType.NATURAL);
|
+ int canSpawn = net.minecraftforge.common.ForgeHooks.canEntitySpawn(mob, p_47040_, d0, i, d1, null, MobSpawnType.NATURAL);
|
||||||
+ if (canSpawn != -1 && (canSpawn == 1 || m_46991_(p_47040_, mob, d2))) {
|
+ if (canSpawn == 1 || (canSpawn == 0 && m_46991_(p_47040_, mob, d2))) {
|
||||||
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, (LevelAccessor) p_47040_, (float)d0, (float)i, (float)d1, null, MobSpawnType.NATURAL))
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, p_47040_, (float)d0, (float)i, (float)d1, null, MobSpawnType.NATURAL))
|
||||||
spawngroupdata = mob.m_6518_(p_47040_, p_47040_.m_6436_(mob.m_20183_()), MobSpawnType.NATURAL, spawngroupdata, (CompoundTag)null);
|
spawngroupdata = mob.m_6518_(p_47040_, p_47040_.m_6436_(mob.m_20183_()), MobSpawnType.NATURAL, spawngroupdata, (CompoundTag)null);
|
||||||
++j;
|
++j;
|
||||||
++l1;
|
++l1;
|
||||||
@@ -75,11 +75,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,6 +_,7 @@
|
@@ -370,7 +_,9 @@
|
||||||
entity.m_7678_(d0, (double)blockpos.m_123342_(), d1, p_220454_.m_188501_() * 360.0F, 0.0F);
|
entity.m_7678_(d0, (double)blockpos.m_123342_(), d1, p_220454_.m_188501_() * 360.0F, 0.0F);
|
||||||
if (entity instanceof Mob) {
|
if (entity instanceof Mob) {
|
||||||
Mob mob = (Mob)entity;
|
Mob mob = (Mob)entity;
|
||||||
+ if (net.minecraftforge.common.ForgeHooks.canEntitySpawn(mob, p_220451_, d0, blockpos.m_123342_(), d1, null, MobSpawnType.CHUNK_GENERATION) == -1) continue;
|
- if (mob.m_5545_(p_220451_, MobSpawnType.CHUNK_GENERATION) && mob.m_6914_(p_220451_)) {
|
||||||
if (mob.m_5545_(p_220451_, MobSpawnType.CHUNK_GENERATION) && mob.m_6914_(p_220451_)) {
|
+ int res = net.minecraftforge.common.ForgeHooks.canEntitySpawn(mob, p_220451_, d0, blockpos.m_123342_(), d1, null, MobSpawnType.CHUNK_GENERATION);
|
||||||
|
+ if (res == 1 || (res == 0 && mob.m_5545_(p_220451_, MobSpawnType.CHUNK_GENERATION) && mob.m_6914_(p_220451_))) {
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, p_220451_, (float) d0, blockpos.m_123342_(), (float) d1, null, MobSpawnType.CHUNK_GENERATION))
|
||||||
spawngroupdata = mob.m_6518_(p_220451_, p_220451_.m_6436_(mob.m_20183_()), MobSpawnType.CHUNK_GENERATION, spawngroupdata, (CompoundTag)null);
|
spawngroupdata = mob.m_6518_(p_220451_, p_220451_.m_6436_(mob.m_20183_()), MobSpawnType.CHUNK_GENERATION, spawngroupdata, (CompoundTag)null);
|
||||||
p_220451_.m_47205_(mob);
|
p_220451_.m_47205_(mob);
|
||||||
|
flag = true;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
--- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
||||||
+++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
+++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
||||||
@@ -43,7 +_,7 @@
|
@@ -43,11 +_,11 @@
|
||||||
BlockPos blockpos = p_220982_.m_7494_();
|
BlockPos blockpos = p_220982_.m_7494_();
|
||||||
if (p_220981_.m_46859_(blockpos) && blockpos.m_123342_() < p_220981_.m_151558_()) {
|
if (p_220981_.m_46859_(blockpos) && blockpos.m_123342_() < p_220981_.m_151558_()) {
|
||||||
int i = p_220980_.m_61143_(f_51647_);
|
int i = p_220980_.m_61143_(f_51647_);
|
||||||
@@ -9,6 +9,20 @@
|
|||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
boolean flag1 = false;
|
boolean flag1 = false;
|
||||||
BlockState blockstate = p_220981_.m_8055_(p_220982_.m_7495_());
|
BlockState blockstate = p_220981_.m_8055_(p_220982_.m_7495_());
|
||||||
|
- if (blockstate.m_60713_(Blocks.f_50259_)) {
|
||||||
|
+ if (blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
|
||||||
|
flag = true;
|
||||||
|
} else if (blockstate.m_60713_(this.f_51648_)) {
|
||||||
|
int j = 1;
|
||||||
|
@@ -55,7 +_,7 @@
|
||||||
|
for(int k = 0; k < 4; ++k) {
|
||||||
|
BlockState blockstate1 = p_220981_.m_8055_(p_220982_.m_6625_(j + 1));
|
||||||
|
if (!blockstate1.m_60713_(this.f_51648_)) {
|
||||||
|
- if (blockstate1.m_60713_(Blocks.f_50259_)) {
|
||||||
|
+ if (blockstate1.m_60713_(Blocks.f_50259_) || blockstate1.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
|
||||||
|
flag1 = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
@@ -99,7 +_,7 @@
|
@@ -99,7 +_,7 @@
|
||||||
} else {
|
} else {
|
||||||
this.m_51658_(p_220981_, p_220982_);
|
this.m_51658_(p_220981_, p_220982_);
|
||||||
@@ -18,3 +32,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -134,7 +_,7 @@
|
||||||
|
|
||||||
|
public boolean m_7898_(BlockState p_51683_, LevelReader p_51684_, BlockPos p_51685_) {
|
||||||
|
BlockState blockstate = p_51684_.m_8055_(p_51685_.m_7495_());
|
||||||
|
- if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_)) {
|
||||||
|
+ if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_) && !blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
|
||||||
|
if (!blockstate.m_60795_()) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
--- a/net/minecraft/world/level/block/ChorusPlantBlock.java
|
||||||
|
+++ b/net/minecraft/world/level/block/ChorusPlantBlock.java
|
||||||
|
@@ -30,7 +_,7 @@
|
||||||
|
BlockState blockstate3 = p_51711_.m_8055_(p_51712_.m_122029_());
|
||||||
|
BlockState blockstate4 = p_51711_.m_8055_(p_51712_.m_122019_());
|
||||||
|
BlockState blockstate5 = p_51711_.m_8055_(p_51712_.m_122024_());
|
||||||
|
- return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
|
||||||
|
+ return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState m_7417_(BlockState p_51728_, Direction p_51729_, BlockState p_51730_, LevelAccessor p_51731_, BlockPos p_51732_, BlockPos p_51733_) {
|
||||||
|
@@ -38,7 +_,7 @@
|
||||||
|
p_51731_.m_186460_(p_51732_, this, 1);
|
||||||
|
return super.m_7417_(p_51728_, p_51729_, p_51730_, p_51731_, p_51732_, p_51733_);
|
||||||
|
} else {
|
||||||
|
- boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && p_51730_.m_60713_(Blocks.f_50259_);
|
||||||
|
+ boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && (p_51730_.m_60713_(Blocks.f_50259_) || p_51730_.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON));
|
||||||
|
return p_51728_.m_61124_(f_55154_.get(p_51729_), Boolean.valueOf(flag));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -63,13 +_,13 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
BlockState blockstate2 = p_51725_.m_8055_(blockpos.m_7495_());
|
||||||
|
- if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_)) {
|
||||||
|
+ if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_) || blockstate2.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_);
|
||||||
|
+ return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void m_7926_(StateDefinition.Builder<Block, BlockState> p_51735_) {
|
||||||
@@ -4,8 +4,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void m_214148_(ServerLevel p_221243_, RandomSource p_221244_, BlockPos p_221245_, BlockState p_221246_) {
|
public void m_214148_(ServerLevel p_221243_, RandomSource p_221244_, BlockPos p_221245_, BlockState p_221246_) {
|
||||||
|
- this.f_53597_.get().m_203334_().m_224953_(p_221243_, p_221243_.m_7726_().m_8481_(), p_221244_, p_221245_);
|
||||||
+ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221243_, p_221244_, p_221245_, this.f_53597_.get());
|
+ net.minecraftforge.event.level.SaplingGrowTreeEvent event = net.minecraftforge.event.ForgeEventFactory.blockGrowFeature(p_221243_, p_221244_, p_221245_, this.f_53597_.get());
|
||||||
+ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return;
|
+ if (event.getResult().equals(net.minecraftforge.eventbus.api.Event.Result.DENY)) return;
|
||||||
this.f_53597_.get().m_203334_().m_224953_(p_221243_, p_221243_.m_7726_().m_8481_(), p_221244_, p_221245_);
|
+ event.getFeature().m_203334_().m_224953_(p_221243_, p_221243_.m_7726_().m_8481_(), p_221244_, p_221245_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/world/level/block/StemBlock.java
|
--- a/net/minecraft/world/level/block/StemBlock.java
|
||||||
+++ b/net/minecraft/world/level/block/StemBlock.java
|
+++ b/net/minecraft/world/level/block/StemBlock.java
|
||||||
@@ -43,22 +_,24 @@
|
@@ -43,22 +_,23 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void m_213898_(BlockState p_222538_, ServerLevel p_222539_, BlockPos p_222540_, RandomSource p_222541_) {
|
public void m_213898_(BlockState p_222538_, ServerLevel p_222539_, BlockPos p_222540_, RandomSource p_222541_) {
|
||||||
@@ -19,8 +19,7 @@
|
|||||||
BlockPos blockpos = p_222540_.m_121945_(direction);
|
BlockPos blockpos = p_222540_.m_121945_(direction);
|
||||||
BlockState blockstate = p_222539_.m_8055_(blockpos.m_7495_());
|
BlockState blockstate = p_222539_.m_8055_(blockpos.m_7495_());
|
||||||
- if (p_222539_.m_8055_(blockpos).m_60795_() && (blockstate.m_60713_(Blocks.f_50093_) || blockstate.m_204336_(BlockTags.f_144274_))) {
|
- if (p_222539_.m_8055_(blockpos).m_60795_() && (blockstate.m_60713_(Blocks.f_50093_) || blockstate.m_204336_(BlockTags.f_144274_))) {
|
||||||
+ Block block = blockstate.m_60734_();
|
+ if (p_222539_.m_46859_(blockpos) && (blockstate.canSustainPlant(p_222539_, blockpos.m_7495_(), Direction.UP, this.f_57015_) || blockstate.m_60713_(Blocks.f_50093_) || blockstate.m_204336_(BlockTags.f_144274_))) {
|
||||||
+ if (p_222539_.m_46859_(blockpos) && (blockstate.canSustainPlant(p_222539_, blockpos.m_7495_(), Direction.UP, this) || block == Blocks.f_50093_ || block == Blocks.f_50493_ || block == Blocks.f_50546_ || block == Blocks.f_50599_ || block == Blocks.f_50440_)) {
|
|
||||||
p_222539_.m_46597_(blockpos, this.f_57015_.m_49966_());
|
p_222539_.m_46597_(blockpos, this.f_57015_.m_49966_());
|
||||||
p_222539_.m_46597_(p_222540_, this.f_57015_.m_7810_().m_49966_().m_61124_(HorizontalDirectionalBlock.f_54117_, direction));
|
p_222539_.m_46597_(p_222540_, this.f_57015_.m_7810_().m_49966_().m_61124_(HorizontalDirectionalBlock.f_54117_, direction));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
--- a/net/minecraft/world/level/block/StemGrownBlock.java
|
||||||
|
+++ b/net/minecraft/world/level/block/StemGrownBlock.java
|
||||||
|
@@ -2,7 +_,7 @@
|
||||||
|
|
||||||
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
|
|
||||||
|
-public abstract class StemGrownBlock extends Block {
|
||||||
|
+public abstract class StemGrownBlock extends Block implements net.minecraftforge.common.IPlantable {
|
||||||
|
public StemGrownBlock(BlockBehaviour.Properties p_57058_) {
|
||||||
|
super(p_57058_);
|
||||||
|
}
|
||||||
|
@@ -10,4 +_,11 @@
|
||||||
|
public abstract StemBlock m_7161_();
|
||||||
|
|
||||||
|
public abstract AttachedStemBlock m_7810_();
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public net.minecraft.world.level.block.state.BlockState getPlant(net.minecraft.world.level.BlockGetter world, net.minecraft.core.BlockPos pos) {
|
||||||
|
+ net.minecraft.world.level.block.state.BlockState state = world.m_8055_(pos);
|
||||||
|
+ if (state.m_60734_() != this) return m_49966_();
|
||||||
|
+ return state;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -38,12 +38,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ @Deprecated //Forge: Prefer using IForgeBlock#catchFire
|
+ @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
|
||||||
public static void m_57433_(Level p_57434_, BlockPos p_57435_) {
|
public static void m_57433_(Level p_57434_, BlockPos p_57435_) {
|
||||||
m_57436_(p_57434_, p_57435_, (LivingEntity)null);
|
m_57436_(p_57434_, p_57435_, (LivingEntity)null);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ @Deprecated //Forge: Prefer using IForgeBlock#catchFire
|
+ @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
|
||||||
private static void m_57436_(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) {
|
private static void m_57436_(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) {
|
||||||
if (!p_57437_.f_46443_) {
|
if (!p_57437_.f_46443_) {
|
||||||
PrimedTnt primedtnt = new PrimedTnt(p_57437_, (double)p_57438_.m_123341_() + 0.5D, (double)p_57438_.m_123342_(), (double)p_57438_.m_123343_() + 0.5D, p_57439_);
|
PrimedTnt primedtnt = new PrimedTnt(p_57437_, (double)p_57438_.m_123341_() + 0.5D, (double)p_57438_.m_123342_(), (double)p_57438_.m_123343_() + 0.5D, p_57439_);
|
||||||
|
|||||||
+7
-8
@@ -153,7 +153,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -496,5 +_,34 @@
|
@@ -496,5 +_,33 @@
|
||||||
p_58342_.m_36491_(itemstack);
|
p_58342_.m_36491_(itemstack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,13 +164,12 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
||||||
+ if (!this.f_58859_ && facing != null && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && facing != null && !this.f_58859_) {
|
||||||
+ if (facing == Direction.UP)
|
+ return switch (facing) {
|
||||||
+ return handlers[0].cast();
|
+ case UP -> handlers[0].cast();
|
||||||
+ else if (facing == Direction.DOWN)
|
+ case DOWN -> handlers[1].cast();
|
||||||
+ return handlers[1].cast();
|
+ default -> handlers[2].cast();
|
||||||
+ else
|
+ };
|
||||||
+ return handlers[2].cast();
|
|
||||||
+ }
|
+ }
|
||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, @org.jetbrains.annotations.Nullable net.minecraft.core.Direction side) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, @org.jetbrains.annotations.Nullable net.minecraft.core.Direction side) {
|
||||||
+ if (!this.f_58859_ && cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER)
|
+ if (cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && !this.f_58859_)
|
||||||
+ return itemHandler.cast();
|
+ return itemHandler.cast();
|
||||||
+ return super.getCapability(cap, side);
|
+ return super.getCapability(cap, side);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
+7
-8
@@ -51,7 +51,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -258,5 +_,34 @@
|
@@ -258,5 +_,33 @@
|
||||||
|
|
||||||
protected AbstractContainerMenu m_6555_(int p_58990_, Inventory p_58991_) {
|
protected AbstractContainerMenu m_6555_(int p_58990_, Inventory p_58991_) {
|
||||||
return new BrewingStandMenu(p_58990_, p_58991_, this, this.f_58971_);
|
return new BrewingStandMenu(p_58990_, p_58991_, this, this.f_58971_);
|
||||||
@@ -62,13 +62,12 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing) {
|
||||||
+ if (!this.f_58859_ && facing != null && capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
|
+ if (capability == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && facing != null && !this.f_58859_) {
|
||||||
+ if (facing == Direction.UP)
|
+ return switch (facing) {
|
||||||
+ return handlers[0].cast();
|
+ case UP -> handlers[0].cast();
|
||||||
+ else if (facing == Direction.DOWN)
|
+ case DOWN -> handlers[1].cast();
|
||||||
+ return handlers[1].cast();
|
+ default -> handlers[2].cast();
|
||||||
+ else
|
+ };
|
||||||
+ return handlers[2].cast();
|
|
||||||
+ }
|
+ }
|
||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, Direction side) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, Direction side) {
|
||||||
+ if (!this.f_58859_ && cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER) {
|
+ if (cap == net.minecraftforge.common.capabilities.ForgeCapabilities.ITEM_HANDLER && !this.f_58859_) {
|
||||||
+ if (this.chestHandler == null)
|
+ if (this.chestHandler == null)
|
||||||
+ this.chestHandler = net.minecraftforge.common.util.LazyOptional.of(this::createHandler);
|
+ this.chestHandler = net.minecraftforge.common.util.LazyOptional.of(this::createHandler);
|
||||||
+ return this.chestHandler.cast();
|
+ return this.chestHandler.cast();
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
--- a/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
--- a/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
||||||
+++ b/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
+++ b/net/minecraft/world/level/levelgen/PatrolSpawner.java
|
||||||
@@ -104,6 +_,7 @@
|
@@ -104,6 +_,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
patrollingmonster.m_6034_((double)p_224534_.m_123341_(), (double)p_224534_.m_123342_(), (double)p_224534_.m_123343_());
|
patrollingmonster.m_6034_((double)p_224534_.m_123341_(), (double)p_224534_.m_123342_(), (double)p_224534_.m_123343_());
|
||||||
+ if(net.minecraftforge.common.ForgeHooks.canEntitySpawn(patrollingmonster, p_224533_, p_224534_.m_123341_(), p_224534_.m_123342_(), p_224534_.m_123343_(), null, MobSpawnType.PATROL) == -1) return false;
|
+ // Note: This call to canEntitySpawn is erroneous, it is only provided for backwards compatibility.
|
||||||
|
+ if (net.minecraftforge.common.ForgeHooks.canEntitySpawn(patrollingmonster, p_224533_, p_224534_.m_123341_(), p_224534_.m_123342_(), p_224534_.m_123343_(), null, MobSpawnType.PATROL) == -1) return false;
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(patrollingmonster, p_224533_, p_224534_.m_123341_(), p_224534_.m_123342_(), p_224534_.m_123343_(), null, MobSpawnType.PATROL))
|
||||||
patrollingmonster.m_6518_(p_224533_, p_224533_.m_6436_(p_224534_), MobSpawnType.PATROL, (SpawnGroupData)null, (CompoundTag)null);
|
patrollingmonster.m_6518_(p_224533_, p_224533_.m_6436_(p_224534_), MobSpawnType.PATROL, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
p_224533_.m_47205_(patrollingmonster);
|
p_224533_.m_47205_(patrollingmonster);
|
||||||
return true;
|
return true;
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
--- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
--- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
||||||
+++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
+++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
||||||
@@ -60,6 +_,7 @@
|
@@ -60,6 +_,9 @@
|
||||||
for(int i1 = 0; i1 < l; ++i1) {
|
for(int i1 = 0; i1 < l; ++i1) {
|
||||||
Phantom phantom = EntityType.f_20509_.m_20615_(p_64576_);
|
Phantom phantom = EntityType.f_20509_.m_20615_(p_64576_);
|
||||||
phantom.m_20035_(blockpos1, 0.0F, 0.0F);
|
phantom.m_20035_(blockpos1, 0.0F, 0.0F);
|
||||||
+ if(net.minecraftforge.common.ForgeHooks.canEntitySpawn(phantom, p_64576_, blockpos1.m_123341_(), blockpos1.m_123342_(), blockpos1.m_123343_(), null, MobSpawnType.NATURAL) == -1) { i--; continue; }
|
+ // Note: This call to canEntitySpawn is erroneous, it is only provided for backwards compatibility.
|
||||||
|
+ if (net.minecraftforge.common.ForgeHooks.canEntitySpawn(phantom, p_64576_, blockpos1.m_123341_(), blockpos1.m_123342_(), blockpos1.m_123343_(), null, MobSpawnType.NATURAL) == -1) { i--; continue; }
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(phantom, p_64576_, blockpos1.m_123341_(), blockpos1.m_123342_(), blockpos1.m_123343_(), null, MobSpawnType.NATURAL))
|
||||||
spawngroupdata = phantom.m_6518_(p_64576_, difficultyinstance, MobSpawnType.NATURAL, spawngroupdata, (CompoundTag)null);
|
spawngroupdata = phantom.m_6518_(p_64576_, difficultyinstance, MobSpawnType.NATURAL, spawngroupdata, (CompoundTag)null);
|
||||||
p_64576_.m_47205_(phantom);
|
p_64576_.m_47205_(phantom);
|
||||||
}
|
}
|
||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/feature/treedecorators/AlterGroundDecorator.java
|
||||||
|
@@ -72,7 +_,7 @@
|
||||||
|
for(int i = 2; i >= -3; --i) {
|
||||||
|
BlockPos blockpos = p_225975_.m_6630_(i);
|
||||||
|
if (Feature.m_65788_(p_225974_.m_226058_(), blockpos)) {
|
||||||
|
- p_225974_.m_226061_(blockpos, this.f_69303_.m_213972_(p_225974_.m_226067_(), p_225975_));
|
||||||
|
+ p_225974_.m_226061_(blockpos, net.minecraftforge.event.ForgeEventFactory.alterGround(p_225974_.m_226058_(), p_225974_.m_226067_(), blockpos, this.f_69303_.m_213972_(p_225974_.m_226067_(), p_225975_)));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/world/level/levelgen/structure/structures/OceanMonumentPieces.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/structures/OceanMonumentPieces.java
|
||||||
|
@@ -1442,6 +_,7 @@
|
||||||
|
ElderGuardian elderguardian = EntityType.f_20563_.m_20615_(p_228844_.m_6018_());
|
||||||
|
elderguardian.m_5634_(elderguardian.m_21233_());
|
||||||
|
elderguardian.m_7678_((double)blockpos.m_123341_() + 0.5D, (double)blockpos.m_123342_(), (double)blockpos.m_123343_() + 0.5D, 0.0F, 0.0F);
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(elderguardian, p_228844_, (float)elderguardian.m_20185_(), (float)elderguardian.m_20186_(), (float)elderguardian.m_20189_(), null, MobSpawnType.STRUCTURE))
|
||||||
|
elderguardian.m_6518_(p_228844_, p_228844_.m_6436_(elderguardian.m_20183_()), MobSpawnType.STRUCTURE, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
|
p_228844_.m_47205_(elderguardian);
|
||||||
|
return true;
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/world/level/levelgen/structure/structures/WoodlandMansionPieces.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/structures/WoodlandMansionPieces.java
|
||||||
|
@@ -1052,6 +_,7 @@
|
||||||
|
for(Mob mob : list) {
|
||||||
|
mob.m_21530_();
|
||||||
|
mob.m_20035_(p_230214_, 0.0F, 0.0F);
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mob, p_230215_, (float)mob.m_20185_(), (float)mob.m_20186_(), (float)mob.m_20189_(), null, MobSpawnType.STRUCTURE))
|
||||||
|
mob.m_6518_(p_230215_, p_230215_.m_6436_(mob.m_20183_()), MobSpawnType.STRUCTURE, (SpawnGroupData)null, (CompoundTag)null);
|
||||||
|
p_230215_.m_47205_(mob);
|
||||||
|
p_230215_.m_7731_(p_230214_, Blocks.f_50016_.m_49966_(), 2);
|
||||||
+2
-1
@@ -86,7 +86,7 @@
|
|||||||
ListTag listtag = new ListTag();
|
ListTag listtag = new ListTag();
|
||||||
listtag.add(DoubleTag.m_128500_(vec31.f_82479_));
|
listtag.add(DoubleTag.m_128500_(vec31.f_82479_));
|
||||||
listtag.add(DoubleTag.m_128500_(vec31.f_82480_));
|
listtag.add(DoubleTag.m_128500_(vec31.f_82480_));
|
||||||
@@ -391,10 +_,10 @@
|
@@ -391,10 +_,11 @@
|
||||||
compoundtag.m_128365_("Pos", listtag);
|
compoundtag.m_128365_("Pos", listtag);
|
||||||
compoundtag.m_128473_("UUID");
|
compoundtag.m_128473_("UUID");
|
||||||
m_74543_(p_74524_, compoundtag).ifPresent((p_205061_) -> {
|
m_74543_(p_74524_, compoundtag).ifPresent((p_205061_) -> {
|
||||||
@@ -97,6 +97,7 @@
|
|||||||
p_205061_.m_7678_(vec31.f_82479_, vec31.f_82480_, vec31.f_82481_, f, p_205061_.m_146909_());
|
p_205061_.m_7678_(vec31.f_82479_, vec31.f_82480_, vec31.f_82481_, f, p_205061_.m_146909_());
|
||||||
- if (p_74530_ && p_205061_ instanceof Mob) {
|
- if (p_74530_ && p_205061_ instanceof Mob) {
|
||||||
+ if (placementIn.m_74414_() && p_205061_ instanceof Mob) {
|
+ if (placementIn.m_74414_() && p_205061_ instanceof Mob) {
|
||||||
|
+ if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn((Mob)p_205061_, p_74524_, (float)p_205061_.m_20185_(), (float)p_205061_.m_20186_(), (float)p_205061_.m_20189_(), null, MobSpawnType.STRUCTURE))
|
||||||
((Mob)p_205061_).m_6518_(p_74524_, p_74524_.m_6436_(new BlockPos(vec31)), MobSpawnType.STRUCTURE, (SpawnGroupData)null, compoundtag);
|
((Mob)p_205061_).m_6518_(p_74524_, p_74524_.m_6436_(new BlockPos(vec31)), MobSpawnType.STRUCTURE, (SpawnGroupData)null, compoundtag);
|
||||||
}
|
}
|
||||||
|
|
||||||
+19
-2
@@ -6,6 +6,20 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
dependencies {
|
||||||
|
classpath('com.google.code.gson:gson') {
|
||||||
|
version {
|
||||||
|
strictly '2.10.1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
|
||||||
|
}
|
||||||
|
|
||||||
rootProject.name = 'ForgeRoot'
|
rootProject.name = 'ForgeRoot'
|
||||||
|
|
||||||
include 'fmlloader'
|
include 'fmlloader'
|
||||||
@@ -15,11 +29,14 @@ include 'javafmllanguage'
|
|||||||
include 'lowcodelanguage'
|
include 'lowcodelanguage'
|
||||||
|
|
||||||
include ':mcp'
|
include ':mcp'
|
||||||
include ':clean'
|
|
||||||
include ':fmlonly'
|
include ':fmlonly'
|
||||||
include ':forge'
|
include ':forge'
|
||||||
|
|
||||||
project(":mcp").projectDir = file("projects/mcp")
|
project(":mcp").projectDir = file("projects/mcp")
|
||||||
project(":clean").projectDir = file("projects/clean")
|
|
||||||
project(":fmlonly").projectDir = file("projects/fmlonly")
|
project(":fmlonly").projectDir = file("projects/fmlonly")
|
||||||
project(":forge").projectDir = file("projects/forge")
|
project(":forge").projectDir = file("projects/forge")
|
||||||
|
|
||||||
|
if (!System.env.TEAMCITY_VERSION) {
|
||||||
|
include ':clean'
|
||||||
|
project(":clean").projectDir = file("projects/clean")
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"values": [
|
||||||
|
"#forge:end_stones"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -13,10 +13,30 @@ import net.minecraftforge.forgespi.language.IModInfo;
|
|||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
public class ConfigScreenHandler
|
public class ConfigScreenHandler
|
||||||
{
|
{
|
||||||
public record ConfigScreenFactory(BiFunction<Minecraft, Screen, Screen> screenFunction) implements IExtensionPoint<ConfigScreenFactory> {}
|
/**
|
||||||
|
* @param screenFunction A function that takes the {@link Minecraft} client instance and the mods screen as
|
||||||
|
* arguments and returns your config screen to show when the player clicks the config button
|
||||||
|
* for your mod on the mods screen.
|
||||||
|
* <p>You should call {@link Minecraft#setScreen(Screen)} with the provided client instance
|
||||||
|
* and mods screen for the action of your close button.</p>
|
||||||
|
*/
|
||||||
|
public record ConfigScreenFactory(BiFunction<Minecraft, Screen, Screen> screenFunction) implements IExtensionPoint<ConfigScreenFactory> {
|
||||||
|
/**
|
||||||
|
* @param screenFunction A function that takes the mods screen as an argument and returns your config screen to
|
||||||
|
* show when the player clicks the config button for your mod on the mods screen.
|
||||||
|
* <p>You should call {@link Minecraft#setScreen(Screen)} with the provided mods screen
|
||||||
|
* for the action of your close button, using {@link Screen#minecraft} to get the client
|
||||||
|
* instance.</p>
|
||||||
|
*/
|
||||||
|
public ConfigScreenFactory(Function<Screen, Screen> screenFunction) {
|
||||||
|
this((mcClient, modsScreen) -> screenFunction.apply(modsScreen));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static Optional<BiFunction<Minecraft, Screen, Screen>> getScreenFactoryFor(IModInfo selectedMod)
|
public static Optional<BiFunction<Minecraft, Screen, Screen>> getScreenFactoryFor(IModInfo selectedMod)
|
||||||
{
|
{
|
||||||
return ModList.get().getModContainerById(selectedMod.getModId()).
|
return ModList.get().getModContainerById(selectedMod.getModId()).
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import com.mojang.datafixers.util.Either;
|
|||||||
import com.mojang.math.Matrix4f;
|
import com.mojang.math.Matrix4f;
|
||||||
import com.mojang.math.Vector3f;
|
import com.mojang.math.Vector3f;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
|
import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
|
||||||
import net.minecraft.FileUtil;
|
import net.minecraft.FileUtil;
|
||||||
import net.minecraft.client.Camera;
|
import net.minecraft.client.Camera;
|
||||||
import net.minecraft.client.KeyMapping;
|
import net.minecraft.client.KeyMapping;
|
||||||
@@ -71,13 +72,14 @@ import net.minecraft.core.BlockPos;
|
|||||||
import net.minecraft.core.Direction;
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.locale.Language;
|
import net.minecraft.locale.Language;
|
||||||
import net.minecraft.network.Connection;
|
import net.minecraft.network.Connection;
|
||||||
import net.minecraft.network.chat.ChatSender;
|
|
||||||
import net.minecraft.network.chat.ChatType;
|
import net.minecraft.network.chat.ChatType;
|
||||||
|
import net.minecraft.network.chat.ChatTypeDecoration;
|
||||||
import net.minecraft.network.chat.CommonComponents;
|
import net.minecraft.network.chat.CommonComponents;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.FormattedText;
|
import net.minecraft.network.chat.FormattedText;
|
||||||
import net.minecraft.network.chat.MessageSigner;
|
import net.minecraft.network.chat.MessageSigner;
|
||||||
import net.minecraft.network.chat.PlayerChatMessage;
|
import net.minecraft.network.chat.PlayerChatMessage;
|
||||||
|
import net.minecraft.network.chat.Style;
|
||||||
import net.minecraft.network.protocol.status.ServerStatus;
|
import net.minecraft.network.protocol.status.ServerStatus;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.packs.resources.Resource;
|
import net.minecraft.server.packs.resources.Resource;
|
||||||
@@ -98,7 +100,9 @@ import net.minecraft.world.item.crafting.RecipeManager;
|
|||||||
import net.minecraft.world.level.BlockAndTintGetter;
|
import net.minecraft.world.level.BlockAndTintGetter;
|
||||||
import net.minecraft.world.level.GameType;
|
import net.minecraft.world.level.GameType;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.LeavesBlock;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.level.material.Fluid;
|
import net.minecraft.world.level.material.Fluid;
|
||||||
import net.minecraft.world.level.material.FluidState;
|
import net.minecraft.world.level.material.FluidState;
|
||||||
@@ -963,6 +967,17 @@ public class ForgeHooksClient
|
|||||||
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
|
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final ChatTypeDecoration SYSTEM_CHAT_TYPE_DECORATION = new ChatTypeDecoration("forge.chatType.system", List.of(ChatTypeDecoration.Parameter.CONTENT), Style.EMPTY);
|
||||||
|
private static final ChatType SYSTEM_CHAT_TYPE = new ChatType(SYSTEM_CHAT_TYPE_DECORATION, SYSTEM_CHAT_TYPE_DECORATION);
|
||||||
|
private static final ChatType.Bound SYSTEM_CHAT_TYPE_BOUND = SYSTEM_CHAT_TYPE.bind(Component.literal("System"));
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public static Component onClientSystemChat(Component message, boolean overlay)
|
||||||
|
{
|
||||||
|
ClientChatReceivedEvent.System event = new ClientChatReceivedEvent.System(SYSTEM_CHAT_TYPE_BOUND, message, overlay);
|
||||||
|
return MinecraftForge.EVENT_BUS.post(event) ? null : event.getMessage();
|
||||||
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public static String onClientSendMessage(String message)
|
public static String onClientSendMessage(String message)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
package net.minecraftforge.client.event;
|
package net.minecraftforge.client.event;
|
||||||
|
|
||||||
import net.minecraft.Util;
|
import net.minecraft.Util;
|
||||||
|
import net.minecraft.network.chat.ChatMessageContent;
|
||||||
import net.minecraft.network.chat.ChatType;
|
import net.minecraft.network.chat.ChatType;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.MessageSigner;
|
import net.minecraft.network.chat.MessageSigner;
|
||||||
@@ -45,6 +46,11 @@ public class ClientChatReceivedEvent extends Event
|
|||||||
this.messageSigner = messageSigner;
|
this.messageSigner = messageSigner;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ClientChatReceivedEvent(ChatType.Bound boundChatType, Component message, PlayerChatMessage playerChatMessage)
|
||||||
|
{
|
||||||
|
this(boundChatType, message, playerChatMessage, playerChatMessage.signer());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@return the message that will be displayed in the chat message window, if the event is not cancelled}
|
* {@return the message that will be displayed in the chat message window, if the event is not cancelled}
|
||||||
*/
|
*/
|
||||||
@@ -98,4 +104,33 @@ public class ClientChatReceivedEvent extends Event
|
|||||||
{
|
{
|
||||||
return this.messageSigner.isSystem();
|
return this.messageSigner.isSystem();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fired when a system chat message is received on the client.
|
||||||
|
*
|
||||||
|
* <p>This event is {@linkplain Cancelable cancellable}, and does not {@linkplain HasResult have a result}.
|
||||||
|
* If the event is cancelled, the message is not displayed in the chat message window or in the overlay.</p>
|
||||||
|
*
|
||||||
|
* <p>This event is fired on the {@linkplain MinecraftForge#EVENT_BUS main Forge event bus},
|
||||||
|
* only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
|
||||||
|
*/
|
||||||
|
public static class System extends ClientChatReceivedEvent
|
||||||
|
{
|
||||||
|
private final boolean overlay;
|
||||||
|
|
||||||
|
@ApiStatus.Internal
|
||||||
|
public System(ChatType.Bound boundChatType, Component message, boolean overlay)
|
||||||
|
{
|
||||||
|
super(boundChatType, message, PlayerChatMessage.system(new ChatMessageContent(message.getString(), message)));
|
||||||
|
this.overlay = overlay;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@return whether the message goes to the overlay}
|
||||||
|
*/
|
||||||
|
public boolean isOverlay()
|
||||||
|
{
|
||||||
|
return this.overlay;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+9
-9
@@ -67,15 +67,15 @@ public interface IForgeDimensionSpecialEffects
|
|||||||
* Allows for manipulating the coloring of the lightmap texture.
|
* Allows for manipulating the coloring of the lightmap texture.
|
||||||
* Will be called for each 16*16 combination of sky/block light values.
|
* Will be called for each 16*16 combination of sky/block light values.
|
||||||
*
|
*
|
||||||
* @param level The current level (client-side).
|
* @param level The current level (client-side).
|
||||||
* @param partialTicks Progress between ticks.
|
* @param partialTicks Progress between ticks.
|
||||||
* @param skyDarken Current darkness of the sky.
|
* @param skyDarken Current darkness of the sky (can be used to calculate sky light).
|
||||||
* @param skyLight Sky light brightness factor.
|
* @param blockLightRedFlicker Block light flicker factor (red color) (can be used to calculate block light).
|
||||||
* @param blockLight Block light brightness factor.
|
* @param skyLight Sky light brightness (accounting for sky darkness).
|
||||||
* @param pixelX X-coordinate of the lightmap texture.
|
* @param pixelX X-coordinate of the lightmap texture (block).
|
||||||
* @param pixelY Y-coordinate of the lightmap texture.
|
* @param pixelY Y-coordinate of the lightmap texture (sky).
|
||||||
* @param colors The color values that will be used: [r, g, b].
|
* @param colors The color values that will be used: [r, g, b].
|
||||||
* @see LightTexture#updateLightTexture(float)
|
* @see LightTexture#updateLightTexture(float)
|
||||||
*/
|
*/
|
||||||
default void adjustLightmapColors(ClientLevel level, float partialTicks, float skyDarken, float skyLight, float blockLight, int pixelX, int pixelY, Vector3f colors) {}
|
default void adjustLightmapColors(ClientLevel level, float partialTicks, float skyDarken, float blockLightRedFlicker, float skyLight, int pixelX, int pixelY, Vector3f colors) {}
|
||||||
}
|
}
|
||||||
@@ -499,6 +499,13 @@ public class ForgeGui extends Gui
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void clearCache()
|
||||||
|
{
|
||||||
|
super.clearCache();
|
||||||
|
this.debugOverlay.clearChunkCache();
|
||||||
|
}
|
||||||
|
|
||||||
protected void renderRecordOverlay(int width, int height, float partialTick, PoseStack pStack)
|
protected void renderRecordOverlay(int width, int height, float partialTick, PoseStack pStack)
|
||||||
{
|
{
|
||||||
if (overlayMessageTime > 0)
|
if (overlayMessageTime > 0)
|
||||||
|
|||||||
Loaded 100 of 145 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user