mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f173bde812 | ||
|
|
dd10933ab0 | ||
|
|
c3e84646db | ||
|
|
2094f99640 | ||
|
|
94f3bdaa69 | ||
|
|
7220e9d0b0 | ||
|
|
020102d87f | ||
|
|
f101700969 | ||
|
|
c4b148b84b | ||
|
|
b6a9274870 | ||
|
|
830d9699e3 | ||
|
|
fc68b81b21 | ||
|
|
2904772b16 | ||
|
|
e120b57032 | ||
|
|
b86b56260d | ||
|
|
b222b23557 | ||
|
|
8ec4253068 | ||
|
|
74ca88b7be | ||
|
|
a1119cd77a | ||
|
|
545723dc8c | ||
|
|
b64f4780c5 | ||
|
|
1c98b29087 | ||
|
|
33880331d2 | ||
|
|
74a43877e4 | ||
|
|
7542fbea48 | ||
|
|
2d9a1bc6f9 | ||
|
|
a57a240c13 | ||
|
|
b7fb6484d7 | ||
|
|
1a539ffebc | ||
|
|
27220a5ad8 | ||
|
|
e975fc8252 | ||
|
|
d85ea5a3b0 | ||
|
|
ccb7345084 | ||
|
|
93c00b67d9 | ||
|
|
cd393bbfdc | ||
|
|
fd045d4628 | ||
|
|
47e076071b | ||
|
|
a73e003dd3 | ||
|
|
949984268d | ||
|
|
114acfca3b | ||
|
|
56e538e8a9 | ||
|
|
fa46f3dd49 | ||
|
|
6ec5a8f2c1 | ||
|
|
49b596dda3 | ||
|
|
0c5ced1bbf | ||
|
|
4a09a2420d | ||
|
|
0ff8a596fc | ||
|
|
bca20ace4e | ||
|
|
f3b53001c9 | ||
|
|
15bac0eeaa | ||
|
|
1782973a29 | ||
|
|
9a4a501a95 | ||
|
|
9bbfbd5479 | ||
|
|
8c68731838 | ||
|
|
0d7f507f4e | ||
|
|
f78b943bdf | ||
|
|
160f3f88f9 | ||
|
|
45e38859ed | ||
|
|
38a5400a8c | ||
|
|
acd18455c2 | ||
|
|
5a7facc20f | ||
|
|
f54998a6b7 | ||
|
|
7d00d015f3 | ||
|
|
fed7beab89 | ||
|
|
cf3e9d1e0c | ||
|
|
749c9063af | ||
|
|
1af6632a29 | ||
|
|
7e79243bca | ||
|
|
36f9c804d9 | ||
|
|
06fe9ccda0 | ||
|
|
53eedb0f10 | ||
|
|
6e0e67b14d | ||
|
|
22f7f4649b | ||
|
|
8a77681574 | ||
|
|
6982c5dd56 | ||
|
|
7205c30ece | ||
|
|
80baad974e | ||
|
|
ae160cad12 | ||
|
|
6ff6277efa | ||
|
|
74f9ef838a | ||
|
|
395f89c973 | ||
|
|
8536521b7b | ||
|
|
b1659300e0 | ||
|
|
93226bbcff | ||
|
|
51fa230e7b | ||
|
|
5f292895cb | ||
|
|
9cfe741cea | ||
|
|
bed38d4253 | ||
|
|
37f226eda5 | ||
|
|
59b4affbe7 | ||
|
|
5477a36656 | ||
|
|
5648336893 | ||
|
|
f5b53d5d10 | ||
|
|
10448c1ac9 | ||
|
|
5243275db2 | ||
|
|
3041c2022b | ||
|
|
09be003d61 | ||
|
|
3fe5ddd68f | ||
|
|
935cb6782d | ||
|
|
9b421b54a7 | ||
|
|
6e23030595 | ||
|
|
78d69db79e | ||
|
|
9177ac1b2e | ||
|
|
248d207dbc | ||
|
|
03082c361a | ||
|
|
65372e3123 | ||
|
|
0f923fa51f | ||
|
|
d1e3567c6b | ||
|
|
af75547d37 | ||
|
|
37be3aff2d | ||
|
|
b9b17d8331 | ||
|
|
2a433a5c8c | ||
|
|
e344fd08a5 | ||
|
|
0484f695fb | ||
|
|
e55bd86dff | ||
|
|
b1247df4dc | ||
|
|
91dda36b08 | ||
|
|
ac19d1bf2b | ||
|
|
e0e0302ece | ||
|
|
6eb3e20abb | ||
|
|
738491c25d | ||
|
|
2686b7a9ab | ||
|
|
4b93e3a224 | ||
|
|
873c490470 | ||
|
|
11e3281b3f | ||
|
|
ce6c664acd |
No files matched your search
+64
-56
@@ -10,9 +10,9 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.179'
|
classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.187'
|
||||||
classpath 'org.ow2.asm:asm:7.2'
|
classpath 'org.ow2.asm:asm:9.0'
|
||||||
classpath 'org.ow2.asm:asm-tree:7.2'
|
classpath 'org.ow2.asm:asm-tree:9.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,9 +53,9 @@ ext {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
MAPPING_CHANNEL = 'snapshot'
|
MAPPING_CHANNEL = 'snapshot'
|
||||||
MAPPING_VERSION = '20200514-1.16'
|
MAPPING_VERSION = '20201028-1.16.3'
|
||||||
MC_VERSION = '1.16.3'
|
MC_VERSION = '1.16.5'
|
||||||
MCP_VERSION = '20200910.110331'
|
MCP_VERSION = '20210115.111550'
|
||||||
}
|
}
|
||||||
|
|
||||||
project(':mcp') {
|
project(':mcp') {
|
||||||
@@ -197,7 +197,7 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
SPEC_VERSION = '34.0' // This is overwritten by git tag, but here so dev time doesnt explode
|
SPEC_VERSION = '36.0' // This is overwritten by git tag, but here so dev time doesnt explode
|
||||||
// The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
|
// The new versioning sceme is <MCVersion>-<ForgeMC>.<RB>.<CommitsSinceRB>
|
||||||
// ForgeMC is a unique identifier for every MC version we have supported.
|
// ForgeMC is a unique identifier for every MC version we have supported.
|
||||||
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
|
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
|
||||||
@@ -353,8 +353,10 @@ project(':forge') {
|
|||||||
'--mod', 'global_loot_test',
|
'--mod', 'global_loot_test',
|
||||||
'--mod', 'scaffolding_test',
|
'--mod', 'scaffolding_test',
|
||||||
'--mod', 'custom_tag_types_test',
|
'--mod', 'custom_tag_types_test',
|
||||||
|
'--mod', 'new_model_loader_test',
|
||||||
'--output', rootProject.file('src/generated_test/resources/'),
|
'--output', rootProject.file('src/generated_test/resources/'),
|
||||||
'--existing', sourceSets.main.resources.srcDirs[0]
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -430,17 +432,18 @@ project(':forge') {
|
|||||||
fmllauncherImplementation.extendsFrom(installer)
|
fmllauncherImplementation.extendsFrom(installer)
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
installer 'org.ow2.asm:asm:7.2'
|
installer 'org.ow2.asm:asm:9.0'
|
||||||
installer 'org.ow2.asm:asm-commons:7.2'
|
installer 'org.ow2.asm:asm-commons:9.0'
|
||||||
installer 'org.ow2.asm:asm-tree:7.2'
|
installer 'org.ow2.asm:asm-tree:9.0'
|
||||||
installer 'org.ow2.asm:asm-util:7.2'
|
installer 'org.ow2.asm:asm-util:9.0'
|
||||||
installer 'org.ow2.asm:asm-analysis:7.2'
|
installer 'org.ow2.asm:asm-analysis:9.0'
|
||||||
installer 'cpw.mods:modlauncher:7.0.+'
|
installer 'cpw.mods:modlauncher:8.0.+'
|
||||||
installer 'cpw.mods:grossjava9hacks:1.3.+'
|
installer 'cpw.mods:grossjava9hacks:1.3.+'
|
||||||
installer 'net.minecraftforge:accesstransformers:2.2.+:shadowed'
|
installer 'net.minecraftforge:accesstransformers:3.0.+'
|
||||||
installer 'net.minecraftforge:eventbus:3.0.+:service'
|
installer 'org.antlr:antlr4-runtime:4.9.1' //Dep of AccessTransformer
|
||||||
installer 'net.minecraftforge:forgespi:3.1.+'
|
installer 'net.minecraftforge:eventbus:4.0.+'
|
||||||
installer 'net.minecraftforge:coremods:3.0.+'
|
installer 'net.minecraftforge:forgespi:3.2.+'
|
||||||
|
installer 'net.minecraftforge:coremods:4.0.+'
|
||||||
installer 'net.minecraftforge:unsafe:0.2.+'
|
installer 'net.minecraftforge:unsafe:0.2.+'
|
||||||
installer 'com.electronwill.night-config:core:3.6.2'
|
installer 'com.electronwill.night-config:core:3.6.2'
|
||||||
installer 'com.electronwill.night-config:toml:3.6.2'
|
installer 'com.electronwill.night-config:toml:3.6.2'
|
||||||
@@ -451,7 +454,10 @@ project(':forge') {
|
|||||||
installer 'org.apache.logging.log4j:log4j-core:2.11.2'
|
installer 'org.apache.logging.log4j:log4j-core:2.11.2'
|
||||||
installer 'net.minecrell:terminalconsoleappender:1.2.+'
|
installer 'net.minecrell:terminalconsoleappender:1.2.+'
|
||||||
installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
|
installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
|
||||||
installer 'org.spongepowered:mixin:0.8'
|
installer 'org.spongepowered:mixin:0.8.2'
|
||||||
|
// This is org.openjdk.nashorn:nashorn-core:15.1.1 repackaged so it doesn't crash on JREs < 15.
|
||||||
|
// See: https://github.com/LexManos/NashornLegacyPackager
|
||||||
|
installer 'net.minecraftforge:nashorn-core-compat:15.1.1'
|
||||||
fmllauncherImplementation 'com.google.guava:guava:21.0'
|
fmllauncherImplementation 'com.google.guava:guava:21.0'
|
||||||
fmllauncherImplementation 'com.google.code.gson:gson:2.8.0'
|
fmllauncherImplementation 'com.google.code.gson:gson:2.8.0'
|
||||||
fmllauncherImplementation 'org.lwjgl:lwjgl:3.2.2'
|
fmllauncherImplementation 'org.lwjgl:lwjgl:3.2.2'
|
||||||
@@ -473,35 +479,35 @@ project(':forge') {
|
|||||||
if (changelog.exists())
|
if (changelog.exists())
|
||||||
extraTxts += changelog
|
extraTxts += changelog
|
||||||
|
|
||||||
task crowdin(type: CrowdinTask) {
|
task crowdin(type: CrowdinTask) {
|
||||||
key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
|
key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
|
||||||
//TODO: Merge our english.json?
|
//TODO: Merge our english.json?
|
||||||
}
|
}
|
||||||
|
|
||||||
// We apply the bin patches we just created to make a jar that is JUST our changes
|
// We apply the bin patches we just created to make a jar that is JUST our changes
|
||||||
['Client', 'Server', 'Joined'].each { side ->
|
['Client', 'Server', 'Joined'].each { side ->
|
||||||
def gen = tasks.getByName("gen${side}BinPatches")
|
def gen = tasks.getByName("gen${side}BinPatches")
|
||||||
gen.tool = BINPATCH_TOOL
|
gen.tool = BINPATCH_TOOL
|
||||||
task "apply${side}BinPatches"(type: ApplyBinPatches, dependsOn: gen) {
|
task "apply${side}BinPatches"(type: ApplyBinPatches, dependsOn: gen) {
|
||||||
clean = { gen.cleanJar }
|
clean = { gen.cleanJar }
|
||||||
input = gen.output
|
input = gen.output
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
}
|
}
|
||||||
if (side != 'Joined') {
|
if (side != 'Joined') {
|
||||||
// Create SRG named Vanilla jars, using the SpecialSource we have in the installer
|
// Create SRG named Vanilla jars, using the SpecialSource we have in the installer
|
||||||
task "create${side}SRG"(type: RenameJar, dependsOn: gen) {
|
task "create${side}SRG"(type: RenameJar, dependsOn: gen) {
|
||||||
tool = SPECIAL_SOURCE + ':shaded'
|
tool = SPECIAL_SOURCE + ':shaded'
|
||||||
args = ['--stable', '--in-jar', '{input}', '--out-jar', '{output}', '--srg-in', '{mappings}']
|
args = ['--stable', '--in-jar', '{input}', '--out-jar', '{output}', '--srg-in', '{mappings}']
|
||||||
mappings = { gen.srg }
|
mappings = { gen.srg }
|
||||||
input = { gen.cleanJar }
|
input = { gen.cleanJar }
|
||||||
output = file("build/create${name}SRG/output.jar")
|
output = file("build/create${name}SRG/output.jar")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task downloadLibraries(type: DownloadLibrariesTask, dependsOn: ':mcp:setupMCP') {
|
task downloadLibraries(type: DownloadLibrariesTask, dependsOn: ':mcp:setupMCP') {
|
||||||
input = VERSION_JSON
|
input = VERSION_JSON
|
||||||
output = rootProject.file('build/libraries/')
|
output = rootProject.file('build/libraries/')
|
||||||
}
|
}
|
||||||
|
|
||||||
task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
|
task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
|
||||||
@@ -509,23 +515,23 @@ project(':forge') {
|
|||||||
input { genJoinedBinPatches.cleanJar }
|
input { genJoinedBinPatches.cleanJar }
|
||||||
doFirst { downloadLibraries.libraries.each{ addLibrary(it) } }
|
doFirst { downloadLibraries.libraries.each{ addLibrary(it) } }
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkATs(type: CheckATs, dependsOn: extractInheritance) {
|
task checkATs(type: CheckATs, dependsOn: extractInheritance) {
|
||||||
inheritance = extractInheritance.output
|
inheritance = extractInheritance.output
|
||||||
ats = patcher.accessTransformers
|
ats = patcher.accessTransformers
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkSAS(type: CheckSAS, dependsOn: extractInheritance) {
|
task checkSAS(type: CheckSAS, dependsOn: extractInheritance) {
|
||||||
inheritance = extractInheritance.output
|
inheritance = extractInheritance.output
|
||||||
sass = patcher.sideAnnotationStrippers
|
sass = patcher.sideAnnotationStrippers
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkExcs(type: CheckExcs, dependsOn: jar) {
|
task checkExcs(type: CheckExcs, dependsOn: jar) {
|
||||||
binary = jar.archivePath
|
binary = jar.archivePath
|
||||||
excs = patcher.excs
|
excs = patcher.excs
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkAll(dependsOn: [checkATs, checkSAS, checkExcs]){}
|
task checkAll(dependsOn: [checkATs, checkSAS, checkExcs]){}
|
||||||
|
|
||||||
task checkPatchesAndFix(type: CheckPatches) {
|
task checkPatchesAndFix(type: CheckPatches) {
|
||||||
patchDir = file("$rootDir/patches")
|
patchDir = file("$rootDir/patches")
|
||||||
@@ -636,6 +642,7 @@ project(':forge') {
|
|||||||
logo: '/big_logo.png',
|
logo: '/big_logo.png',
|
||||||
minecraft: MC_VERSION,
|
minecraft: MC_VERSION,
|
||||||
welcome: "Welcome to the simple ${project.name.capitalize()} installer.",
|
welcome: "Welcome to the simple ${project.name.capitalize()} installer.",
|
||||||
|
mirrorList: "https://files.minecraftforge.net/mirrors-2.0.json",
|
||||||
data: [
|
data: [
|
||||||
MAPPINGS: [
|
MAPPINGS: [
|
||||||
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@txt]",
|
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@txt]",
|
||||||
@@ -756,7 +763,7 @@ project(':forge') {
|
|||||||
// add crowdin locales
|
// add crowdin locales
|
||||||
from { crowdin.output.exists() ? zipTree(crowdin.output) : null}
|
from { crowdin.output.exists() ? zipTree(crowdin.output) : null}
|
||||||
dependsOn crowdin
|
dependsOn crowdin
|
||||||
duplicatesStrategy = 'exclude'
|
duplicatesStrategy = 'exclude'
|
||||||
|
|
||||||
doFirst {
|
doFirst {
|
||||||
MANIFESTS.each{ pkg, values ->
|
MANIFESTS.each{ pkg, values ->
|
||||||
@@ -877,7 +884,9 @@ project(':forge') {
|
|||||||
FORGE_NAME: project.name,
|
FORGE_NAME: project.name,
|
||||||
MC_VERSION: MC_VERSION,
|
MC_VERSION: MC_VERSION,
|
||||||
MAPPING_CHANNEL: MAPPING_CHANNEL,
|
MAPPING_CHANNEL: MAPPING_CHANNEL,
|
||||||
MAPPING_VERSION: MAPPING_VERSION
|
MAPPING_VERSION: MAPPING_VERSION,
|
||||||
|
FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0],
|
||||||
|
MC_NEXT_VERSION: "1."+((MC_VERSION.split("\\.")[1] as int)+1)
|
||||||
])
|
])
|
||||||
rename 'gitignore\\.txt', '.gitignore'
|
rename 'gitignore\\.txt', '.gitignore'
|
||||||
rename 'gitattributes\\.txt', '.gitattributes'
|
rename 'gitattributes\\.txt', '.gitattributes'
|
||||||
@@ -945,6 +954,7 @@ project(':forge') {
|
|||||||
exclude 'net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java'
|
exclude 'net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java'
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/Restriction.java'
|
exclude 'net/minecraftforge/fml/common/versioning/Restriction.java'
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/VersionRange.java'
|
exclude 'net/minecraftforge/fml/common/versioning/VersionRange.java'
|
||||||
|
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
main {
|
main {
|
||||||
@@ -1062,5 +1072,3 @@ task setup() {
|
|||||||
dependsOn ':clean:extractMapped'
|
dependsOn ':clean:extractMapped'
|
||||||
dependsOn ':forge:extractMapped' //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
dependsOn ':forge:extractMapped' //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -21,31 +21,44 @@ public class CheckSAS extends DefaultTask {
|
|||||||
sass.each { f ->
|
sass.each { f ->
|
||||||
def lines = []
|
def lines = []
|
||||||
f.eachLine { line ->
|
f.eachLine { line ->
|
||||||
if (line[0] == '\t') return //Skip any tabed lines, those are ones we add
|
if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
|
||||||
def idx = line.indexOf('#')
|
def idx = line.indexOf('#')
|
||||||
if (idx == 0 || line.isEmpty()) {
|
if (idx == 0 || line.isEmpty()) {
|
||||||
lines.add(line)
|
lines.add(line)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
def comment = idx == -1 ? null : line.substring(idx)
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
if (idx != -1) line = line.substring(0, idx - 1)
|
||||||
|
|
||||||
def (cls, desc) = (line.trim() + ' ').split(' ', -1)
|
def (cls, desc) = (line.trim() + ' ').split(' ', -1)
|
||||||
cls = cls.replaceAll('\\.', '/')
|
cls = cls.replaceAll('\\.', '/')
|
||||||
desc = desc.replace('(', ' (')
|
desc = desc.replace('(', ' (')
|
||||||
if (desc.isEmpty() || json[cls] == null || json[cls]['methods'] == null || json[cls]['methods'][desc] == null) {
|
|
||||||
|
if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
|
||||||
println('Invalid: ' + line)
|
println('Invalid: ' + line)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
def mtd = json[cls]['methods'][desc]
|
//Class SAS
|
||||||
|
if (desc.isEmpty()) {
|
||||||
|
lines.add(cls + (comment == null ? '' : ' ' + comment))
|
||||||
|
if (json[cls]['methods'] != null)
|
||||||
|
(json[cls]['methods'] as TreeMap).each {
|
||||||
|
findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
//Method SAS
|
||||||
lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
|
lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
|
||||||
def children = json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
|
findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
|
||||||
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
|
||||||
children.each { lines.add('\t' + it) }
|
|
||||||
}
|
}
|
||||||
f.text = lines.join('\n')
|
f.text = lines.join('\n')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static findChildMethods(json, cls, desc)
|
||||||
|
{
|
||||||
|
return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
|
||||||
|
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -59,11 +59,12 @@ public class Util {
|
|||||||
url = "https://files.minecraftforge.net/maven/${path}"
|
url = "https://files.minecraftforge.net/maven/${path}"
|
||||||
}
|
}
|
||||||
//TODO remove when Mojang launcher is updated
|
//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'
|
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.version = "${art.version}-${art.classifier}"
|
||||||
art.classifier = null
|
art.classifier = null
|
||||||
art.extension = 'jar'
|
art.extension = 'jar'
|
||||||
path = "${art.group.replace('.', '/')}/${art.name}/${art.version}/${art.name}-${art.version}.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}"),
|
||||||
|
|||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
<img src="assets/Forge_logo.svg">
|

|
||||||
|
|
||||||
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) [](https://discord.gg/UvedJ9m) [](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!
|
||||||
|
|||||||
+5
-1
@@ -75,7 +75,8 @@ minecraft {
|
|||||||
// Recommended logging level for the console
|
// Recommended logging level for the console
|
||||||
property 'forge.logging.console.level', 'debug'
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
args '--mod', 'examplemod', '--all', '--output', file('src/generated/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/')
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
examplemod {
|
examplemod {
|
||||||
@@ -86,6 +87,9 @@ minecraft {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Include resources generated by data generators.
|
||||||
|
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
|
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
|
||||||
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
|
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
|
||||||
|
|||||||
@@ -6,24 +6,26 @@
|
|||||||
# 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="[34,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
loaderVersion="[@FORGE_SPEC_VERSION@,)" #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="All rights reserved"
|
||||||
# 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="http://my.issue.tracker/" #optional
|
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
||||||
# 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="examplemod" #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 - there's a few well known ${} variables useable here or just hardcode it
|
||||||
|
# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
|
||||||
|
# see the associated build.gradle script for how to populate this completely automatically during a build
|
||||||
version="${file.jarVersion}" #mandatory
|
version="${file.jarVersion}" #mandatory
|
||||||
# A display name for the mod
|
# A display name for the mod
|
||||||
displayName="Example Mod" #mandatory
|
displayName="Example Mod" #mandatory
|
||||||
# A URL to query for updates for this mod. See the JSON update specification <here>
|
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
|
||||||
updateJSONURL="http://myurl.me/" #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="http://example.com/" #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
|
||||||
@@ -45,7 +47,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
|
|||||||
# 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="[34,)" #mandatory
|
versionRange="[@FORGE_SPEC_VERSION@,)" #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 relationship is not mandatory
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
||||||
@@ -54,6 +56,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn
|
|||||||
[[dependencies.examplemod]]
|
[[dependencies.examplemod]]
|
||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
versionRange="[1.16.3]"
|
# 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@)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="BOTH"
|
side="BOTH"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
@@ -556,10 +556,17 @@
|
@@ -572,10 +572,17 @@
|
||||||
GL13.glClientActiveTexture(p_227747_0_);
|
GL13.glClientActiveTexture(p_227747_0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Advancement.Builder func_241043_a_(JsonObject p_241043_0_, ConditionArrayParser p_241043_1_) {
|
public static Advancement.Builder func_241043_a_(JsonObject p_241043_0_, ConditionArrayParser p_241043_1_) {
|
||||||
+ if (!net.minecraftforge.common.crafting.ConditionalAdvancement.processConditions(p_241043_0_)) return null;
|
+ if ((p_241043_0_ = net.minecraftforge.common.crafting.ConditionalAdvancement.processConditional(p_241043_0_)) == null) return null;
|
||||||
ResourceLocation resourcelocation = p_241043_0_.has("parent") ? new ResourceLocation(JSONUtils.func_151200_h(p_241043_0_, "parent")) : null;
|
ResourceLocation resourcelocation = p_241043_0_.has("parent") ? new ResourceLocation(JSONUtils.func_151200_h(p_241043_0_, "parent")) : null;
|
||||||
DisplayInfo displayinfo = p_241043_0_.has("display") ? DisplayInfo.func_192294_a(JSONUtils.func_152754_s(p_241043_0_, "display")) : null;
|
DisplayInfo displayinfo = p_241043_0_.has("display") ? DisplayInfo.func_192294_a(JSONUtils.func_152754_s(p_241043_0_, "display")) : null;
|
||||||
AdvancementRewards advancementrewards = p_241043_0_.has("rewards") ? AdvancementRewards.func_241096_a_(JSONUtils.func_152754_s(p_241043_0_, "rewards")) : AdvancementRewards.field_192114_a;
|
AdvancementRewards advancementrewards = p_241043_0_.has("rewards") ? AdvancementRewards.func_241096_a_(JSONUtils.func_152754_s(p_241043_0_, "rewards")) : AdvancementRewards.field_192114_a;
|
||||||
@@ -65,10 +65,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
return this.field_220085_g;
|
return this.field_220085_g;
|
||||||
@@ -346,6 +349,10 @@
|
@@ -346,6 +349,14 @@
|
||||||
return this.field_235684_aB_.field_235800_b_.apply(this.func_230328_p_().func_176223_P());
|
return this.field_235684_aB_.field_235800_b_.apply(this.func_230328_p_().func_176223_P());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ protected boolean isAir(BlockState state) {
|
||||||
|
+ return ((AbstractBlockState)state).field_235702_f_;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ /* ======================================== FORGE START ===================================== */
|
+ /* ======================================== FORGE START ===================================== */
|
||||||
+ private final java.util.function.Supplier<ResourceLocation> lootTableSupplier;
|
+ private final java.util.function.Supplier<ResourceLocation> lootTableSupplier;
|
||||||
+ /* ========================================= FORGE END ====================================== */
|
+ /* ========================================= FORGE END ====================================== */
|
||||||
@@ -76,16 +80,18 @@
|
|||||||
public abstract static class AbstractBlockState extends StateHolder<Block, BlockState> {
|
public abstract static class AbstractBlockState extends StateHolder<Block, BlockState> {
|
||||||
private final int field_215708_d;
|
private final int field_215708_d;
|
||||||
private final boolean field_215709_e;
|
private final boolean field_215709_e;
|
||||||
@@ -428,6 +435,8 @@
|
@@ -428,14 +439,18 @@
|
||||||
return this.field_215708_d;
|
return this.field_215708_d;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ /** @deprecated use {@link BlockState#isAir(IBlockReader, BlockPos) */
|
+ /** @deprecated use {@link BlockState#isAir(IBlockReader, BlockPos) */
|
||||||
+ @Deprecated
|
+ @Deprecated
|
||||||
public boolean func_196958_f() {
|
public boolean func_196958_f() {
|
||||||
return this.field_235702_f_;
|
- return this.field_235702_f_;
|
||||||
|
+ return this.func_177230_c().isAir((BlockState)this);
|
||||||
}
|
}
|
||||||
@@ -436,6 +445,8 @@
|
|
||||||
|
public MaterialColor func_185909_g(IBlockReader p_185909_1_, BlockPos p_185909_2_) {
|
||||||
return this.field_235704_h_;
|
return this.field_235704_h_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,7 +100,7 @@
|
|||||||
public BlockState func_185907_a(Rotation p_185907_1_) {
|
public BlockState func_185907_a(Rotation p_185907_1_) {
|
||||||
return this.func_177230_c().func_185499_a(this.func_230340_p_(), p_185907_1_);
|
return this.func_177230_c().func_185499_a(this.func_230340_p_(), p_185907_1_);
|
||||||
}
|
}
|
||||||
@@ -802,6 +813,9 @@
|
@@ -802,6 +817,9 @@
|
||||||
private ResourceLocation field_222381_j;
|
private ResourceLocation field_222381_j;
|
||||||
private boolean field_226895_m_ = true;
|
private boolean field_226895_m_ = true;
|
||||||
private boolean field_235813_o_;
|
private boolean field_235813_o_;
|
||||||
@@ -104,7 +110,7 @@
|
|||||||
private AbstractBlock.IExtendedPositionPredicate<EntityType<?>> field_235814_p_ = (p_235832_0_, p_235832_1_, p_235832_2_, p_235832_3_) -> {
|
private AbstractBlock.IExtendedPositionPredicate<EntityType<?>> field_235814_p_ = (p_235832_0_, p_235832_1_, p_235832_2_, p_235832_3_) -> {
|
||||||
return p_235832_0_.func_224755_d(p_235832_1_, p_235832_2_, Direction.UP) && p_235832_0_.func_185906_d() < 14;
|
return p_235832_0_.func_224755_d(p_235832_1_, p_235832_2_, Direction.UP) && p_235832_0_.func_185906_d() < 14;
|
||||||
};
|
};
|
||||||
@@ -863,6 +877,8 @@
|
@@ -863,6 +881,8 @@
|
||||||
abstractblock$properties.field_226895_m_ = p_200950_0_.field_235684_aB_.field_226895_m_;
|
abstractblock$properties.field_226895_m_ = p_200950_0_.field_235684_aB_.field_226895_m_;
|
||||||
abstractblock$properties.field_235813_o_ = p_200950_0_.field_235684_aB_.field_235813_o_;
|
abstractblock$properties.field_235813_o_ = p_200950_0_.field_235684_aB_.field_235813_o_;
|
||||||
abstractblock$properties.field_235806_h_ = p_200950_0_.field_235684_aB_.field_235806_h_;
|
abstractblock$properties.field_235806_h_ = p_200950_0_.field_235684_aB_.field_235806_h_;
|
||||||
@@ -113,7 +119,7 @@
|
|||||||
return abstractblock$properties;
|
return abstractblock$properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -877,6 +893,24 @@
|
@@ -877,6 +897,24 @@
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,12 +144,22 @@
|
|||||||
public AbstractBlock.Properties func_200941_a(float p_200941_1_) {
|
public AbstractBlock.Properties func_200941_a(float p_200941_1_) {
|
||||||
this.field_200961_i = p_200941_1_;
|
this.field_200961_i = p_200941_1_;
|
||||||
return this;
|
return this;
|
||||||
@@ -933,7 +967,7 @@
|
@@ -932,11 +970,17 @@
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ @Deprecated // FORGE: Use the variant that takes a Supplier below
|
||||||
public AbstractBlock.Properties func_222379_b(Block p_222379_1_) {
|
public AbstractBlock.Properties func_222379_b(Block p_222379_1_) {
|
||||||
- this.field_222381_j = p_222379_1_.func_220068_i();
|
- this.field_222381_j = p_222379_1_.func_220068_i();
|
||||||
+ this.lootTableSupplier = () -> p_222379_1_.delegate.get().func_220068_i();
|
+ this.lootTableSupplier = () -> p_222379_1_.delegate.get().func_220068_i();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ public AbstractBlock.Properties lootFrom(java.util.function.Supplier<? extends Block> blockIn) {
|
||||||
|
+ this.lootTableSupplier = () -> blockIn.get().func_220068_i();
|
||||||
|
+ return this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public AbstractBlock.Properties func_235859_g_() {
|
||||||
|
this.field_235813_o_ = true;
|
||||||
|
return this;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/net/minecraft/block/BeehiveBlock.java
|
||||||
|
+++ b/net/minecraft/block/BeehiveBlock.java
|
||||||
|
@@ -85,6 +85,7 @@
|
||||||
|
List<BeeEntity> list = p_226881_1_.func_217357_a(BeeEntity.class, (new AxisAlignedBB(p_226881_2_)).func_72314_b(8.0D, 6.0D, 8.0D));
|
||||||
|
if (!list.isEmpty()) {
|
||||||
|
List<PlayerEntity> list1 = p_226881_1_.func_217357_a(PlayerEntity.class, (new AxisAlignedBB(p_226881_2_)).func_72314_b(8.0D, 6.0D, 8.0D));
|
||||||
|
+ if (list1.isEmpty()) return; //Forge: Prevent Error when no players are around.
|
||||||
|
int i = list1.size();
|
||||||
|
|
||||||
|
for(BeeEntity beeentity : list) {
|
||||||
|
@@ -105,7 +106,7 @@
|
||||||
|
int i = p_225533_1_.func_177229_b(field_226873_c_);
|
||||||
|
boolean flag = false;
|
||||||
|
if (i >= 5) {
|
||||||
|
- if (itemstack.func_77973_b() == Items.field_151097_aZ) {
|
||||||
|
+ if (itemstack.func_77973_b() instanceof net.minecraft.item.ShearsItem) {
|
||||||
|
p_225533_2_.func_184148_a(p_225533_4_, p_225533_4_.func_226277_ct_(), p_225533_4_.func_226278_cu_(), p_225533_4_.func_226281_cx_(), SoundEvents.field_226133_ah_, SoundCategory.NEUTRAL, 1.0F, 1.0F);
|
||||||
|
func_226878_a_(p_225533_2_, p_225533_3_);
|
||||||
|
itemstack.func_222118_a(1, p_225533_4_, (p_226874_1_) -> {
|
||||||
@@ -9,3 +9,12 @@
|
|||||||
if (flag && !p_220066_2_.func_177229_b(field_220101_b) && !p_220066_2_.func_177229_b(field_220103_d)) {
|
if (flag && !p_220066_2_.func_177229_b(field_220101_b) && !p_220066_2_.func_177229_b(field_220103_d)) {
|
||||||
BlockPos blockpos = p_220066_3_.func_216350_a();
|
BlockPos blockpos = p_220066_3_.func_216350_a();
|
||||||
p_220066_1_.func_180501_a(blockpos, p_220066_2_.func_206870_a(BlockStateProperties.field_208190_q, Boolean.valueOf(true)), 11);
|
p_220066_1_.func_180501_a(blockpos, p_220066_2_.func_206870_a(BlockStateProperties.field_208190_q, Boolean.valueOf(true)), 11);
|
||||||
|
@@ -208,7 +208,7 @@
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
- boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, p_235474_1_, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);
|
||||||
|
+ boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, blockpos, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);//Forge fix: MC-201374
|
||||||
|
if (flag) {
|
||||||
|
BlockState blockstate1 = p_235474_0_.func_180495_p(blockpos.func_177977_b());
|
||||||
|
return func_226915_i_(blockstate1);
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
+ * flower pots from altering vanilla behavior.
|
+ * flower pots from altering vanilla behavior.
|
||||||
+ *
|
+ *
|
||||||
+ * @param emptyPot The empty pot for this pot, or null for self.
|
+ * @param emptyPot The empty pot for this pot, or null for self.
|
||||||
+ * @param p_i48395_1_ The flower block.
|
+ * @param block The flower block.
|
||||||
+ * @param properties
|
+ * @param properties
|
||||||
+ */
|
+ */
|
||||||
+ public FlowerPotBlock(@javax.annotation.Nullable java.util.function.Supplier<FlowerPotBlock> emptyPot, java.util.function.Supplier<? extends Block> p_i48395_1_, AbstractBlock.Properties properties) {
|
+ public FlowerPotBlock(@javax.annotation.Nullable java.util.function.Supplier<FlowerPotBlock> emptyPot, java.util.function.Supplier<? extends Block> p_i48395_1_, AbstractBlock.Properties properties) {
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/block/PumpkinBlock.java
|
||||||
|
+++ b/net/minecraft/block/PumpkinBlock.java
|
||||||
|
@@ -20,7 +20,7 @@
|
||||||
|
|
||||||
|
public ActionResultType func_225533_a_(BlockState p_225533_1_, World p_225533_2_, BlockPos p_225533_3_, PlayerEntity p_225533_4_, Hand p_225533_5_, BlockRayTraceResult p_225533_6_) {
|
||||||
|
ItemStack itemstack = p_225533_4_.func_184586_b(p_225533_5_);
|
||||||
|
- if (itemstack.func_77973_b() == Items.field_151097_aZ) {
|
||||||
|
+ if (itemstack.func_77973_b() instanceof net.minecraft.item.ShearsItem) {
|
||||||
|
if (!p_225533_2_.field_72995_K) {
|
||||||
|
Direction direction = p_225533_6_.func_216354_b();
|
||||||
|
Direction direction1 = direction.func_176740_k() == Direction.Axis.Y ? p_225533_4_.func_174811_aO().func_176734_d() : direction;
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/block/SoundType.java
|
||||||
|
+++ b/net/minecraft/block/SoundType.java
|
||||||
|
@@ -59,6 +59,7 @@
|
||||||
|
private final SoundEvent field_185865_r;
|
||||||
|
private final SoundEvent field_185866_s;
|
||||||
|
|
||||||
|
+ @Deprecated // Forge: Use {@link net.minecraftforge.common.util.ForgeSoundType} instead for suppliers
|
||||||
|
public SoundType(float p_i46679_1_, float p_i46679_2_, SoundEvent p_i46679_3_, SoundEvent p_i46679_4_, SoundEvent p_i46679_5_, SoundEvent p_i46679_6_, SoundEvent p_i46679_7_) {
|
||||||
|
this.field_185860_m = p_i46679_1_;
|
||||||
|
this.field_185861_n = p_i46679_2_;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/block/TripWireBlock.java
|
||||||
|
+++ b/net/minecraft/block/TripWireBlock.java
|
||||||
|
@@ -67,7 +67,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, BlockState p_176208_3_, PlayerEntity p_176208_4_) {
|
||||||
|
- if (!p_176208_1_.field_72995_K && !p_176208_4_.func_184614_ca().func_190926_b() && p_176208_4_.func_184614_ca().func_77973_b() == Items.field_151097_aZ) {
|
||||||
|
+ if (!p_176208_1_.field_72995_K && !p_176208_4_.func_184614_ca().func_190926_b() && p_176208_4_.func_184614_ca().func_77973_b() instanceof net.minecraft.item.ShearsItem) {
|
||||||
|
p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_.func_206870_a(field_176295_N, Boolean.valueOf(true)), 4);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -26,16 +26,19 @@
|
|||||||
Direction direction3 = direction.func_176746_e();
|
Direction direction3 = direction.func_176746_e();
|
||||||
Direction direction4 = direction.func_176735_f();
|
Direction direction4 = direction.func_176735_f();
|
||||||
boolean flag = p_225542_1_.func_177229_b(func_176267_a(direction3));
|
boolean flag = p_225542_1_.func_177229_b(func_176267_a(direction3));
|
||||||
@@ -216,7 +216,7 @@
|
@@ -216,8 +216,9 @@
|
||||||
if (p_225542_3_.func_177956_o() > 0) {
|
if (p_225542_3_.func_177956_o() > 0) {
|
||||||
BlockPos blockpos1 = p_225542_3_.func_177977_b();
|
BlockPos blockpos1 = p_225542_3_.func_177977_b();
|
||||||
BlockState blockstate = p_225542_2_.func_180495_p(blockpos1);
|
BlockState blockstate = p_225542_2_.func_180495_p(blockpos1);
|
||||||
- if (blockstate.func_196958_f() || blockstate.func_203425_a(this)) {
|
- if (blockstate.func_196958_f() || blockstate.func_203425_a(this)) {
|
||||||
+ if (blockstate.isAir(p_225542_2_, blockpos) || blockstate.func_203425_a(this)) {
|
- BlockState blockstate1 = blockstate.func_196958_f() ? this.func_176223_P() : blockstate;
|
||||||
BlockState blockstate1 = blockstate.func_196958_f() ? this.func_176223_P() : blockstate;
|
+ boolean isAir = blockstate.isAir(p_225542_2_, blockpos1);
|
||||||
|
+ if (isAir || blockstate.func_203425_a(this)) {
|
||||||
|
+ BlockState blockstate1 = isAir ? this.func_176223_P() : blockstate;
|
||||||
BlockState blockstate2 = this.func_196544_a(p_225542_1_, blockstate1, p_225542_4_);
|
BlockState blockstate2 = this.func_196544_a(p_225542_1_, blockstate1, p_225542_4_);
|
||||||
if (blockstate1 != blockstate2 && this.func_196540_x(blockstate2)) {
|
if (blockstate1 != blockstate2 && this.func_196540_x(blockstate2)) {
|
||||||
@@ -322,4 +322,7 @@
|
p_225542_2_.func_180501_a(blockpos1, blockstate2, 2);
|
||||||
|
@@ -322,4 +323,7 @@
|
||||||
public static BooleanProperty func_176267_a(Direction p_176267_0_) {
|
public static BooleanProperty func_176267_a(Direction p_176267_0_) {
|
||||||
return field_196546_A.get(p_176267_0_);
|
return field_196546_A.get(p_176267_0_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/GameSettings.java
|
--- a/net/minecraft/client/GameSettings.java
|
||||||
+++ b/net/minecraft/client/GameSettings.java
|
+++ b/net/minecraft/client/GameSettings.java
|
||||||
@@ -167,6 +167,7 @@
|
@@ -170,6 +170,7 @@
|
||||||
public boolean field_241568_aS_;
|
public boolean field_241568_aS_;
|
||||||
|
|
||||||
public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_) {
|
public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_) {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
this.field_74317_L = p_i46326_1_;
|
this.field_74317_L = p_i46326_1_;
|
||||||
this.field_74354_ai = new File(p_i46326_2_, "options.txt");
|
this.field_74354_ai = new File(p_i46326_2_, "options.txt");
|
||||||
if (p_i46326_1_.func_147111_S() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
|
if (p_i46326_1_.func_147111_S() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
|
||||||
@@ -518,7 +519,11 @@
|
@@ -529,7 +530,11 @@
|
||||||
|
|
||||||
for(KeyBinding keybinding : this.field_74324_K) {
|
for(KeyBinding keybinding : this.field_74324_K) {
|
||||||
if (s.equals("key_" + keybinding.func_151464_g())) {
|
if (s.equals("key_" + keybinding.func_151464_g())) {
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -565,6 +570,7 @@
|
@@ -576,6 +581,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_74303_b() {
|
public void func_74303_b() {
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
try (PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.field_74354_ai), StandardCharsets.UTF_8))) {
|
try (PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.field_74354_ai), StandardCharsets.UTF_8))) {
|
||||||
printwriter.println("version:" + SharedConstants.func_215069_a().getWorldVersion());
|
printwriter.println("version:" + SharedConstants.func_215069_a().getWorldVersion());
|
||||||
printwriter.println("autoJump:" + AbstractOption.field_216719_z.func_216741_b(this));
|
printwriter.println("autoJump:" + AbstractOption.field_216719_z.func_216741_b(this));
|
||||||
@@ -648,7 +654,7 @@
|
@@ -661,7 +667,7 @@
|
||||||
printwriter.println("syncChunkWrites:" + this.field_241568_aS_);
|
printwriter.println("syncChunkWrites:" + this.field_241568_aS_);
|
||||||
|
|
||||||
for(KeyBinding keybinding : this.field_74324_K) {
|
for(KeyBinding keybinding : this.field_74324_K) {
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(SoundCategory soundcategory : SoundCategory.values()) {
|
for(SoundCategory soundcategory : SoundCategory.values()) {
|
||||||
@@ -747,6 +753,23 @@
|
@@ -760,6 +766,23 @@
|
||||||
p_198017_1_.func_198985_a(set);
|
p_198017_1_.func_198985_a(set);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,3 +9,11 @@
|
|||||||
if (monitor != null) {
|
if (monitor != null) {
|
||||||
VideoMode videomode = monitor.func_197992_a(this.field_198125_l ? this.field_198124_k : Optional.empty());
|
VideoMode videomode = monitor.func_197992_a(this.field_198125_l ? this.field_198124_k : Optional.empty());
|
||||||
this.field_198120_g = this.field_198127_n = monitor.func_197989_c() + videomode.func_198064_a() / 2 - this.field_198129_p / 2;
|
this.field_198120_g = this.field_198127_n = monitor.func_197989_c() + videomode.func_198064_a() / 2 - this.field_198129_p / 2;
|
||||||
|
@@ -271,6 +271,7 @@
|
||||||
|
GLFW.glfwGetFramebufferSize(this.field_198119_f, aint, aint1);
|
||||||
|
this.field_198131_r = aint[0];
|
||||||
|
this.field_198132_s = aint1[0];
|
||||||
|
+ if (this.field_198132_s == 0 || this.field_198131_r==0) net.minecraftforge.fml.loading.progress.EarlyProgressVisualization.INSTANCE.updateFBSize(w->this.field_198131_r=w, h->this.field_198132_s=h);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_198089_c(long p_198089_1_, int p_198089_3_, int p_198089_4_) {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Minecraft.java
|
--- a/net/minecraft/client/Minecraft.java
|
||||||
+++ b/net/minecraft/client/Minecraft.java
|
+++ b/net/minecraft/client/Minecraft.java
|
||||||
@@ -357,6 +357,7 @@
|
@@ -368,6 +368,7 @@
|
||||||
public Minecraft(GameConfiguration p_i45547_1_) {
|
public Minecraft(GameConfiguration p_i45547_1_) {
|
||||||
super("Client");
|
super("Client");
|
||||||
field_71432_P = this;
|
field_71432_P = this;
|
||||||
@@ -8,15 +8,15 @@
|
|||||||
this.field_71412_D = p_i45547_1_.field_178744_c.field_178760_a;
|
this.field_71412_D = p_i45547_1_.field_178744_c.field_178760_a;
|
||||||
File file1 = p_i45547_1_.field_178744_c.field_178759_c;
|
File file1 = p_i45547_1_.field_178744_c.field_178759_c;
|
||||||
this.field_130070_K = p_i45547_1_.field_178744_c.field_178758_b;
|
this.field_130070_K = p_i45547_1_.field_178744_c.field_178758_b;
|
||||||
@@ -369,7 +370,6 @@
|
@@ -382,7 +383,6 @@
|
||||||
this.field_152355_az = (new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString())).createMinecraftSessionService();
|
this.field_244734_au = this.func_244735_a(yggdrasilauthenticationservice, p_i45547_1_);
|
||||||
this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
|
this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
|
||||||
field_147123_G.info("Setting user: {}", (Object)this.field_71449_j.func_111285_a());
|
field_147123_G.info("Setting user: {}", (Object)this.field_71449_j.func_111285_a());
|
||||||
- field_147123_G.debug("(Session ID is {})", (Object)this.field_71449_j.func_111286_b());
|
- field_147123_G.debug("(Session ID is {})", (Object)this.field_71449_j.func_111286_b());
|
||||||
this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
|
this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
|
||||||
this.field_238175_ae_ = !p_i45547_1_.field_178741_d.field_239099_d_;
|
this.field_238175_ae_ = !p_i45547_1_.field_178741_d.field_239099_d_;
|
||||||
this.field_238176_af_ = !p_i45547_1_.field_178741_d.field_239100_e_;
|
this.field_238176_af_ = !p_i45547_1_.field_178741_d.field_239100_e_;
|
||||||
@@ -415,13 +415,13 @@
|
@@ -428,13 +428,13 @@
|
||||||
|
|
||||||
this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
|
this.field_195558_d.func_216526_a(this.field_71474_y.field_74350_i);
|
||||||
this.field_71417_B = new MouseHelper(this);
|
this.field_71417_B = new MouseHelper(this);
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
this.field_110448_aq.func_198983_a();
|
this.field_110448_aq.func_198983_a();
|
||||||
this.field_71474_y.func_198017_a(this.field_110448_aq);
|
this.field_71474_y.func_198017_a(this.field_110448_aq);
|
||||||
this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
|
this.field_135017_as = new LanguageManager(this.field_71474_y.field_74363_ab);
|
||||||
@@ -462,6 +462,7 @@
|
@@ -476,6 +476,7 @@
|
||||||
this.func_193986_ar();
|
this.func_193986_ar();
|
||||||
this.field_110451_am.func_219534_a(this.field_193995_ae);
|
this.field_110451_am.func_219534_a(this.field_193995_ae);
|
||||||
this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
|
this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
this.field_110451_am.func_219534_a(this.field_71452_i);
|
this.field_110451_am.func_219534_a(this.field_71452_i);
|
||||||
this.field_213272_aL = new PaintingSpriteUploader(this.field_71446_o);
|
this.field_213272_aL = new PaintingSpriteUploader(this.field_71446_o);
|
||||||
this.field_110451_am.func_219534_a(this.field_213272_aL);
|
this.field_110451_am.func_219534_a(this.field_213272_aL);
|
||||||
@@ -469,7 +470,8 @@
|
@@ -483,7 +484,8 @@
|
||||||
this.field_110451_am.func_219534_a(this.field_213273_aM);
|
this.field_110451_am.func_219534_a(this.field_213273_aM);
|
||||||
this.field_241557_ar_ = new GPUWarning();
|
this.field_241557_ar_ = new GPUWarning();
|
||||||
this.field_110451_am.func_219534_a(this.field_241557_ar_);
|
this.field_110451_am.func_219534_a(this.field_241557_ar_);
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
this.field_184132_p = new DebugRenderer(this);
|
this.field_184132_p = new DebugRenderer(this);
|
||||||
RenderSystem.setErrorCallback(this::func_195545_a);
|
RenderSystem.setErrorCallback(this::func_195545_a);
|
||||||
if (this.field_71474_y.field_74353_u && !this.field_195558_d.func_198113_j()) {
|
if (this.field_71474_y.field_74353_u && !this.field_195558_d.func_198113_j()) {
|
||||||
@@ -481,11 +483,6 @@
|
@@ -495,11 +497,6 @@
|
||||||
this.field_195558_d.func_224798_d(this.field_71474_y.field_225307_E);
|
this.field_195558_d.func_224798_d(this.field_71474_y.field_225307_E);
|
||||||
this.field_195558_d.func_227801_c_();
|
this.field_195558_d.func_227801_c_();
|
||||||
this.func_213226_a();
|
this.func_213226_a();
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
|
|
||||||
ResourceLoadProgressGui.func_212970_a(this);
|
ResourceLoadProgressGui.func_212970_a(this);
|
||||||
List<IResourcePack> list = this.field_110448_aq.func_232623_f_();
|
List<IResourcePack> list = this.field_110448_aq.func_232623_f_();
|
||||||
@@ -494,7 +491,14 @@
|
@@ -508,7 +505,14 @@
|
||||||
if (SharedConstants.field_206244_b) {
|
if (SharedConstants.field_206244_b) {
|
||||||
this.func_213256_aB();
|
this.func_213256_aB();
|
||||||
}
|
}
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
});
|
});
|
||||||
}, false));
|
}, false));
|
||||||
}
|
}
|
||||||
@@ -533,7 +537,7 @@
|
@@ -556,7 +560,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void func_229988_a_(Throwable p_229988_1_) {
|
private void func_229988_a_(Throwable p_229988_1_) {
|
||||||
@@ -86,7 +86,7 @@
|
|||||||
ITextComponent itextcomponent;
|
ITextComponent itextcomponent;
|
||||||
if (p_229988_1_ instanceof SimpleReloadableResourceManager.FailedPackException) {
|
if (p_229988_1_ instanceof SimpleReloadableResourceManager.FailedPackException) {
|
||||||
itextcomponent = new StringTextComponent(((SimpleReloadableResourceManager.FailedPackException)p_229988_1_).func_241203_a().func_195762_a());
|
itextcomponent = new StringTextComponent(((SimpleReloadableResourceManager.FailedPackException)p_229988_1_).func_241203_a().func_195762_a());
|
||||||
@@ -621,7 +625,7 @@
|
@@ -644,7 +648,7 @@
|
||||||
return Stream.of(Registry.field_212630_s.func_177774_c(p_213251_0_.func_77973_b()));
|
return Stream.of(Registry.field_212630_s.func_177774_c(p_213251_0_.func_77973_b()));
|
||||||
});
|
});
|
||||||
SearchTreeReloadable<ItemStack> searchtreereloadable = new SearchTreeReloadable<>((p_213235_0_) -> {
|
SearchTreeReloadable<ItemStack> searchtreereloadable = new SearchTreeReloadable<>((p_213235_0_) -> {
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
});
|
});
|
||||||
NonNullList<ItemStack> nonnulllist = NonNullList.func_191196_a();
|
NonNullList<ItemStack> nonnulllist = NonNullList.func_191196_a();
|
||||||
|
|
||||||
@@ -691,13 +695,13 @@
|
@@ -714,13 +718,13 @@
|
||||||
Bootstrap.func_179870_a(p_71377_0_.func_71502_e());
|
Bootstrap.func_179870_a(p_71377_0_.func_71502_e());
|
||||||
if (p_71377_0_.func_71497_f() != null) {
|
if (p_71377_0_.func_71497_f() != null) {
|
||||||
Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_0_.func_71497_f());
|
Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_0_.func_71497_f());
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -706,6 +710,7 @@
|
@@ -729,6 +733,7 @@
|
||||||
return this.field_71474_y.field_211842_aO;
|
return this.field_71474_y.field_211842_aO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +120,7 @@
|
|||||||
public CompletableFuture<Void> func_213237_g() {
|
public CompletableFuture<Void> func_213237_g() {
|
||||||
if (this.field_213276_aV != null) {
|
if (this.field_213276_aV != null) {
|
||||||
return this.field_213276_aV;
|
return this.field_213276_aV;
|
||||||
@@ -794,10 +799,6 @@
|
@@ -817,10 +822,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_147108_a(@Nullable Screen p_147108_1_) {
|
public void func_147108_a(@Nullable Screen p_147108_1_) {
|
||||||
@@ -131,7 +131,7 @@
|
|||||||
if (p_147108_1_ == null && this.field_71441_e == null) {
|
if (p_147108_1_ == null && this.field_71441_e == null) {
|
||||||
p_147108_1_ = new MainMenuScreen();
|
p_147108_1_ = new MainMenuScreen();
|
||||||
} else if (p_147108_1_ == null && this.field_71439_g.func_233643_dh_()) {
|
} else if (p_147108_1_ == null && this.field_71439_g.func_233643_dh_()) {
|
||||||
@@ -808,6 +809,14 @@
|
@@ -831,6 +832,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
if (p_147108_1_ instanceof MainMenuScreen || p_147108_1_ instanceof MultiplayerScreen) {
|
if (p_147108_1_ instanceof MainMenuScreen || p_147108_1_ instanceof MultiplayerScreen) {
|
||||||
this.field_71474_y.field_74330_P = false;
|
this.field_71474_y.field_74330_P = false;
|
||||||
this.field_71456_v.func_146158_b().func_146231_a(true);
|
this.field_71456_v.func_146158_b().func_146231_a(true);
|
||||||
@@ -939,11 +948,13 @@
|
@@ -962,11 +971,13 @@
|
||||||
RenderSystem.enableCull();
|
RenderSystem.enableCull();
|
||||||
this.field_71424_I.func_76319_b();
|
this.field_71424_I.func_76319_b();
|
||||||
if (!this.field_71454_w) {
|
if (!this.field_71454_w) {
|
||||||
@@ -160,7 +160,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.field_238174_aV_ != null) {
|
if (this.field_238174_aV_ != null) {
|
||||||
@@ -1042,6 +1053,7 @@
|
@@ -1065,6 +1076,7 @@
|
||||||
|
|
||||||
Framebuffer framebuffer = this.func_147110_a();
|
Framebuffer framebuffer = this.func_147110_a();
|
||||||
framebuffer.func_216491_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), field_142025_a);
|
framebuffer.func_216491_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l(), field_142025_a);
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
|
this.field_71460_t.func_147704_a(this.field_195558_d.func_198109_k(), this.field_195558_d.func_198091_l());
|
||||||
this.field_71417_B.func_198021_g();
|
this.field_71417_B.func_198021_g();
|
||||||
}
|
}
|
||||||
@@ -1230,11 +1242,21 @@
|
@@ -1253,11 +1265,21 @@
|
||||||
if (p_147115_1_ && this.field_71476_x != null && this.field_71476_x.func_216346_c() == RayTraceResult.Type.BLOCK) {
|
if (p_147115_1_ && this.field_71476_x != null && this.field_71476_x.func_216346_c() == RayTraceResult.Type.BLOCK) {
|
||||||
BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
|
BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
|
||||||
BlockPos blockpos = blockraytraceresult.func_216350_a();
|
BlockPos blockpos = blockraytraceresult.func_216350_a();
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1253,6 +1275,8 @@
|
@@ -1276,6 +1298,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (!this.field_71439_g.func_184838_M()) {
|
} else if (!this.field_71439_g.func_184838_M()) {
|
||||||
@@ -201,7 +201,7 @@
|
|||||||
switch(this.field_71476_x.func_216346_c()) {
|
switch(this.field_71476_x.func_216346_c()) {
|
||||||
case ENTITY:
|
case ENTITY:
|
||||||
this.field_71442_b.func_78764_a(this.field_71439_g, ((EntityRayTraceResult)this.field_71476_x).func_216348_a());
|
this.field_71442_b.func_78764_a(this.field_71439_g, ((EntityRayTraceResult)this.field_71476_x).func_216348_a());
|
||||||
@@ -1260,7 +1284,7 @@
|
@@ -1283,7 +1307,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
|
BlockRayTraceResult blockraytraceresult = (BlockRayTraceResult)this.field_71476_x;
|
||||||
BlockPos blockpos = blockraytraceresult.func_216350_a();
|
BlockPos blockpos = blockraytraceresult.func_216350_a();
|
||||||
@@ -210,7 +210,7 @@
|
|||||||
this.field_71442_b.func_180511_b(blockpos, blockraytraceresult.func_216354_b());
|
this.field_71442_b.func_180511_b(blockpos, blockraytraceresult.func_216354_b());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1270,8 +1294,10 @@
|
@@ -1293,8 +1317,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_71439_g.func_184821_cY();
|
this.field_71439_g.func_184821_cY();
|
||||||
@@ -221,7 +221,7 @@
|
|||||||
this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
|
this.field_71439_g.func_184609_a(Hand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1286,6 +1312,11 @@
|
@@ -1309,6 +1335,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
for(Hand hand : Hand.values()) {
|
for(Hand hand : Hand.values()) {
|
||||||
@@ -233,7 +233,7 @@
|
|||||||
ItemStack itemstack = this.field_71439_g.func_184586_b(hand);
|
ItemStack itemstack = this.field_71439_g.func_184586_b(hand);
|
||||||
if (this.field_71476_x != null) {
|
if (this.field_71476_x != null) {
|
||||||
switch(this.field_71476_x.func_216346_c()) {
|
switch(this.field_71476_x.func_216346_c()) {
|
||||||
@@ -1299,6 +1330,7 @@
|
@@ -1322,6 +1353,7 @@
|
||||||
|
|
||||||
if (actionresulttype.func_226246_a_()) {
|
if (actionresulttype.func_226246_a_()) {
|
||||||
if (actionresulttype.func_226247_b_()) {
|
if (actionresulttype.func_226247_b_()) {
|
||||||
@@ -241,7 +241,7 @@
|
|||||||
this.field_71439_g.func_184609_a(hand);
|
this.field_71439_g.func_184609_a(hand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1311,6 +1343,7 @@
|
@@ -1334,6 +1366,7 @@
|
||||||
ActionResultType actionresulttype1 = this.field_71442_b.func_217292_a(this.field_71439_g, this.field_71441_e, hand, blockraytraceresult);
|
ActionResultType actionresulttype1 = this.field_71442_b.func_217292_a(this.field_71439_g, this.field_71441_e, hand, blockraytraceresult);
|
||||||
if (actionresulttype1.func_226246_a_()) {
|
if (actionresulttype1.func_226246_a_()) {
|
||||||
if (actionresulttype1.func_226247_b_()) {
|
if (actionresulttype1.func_226247_b_()) {
|
||||||
@@ -249,7 +249,7 @@
|
|||||||
this.field_71439_g.func_184609_a(hand);
|
this.field_71439_g.func_184609_a(hand);
|
||||||
if (!itemstack.func_190926_b() && (itemstack.func_190916_E() != i || this.field_71442_b.func_78758_h())) {
|
if (!itemstack.func_190926_b() && (itemstack.func_190916_E() != i || this.field_71442_b.func_78758_h())) {
|
||||||
this.field_71460_t.field_78516_c.func_187460_a(hand);
|
this.field_71460_t.field_78516_c.func_187460_a(hand);
|
||||||
@@ -1326,6 +1359,9 @@
|
@@ -1349,6 +1382,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,7 +259,7 @@
|
|||||||
if (!itemstack.func_190926_b()) {
|
if (!itemstack.func_190926_b()) {
|
||||||
ActionResultType actionresulttype2 = this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, hand);
|
ActionResultType actionresulttype2 = this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, hand);
|
||||||
if (actionresulttype2.func_226246_a_()) {
|
if (actionresulttype2.func_226246_a_()) {
|
||||||
@@ -1352,6 +1388,8 @@
|
@@ -1375,6 +1411,8 @@
|
||||||
--this.field_71467_ac;
|
--this.field_71467_ac;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,7 +268,7 @@
|
|||||||
this.field_71424_I.func_76320_a("gui");
|
this.field_71424_I.func_76320_a("gui");
|
||||||
if (!this.field_71445_n) {
|
if (!this.field_71445_n) {
|
||||||
this.field_71456_v.func_73831_a();
|
this.field_71456_v.func_73831_a();
|
||||||
@@ -1468,6 +1506,8 @@
|
@@ -1500,6 +1538,8 @@
|
||||||
this.field_71424_I.func_219895_b("keyboard");
|
this.field_71424_I.func_219895_b("keyboard");
|
||||||
this.field_195559_v.func_204870_b();
|
this.field_195559_v.func_204870_b();
|
||||||
this.field_71424_I.func_76319_b();
|
this.field_71424_I.func_76319_b();
|
||||||
@@ -276,8 +276,8 @@
|
|||||||
+ net.minecraftforge.fml.hooks.BasicEventHooks.onPostClientTick();
|
+ net.minecraftforge.fml.hooks.BasicEventHooks.onPostClientTick();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void func_184117_aA() {
|
private boolean func_244600_aM() {
|
||||||
@@ -1697,7 +1737,12 @@
|
@@ -1747,7 +1787,12 @@
|
||||||
networkmanager.func_150719_a(new ClientLoginNetHandler(networkmanager, this, (Screen)null, (p_229998_0_) -> {
|
networkmanager.func_150719_a(new ClientLoginNetHandler(networkmanager, this, (Screen)null, (p_229998_0_) -> {
|
||||||
}));
|
}));
|
||||||
networkmanager.func_179290_a(new CHandshakePacket(socketaddress.toString(), 0, ProtocolType.LOGIN));
|
networkmanager.func_179290_a(new CHandshakePacket(socketaddress.toString(), 0, ProtocolType.LOGIN));
|
||||||
@@ -291,7 +291,7 @@
|
|||||||
this.field_71453_ak = networkmanager;
|
this.field_71453_ak = networkmanager;
|
||||||
} else {
|
} else {
|
||||||
this.func_241559_a_(p_238195_6_, p_238195_1_, flag, () -> {
|
this.func_241559_a_(p_238195_6_, p_238195_1_, flag, () -> {
|
||||||
@@ -1771,6 +1816,7 @@
|
@@ -1821,6 +1866,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_71403_a(ClientWorld p_71403_1_) {
|
public void func_71403_a(ClientWorld p_71403_1_) {
|
||||||
@@ -299,7 +299,7 @@
|
|||||||
WorkingScreen workingscreen = new WorkingScreen();
|
WorkingScreen workingscreen = new WorkingScreen();
|
||||||
workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
|
workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
|
||||||
this.func_213241_c(workingscreen);
|
this.func_213241_c(workingscreen);
|
||||||
@@ -1802,10 +1848,12 @@
|
@@ -1852,10 +1898,12 @@
|
||||||
IntegratedServer integratedserver = this.field_71437_Z;
|
IntegratedServer integratedserver = this.field_71437_Z;
|
||||||
this.field_71437_Z = null;
|
this.field_71437_Z = null;
|
||||||
this.field_71460_t.func_190564_k();
|
this.field_71460_t.func_190564_k();
|
||||||
@@ -312,7 +312,7 @@
|
|||||||
if (integratedserver != null) {
|
if (integratedserver != null) {
|
||||||
this.field_71424_I.func_76320_a("waitForServer");
|
this.field_71424_I.func_76320_a("waitForServer");
|
||||||
|
|
||||||
@@ -1820,6 +1868,7 @@
|
@@ -1870,6 +1918,7 @@
|
||||||
this.field_71456_v.func_181029_i();
|
this.field_71456_v.func_181029_i();
|
||||||
this.field_71422_O = null;
|
this.field_71422_O = null;
|
||||||
this.field_71455_al = false;
|
this.field_71455_al = false;
|
||||||
@@ -320,7 +320,7 @@
|
|||||||
this.field_213274_aO.func_216815_b();
|
this.field_213274_aO.func_216815_b();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1850,6 +1899,7 @@
|
@@ -1900,6 +1949,7 @@
|
||||||
this.field_71452_i.func_78870_a(p_213257_1_);
|
this.field_71452_i.func_78870_a(p_213257_1_);
|
||||||
TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
|
TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
|
||||||
this.func_230150_b_();
|
this.func_230150_b_();
|
||||||
@@ -328,7 +328,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_238216_r_() {
|
public boolean func_238216_r_() {
|
||||||
@@ -1895,112 +1945,9 @@
|
@@ -1945,112 +1995,9 @@
|
||||||
|
|
||||||
private void func_147112_ai() {
|
private void func_147112_ai() {
|
||||||
if (this.field_71476_x != null && this.field_71476_x.func_216346_c() != RayTraceResult.Type.MISS) {
|
if (this.field_71476_x != null && this.field_71476_x.func_216346_c() != RayTraceResult.Type.MISS) {
|
||||||
@@ -444,7 +444,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2090,6 +2037,7 @@
|
@@ -2140,6 +2087,7 @@
|
||||||
return field_71432_P;
|
return field_71432_P;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,7 +452,7 @@
|
|||||||
public CompletableFuture<Void> func_213245_w() {
|
public CompletableFuture<Void> func_213245_w() {
|
||||||
return this.func_213169_a(this::func_213237_g).thenCompose((p_229993_0_) -> {
|
return this.func_213169_a(this::func_213237_g).thenCompose((p_229993_0_) -> {
|
||||||
return p_229993_0_;
|
return p_229993_0_;
|
||||||
@@ -2397,7 +2345,7 @@
|
@@ -2451,7 +2399,7 @@
|
||||||
supplier = func_228022_c_(supplier);
|
supplier = func_228022_c_(supplier);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -461,7 +461,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static Supplier<IResourcePack> func_228021_b_(Supplier<IResourcePack> p_228021_0_) {
|
private static Supplier<IResourcePack> func_228021_b_(Supplier<IResourcePack> p_228021_0_) {
|
||||||
@@ -2416,6 +2364,14 @@
|
@@ -2470,6 +2418,14 @@
|
||||||
this.field_175617_aL.func_229355_a_(p_228020_1_);
|
this.field_175617_aL.func_229355_a_(p_228020_1_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/IngameGui.java
|
--- a/net/minecraft/client/gui/IngameGui.java
|
||||||
+++ b/net/minecraft/client/gui/IngameGui.java
|
+++ b/net/minecraft/client/gui/IngameGui.java
|
||||||
@@ -78,7 +78,7 @@
|
@@ -79,7 +79,7 @@
|
||||||
protected static final ResourceLocation field_110329_b = new ResourceLocation("textures/misc/vignette.png");
|
protected static final ResourceLocation field_110329_b = new ResourceLocation("textures/misc/vignette.png");
|
||||||
protected static final ResourceLocation field_110330_c = new ResourceLocation("textures/gui/widgets.png");
|
protected static final ResourceLocation field_110330_c = new ResourceLocation("textures/gui/widgets.png");
|
||||||
protected static final ResourceLocation field_110328_d = new ResourceLocation("textures/misc/pumpkinblur.png");
|
protected static final ResourceLocation field_110328_d = new ResourceLocation("textures/misc/pumpkinblur.png");
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
protected final Random field_73842_c = new Random();
|
protected final Random field_73842_c = new Random();
|
||||||
protected final Minecraft field_73839_d;
|
protected final Minecraft field_73839_d;
|
||||||
protected final ItemRenderer field_73841_b;
|
protected final ItemRenderer field_73841_b;
|
||||||
@@ -414,6 +414,9 @@
|
@@ -415,6 +415,9 @@
|
||||||
|
|
||||||
for(EffectInstance effectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
for(EffectInstance effectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
||||||
Effect effect = effectinstance.func_188419_a();
|
Effect effect = effectinstance.func_188419_a();
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
if (effectinstance.func_205348_f()) {
|
if (effectinstance.func_205348_f()) {
|
||||||
int k = this.field_194811_H;
|
int k = this.field_194811_H;
|
||||||
int l = 1;
|
int l = 1;
|
||||||
@@ -451,6 +454,7 @@
|
@@ -452,6 +455,7 @@
|
||||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, f1);
|
||||||
func_238470_a_(p_238444_1_, j1 + 3, k1 + 3, this.func_230927_p_(), 18, 18, textureatlassprite);
|
func_238470_a_(p_238444_1_, j1 + 3, k1 + 3, this.func_230927_p_(), 18, 18, textureatlassprite);
|
||||||
});
|
});
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -575,7 +579,8 @@
|
@@ -576,7 +580,8 @@
|
||||||
iformattabletextcomponent.func_240699_a_(TextFormatting.ITALIC);
|
iformattabletextcomponent.func_240699_a_(TextFormatting.ITALIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
int j = (this.field_194811_H - i) / 2;
|
int j = (this.field_194811_H - i) / 2;
|
||||||
int k = this.field_194812_I - 59;
|
int k = this.field_194812_I - 59;
|
||||||
if (!this.field_73839_d.field_71442_b.func_78755_b()) {
|
if (!this.field_73839_d.field_71442_b.func_78755_b()) {
|
||||||
@@ -592,7 +597,13 @@
|
@@ -593,7 +598,13 @@
|
||||||
RenderSystem.enableBlend();
|
RenderSystem.enableBlend();
|
||||||
RenderSystem.defaultBlendFunc();
|
RenderSystem.defaultBlendFunc();
|
||||||
func_238467_a_(p_238453_1_, j - 2, k - 2, j + i + 2, k + 9 + 2, this.field_73839_d.field_71474_y.func_216839_a(0));
|
func_238467_a_(p_238453_1_, j - 2, k - 2, j + i + 2, k + 9 + 2, this.field_73839_d.field_71474_y.func_216839_a(0));
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
RenderSystem.disableBlend();
|
RenderSystem.disableBlend();
|
||||||
RenderSystem.popMatrix();
|
RenderSystem.popMatrix();
|
||||||
}
|
}
|
||||||
@@ -1055,7 +1066,7 @@
|
@@ -1056,7 +1067,7 @@
|
||||||
ItemStack itemstack = this.field_73839_d.field_71439_g.field_71071_by.func_70448_g();
|
ItemStack itemstack = this.field_73839_d.field_71439_g.field_71071_by.func_70448_g();
|
||||||
if (itemstack.func_190926_b()) {
|
if (itemstack.func_190926_b()) {
|
||||||
this.field_92017_k = 0;
|
this.field_92017_k = 0;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
this.field_193018_j.add(new RecipeTabToggleWidget(recipebookcategories));
|
this.field_193018_j.add(new RecipeTabToggleWidget(recipebookcategories));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -433,7 +433,7 @@
|
@@ -434,7 +434,7 @@
|
||||||
|
|
||||||
languagemanager.func_135045_a(language);
|
languagemanager.func_135045_a(language);
|
||||||
this.field_191888_F.field_71474_y.field_74363_ab = language.getCode();
|
this.field_191888_F.field_71474_y.field_74363_ab = language.getCode();
|
||||||
|
|||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
--- a/net/minecraft/client/gui/screen/BiomeGeneratorTypeScreens.java
|
||||||
|
+++ b/net/minecraft/client/gui/screen/BiomeGeneratorTypeScreens.java
|
||||||
|
@@ -113,6 +113,9 @@
|
||||||
|
private BiomeGeneratorTypeScreens(String p_i232324_1_) {
|
||||||
|
this.field_239076_k_ = new TranslationTextComponent("generator." + p_i232324_1_);
|
||||||
|
}
|
||||||
|
+ public BiomeGeneratorTypeScreens(ITextComponent displayName) {
|
||||||
|
+ this.field_239076_k_ = displayName;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
private static DimensionGeneratorSettings func_243452_a(DynamicRegistries p_243452_0_, DimensionGeneratorSettings p_243452_1_, BiomeGeneratorTypeScreens p_243452_2_, Biome p_243452_3_) {
|
||||||
|
BiomeProvider biomeprovider = new SingleBiomeProvider(p_243452_3_);
|
||||||
|
@@ -166,4 +169,8 @@
|
||||||
|
public interface IFactory {
|
||||||
|
Screen createEditScreen(CreateWorldScreen p_createEditScreen_1_, DimensionGeneratorSettings p_createEditScreen_2_);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Forge start
|
||||||
|
+ // For internal use only, automatically called for all ForgeWorldTypes. Register your ForgeWorldType in the forge registry!
|
||||||
|
+ public static void registerGenerator(BiomeGeneratorTypeScreens gen) { field_239068_c_.add(gen); }
|
||||||
|
}
|
||||||
@@ -1,5 +1,14 @@
|
|||||||
--- a/net/minecraft/client/gui/screen/CreateWorldScreen.java
|
--- a/net/minecraft/client/gui/screen/CreateWorldScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screen/CreateWorldScreen.java
|
+++ b/net/minecraft/client/gui/screen/CreateWorldScreen.java
|
||||||
|
@@ -110,7 +110,7 @@
|
||||||
|
|
||||||
|
public static CreateWorldScreen func_243425_a(@Nullable Screen p_243425_0_) {
|
||||||
|
DynamicRegistries.Impl dynamicregistries$impl = DynamicRegistries.func_239770_b_();
|
||||||
|
- return new CreateWorldScreen(p_243425_0_, DatapackCodec.field_234880_a_, new WorldOptionsScreen(dynamicregistries$impl, DimensionGeneratorSettings.func_242751_a(dynamicregistries$impl.func_243612_b(Registry.field_239698_ad_), dynamicregistries$impl.func_243612_b(Registry.field_239720_u_), dynamicregistries$impl.func_243612_b(Registry.field_243549_ar)), Optional.of(BiomeGeneratorTypeScreens.field_239066_a_), OptionalLong.empty()));
|
||||||
|
+ return new CreateWorldScreen(p_243425_0_, DatapackCodec.field_234880_a_, new WorldOptionsScreen(dynamicregistries$impl, net.minecraftforge.client.ForgeHooksClient.getDefaultWorldType().map(type -> type.func_241220_a_(dynamicregistries$impl, new java.util.Random().nextLong(), true, false)).orElseGet(() -> DimensionGeneratorSettings.func_242751_a(dynamicregistries$impl.func_243612_b(Registry.field_239698_ad_), dynamicregistries$impl.func_243612_b(Registry.field_239720_u_), dynamicregistries$impl.func_243612_b(Registry.field_243549_ar))), net.minecraftforge.client.ForgeHooksClient.getDefaultWorldType(), OptionalLong.empty()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private CreateWorldScreen(@Nullable Screen p_i242063_1_, DatapackCodec p_i242063_2_, WorldOptionsScreen p_i242063_3_) {
|
||||||
@@ -542,6 +542,7 @@
|
@@ -542,6 +542,7 @@
|
||||||
File file1 = path.toFile();
|
File file1 = path.toFile();
|
||||||
if (this.field_243416_G == null) {
|
if (this.field_243416_G == null) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screen/LanguageScreen.java
|
--- a/net/minecraft/client/gui/screen/LanguageScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screen/LanguageScreen.java
|
+++ b/net/minecraft/client/gui/screen/LanguageScreen.java
|
||||||
@@ -45,7 +45,7 @@
|
@@ -46,7 +46,7 @@
|
||||||
if (languagescreen$list$languageentry != null && !languagescreen$list$languageentry.field_214398_b.getCode().equals(this.field_146454_h.func_135041_c().getCode())) {
|
if (languagescreen$list$languageentry != null && !languagescreen$list$languageentry.field_214398_b.getCode().equals(this.field_146454_h.func_135041_c().getCode())) {
|
||||||
this.field_146454_h.func_135045_a(languagescreen$list$languageentry.field_214398_b);
|
this.field_146454_h.func_135045_a(languagescreen$list$languageentry.field_214398_b);
|
||||||
this.field_228183_b_.field_74363_ab = languagescreen$list$languageentry.field_214398_b.getCode();
|
this.field_228183_b_.field_74363_ab = languagescreen$list$languageentry.field_214398_b.getCode();
|
||||||
|
|||||||
@@ -7,23 +7,35 @@
|
|||||||
- this.func_243308_b(p_230457_1_, this.func_231151_a_(p_230457_2_), p_230457_3_, p_230457_4_);
|
- this.func_243308_b(p_230457_1_, this.func_231151_a_(p_230457_2_), p_230457_3_, p_230457_4_);
|
||||||
+ FontRenderer font = p_230457_2_.func_77973_b().getFontRenderer(p_230457_2_);
|
+ FontRenderer font = p_230457_2_.func_77973_b().getFontRenderer(p_230457_2_);
|
||||||
+ net.minecraftforge.fml.client.gui.GuiUtils.preItemToolTip(p_230457_2_);
|
+ net.minecraftforge.fml.client.gui.GuiUtils.preItemToolTip(p_230457_2_);
|
||||||
+ this.renderToolTip(p_230457_1_, Lists.transform(this.func_231151_a_(p_230457_2_), ITextComponent::func_241878_f), p_230457_3_, p_230457_4_, (font == null ? this.field_230712_o_ : font));
|
+ this.renderWrappedToolTip(p_230457_1_, this.func_231151_a_(p_230457_2_), p_230457_3_, p_230457_4_, (font == null ? this.field_230712_o_ : font));
|
||||||
+ net.minecraftforge.fml.client.gui.GuiUtils.postItemToolTip();
|
+ net.minecraftforge.fml.client.gui.GuiUtils.postItemToolTip();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ITextComponent> func_231151_a_(ItemStack p_231151_1_) {
|
public List<ITextComponent> func_231151_a_(ItemStack p_231151_1_) {
|
||||||
@@ -129,6 +132,10 @@
|
@@ -121,14 +124,20 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void func_238652_a_(MatrixStack p_238652_1_, ITextComponent p_238652_2_, int p_238652_3_, int p_238652_4_) {
|
||||||
|
- this.func_238654_b_(p_238652_1_, Arrays.asList(p_238652_2_.func_241878_f()), p_238652_3_, p_238652_4_);
|
||||||
|
+ this.func_243308_b(p_238652_1_, Arrays.asList(p_238652_2_), p_238652_3_, p_238652_4_);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_243308_b(MatrixStack p_243308_1_, List<ITextComponent> p_243308_2_, int p_243308_3_, int p_243308_4_) {
|
||||||
|
- this.func_238654_b_(p_243308_1_, Lists.transform(p_243308_2_, ITextComponent::func_241878_f), p_243308_3_, p_243308_4_);
|
||||||
|
+ this.renderWrappedToolTip(p_243308_1_, p_243308_2_, p_243308_3_, p_243308_4_, field_230712_o_);
|
||||||
|
}
|
||||||
|
+ public void renderWrappedToolTip(MatrixStack matrixStack, List<? extends net.minecraft.util.text.ITextProperties> tooltips, int mouseX, int mouseY, FontRenderer font) {
|
||||||
|
+ net.minecraftforge.fml.client.gui.GuiUtils.drawHoveringText(matrixStack, tooltips, mouseX, mouseY, field_230708_k_, field_230709_l_, -1, font);
|
||||||
|
+ }
|
||||||
|
|
||||||
public void func_238654_b_(MatrixStack p_238654_1_, List<? extends IReorderingProcessor> p_238654_2_, int p_238654_3_, int p_238654_4_) {
|
public void func_238654_b_(MatrixStack p_238654_1_, List<? extends IReorderingProcessor> p_238654_2_, int p_238654_3_, int p_238654_4_) {
|
||||||
+ this.renderToolTip(p_238654_1_, p_238654_2_, p_238654_3_, p_238654_4_, field_230712_o_);
|
+ this.renderToolTip(p_238654_1_, p_238654_2_, p_238654_3_, p_238654_4_, field_230712_o_);
|
||||||
+ }
|
+ }
|
||||||
+ public void renderToolTip(MatrixStack p_238654_1_, List<? extends IReorderingProcessor> p_238654_2_, int p_238654_3_, int p_238654_4_, FontRenderer font) {
|
+ public void renderToolTip(MatrixStack p_238654_1_, List<? extends IReorderingProcessor> p_238654_2_, int p_238654_3_, int p_238654_4_, FontRenderer font) {
|
||||||
+ //net.minecraftforge.fml.client.gui.GuiUtils.drawHoveringText(p_238654_1_, p_238654_2_, p_238654_3_, p_238654_4_, field_230708_k_, field_230709_l_, -1, font);
|
|
||||||
if (!p_238654_2_.isEmpty()) {
|
if (!p_238654_2_.isEmpty()) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
@@ -289,9 +296,12 @@
|
@@ -289,9 +298,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_231159_b_(String p_231159_1_, boolean p_231159_2_) {
|
public void func_231159_b_(String p_231159_1_, boolean p_231159_2_) {
|
||||||
@@ -36,7 +48,7 @@
|
|||||||
|
|
||||||
this.field_230706_i_.field_71439_g.func_71165_d(p_231159_1_);
|
this.field_230706_i_.field_71439_g.func_71165_d(p_231159_1_);
|
||||||
}
|
}
|
||||||
@@ -302,10 +312,17 @@
|
@@ -302,10 +314,17 @@
|
||||||
this.field_230712_o_ = p_231158_1_.field_71466_p;
|
this.field_230712_o_ = p_231158_1_.field_71466_p;
|
||||||
this.field_230708_k_ = p_231158_2_;
|
this.field_230708_k_ = p_231158_2_;
|
||||||
this.field_230709_l_ = p_231158_3_;
|
this.field_230709_l_ = p_231158_3_;
|
||||||
@@ -54,7 +66,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public List<? extends IGuiEventListener> func_231039_at__() {
|
public List<? extends IGuiEventListener> func_231039_at__() {
|
||||||
@@ -328,6 +345,7 @@
|
@@ -328,6 +347,7 @@
|
||||||
public void func_238651_a_(MatrixStack p_238651_1_, int p_238651_2_) {
|
public void func_238651_a_(MatrixStack p_238651_1_, int p_238651_2_) {
|
||||||
if (this.field_230706_i_.field_71441_e != null) {
|
if (this.field_230706_i_.field_71441_e != null) {
|
||||||
this.func_238468_a_(p_238651_1_, 0, 0, this.field_230708_k_, this.field_230709_l_, -1072689136, -804253680);
|
this.func_238468_a_(p_238651_1_, 0, 0, this.field_230708_k_, this.field_230709_l_, -1072689136, -804253680);
|
||||||
@@ -62,7 +74,7 @@
|
|||||||
} else {
|
} else {
|
||||||
this.func_231165_f_(p_238651_2_);
|
this.func_231165_f_(p_238651_2_);
|
||||||
}
|
}
|
||||||
@@ -346,6 +364,7 @@
|
@@ -346,6 +366,7 @@
|
||||||
bufferbuilder.func_225582_a_((double)this.field_230708_k_, 0.0D, 0.0D).func_225583_a_((float)this.field_230708_k_ / 32.0F, (float)p_231165_1_).func_225586_a_(64, 64, 64, 255).func_181675_d();
|
bufferbuilder.func_225582_a_((double)this.field_230708_k_, 0.0D, 0.0D).func_225583_a_((float)this.field_230708_k_ / 32.0F, (float)p_231165_1_).func_225586_a_(64, 64, 64, 255).func_181675_d();
|
||||||
bufferbuilder.func_225582_a_(0.0D, 0.0D, 0.0D).func_225583_a_(0.0F, (float)p_231165_1_).func_225586_a_(64, 64, 64, 255).func_181675_d();
|
bufferbuilder.func_225582_a_(0.0D, 0.0D, 0.0D).func_225583_a_(0.0F, (float)p_231165_1_).func_225586_a_(64, 64, 64, 255).func_181675_d();
|
||||||
tessellator.func_78381_a();
|
tessellator.func_78381_a();
|
||||||
@@ -70,7 +82,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_231177_au__() {
|
public boolean func_231177_au__() {
|
||||||
@@ -432,4 +451,8 @@
|
@@ -432,4 +453,8 @@
|
||||||
|
|
||||||
public void func_230476_a_(List<Path> p_230476_1_) {
|
public void func_230476_a_(List<Path> p_230476_1_) {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screen/ServerSelectionList.java
|
--- a/net/minecraft/client/gui/screen/ServerSelectionList.java
|
||||||
+++ b/net/minecraft/client/gui/screen/ServerSelectionList.java
|
+++ b/net/minecraft/client/gui/screen/ServerSelectionList.java
|
||||||
@@ -310,6 +310,8 @@
|
@@ -307,6 +307,8 @@
|
||||||
this.field_148303_c.func_238854_b_(list1);
|
this.field_148303_c.func_238854_b_(list1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/net/minecraft/client/gui/screen/WorldOptionsScreen.java
|
||||||
|
+++ b/net/minecraft/client/gui/screen/WorldOptionsScreen.java
|
||||||
|
@@ -134,6 +134,7 @@
|
||||||
|
this.field_239035_i_.field_230693_o_ = this.field_239040_n_.isPresent();
|
||||||
|
this.field_239036_j_ = p_239048_1_.func_230480_a_(new Button(j, 120, 150, 20, new TranslationTextComponent("selectWorld.customizeType"), (p_239044_3_) -> {
|
||||||
|
BiomeGeneratorTypeScreens.IFactory biomegeneratortypescreens$ifactory = BiomeGeneratorTypeScreens.field_239069_d_.get(this.field_239040_n_);
|
||||||
|
+ biomegeneratortypescreens$ifactory = net.minecraftforge.client.ForgeHooksClient.getBiomeGeneratorTypeScreenFactory(this.field_239040_n_, biomegeneratortypescreens$ifactory);
|
||||||
|
if (biomegeneratortypescreens$ifactory != null) {
|
||||||
|
p_239048_2_.func_147108_a(biomegeneratortypescreens$ifactory.createEditScreen(p_239048_1_, this.field_239039_m_));
|
||||||
|
}
|
||||||
|
@@ -292,7 +293,7 @@
|
||||||
|
} else {
|
||||||
|
this.field_239034_h_.field_230694_p_ = p_239059_1_;
|
||||||
|
this.field_239027_a_.field_230694_p_ = p_239059_1_;
|
||||||
|
- this.field_239036_j_.field_230694_p_ = p_239059_1_ && BiomeGeneratorTypeScreens.field_239069_d_.containsKey(this.field_239040_n_);
|
||||||
|
+ this.field_239036_j_.field_230694_p_ = p_239059_1_ && (BiomeGeneratorTypeScreens.field_239069_d_.containsKey(this.field_239040_n_) || net.minecraftforge.client.ForgeHooksClient.hasBiomeGeneratorSettingsOptionsScreen(this.field_239040_n_));
|
||||||
|
this.field_239037_k_.field_230694_p_ = p_239059_1_;
|
||||||
|
}
|
||||||
|
|
||||||
+1
-1
@@ -181,7 +181,7 @@
|
|||||||
- this.func_243308_b(p_230457_1_, list1, p_230457_3_, p_230457_4_);
|
- this.func_243308_b(p_230457_1_, list1, p_230457_3_, p_230457_4_);
|
||||||
+ net.minecraft.client.gui.FontRenderer font = p_230457_2_.func_77973_b().getFontRenderer(p_230457_2_);
|
+ net.minecraft.client.gui.FontRenderer font = p_230457_2_.func_77973_b().getFontRenderer(p_230457_2_);
|
||||||
+ net.minecraftforge.fml.client.gui.GuiUtils.preItemToolTip(p_230457_2_);
|
+ net.minecraftforge.fml.client.gui.GuiUtils.preItemToolTip(p_230457_2_);
|
||||||
+ this.renderToolTip(p_230457_1_, Lists.transform(list1, ITextComponent::func_241878_f), p_230457_3_, p_230457_4_, (font == null ? this.field_230712_o_ : font));
|
+ this.renderWrappedToolTip(p_230457_1_, list1, p_230457_3_, p_230457_4_, (font == null ? this.field_230712_o_ : font));
|
||||||
+ net.minecraftforge.fml.client.gui.GuiUtils.postItemToolTip();
|
+ net.minecraftforge.fml.client.gui.GuiUtils.postItemToolTip();
|
||||||
} else {
|
} else {
|
||||||
super.func_230457_a_(p_230457_1_, p_230457_2_, p_230457_3_, p_230457_4_);
|
super.func_230457_a_(p_230457_1_, p_230457_2_, p_230457_3_, p_230457_4_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/widget/list/AbstractList.java
|
--- a/net/minecraft/client/gui/widget/list/AbstractList.java
|
||||||
+++ b/net/minecraft/client/gui/widget/list/AbstractList.java
|
+++ b/net/minecraft/client/gui/widget/list/AbstractList.java
|
||||||
@@ -471,6 +471,13 @@
|
@@ -492,6 +492,13 @@
|
||||||
p_238480_1_.field_230666_a_ = this;
|
p_238480_1_.field_230666_a_ = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,7 @@
|
|||||||
} else {
|
} else {
|
||||||
ItemStack itemstack = p_217292_1_.func_184586_b(p_217292_3_);
|
ItemStack itemstack = p_217292_1_.func_184586_b(p_217292_3_);
|
||||||
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks
|
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks
|
||||||
+ .onRightClickBlock(p_217292_1_, p_217292_3_, blockpos, p_217292_4_.func_216354_b());
|
+ .onRightClickBlock(p_217292_1_, p_217292_3_, blockpos, p_217292_4_);
|
||||||
+ if (event.isCanceled()) {
|
+ if (event.isCanceled()) {
|
||||||
+ this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
+ this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
||||||
+ return event.getCancellationResult();
|
+ return event.getCancellationResult();
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
+ boolean flag = !p_217292_1_.func_184614_ca().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_) || !p_217292_1_.func_184592_cb().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_);
|
+ boolean flag = !p_217292_1_.func_184614_ca().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_) || !p_217292_1_.func_184592_cb().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_);
|
||||||
boolean flag1 = p_217292_1_.func_226563_dT_() && flag;
|
boolean flag1 = p_217292_1_.func_226563_dT_() && flag;
|
||||||
- if (!flag1) {
|
- if (!flag1) {
|
||||||
+ if (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1) {
|
+ if (event.getUseBlock() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1)) {
|
||||||
ActionResultType actionresulttype = p_217292_2_.func_180495_p(blockpos).func_227031_a_(p_217292_2_, p_217292_1_, p_217292_3_, p_217292_4_);
|
ActionResultType actionresulttype = p_217292_2_.func_180495_p(blockpos).func_227031_a_(p_217292_2_, p_217292_1_, p_217292_3_, p_217292_4_);
|
||||||
if (actionresulttype.func_226246_a_()) {
|
if (actionresulttype.func_226246_a_()) {
|
||||||
this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
||||||
@@ -130,9 +130,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
|
||||||
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.DENY) return ActionResultType.PASS;
|
- if (!itemstack.func_190926_b() && !p_217292_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b())) {
|
||||||
if (!itemstack.func_190926_b() && !p_217292_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b())) {
|
|
||||||
- ItemUseContext itemusecontext = new ItemUseContext(p_217292_1_, p_217292_3_, p_217292_4_);
|
- ItemUseContext itemusecontext = new ItemUseContext(p_217292_1_, p_217292_3_, p_217292_4_);
|
||||||
|
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.DENY) return ActionResultType.PASS;
|
||||||
|
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (!itemstack.func_190926_b() && !p_217292_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b()))) {
|
||||||
ActionResultType actionresulttype1;
|
ActionResultType actionresulttype1;
|
||||||
if (this.field_78779_k.func_77145_d()) {
|
if (this.field_78779_k.func_77145_d()) {
|
||||||
int i = itemstack.func_190916_E();
|
int i = itemstack.func_190916_E();
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/network/login/ClientLoginNetHandler.java
|
--- a/net/minecraft/client/network/login/ClientLoginNetHandler.java
|
||||||
+++ b/net/minecraft/client/network/login/ClientLoginNetHandler.java
|
+++ b/net/minecraft/client/network/login/ClientLoginNetHandler.java
|
||||||
@@ -99,6 +99,7 @@
|
@@ -115,6 +115,7 @@
|
||||||
this.field_209525_d.accept(new TranslationTextComponent("connect.joining"));
|
this.field_209525_d.accept(new TranslationTextComponent("connect.joining"));
|
||||||
this.field_175091_e = p_147390_1_.func_179730_a();
|
this.field_175091_e = p_147390_1_.func_179730_a();
|
||||||
this.field_147393_d.func_150723_a(ProtocolType.PLAY);
|
this.field_147393_d.func_150723_a(ProtocolType.PLAY);
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
this.field_147393_d.func_150719_a(new ClientPlayNetHandler(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e));
|
this.field_147393_d.func_150719_a(new ClientPlayNetHandler(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +128,7 @@
|
@@ -143,6 +144,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_209521_a(SCustomPayloadLoginPacket p_209521_1_) {
|
public void func_209521_a(SCustomPayloadLoginPacket p_209521_1_) {
|
||||||
|
|||||||
@@ -77,21 +77,23 @@
|
|||||||
if (effect != null) {
|
if (effect != null) {
|
||||||
EffectInstance effectinstance = new EffectInstance(effect, p_147260_1_.func_180755_e(), p_147260_1_.func_149428_f(), p_147260_1_.func_186984_g(), p_147260_1_.func_179707_f(), p_147260_1_.func_205527_h());
|
EffectInstance effectinstance = new EffectInstance(effect, p_147260_1_.func_180755_e(), p_147260_1_.func_149428_f(), p_147260_1_.func_186984_g(), p_147260_1_.func_179707_f(), p_147260_1_.func_205527_h());
|
||||||
effectinstance.func_100012_b(p_147260_1_.func_149429_c());
|
effectinstance.func_100012_b(p_147260_1_.func_149429_c());
|
||||||
@@ -1388,11 +1401,12 @@
|
@@ -1388,11 +1401,14 @@
|
||||||
public void func_199723_a(STagsListPacket p_199723_1_) {
|
public void func_199723_a(STagsListPacket p_199723_1_) {
|
||||||
PacketThreadUtil.func_218797_a(p_199723_1_, this, this.field_147299_f);
|
PacketThreadUtil.func_218797_a(p_199723_1_, this, this.field_147299_f);
|
||||||
ITagCollectionSupplier itagcollectionsupplier = p_199723_1_.func_199858_a();
|
ITagCollectionSupplier itagcollectionsupplier = p_199723_1_.func_199858_a();
|
||||||
- Multimap<ResourceLocation, ResourceLocation> multimap = TagRegistryManager.func_242198_b(itagcollectionsupplier);
|
- Multimap<ResourceLocation, ResourceLocation> multimap = TagRegistryManager.func_242198_b(itagcollectionsupplier);
|
||||||
+ Multimap<ResourceLocation, ResourceLocation> multimap = TagRegistryManager.validateVanillaTags(itagcollectionsupplier);
|
+ boolean vanillaConnection = net.minecraftforge.fml.network.NetworkHooks.isVanillaConnection(field_147302_e);
|
||||||
|
+ Multimap<ResourceLocation, ResourceLocation> multimap = vanillaConnection ? TagRegistryManager.func_242198_b(net.minecraftforge.common.ForgeTagHandler.withNoCustom(itagcollectionsupplier)) : TagRegistryManager.validateVanillaTags(itagcollectionsupplier);//Forge: If we are connecting to vanilla validate all tags to properly validate custom tags the client may "require", and if we are connecting to forge only validate the vanilla tag types as the custom tag types get synced in a separate packet so may still arrive
|
||||||
if (!multimap.isEmpty()) {
|
if (!multimap.isEmpty()) {
|
||||||
field_147301_d.warn("Incomplete server tags, disconnecting. Missing: {}", (Object)multimap);
|
field_147301_d.warn("Incomplete server tags, disconnecting. Missing: {}", (Object)multimap);
|
||||||
this.field_147302_e.func_150718_a(new TranslationTextComponent("multiplayer.disconnect.missing_tags"));
|
this.field_147302_e.func_150718_a(new TranslationTextComponent("multiplayer.disconnect.missing_tags"));
|
||||||
} else {
|
} else {
|
||||||
+ net.minecraftforge.common.ForgeTagHandler.resetCachedTagCollections();
|
+ net.minecraftforge.common.ForgeTagHandler.resetCachedTagCollections(true, vanillaConnection);
|
||||||
|
+ itagcollectionsupplier = ITagCollectionSupplier.reinjectOptionalTags(itagcollectionsupplier);
|
||||||
this.field_199725_m = itagcollectionsupplier;
|
this.field_199725_m = itagcollectionsupplier;
|
||||||
if (!this.field_147302_e.func_150731_c()) {
|
if (!this.field_147302_e.func_150731_c()) {
|
||||||
itagcollectionsupplier.func_242212_e();
|
itagcollectionsupplier.func_242212_e();
|
||||||
@@ -1883,10 +1897,12 @@
|
@@ -1885,10 +1901,12 @@
|
||||||
int l5 = packetbuffer.readInt();
|
int l5 = packetbuffer.readInt();
|
||||||
this.field_147299_f.field_184132_p.field_229018_q_.func_229022_a_(blockpos8, l3, s10, l5);
|
this.field_147299_f.field_184132_p.field_229018_q_.func_229022_a_(blockpos8, l3, s10, l5);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/client/network/play/NetworkPlayerInfo.java
|
||||||
|
+++ b/net/minecraft/client/network/play/NetworkPlayerInfo.java
|
||||||
|
@@ -50,6 +50,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void func_178839_a(GameType p_178839_1_) {
|
||||||
|
+ net.minecraftforge.client.ForgeHooksClient.onClientChangeGameMode(this, this.field_178866_b, p_178839_1_);
|
||||||
|
this.field_178866_b = p_178839_1_;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,6 +1,30 @@
|
|||||||
--- a/net/minecraft/client/renderer/WorldRenderer.java
|
--- a/net/minecraft/client/renderer/WorldRenderer.java
|
||||||
+++ b/net/minecraft/client/renderer/WorldRenderer.java
|
+++ b/net/minecraft/client/renderer/WorldRenderer.java
|
||||||
@@ -830,7 +830,7 @@
|
@@ -222,6 +222,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_228438_a_(LightTexture p_228438_1_, float p_228438_2_, double p_228438_3_, double p_228438_5_, double p_228438_7_) {
|
||||||
|
+ net.minecraftforge.client.IWeatherRenderHandler renderHandler = field_72769_h.func_239132_a_().getWeatherRenderHandler();
|
||||||
|
+ if (renderHandler != null) {
|
||||||
|
+ renderHandler.render(field_72773_u, p_228438_2_, field_72769_h, field_72777_q, p_228438_1_, p_228438_3_, p_228438_5_, p_228438_7_);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
float f = this.field_72777_q.field_71441_e.func_72867_j(p_228438_2_);
|
||||||
|
if (!(f <= 0.0F)) {
|
||||||
|
p_228438_1_.func_205109_c();
|
||||||
|
@@ -347,6 +352,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_228436_a_(ActiveRenderInfo p_228436_1_) {
|
||||||
|
+ net.minecraftforge.client.IWeatherParticleRenderHandler renderHandler = field_72769_h.func_239132_a_().getWeatherParticleRenderHandler();
|
||||||
|
+ if (renderHandler != null) {
|
||||||
|
+ renderHandler.render(field_72773_u, field_72769_h, field_72777_q, p_228436_1_);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
float f = this.field_72777_q.field_71441_e.func_72867_j(1.0F) / (Minecraft.func_71375_t() ? 1.0F : 2.0F);
|
||||||
|
if (!(f <= 0.0F)) {
|
||||||
|
Random random = new Random((long)this.field_72773_u * 312987231L);
|
||||||
|
@@ -830,7 +840,7 @@
|
||||||
this.field_147595_R = true;
|
this.field_147595_R = true;
|
||||||
BlockPos blockpos2 = chunkrenderdispatcher$chunkrender4.func_178568_j().func_177982_a(8, 8, 8);
|
BlockPos blockpos2 = chunkrenderdispatcher$chunkrender4.func_178568_j().func_177982_a(8, 8, 8);
|
||||||
boolean flag1 = blockpos2.func_177951_i(blockpos) < 768.0D;
|
boolean flag1 = blockpos2.func_177951_i(blockpos) < 768.0D;
|
||||||
@@ -9,7 +33,7 @@
|
|||||||
this.field_175009_l.add(chunkrenderdispatcher$chunkrender4);
|
this.field_175009_l.add(chunkrenderdispatcher$chunkrender4);
|
||||||
} else {
|
} else {
|
||||||
this.field_72777_q.func_213239_aq().func_76320_a("build near");
|
this.field_72777_q.func_213239_aq().func_76320_a("build near");
|
||||||
@@ -915,13 +915,13 @@
|
@@ -915,13 +925,13 @@
|
||||||
float f = p_228426_7_.func_205001_m();
|
float f = p_228426_7_.func_205001_m();
|
||||||
boolean flag1 = this.field_72777_q.field_71441_e.func_239132_a_().func_230493_a_(MathHelper.func_76128_c(d0), MathHelper.func_76128_c(d1)) || this.field_72777_q.field_71456_v.func_184046_j().func_184056_f();
|
boolean flag1 = this.field_72777_q.field_71441_e.func_239132_a_().func_230493_a_(MathHelper.func_76128_c(d0), MathHelper.func_76128_c(d1)) || this.field_72777_q.field_71456_v.func_184046_j().func_184056_f();
|
||||||
if (this.field_72777_q.field_71474_y.field_151451_c >= 4) {
|
if (this.field_72777_q.field_71474_y.field_151451_c >= 4) {
|
||||||
@@ -25,7 +49,7 @@
|
|||||||
iprofiler.func_219895_b("terrain_setup");
|
iprofiler.func_219895_b("terrain_setup");
|
||||||
this.func_228437_a_(p_228426_6_, clippinghelper, flag, this.field_228409_ai_++, this.field_72777_q.field_71439_g.func_175149_v());
|
this.func_228437_a_(p_228426_6_, clippinghelper, flag, this.field_228409_ai_++, this.field_72777_q.field_71439_g.func_175149_v());
|
||||||
iprofiler.func_219895_b("updatechunks");
|
iprofiler.func_219895_b("updatechunks");
|
||||||
@@ -942,7 +942,9 @@
|
@@ -942,7 +952,9 @@
|
||||||
this.func_174967_a(p_228426_3_ + l1);
|
this.func_174967_a(p_228426_3_ + l1);
|
||||||
iprofiler.func_219895_b("terrain");
|
iprofiler.func_219895_b("terrain");
|
||||||
this.func_228441_a_(RenderType.func_228639_c_(), p_228426_1_, d0, d1, d2);
|
this.func_228441_a_(RenderType.func_228639_c_(), p_228426_1_, d0, d1, d2);
|
||||||
@@ -35,7 +59,16 @@
|
|||||||
this.func_228441_a_(RenderType.func_228643_e_(), p_228426_1_, d0, d1, d2);
|
this.func_228441_a_(RenderType.func_228643_e_(), p_228426_1_, d0, d1, d2);
|
||||||
if (this.field_72769_h.func_239132_a_().func_239217_c_()) {
|
if (this.field_72769_h.func_239132_a_().func_239217_c_()) {
|
||||||
RenderHelper.func_237533_a_(p_228426_1_.func_227866_c_().func_227870_a_());
|
RenderHelper.func_237533_a_(p_228426_1_.func_227866_c_().func_227870_a_());
|
||||||
@@ -1010,6 +1012,7 @@
|
@@ -972,7 +984,7 @@
|
||||||
|
IRenderTypeBuffer.Impl irendertypebuffer$impl = this.field_228415_m_.func_228487_b_();
|
||||||
|
|
||||||
|
for(Entity entity : this.field_72769_h.func_217416_b()) {
|
||||||
|
- if ((this.field_175010_j.func_229086_a_(entity, clippinghelper, d0, d1, d2) || entity.func_184215_y(this.field_72777_q.field_71439_g)) && (entity != p_228426_6_.func_216773_g() || p_228426_6_.func_216770_i() || p_228426_6_.func_216773_g() instanceof LivingEntity && ((LivingEntity)p_228426_6_.func_216773_g()).func_70608_bn()) && (!(entity instanceof ClientPlayerEntity) || p_228426_6_.func_216773_g() == entity)) {
|
||||||
|
+ if ((this.field_175010_j.func_229086_a_(entity, clippinghelper, d0, d1, d2) || entity.func_184215_y(this.field_72777_q.field_71439_g)) && (entity != p_228426_6_.func_216773_g() || p_228426_6_.func_216770_i() || p_228426_6_.func_216773_g() instanceof LivingEntity && ((LivingEntity)p_228426_6_.func_216773_g()).func_70608_bn()) && (!(entity instanceof ClientPlayerEntity) || p_228426_6_.func_216773_g() == entity || (entity == field_72777_q.field_71439_g && !field_72777_q.field_71439_g.func_175149_v()))) { //FORGE: render local player entity when it is not the renderViewEntity
|
||||||
|
++this.field_72749_I;
|
||||||
|
if (entity.field_70173_aa == 0) {
|
||||||
|
entity.field_70142_S = entity.func_226277_ct_();
|
||||||
|
@@ -1010,6 +1022,7 @@
|
||||||
List<TileEntity> list = worldrenderer$localrenderinformationcontainer.field_178036_a.func_178571_g().func_178485_b();
|
List<TileEntity> list = worldrenderer$localrenderinformationcontainer.field_178036_a.func_178571_g().func_178485_b();
|
||||||
if (!list.isEmpty()) {
|
if (!list.isEmpty()) {
|
||||||
for(TileEntity tileentity1 : list) {
|
for(TileEntity tileentity1 : list) {
|
||||||
@@ -43,7 +76,7 @@
|
|||||||
BlockPos blockpos3 = tileentity1.func_174877_v();
|
BlockPos blockpos3 = tileentity1.func_174877_v();
|
||||||
IRenderTypeBuffer irendertypebuffer1 = irendertypebuffer$impl;
|
IRenderTypeBuffer irendertypebuffer1 = irendertypebuffer$impl;
|
||||||
p_228426_1_.func_227860_a_();
|
p_228426_1_.func_227860_a_();
|
||||||
@@ -1035,6 +1038,7 @@
|
@@ -1035,6 +1048,7 @@
|
||||||
|
|
||||||
synchronized(this.field_181024_n) {
|
synchronized(this.field_181024_n) {
|
||||||
for(TileEntity tileentity : this.field_181024_n) {
|
for(TileEntity tileentity : this.field_181024_n) {
|
||||||
@@ -51,7 +84,7 @@
|
|||||||
BlockPos blockpos2 = tileentity.func_174877_v();
|
BlockPos blockpos2 = tileentity.func_174877_v();
|
||||||
p_228426_1_.func_227860_a_();
|
p_228426_1_.func_227860_a_();
|
||||||
p_228426_1_.func_227861_a_((double)blockpos2.func_177958_n() - d0, (double)blockpos2.func_177956_o() - d1, (double)blockpos2.func_177952_p() - d2);
|
p_228426_1_.func_227861_a_((double)blockpos2.func_177958_n() - d0, (double)blockpos2.func_177956_o() - d1, (double)blockpos2.func_177952_p() - d2);
|
||||||
@@ -1084,10 +1088,13 @@
|
@@ -1084,10 +1098,13 @@
|
||||||
iprofiler.func_219895_b("outline");
|
iprofiler.func_219895_b("outline");
|
||||||
BlockPos blockpos = ((BlockRayTraceResult)raytraceresult).func_216350_a();
|
BlockPos blockpos = ((BlockRayTraceResult)raytraceresult).func_216350_a();
|
||||||
BlockState blockstate = this.field_72769_h.func_180495_p(blockpos);
|
BlockState blockstate = this.field_72769_h.func_180495_p(blockpos);
|
||||||
@@ -66,7 +99,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderSystem.pushMatrix();
|
RenderSystem.pushMatrix();
|
||||||
@@ -1119,7 +1126,7 @@
|
@@ -1119,7 +1136,7 @@
|
||||||
this.field_239224_H_.func_237506_a_(this.field_72777_q.func_147110_a());
|
this.field_239224_H_.func_237506_a_(this.field_72777_q.func_147110_a());
|
||||||
RenderState.field_239237_T_.func_228547_a_();
|
RenderState.field_239237_T_.func_228547_a_();
|
||||||
iprofiler.func_219895_b("particles");
|
iprofiler.func_219895_b("particles");
|
||||||
@@ -75,7 +108,7 @@
|
|||||||
RenderState.field_239237_T_.func_228549_b_();
|
RenderState.field_239237_T_.func_228549_b_();
|
||||||
} else {
|
} else {
|
||||||
iprofiler.func_219895_b("translucent");
|
iprofiler.func_219895_b("translucent");
|
||||||
@@ -1129,7 +1136,7 @@
|
@@ -1129,7 +1146,7 @@
|
||||||
iprofiler.func_219895_b("string");
|
iprofiler.func_219895_b("string");
|
||||||
this.func_228441_a_(RenderType.func_241715_r_(), p_228426_1_, d0, d1, d2);
|
this.func_228441_a_(RenderType.func_241715_r_(), p_228426_1_, d0, d1, d2);
|
||||||
iprofiler.func_219895_b("particles");
|
iprofiler.func_219895_b("particles");
|
||||||
@@ -84,7 +117,40 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderSystem.pushMatrix();
|
RenderSystem.pushMatrix();
|
||||||
@@ -2076,7 +2083,12 @@
|
@@ -1481,6 +1498,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_228424_a_(MatrixStack p_228424_1_, float p_228424_2_) {
|
||||||
|
+ net.minecraftforge.client.ISkyRenderHandler renderHandler = field_72769_h.func_239132_a_().getSkyRenderHandler();
|
||||||
|
+ if (renderHandler != null) {
|
||||||
|
+ renderHandler.render(field_72773_u, p_228424_2_, p_228424_1_, field_72769_h, field_72777_q);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
if (this.field_72777_q.field_71441_e.func_239132_a_().func_241683_c_() == DimensionRenderInfo.FogType.END) {
|
||||||
|
this.func_228444_b_(p_228424_1_);
|
||||||
|
} else if (this.field_72777_q.field_71441_e.func_239132_a_().func_241683_c_() == DimensionRenderInfo.FogType.NORMAL) {
|
||||||
|
@@ -1609,6 +1631,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_228425_a_(MatrixStack p_228425_1_, float p_228425_2_, double p_228425_3_, double p_228425_5_, double p_228425_7_) {
|
||||||
|
+ net.minecraftforge.client.ICloudRenderHandler renderHandler = field_72769_h.func_239132_a_().getCloudRenderHandler();
|
||||||
|
+ if (renderHandler != null) {
|
||||||
|
+ renderHandler.render(field_72773_u, p_228425_2_, p_228425_1_, field_72769_h, field_72777_q, p_228425_3_, p_228425_5_, p_228425_7_);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
float f = this.field_72769_h.func_239132_a_().func_239213_a_();
|
||||||
|
if (!Float.isNaN(f)) {
|
||||||
|
RenderSystem.disableCull();
|
||||||
|
@@ -1792,7 +1819,7 @@
|
||||||
|
|
||||||
|
while(iterator.hasNext()) {
|
||||||
|
ChunkRenderDispatcher.ChunkRender chunkrenderdispatcher$chunkrender = iterator.next();
|
||||||
|
- if (chunkrenderdispatcher$chunkrender.func_188281_o()) {
|
||||||
|
+ if (!net.minecraftforge.common.ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.get() && chunkrenderdispatcher$chunkrender.func_188281_o()) {
|
||||||
|
this.field_174995_M.func_228902_a_(chunkrenderdispatcher$chunkrender);
|
||||||
|
} else {
|
||||||
|
chunkrenderdispatcher$chunkrender.func_228929_a_(this.field_174995_M);
|
||||||
|
@@ -2076,7 +2103,12 @@
|
||||||
this.field_175008_n.func_217628_a(p_215319_1_, p_215319_2_, p_215319_3_, p_215319_4_);
|
this.field_175008_n.func_217628_a(p_215319_1_, p_215319_2_, p_215319_3_, p_215319_4_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,7 +163,7 @@
|
|||||||
ISound isound = this.field_147593_P.get(p_184377_2_);
|
ISound isound = this.field_147593_P.get(p_184377_2_);
|
||||||
if (isound != null) {
|
if (isound != null) {
|
||||||
this.field_72777_q.func_147118_V().func_147683_b(isound);
|
this.field_72777_q.func_147118_V().func_147683_b(isound);
|
||||||
@@ -2084,7 +2096,7 @@
|
@@ -2084,7 +2116,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p_184377_1_ != null) {
|
if (p_184377_1_ != null) {
|
||||||
@@ -106,7 +172,7 @@
|
|||||||
if (musicdiscitem != null) {
|
if (musicdiscitem != null) {
|
||||||
this.field_72777_q.field_71456_v.func_238451_a_(musicdiscitem.func_234801_g_());
|
this.field_72777_q.field_71456_v.func_238451_a_(musicdiscitem.func_234801_g_());
|
||||||
}
|
}
|
||||||
@@ -2232,7 +2244,7 @@
|
@@ -2232,7 +2264,7 @@
|
||||||
break;
|
break;
|
||||||
case 1010:
|
case 1010:
|
||||||
if (Item.func_150899_d(p_180439_4_) instanceof MusicDiscItem) {
|
if (Item.func_150899_d(p_180439_4_) instanceof MusicDiscItem) {
|
||||||
@@ -115,7 +181,7 @@
|
|||||||
} else {
|
} else {
|
||||||
this.func_184377_a((SoundEvent)null, p_180439_3_);
|
this.func_184377_a((SoundEvent)null, p_180439_3_);
|
||||||
}
|
}
|
||||||
@@ -2382,8 +2394,8 @@
|
@@ -2382,8 +2414,8 @@
|
||||||
break;
|
break;
|
||||||
case 2001:
|
case 2001:
|
||||||
BlockState blockstate = Block.func_196257_b(p_180439_4_);
|
BlockState blockstate = Block.func_196257_b(p_180439_4_);
|
||||||
@@ -126,7 +192,7 @@
|
|||||||
this.field_72769_h.func_184156_a(p_180439_3_, soundtype.func_185845_c(), SoundCategory.BLOCKS, (soundtype.func_185843_a() + 1.0F) / 2.0F, soundtype.func_185847_b() * 0.8F, false);
|
this.field_72769_h.func_184156_a(p_180439_3_, soundtype.func_185845_c(), SoundCategory.BLOCKS, (soundtype.func_185843_a() + 1.0F) / 2.0F, soundtype.func_185847_b() * 0.8F, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2531,7 +2543,7 @@
|
@@ -2531,7 +2563,7 @@
|
||||||
} else {
|
} else {
|
||||||
int i = p_228420_0_.func_226658_a_(LightType.SKY, p_228420_2_);
|
int i = p_228420_0_.func_226658_a_(LightType.SKY, p_228420_2_);
|
||||||
int j = p_228420_0_.func_226658_a_(LightType.BLOCK, p_228420_2_);
|
int j = p_228420_0_.func_226658_a_(LightType.BLOCK, p_228420_2_);
|
||||||
@@ -135,7 +201,7 @@
|
|||||||
if (j < k) {
|
if (j < k) {
|
||||||
j = k;
|
j = k;
|
||||||
}
|
}
|
||||||
@@ -2570,6 +2582,11 @@
|
@@ -2570,6 +2602,11 @@
|
||||||
return this.field_239226_J_;
|
return this.field_239226_J_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,3 +13,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -77,7 +79,7 @@
|
||||||
|
|
||||||
|
protected void func_225629_a_(T p_225629_1_, ITextComponent p_225629_2_, MatrixStack p_225629_3_, IRenderTypeBuffer p_225629_4_, int p_225629_5_) {
|
||||||
|
double d0 = this.field_76990_c.func_229099_b_(p_225629_1_);
|
||||||
|
- if (!(d0 > 4096.0D)) {
|
||||||
|
+ if (net.minecraftforge.client.ForgeHooksClient.isNameplateInRenderDistance(p_225629_1_, d0)) {
|
||||||
|
boolean flag = !p_225629_1_.func_226273_bm_();
|
||||||
|
float f = p_225629_1_.func_213302_cg() + 0.5F;
|
||||||
|
int i = "deadmau5".equals(p_225629_2_.getString()) ? -10 : 0;
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
private final ItemCameraTransforms field_177651_f;
|
private final ItemCameraTransforms field_177651_f;
|
||||||
|
|
||||||
+ public Builder(net.minecraftforge.client.model.IModelConfiguration model, ItemOverrideList overrides) {
|
+ public Builder(net.minecraftforge.client.model.IModelConfiguration model, ItemOverrideList overrides) {
|
||||||
+ this(model.useSmoothLighting(), model.isShadedInGui(), model.isSideLit(), model.getCameraTransforms(), overrides);
|
+ this(model.useSmoothLighting(), model.isSideLit(), model.isShadedInGui(), model.getCameraTransforms(), overrides);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public Builder(BlockModel p_i230060_1_, ItemOverrideList p_i230060_2_, boolean p_i230060_3_) {
|
public Builder(BlockModel p_i230060_1_, ItemOverrideList p_i230060_2_, boolean p_i230060_3_) {
|
||||||
|
|||||||
+5
-7
@@ -1,16 +1,14 @@
|
|||||||
--- a/net/minecraft/client/renderer/tileentity/PistonTileEntityRenderer.java
|
--- a/net/minecraft/client/renderer/tileentity/PistonTileEntityRenderer.java
|
||||||
+++ b/net/minecraft/client/renderer/tileentity/PistonTileEntityRenderer.java
|
+++ b/net/minecraft/client/renderer/tileentity/PistonTileEntityRenderer.java
|
||||||
@@ -61,8 +61,12 @@
|
@@ -61,8 +61,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void func_228876_a_(BlockPos p_228876_1_, BlockState p_228876_2_, MatrixStack p_228876_3_, IRenderTypeBuffer p_228876_4_, World p_228876_5_, boolean p_228876_6_, int p_228876_7_) {
|
private void func_228876_a_(BlockPos p_228876_1_, BlockState p_228876_2_, MatrixStack p_228876_3_, IRenderTypeBuffer p_228876_4_, World p_228876_5_, boolean p_228876_6_, int p_228876_7_) {
|
||||||
- RenderType rendertype = RenderTypeLookup.func_239221_b_(p_228876_2_);
|
+ net.minecraftforge.client.ForgeHooksClient.renderPistonMovedBlocks(p_228876_1_, p_228876_2_, p_228876_3_, p_228876_4_, p_228876_5_, p_228876_6_, p_228876_7_, field_178462_c == null ? field_178462_c = Minecraft.func_71410_x().func_175602_ab() : field_178462_c);
|
||||||
+ net.minecraft.client.renderer.RenderType.func_228661_n_().stream().filter(t -> RenderTypeLookup.canRenderInLayer(p_228876_2_, t)).forEach(rendertype -> {
|
+ if(false) {
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.setRenderLayer(rendertype);
|
RenderType rendertype = RenderTypeLookup.func_239221_b_(p_228876_2_);
|
||||||
IVertexBuilder ivertexbuilder = p_228876_4_.getBuffer(rendertype);
|
IVertexBuilder ivertexbuilder = p_228876_4_.getBuffer(rendertype);
|
||||||
+ if (field_178462_c == null) field_178462_c = Minecraft.func_71410_x().func_175602_ab();
|
|
||||||
this.field_178462_c.func_175019_b().func_228802_a_(p_228876_5_, this.field_178462_c.func_184389_a(p_228876_2_), p_228876_2_, p_228876_1_, p_228876_3_, ivertexbuilder, p_228876_6_, new Random(), p_228876_2_.func_209533_a(p_228876_1_), p_228876_7_);
|
this.field_178462_c.func_175019_b().func_228802_a_(p_228876_5_, this.field_178462_c.func_184389_a(p_228876_2_), p_228876_2_, p_228876_1_, p_228876_3_, ivertexbuilder, p_228876_6_, new Random(), p_228876_2_.func_209533_a(p_228876_1_), p_228876_7_);
|
||||||
+ });
|
+ }
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.setRenderLayer(null);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
|
|
||||||
public boolean func_151470_d() {
|
public boolean func_151470_d() {
|
||||||
- return this.field_74513_e;
|
- return this.field_74513_e;
|
||||||
+ return this.field_74513_e && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext());
|
+ return this.field_74513_e && isConflictContextAndModifierActive();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String func_151466_e() {
|
public String func_151466_e() {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
--- a/net/minecraft/client/settings/ToggleableKeyBinding.java
|
||||||
|
+++ b/net/minecraft/client/settings/ToggleableKeyBinding.java
|
||||||
|
@@ -16,7 +16,7 @@
|
||||||
|
|
||||||
|
public void func_225593_a_(boolean p_225593_1_) {
|
||||||
|
if (this.field_228053_a_.getAsBoolean()) {
|
||||||
|
- if (p_225593_1_) {
|
||||||
|
+ if (p_225593_1_ && isConflictContextAndModifierActive()) {
|
||||||
|
super.func_225593_a_(!this.func_151470_d());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@@ -24,4 +24,5 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
+ @Override public boolean func_151470_d() { return this.field_74513_e && (isConflictContextAndModifierActive() || field_228053_a_.getAsBoolean()); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
--- a/net/minecraft/client/world/DimensionRenderInfo.java
|
||||||
|
+++ b/net/minecraft/client/world/DimensionRenderInfo.java
|
||||||
|
@@ -26,6 +26,10 @@
|
||||||
|
private final DimensionRenderInfo.FogType field_241680_e_;
|
||||||
|
private final boolean field_241681_f_;
|
||||||
|
private final boolean field_239212_e_;
|
||||||
|
+ private net.minecraftforge.client.IWeatherRenderHandler weatherRenderHandler = null;
|
||||||
|
+ private net.minecraftforge.client.IWeatherParticleRenderHandler weatherParticleRenderHandler = null;
|
||||||
|
+ private net.minecraftforge.client.ISkyRenderHandler skyRenderHandler = null;
|
||||||
|
+ private net.minecraftforge.client.ICloudRenderHandler cloudRenderHandler = null;
|
||||||
|
|
||||||
|
public DimensionRenderInfo(float p_i241259_1_, boolean p_i241259_2_, DimensionRenderInfo.FogType p_i241259_3_, boolean p_i241259_4_, boolean p_i241259_5_) {
|
||||||
|
this.field_239210_c_ = p_i241259_1_;
|
||||||
|
@@ -82,6 +86,35 @@
|
||||||
|
return this.field_239212_e_;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public void setWeatherRenderHandler(net.minecraftforge.client.IWeatherRenderHandler weatherRenderHandler) {
|
||||||
|
+ this.weatherRenderHandler = weatherRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ public void setWeatherParticleRenderHandler(net.minecraftforge.client.IWeatherParticleRenderHandler weatherParticleRenderHandler) {
|
||||||
|
+ this.weatherParticleRenderHandler = weatherParticleRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ public void setSkyRenderHandler(net.minecraftforge.client.ISkyRenderHandler skyRenderHandler) {
|
||||||
|
+ this.skyRenderHandler = skyRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ public void setCloudRenderHandler(net.minecraftforge.client.ICloudRenderHandler cloudRenderHandler) {
|
||||||
|
+ this.cloudRenderHandler = cloudRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ @Nullable
|
||||||
|
+ public net.minecraftforge.client.ICloudRenderHandler getCloudRenderHandler() {
|
||||||
|
+ return cloudRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ @Nullable
|
||||||
|
+ public net.minecraftforge.client.IWeatherRenderHandler getWeatherRenderHandler() {
|
||||||
|
+ return weatherRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ @Nullable
|
||||||
|
+ public net.minecraftforge.client.IWeatherParticleRenderHandler getWeatherParticleRenderHandler() {
|
||||||
|
+ return weatherParticleRenderHandler;
|
||||||
|
+ }
|
||||||
|
+ @Nullable
|
||||||
|
+ public net.minecraftforge.client.ISkyRenderHandler getSkyRenderHandler() {
|
||||||
|
+ return skyRenderHandler;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public static class End extends DimensionRenderInfo {
|
||||||
|
public End() {
|
||||||
@@ -8,10 +8,11 @@
|
|||||||
|
|
||||||
this.field_197062_b.findAmbiguities((p_201302_1_, p_201302_2_, p_201302_3_, p_201302_4_) -> {
|
this.field_197062_b.findAmbiguities((p_201302_1_, p_201302_2_, p_201302_3_, p_201302_4_) -> {
|
||||||
field_197061_a.warn("Ambiguity between arguments {} and {} with inputs: {}", this.field_197062_b.getPath(p_201302_2_), this.field_197062_b.getPath(p_201302_3_), p_201302_4_);
|
field_197061_a.warn("Ambiguity between arguments {} and {} with inputs: {}", this.field_197062_b.getPath(p_201302_2_), this.field_197062_b.getPath(p_201302_3_), p_201302_4_);
|
||||||
@@ -205,6 +206,14 @@
|
@@ -205,7 +206,15 @@
|
||||||
|
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
|
- return this.field_197062_b.execute(stringreader, p_197059_1_);
|
||||||
+ ParseResults<CommandSource> parse = this.field_197062_b.parse(stringreader, p_197059_1_);
|
+ ParseResults<CommandSource> parse = this.field_197062_b.parse(stringreader, p_197059_1_);
|
||||||
+ net.minecraftforge.event.CommandEvent event = new net.minecraftforge.event.CommandEvent(parse);
|
+ net.minecraftforge.event.CommandEvent event = new net.minecraftforge.event.CommandEvent(parse);
|
||||||
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) {
|
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) {
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
+ }
|
+ }
|
||||||
+ return 1;
|
+ return 1;
|
||||||
+ }
|
+ }
|
||||||
return this.field_197062_b.execute(stringreader, p_197059_1_);
|
+ return this.field_197062_b.execute(event.getParseResults());
|
||||||
} catch (CommandException commandexception) {
|
} catch (CommandException commandexception) {
|
||||||
p_197059_1_.func_197021_a(commandexception.func_197003_a());
|
p_197059_1_.func_197021_a(commandexception.func_197003_a());
|
||||||
|
return 0;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/command/arguments/ArgumentTypes.java
|
||||||
|
+++ b/net/minecraft/command/arguments/ArgumentTypes.java
|
||||||
|
@@ -220,4 +220,8 @@
|
||||||
|
this.field_197481_c = p_i48088_3_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ @javax.annotation.Nullable public static ResourceLocation getId(ArgumentType<?> type) {
|
||||||
|
+ Entry<?> entry = func_201040_a(type);
|
||||||
|
+ return entry == null ? null : entry.field_197481_c;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
--- a/net/minecraft/data/Main.java
|
--- a/net/minecraft/data/Main.java
|
||||||
+++ b/net/minecraft/data/Main.java
|
+++ b/net/minecraft/data/Main.java
|
||||||
@@ -21,8 +21,12 @@
|
@@ -21,8 +21,13 @@
|
||||||
OptionSpec<Void> optionspec6 = optionparser.accepts("all", "Include all generators");
|
OptionSpec<Void> optionspec6 = optionparser.accepts("all", "Include all generators");
|
||||||
OptionSpec<String> optionspec7 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
|
OptionSpec<String> optionspec7 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
|
||||||
OptionSpec<String> optionspec8 = optionparser.accepts("input", "Input folder").withRequiredArg();
|
OptionSpec<String> optionspec8 = optionparser.accepts("input", "Input folder").withRequiredArg();
|
||||||
+ OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
|
+ OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
|
||||||
|
+ OptionSpec<String> existingMod = optionparser.accepts("existing-mod", "Existing mods that generated resources can reference the resource packs of").withRequiredArg();
|
||||||
+ OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
|
+ OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
|
||||||
+ OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
|
+ OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
|
||||||
+ OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
|
+ OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
|
||||||
@@ -14,7 +15,7 @@
|
|||||||
Path path = Paths.get(optionspec7.value(optionset));
|
Path path = Paths.get(optionspec7.value(optionset));
|
||||||
boolean flag = optionset.has(optionspec6);
|
boolean flag = optionset.has(optionspec6);
|
||||||
boolean flag1 = flag || optionset.has(optionspec2);
|
boolean flag1 = flag || optionset.has(optionspec2);
|
||||||
@@ -30,10 +34,13 @@
|
@@ -30,10 +35,14 @@
|
||||||
boolean flag3 = flag || optionset.has(optionspec3);
|
boolean flag3 = flag || optionset.has(optionspec3);
|
||||||
boolean flag4 = flag || optionset.has(optionspec4);
|
boolean flag4 = flag || optionset.has(optionspec4);
|
||||||
boolean flag5 = flag || optionset.has(optionspec5);
|
boolean flag5 = flag || optionset.has(optionspec5);
|
||||||
@@ -24,9 +25,10 @@
|
|||||||
- datagenerator.func_200392_c();
|
- datagenerator.func_200392_c();
|
||||||
+ Collection<Path> inputs = optionset.valuesOf(optionspec8).stream().map(Paths::get).collect(Collectors.toList());
|
+ Collection<Path> inputs = optionset.valuesOf(optionspec8).stream().map(Paths::get).collect(Collectors.toList());
|
||||||
+ Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).collect(Collectors.toList());
|
+ Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).collect(Collectors.toList());
|
||||||
|
+ java.util.Set<String> existingMods = new java.util.HashSet<>(optionset.valuesOf(existingMod));
|
||||||
+ java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
|
+ java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
|
||||||
+ boolean isFlat = mods.isEmpty() || optionset.has(flat);
|
+ boolean isFlat = mods.isEmpty() || optionset.has(flat);
|
||||||
+ net.minecraftforge.fml.DatagenModLoader.begin(mods, path, inputs, existingPacks, flag2, flag1, flag3, flag4, flag5, isFlat);
|
+ net.minecraftforge.fml.DatagenModLoader.begin(mods, path, inputs, existingPacks, existingMods, flag2, flag1, flag3, flag4, flag5, isFlat);
|
||||||
+ if (mods.contains("minecraft") || mods.isEmpty())
|
+ if (mods.contains("minecraft") || mods.isEmpty())
|
||||||
+ func_200264_a(isFlat ? path : path.resolve("minecraft"), inputs, flag1, flag2, flag3, flag4, flag5).func_200392_c();
|
+ func_200264_a(isFlat ? path : path.resolve("minecraft"), inputs, flag1, flag2, flag3, flag4, flag5).func_200392_c();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
--- a/net/minecraft/data/TagsProvider.java
|
--- a/net/minecraft/data/TagsProvider.java
|
||||||
+++ b/net/minecraft/data/TagsProvider.java
|
+++ b/net/minecraft/data/TagsProvider.java
|
||||||
@@ -28,10 +28,18 @@
|
@@ -28,10 +28,20 @@
|
||||||
protected final DataGenerator field_200433_a;
|
protected final DataGenerator field_200433_a;
|
||||||
protected final Registry<T> field_200435_c;
|
protected final Registry<T> field_200435_c;
|
||||||
protected final Map<ResourceLocation, ITag.Builder> field_200434_b = Maps.newLinkedHashMap();
|
protected final Map<ResourceLocation, ITag.Builder> field_200434_b = Maps.newLinkedHashMap();
|
||||||
+ protected final String modId;
|
+ protected final String modId;
|
||||||
+ protected final net.minecraftforge.common.data.ExistingFileHelper existingFileHelper;
|
+ protected final net.minecraftforge.common.data.ExistingFileHelper existingFileHelper;
|
||||||
|
+ private final net.minecraftforge.common.data.ExistingFileHelper.IResourceType resourceType;
|
||||||
|
|
||||||
+ @Deprecated//Forge, Use ModID version.
|
+ @Deprecated//Forge, Use ModID version.
|
||||||
protected TagsProvider(DataGenerator p_i49827_1_, Registry<T> p_i49827_2_) {
|
protected TagsProvider(DataGenerator p_i49827_1_, Registry<T> p_i49827_2_) {
|
||||||
@@ -16,10 +17,11 @@
|
|||||||
this.field_200435_c = p_i49827_2_;
|
this.field_200435_c = p_i49827_2_;
|
||||||
+ this.modId = modId;
|
+ this.modId = modId;
|
||||||
+ this.existingFileHelper = existingFileHelper;
|
+ this.existingFileHelper = existingFileHelper;
|
||||||
|
+ this.resourceType = new net.minecraftforge.common.data.ExistingFileHelper.ResourceType(net.minecraft.resources.ResourcePackType.SERVER_DATA, ".json", "tags/" + getTagFolder());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void func_200432_c();
|
protected abstract void func_200432_c();
|
||||||
@@ -47,12 +55,14 @@
|
@@ -47,12 +57,14 @@
|
||||||
return this.field_200435_c.func_241873_b(p_240527_1_).orElse((T)null);
|
return this.field_200435_c.func_241873_b(p_240527_1_).orElse((T)null);
|
||||||
};
|
};
|
||||||
this.field_200434_b.forEach((p_240524_4_, p_240524_5_) -> {
|
this.field_200434_b.forEach((p_240524_4_, p_240524_5_) -> {
|
||||||
@@ -35,7 +37,7 @@
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
String s = field_200437_e.toJson((JsonElement)jsonobject);
|
String s = field_200437_e.toJson((JsonElement)jsonobject);
|
||||||
@@ -74,11 +84,26 @@
|
@@ -74,20 +86,36 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +46,7 @@
|
|||||||
+ // We only care about non-optional tag entries, this is the only type that can reference a resource and needs validation
|
+ // We only care about non-optional tag entries, this is the only type that can reference a resource and needs validation
|
||||||
+ // Optional tags should not be validated
|
+ // Optional tags should not be validated
|
||||||
+ if (entry instanceof ITag.TagEntry) {
|
+ if (entry instanceof ITag.TagEntry) {
|
||||||
+ return existingFileHelper == null || !existingFileHelper.exists(((ITag.TagEntry)entry).getId(), net.minecraft.resources.ResourcePackType.SERVER_DATA, ".json", "tags/" + getTagFolder());
|
+ return existingFileHelper == null || !existingFileHelper.exists(((ITag.TagEntry)entry).getId(), resourceType);
|
||||||
+ }
|
+ }
|
||||||
+ return false;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
@@ -63,7 +65,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected ITag.Builder func_240525_b_(ITag.INamedTag<T> p_240525_1_) {
|
protected ITag.Builder func_240525_b_(ITag.INamedTag<T> p_240525_1_) {
|
||||||
@@ -87,7 +112,7 @@
|
return this.field_200434_b.computeIfAbsent(p_240525_1_.func_230234_a_(), (p_240526_0_) -> {
|
||||||
|
+ existingFileHelper.trackGenerated(p_240526_0_, resourceType);
|
||||||
|
return new ITag.Builder();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +76,7 @@
|
|||||||
private final ITag.Builder field_240528_a_;
|
private final ITag.Builder field_240528_a_;
|
||||||
private final Registry<T> field_240529_b_;
|
private final Registry<T> field_240529_b_;
|
||||||
private final String field_240530_c_;
|
private final String field_240530_c_;
|
||||||
@@ -115,5 +140,18 @@
|
@@ -115,5 +143,18 @@
|
||||||
});
|
});
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/enchantment/EfficiencyEnchantment.java
|
||||||
|
+++ b/net/minecraft/enchantment/EfficiencyEnchantment.java
|
||||||
|
@@ -22,6 +22,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean func_92089_a(ItemStack p_92089_1_) {
|
||||||
|
- return p_92089_1_.func_77973_b() == Items.field_151097_aZ ? true : super.func_92089_a(p_92089_1_);
|
||||||
|
+ return p_92089_1_.func_77973_b() instanceof net.minecraft.item.ShearsItem ? true : super.func_92089_a(p_92089_1_);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,15 +1,31 @@
|
|||||||
--- a/net/minecraft/enchantment/Enchantment.java
|
--- a/net/minecraft/enchantment/Enchantment.java
|
||||||
+++ b/net/minecraft/enchantment/Enchantment.java
|
+++ b/net/minecraft/enchantment/Enchantment.java
|
||||||
@@ -18,7 +18,7 @@
|
@@ -18,7 +18,8 @@
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
-public abstract class Enchantment {
|
-public abstract class Enchantment {
|
||||||
+public abstract class Enchantment extends net.minecraftforge.registries.ForgeRegistryEntry<Enchantment> {
|
+public abstract class Enchantment extends net.minecraftforge.registries.ForgeRegistryEntry<Enchantment> {
|
||||||
|
+ private final net.minecraftforge.common.util.ReverseTagWrapper<Enchantment> reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, () -> net.minecraft.tags.TagCollectionManager.func_242178_a().getCustomTypeCollection(net.minecraftforge.registries.ForgeRegistries.ENCHANTMENTS));
|
||||||
private final EquipmentSlotType[] field_185263_a;
|
private final EquipmentSlotType[] field_185263_a;
|
||||||
private final Enchantment.Rarity field_77333_a;
|
private final Enchantment.Rarity field_77333_a;
|
||||||
public final EnchantmentType field_77351_y;
|
public final EnchantmentType field_77351_y;
|
||||||
@@ -114,7 +114,7 @@
|
@@ -37,6 +38,14 @@
|
||||||
|
this.field_185263_a = p_i46731_3_;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public java.util.Set<net.minecraft.util.ResourceLocation> getTags() {
|
||||||
|
+ return reverseTags.getTagNames();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean isIn(net.minecraft.tags.ITag<Enchantment> tag) {
|
||||||
|
+ return tag.func_230235_a_(this);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public Map<EquipmentSlotType, ItemStack> func_222181_a(LivingEntity p_222181_1_) {
|
||||||
|
Map<EquipmentSlotType, ItemStack> map = Maps.newEnumMap(EquipmentSlotType.class);
|
||||||
|
|
||||||
|
@@ -114,7 +123,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_92089_a(ItemStack p_92089_1_) {
|
public boolean func_92089_a(ItemStack p_92089_1_) {
|
||||||
@@ -18,7 +34,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_151368_a(LivingEntity p_151368_1_, Entity p_151368_2_, int p_151368_3_) {
|
public void func_151368_a(LivingEntity p_151368_1_, Entity p_151368_2_, int p_151368_3_) {
|
||||||
@@ -139,6 +139,24 @@
|
@@ -139,6 +148,24 @@
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -231,9 +231,8 @@
|
|||||||
this.func_213319_R();
|
this.func_213319_R();
|
||||||
this.field_70170_p.func_217381_Z().func_76320_a("reposition");
|
this.field_70170_p.func_217381_Z().func_76320_a("reposition");
|
||||||
- PortalInfo portalinfo = this.func_241829_a(p_241206_1_);
|
- PortalInfo portalinfo = this.func_241829_a(p_241206_1_);
|
||||||
- if (portalinfo == null) {
|
+ PortalInfo portalinfo = teleporter.getPortalInfo(this, p_241206_1_, this::func_241829_a);
|
||||||
+ PortalInfo portalinfo = teleporter.isVanilla() ? this.func_241829_a(p_241206_1_) : null;
|
if (portalinfo == null) {
|
||||||
+ if (portalinfo == null && teleporter.isVanilla()) {
|
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
+ Entity transportedEntity = teleporter.placeEntity(this, (ServerWorld) this.field_70170_p, p_241206_1_, this.field_70177_z, spawnPortal -> { //Forge: Start vanilla logic
|
+ Entity transportedEntity = teleporter.placeEntity(this, (ServerWorld) this.field_70170_p, p_241206_1_, this.field_70177_z, spawnPortal -> { //Forge: Start vanilla logic
|
||||||
|
|||||||
@@ -9,13 +9,28 @@
|
|||||||
MONSTER("monster", 70, false, false, 128),
|
MONSTER("monster", 70, false, false, 128),
|
||||||
CREATURE("creature", 10, true, true, 128),
|
CREATURE("creature", 10, true, true, 128),
|
||||||
AMBIENT("ambient", 15, true, false, 128),
|
AMBIENT("ambient", 15, true, false, 128),
|
||||||
@@ -57,6 +57,10 @@
|
@@ -14,7 +14,7 @@
|
||||||
|
WATER_AMBIENT("water_ambient", 20, true, false, 64),
|
||||||
|
MISC("misc", -1, true, true, 128);
|
||||||
|
|
||||||
|
- public static final Codec<EntityClassification> field_233667_g_ = IStringSerializable.func_233023_a_(EntityClassification::values, EntityClassification::func_233670_a_);
|
||||||
|
+ public static final Codec<EntityClassification> field_233667_g_ = net.minecraftforge.common.IExtensibleEnum.createCodecForExtensibleEnum(EntityClassification::values, EntityClassification::func_233670_a_);
|
||||||
|
private static final Map<String, EntityClassification> field_220364_f = Arrays.stream(values()).collect(Collectors.toMap(EntityClassification::func_220363_a, (p_220362_0_) -> {
|
||||||
|
return p_220362_0_;
|
||||||
|
}));
|
||||||
|
@@ -57,6 +57,16 @@
|
||||||
return this.field_82707_i;
|
return this.field_82707_i;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static EntityClassification create(String name, String id, int maxNumberOfCreatureIn, boolean isPeacefulCreatureIn, boolean isAnimalIn, int despawnDistance) {
|
+ public static EntityClassification create(String name, String id, int maxNumberOfCreatureIn, boolean isPeacefulCreatureIn, boolean isAnimalIn, int despawnDistance) {
|
||||||
+ throw new IllegalStateException("Enum not extended");
|
+ throw new IllegalStateException("Enum not extended");
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ @Deprecated
|
||||||
|
+ public void init() {
|
||||||
|
+ field_220364_f.put(this.func_220363_a(), this);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
public int func_233671_f_() {
|
public int func_233671_f_() {
|
||||||
return this.field_233669_n_;
|
return this.field_233669_n_;
|
||||||
|
|||||||
@@ -481,7 +481,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_70094_T() {
|
public boolean func_70094_T() {
|
||||||
@@ -3082,6 +3138,60 @@
|
@@ -3082,6 +3138,58 @@
|
||||||
this.func_213361_c(p_213334_1_ == Hand.MAIN_HAND ? EquipmentSlotType.MAINHAND : EquipmentSlotType.OFFHAND);
|
this.func_213361_c(p_213334_1_ == Hand.MAIN_HAND ? EquipmentSlotType.MAINHAND : EquipmentSlotType.OFFHAND);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -531,12 +531,10 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void remove(boolean keepData) {
|
+ protected void invalidateCaps() {
|
||||||
+ super.remove(keepData);
|
+ super.invalidateCaps();
|
||||||
+ if (!keepData) {
|
+ for (int x = 0; x < handlers.length; x++)
|
||||||
+ for (int x = 0; x < handlers.length; x++)
|
+ handlers[x].invalidate();
|
||||||
+ handlers[x].invalidate();
|
|
||||||
+ }
|
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
--- a/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java
|
||||||
|
+++ b/net/minecraft/entity/ai/goal/TriggerSkeletonTrapGoal.java
|
||||||
|
@@ -28,6 +28,10 @@
|
||||||
|
|
||||||
|
public void func_75246_d() {
|
||||||
|
ServerWorld serverworld = (ServerWorld)this.field_188516_a.field_70170_p;
|
||||||
|
+ // Forge: Trigger the trap in a tick task to avoid crashes when mods add goals to skeleton horses
|
||||||
|
+ // (MC-206338/Forge PR #7509)
|
||||||
|
+ serverworld.func_73046_m().func_212871_a_(new net.minecraft.util.concurrent.TickDelayedTask(serverworld.func_73046_m().func_71259_af(), () -> {
|
||||||
|
+ if (!this.field_188516_a.func_70089_S()) return;
|
||||||
|
DifficultyInstance difficultyinstance = serverworld.func_175649_E(this.field_188516_a.func_233580_cy_());
|
||||||
|
this.field_188516_a.func_190691_p(false);
|
||||||
|
this.field_188516_a.func_110234_j(true);
|
||||||
|
@@ -47,7 +51,7 @@
|
||||||
|
abstracthorseentity.func_70024_g(this.field_188516_a.func_70681_au().nextGaussian() * 0.5D, 0.0D, this.field_188516_a.func_70681_au().nextGaussian() * 0.5D);
|
||||||
|
serverworld.func_242417_l(abstracthorseentity);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ }));
|
||||||
|
}
|
||||||
|
|
||||||
|
private AbstractHorseEntity func_188515_a(DifficultyInstance p_188515_1_) {
|
||||||
+10
-5
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
|
--- a/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
|
||||||
+++ b/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
|
+++ b/net/minecraft/entity/item/minecart/ContainerMinecartEntity.java
|
||||||
@@ -118,17 +118,19 @@
|
@@ -118,17 +118,18 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -20,11 +20,10 @@
|
|||||||
|
|
||||||
- super.func_70106_y();
|
- super.func_70106_y();
|
||||||
+ super.remove(keepData);
|
+ super.remove(keepData);
|
||||||
+ if (!keepData) itemHandler.invalidate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void func_213281_b(CompoundNBT p_213281_1_) {
|
protected void func_213281_b(CompoundNBT p_213281_1_) {
|
||||||
@@ -157,6 +159,8 @@
|
@@ -157,6 +158,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public ActionResultType func_184230_a(PlayerEntity p_184230_1_, Hand p_184230_2_) {
|
public ActionResultType func_184230_a(PlayerEntity p_184230_1_, Hand p_184230_2_) {
|
||||||
@@ -33,7 +32,7 @@
|
|||||||
p_184230_1_.func_213829_a(this);
|
p_184230_1_.func_213829_a(this);
|
||||||
if (!p_184230_1_.field_70170_p.field_72995_K) {
|
if (!p_184230_1_.field_70170_p.field_72995_K) {
|
||||||
PiglinTasks.func_234478_a_(p_184230_1_, true);
|
PiglinTasks.func_234478_a_(p_184230_1_, true);
|
||||||
@@ -185,6 +189,8 @@
|
@@ -185,6 +188,8 @@
|
||||||
|
|
||||||
this.field_184290_c = null;
|
this.field_184290_c = null;
|
||||||
LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld)this.field_70170_p)).func_216015_a(LootParameters.field_237457_g_, this.func_213303_ch()).func_216016_a(this.field_184291_d);
|
LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld)this.field_70170_p)).func_216015_a(LootParameters.field_237457_g_, this.func_213303_ch()).func_216016_a(this.field_184291_d);
|
||||||
@@ -42,7 +41,7 @@
|
|||||||
if (p_184288_1_ != null) {
|
if (p_184288_1_ != null) {
|
||||||
lootcontext$builder.func_186469_a(p_184288_1_.func_184817_da()).func_216015_a(LootParameters.field_216281_a, p_184288_1_);
|
lootcontext$builder.func_186469_a(p_184288_1_.func_184817_da()).func_216015_a(LootParameters.field_216281_a, p_184288_1_);
|
||||||
}
|
}
|
||||||
@@ -215,4 +221,17 @@
|
@@ -215,4 +220,23 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract Container func_213968_a(int p_213968_1_, PlayerInventory p_213968_2_);
|
protected abstract Container func_213968_a(int p_213968_1_, PlayerInventory p_213968_2_);
|
||||||
@@ -56,6 +55,12 @@
|
|||||||
+ return super.getCapability(capability, facing);
|
+ return super.getCapability(capability, facing);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ @Override
|
||||||
|
+ protected void invalidateCaps() {
|
||||||
|
+ super.invalidateCaps();
|
||||||
|
+ itemHandler.invalidate();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ public void dropContentsWhenDead(boolean value) {
|
+ public void dropContentsWhenDead(boolean value) {
|
||||||
+ this.field_94112_b = value;
|
+ this.field_94112_b = value;
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -19,3 +19,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@@ -687,7 +688,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_241841_a(ServerWorld p_241841_1_, LightningBoltEntity p_241841_2_) {
|
||||||
|
- if (p_241841_1_.func_175659_aa() != Difficulty.PEACEFUL) {
|
||||||
|
+ if (p_241841_1_.func_175659_aa() != Difficulty.PEACEFUL && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_200759_ay, (timer) -> {})) {
|
||||||
|
field_184243_a.info("Villager {} was struck by lightning {}.", this, p_241841_2_);
|
||||||
|
WitchEntity witchentity = EntityType.field_200759_ay.func_200721_a(p_241841_1_);
|
||||||
|
witchentity.func_70012_b(this.func_226277_ct_(), this.func_226278_cu_(), this.func_226281_cx_(), this.field_70177_z, this.field_70125_A);
|
||||||
|
@@ -699,6 +700,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
witchentity.func_110163_bv();
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, witchentity);
|
||||||
|
p_241841_1_.func_242417_l(witchentity);
|
||||||
|
this.func_242369_fq();
|
||||||
|
this.func_70106_y();
|
||||||
@@ -1,13 +1,19 @@
|
|||||||
--- a/net/minecraft/entity/monster/HoglinEntity.java
|
--- a/net/minecraft/entity/monster/HoglinEntity.java
|
||||||
+++ b/net/minecraft/entity/monster/HoglinEntity.java
|
+++ b/net/minecraft/entity/monster/HoglinEntity.java
|
||||||
@@ -279,8 +279,8 @@
|
@@ -117,7 +117,7 @@
|
||||||
return hoglinentity;
|
HoglinTasks.func_234377_a_(this);
|
||||||
}
|
if (this.func_234364_eK_()) {
|
||||||
|
++this.field_234358_by_;
|
||||||
|
- if (this.field_234358_by_ > 300) {
|
||||||
|
+ if (this.field_234358_by_ > 300 && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_233590_aW_, (timer) -> this.field_234358_by_ = timer)) {
|
||||||
|
this.func_241412_a_(SoundEvents.field_232715_fE_);
|
||||||
|
this.func_234360_a_((ServerWorld)this.field_70170_p);
|
||||||
|
}
|
||||||
|
@@ -212,6 +212,7 @@
|
||||||
|
ZoglinEntity zoglinentity = this.func_233656_b_(EntityType.field_233590_aW_, true);
|
||||||
|
if (zoglinentity != null) {
|
||||||
|
zoglinentity.func_195064_c(new EffectInstance(Effects.field_76431_k, 200, 0));
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, zoglinentity);
|
||||||
|
}
|
||||||
|
|
||||||
- public boolean func_204701_dC() {
|
|
||||||
- return !HoglinTasks.func_234386_c_(this) && super.func_204701_dC();
|
|
||||||
+ public boolean func_213743_em() {
|
|
||||||
+ return !HoglinTasks.func_234386_c_(this) && super.func_213743_em();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public SoundCategory func_184176_by() {
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/net/minecraft/entity/monster/PhantomEntity.java
|
|
||||||
+++ b/net/minecraft/entity/monster/PhantomEntity.java
|
|
||||||
@@ -214,7 +214,7 @@
|
|
||||||
this.field_203142_b = 60;
|
|
||||||
List<PlayerEntity> list = PhantomEntity.this.field_70170_p.func_217373_a(this.field_220842_b, PhantomEntity.this, PhantomEntity.this.func_174813_aQ().func_72314_b(16.0D, 64.0D, 16.0D));
|
|
||||||
if (!list.isEmpty()) {
|
|
||||||
- list.sort(Comparator.comparing(Entity::func_226278_cu_).reversed());
|
|
||||||
+ list.sort(Comparator.<Entity, Double>comparing(Entity::func_226278_cu_).reversed());
|
|
||||||
|
|
||||||
for(PlayerEntity playerentity : list) {
|
|
||||||
if (PhantomEntity.this.func_213344_a(playerentity, EntityPredicate.field_221016_a)) {
|
|
||||||
@@ -1,6 +1,24 @@
|
|||||||
--- a/net/minecraft/entity/monster/ZombieEntity.java
|
--- a/net/minecraft/entity/monster/ZombieEntity.java
|
||||||
+++ b/net/minecraft/entity/monster/ZombieEntity.java
|
+++ b/net/minecraft/entity/monster/ZombieEntity.java
|
||||||
@@ -268,12 +268,16 @@
|
@@ -186,7 +186,8 @@
|
||||||
|
if (!this.field_70170_p.field_72995_K && this.func_70089_S() && !this.func_175446_cd()) {
|
||||||
|
if (this.func_204706_dD()) {
|
||||||
|
--this.field_204708_bE;
|
||||||
|
- if (this.field_204708_bE < 0) {
|
||||||
|
+
|
||||||
|
+ if (this.field_204708_bE < 0 && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_200725_aD, (timer) -> this.field_204708_bE = timer)) {
|
||||||
|
this.func_207302_dI();
|
||||||
|
}
|
||||||
|
} else if (this.func_204703_dA()) {
|
||||||
|
@@ -248,6 +249,7 @@
|
||||||
|
if (zombieentity != null) {
|
||||||
|
zombieentity.func_207304_a(zombieentity.field_70170_p.func_175649_E(zombieentity.func_233580_cy_()).func_180170_c());
|
||||||
|
zombieentity.func_146070_a(zombieentity.func_204900_dz() && this.func_146072_bX());
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, zombieentity);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -268,12 +270,16 @@
|
||||||
livingentity = (LivingEntity)p_70097_1_.func_76346_g();
|
livingentity = (LivingEntity)p_70097_1_.func_76346_g();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -19,7 +37,7 @@
|
|||||||
for(int l = 0; l < 50; ++l) {
|
for(int l = 0; l < 50; ++l) {
|
||||||
int i1 = i + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
|
int i1 = i + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
|
||||||
int j1 = j + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
|
int j1 = j + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
|
||||||
@@ -284,6 +288,7 @@
|
@@ -284,6 +290,7 @@
|
||||||
if (WorldEntitySpawner.func_209382_a(entityspawnplacementregistry$placementtype, this.field_70170_p, blockpos, entitytype) && EntitySpawnPlacementRegistry.func_223515_a(entitytype, serverworld, SpawnReason.REINFORCEMENT, blockpos, this.field_70170_p.field_73012_v)) {
|
if (WorldEntitySpawner.func_209382_a(entityspawnplacementregistry$placementtype, this.field_70170_p, blockpos, entitytype) && EntitySpawnPlacementRegistry.func_223515_a(entitytype, serverworld, SpawnReason.REINFORCEMENT, blockpos, this.field_70170_p.field_73012_v)) {
|
||||||
zombieentity.func_70107_b((double)i1, (double)j1, (double)k1);
|
zombieentity.func_70107_b((double)i1, (double)j1, (double)k1);
|
||||||
if (!this.field_70170_p.func_217358_a((double)i1, (double)j1, (double)k1, 7.0D) && this.field_70170_p.func_226668_i_(zombieentity) && this.field_70170_p.func_226669_j_(zombieentity) && !this.field_70170_p.func_72953_d(zombieentity.func_174813_aQ())) {
|
if (!this.field_70170_p.func_217358_a((double)i1, (double)j1, (double)k1, 7.0D) && this.field_70170_p.func_226668_i_(zombieentity) && this.field_70170_p.func_226669_j_(zombieentity) && !this.field_70170_p.func_72953_d(zombieentity.func_174813_aQ())) {
|
||||||
@@ -27,7 +45,24 @@
|
|||||||
zombieentity.func_70624_b(livingentity);
|
zombieentity.func_70624_b(livingentity);
|
||||||
zombieentity.func_213386_a(serverworld, this.field_70170_p.func_175649_E(zombieentity.func_233580_cy_()), SpawnReason.REINFORCEMENT, (ILivingEntityData)null, (CompoundNBT)null);
|
zombieentity.func_213386_a(serverworld, this.field_70170_p.func_175649_E(zombieentity.func_233580_cy_()), SpawnReason.REINFORCEMENT, (ILivingEntityData)null, (CompoundNBT)null);
|
||||||
serverworld.func_242417_l(zombieentity);
|
serverworld.func_242417_l(zombieentity);
|
||||||
@@ -448,7 +453,7 @@
|
@@ -369,7 +376,7 @@
|
||||||
|
|
||||||
|
public void func_241847_a(ServerWorld p_241847_1_, LivingEntity p_241847_2_) {
|
||||||
|
super.func_241847_a(p_241847_1_, p_241847_2_);
|
||||||
|
- if ((p_241847_1_.func_175659_aa() == Difficulty.NORMAL || p_241847_1_.func_175659_aa() == Difficulty.HARD) && p_241847_2_ instanceof VillagerEntity) {
|
||||||
|
+ if ((p_241847_1_.func_175659_aa() == Difficulty.NORMAL || p_241847_1_.func_175659_aa() == Difficulty.HARD) && p_241847_2_ instanceof VillagerEntity && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(p_241847_2_, EntityType.field_200727_aF, (timer) -> {})) {
|
||||||
|
if (p_241847_1_.func_175659_aa() != Difficulty.HARD && this.field_70146_Z.nextBoolean()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -381,6 +388,7 @@
|
||||||
|
zombievillagerentity.func_223727_a(villagerentity.func_223722_es().func_234058_a_(NBTDynamicOps.field_210820_a).getValue());
|
||||||
|
zombievillagerentity.func_213790_g(villagerentity.func_213706_dY().func_222199_a());
|
||||||
|
zombievillagerentity.func_213789_a(villagerentity.func_213708_dV());
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(p_241847_2_, zombievillagerentity);
|
||||||
|
if (!this.func_174814_R()) {
|
||||||
|
p_241847_1_.func_217378_a((PlayerEntity)null, 1026, this.func_233580_cy_(), 0);
|
||||||
|
}
|
||||||
|
@@ -448,7 +456,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean func_241399_a_(Random p_241399_0_) {
|
public static boolean func_241399_a_(Random p_241399_0_) {
|
||||||
@@ -36,7 +71,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void func_207304_a(float p_207304_1_) {
|
protected void func_207304_a(float p_207304_1_) {
|
||||||
@@ -468,7 +473,7 @@
|
@@ -468,7 +476,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void func_230291_eT_() {
|
protected void func_230291_eT_() {
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- a/net/minecraft/entity/monster/ZombieVillagerEntity.java
|
||||||
|
+++ b/net/minecraft/entity/monster/ZombieVillagerEntity.java
|
||||||
|
@@ -116,7 +116,7 @@
|
||||||
|
if (!this.field_70170_p.field_72995_K && this.func_70089_S() && this.func_82230_o()) {
|
||||||
|
int i = this.func_190735_dq();
|
||||||
|
this.field_82234_d -= i;
|
||||||
|
- if (this.field_82234_d <= 0) {
|
||||||
|
+ if (this.field_82234_d <= 0 && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_200756_av, (timer) -> this.field_82234_d = timer)) {
|
||||||
|
this.func_213791_a((ServerWorld)this.field_70170_p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -218,7 +218,7 @@
|
||||||
|
if (!this.func_174814_R()) {
|
||||||
|
p_213791_1_.func_217378_a((PlayerEntity)null, 1027, this.func_233580_cy_(), 0);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, villagerentity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int func_190735_dq() {
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/net/minecraft/entity/monster/piglin/AbstractPiglinEntity.java
|
||||||
|
+++ b/net/minecraft/entity/monster/piglin/AbstractPiglinEntity.java
|
||||||
|
@@ -83,7 +83,7 @@
|
||||||
|
this.field_242334_c = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (this.field_242334_c > 300) {
|
||||||
|
+ if (this.field_242334_c > 300 && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_233592_ba_, (timer) -> this.field_242334_c = timer)) {
|
||||||
|
this.func_241848_eP();
|
||||||
|
this.func_234416_a_((ServerWorld)this.field_70170_p);
|
||||||
|
}
|
||||||
|
@@ -98,6 +98,7 @@
|
||||||
|
ZombifiedPiglinEntity zombifiedpiglinentity = this.func_233656_b_(EntityType.field_233592_ba_, true);
|
||||||
|
if (zombifiedpiglinentity != null) {
|
||||||
|
zombifiedpiglinentity.func_195064_c(new EffectInstance(Effects.field_76431_k, 200, 0));
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, zombifiedpiglinentity);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,23 +1,5 @@
|
|||||||
--- a/net/minecraft/entity/passive/AnimalEntity.java
|
--- a/net/minecraft/entity/passive/AnimalEntity.java
|
||||||
+++ b/net/minecraft/entity/passive/AnimalEntity.java
|
+++ b/net/minecraft/entity/passive/AnimalEntity.java
|
||||||
@@ -121,7 +121,7 @@
|
|
||||||
ItemStack itemstack = p_230254_1_.func_184586_b(p_230254_2_);
|
|
||||||
if (this.func_70877_b(itemstack)) {
|
|
||||||
int i = this.func_70874_b();
|
|
||||||
- if (!this.field_70170_p.field_72995_K && i == 0 && this.func_204701_dC()) {
|
|
||||||
+ if (!this.field_70170_p.field_72995_K && i == 0 && this.func_213743_em()) {
|
|
||||||
this.func_175505_a(p_230254_1_, itemstack);
|
|
||||||
this.func_146082_f(p_230254_1_);
|
|
||||||
return ActionResultType.SUCCESS;
|
|
||||||
@@ -148,7 +148,7 @@
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
- public boolean func_204701_dC() {
|
|
||||||
+ public boolean func_213743_em() {
|
|
||||||
return this.field_70881_d <= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -199,6 +199,17 @@
|
@@ -199,6 +199,17 @@
|
||||||
|
|
||||||
public void func_234177_a_(ServerWorld p_234177_1_, AnimalEntity p_234177_2_) {
|
public void func_234177_a_(ServerWorld p_234177_1_, AnimalEntity p_234177_2_) {
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/net/minecraft/entity/passive/PandaEntity.java
|
|
||||||
+++ b/net/minecraft/entity/passive/PandaEntity.java
|
|
||||||
@@ -586,7 +586,7 @@
|
|
||||||
if (this.func_70631_g_()) {
|
|
||||||
this.func_175505_a(p_230254_1_, itemstack);
|
|
||||||
this.func_175501_a((int)((float)(-this.func_70874_b() / 20) * 0.1F), true);
|
|
||||||
- } else if (!this.field_70170_p.field_72995_K && this.func_70874_b() == 0 && this.func_204701_dC()) {
|
|
||||||
+ } else if (!this.field_70170_p.field_72995_K && this.func_70874_b() == 0 && this.func_213743_em()) {
|
|
||||||
this.func_175505_a(p_230254_1_, itemstack);
|
|
||||||
this.func_146082_f(p_230254_1_);
|
|
||||||
} else {
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/net/minecraft/entity/passive/PigEntity.java
|
||||||
|
+++ b/net/minecraft/entity/passive/PigEntity.java
|
||||||
|
@@ -203,7 +203,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_241841_a(ServerWorld p_241841_1_, LightningBoltEntity p_241841_2_) {
|
||||||
|
- if (p_241841_1_.func_175659_aa() != Difficulty.PEACEFUL) {
|
||||||
|
+ if (p_241841_1_.func_175659_aa() != Difficulty.PEACEFUL && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.field_233592_ba_, (timer) -> {})) {
|
||||||
|
ZombifiedPiglinEntity zombifiedpiglinentity = EntityType.field_233592_ba_.func_200721_a(p_241841_1_);
|
||||||
|
zombifiedpiglinentity.func_184201_a(EquipmentSlotType.MAINHAND, new ItemStack(Items.field_151010_B));
|
||||||
|
zombifiedpiglinentity.func_70012_b(this.func_226277_ct_(), this.func_226278_cu_(), this.func_226281_cx_(), this.field_70177_z, this.field_70125_A);
|
||||||
|
@@ -215,6 +215,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
zombifiedpiglinentity.func_110163_bv();
|
||||||
|
+ net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, zombifiedpiglinentity);
|
||||||
|
p_241841_1_.func_217376_c(zombifiedpiglinentity);
|
||||||
|
this.func_70106_y();
|
||||||
|
} else {
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
--- a/net/minecraft/entity/passive/TurtleEntity.java
|
|
||||||
+++ b/net/minecraft/entity/passive/TurtleEntity.java
|
|
||||||
@@ -235,8 +235,8 @@
|
|
||||||
this.func_184185_a(soundevent, 0.15F, 1.0F);
|
|
||||||
}
|
|
||||||
|
|
||||||
- public boolean func_204701_dC() {
|
|
||||||
- return super.func_204701_dC() && !this.func_203020_dx();
|
|
||||||
+ public boolean func_213743_em() {
|
|
||||||
+ return super.func_213743_em() && !this.func_203020_dx();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected float func_203009_ad() {
|
|
||||||
@@ -43,9 +43,9 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void remove(boolean keepData) {
|
+ protected void invalidateCaps() {
|
||||||
+ super.remove(keepData);
|
+ super.invalidateCaps();
|
||||||
+ if (!keepData && itemHandler != null) {
|
+ if (itemHandler != null) {
|
||||||
+ itemHandler.invalidate();
|
+ itemHandler.invalidate();
|
||||||
+ itemHandler = null;
|
+ itemHandler = null;
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/net/minecraft/entity/passive/horse/LlamaEntity.java
|
|
||||||
+++ b/net/minecraft/entity/passive/horse/LlamaEntity.java
|
|
||||||
@@ -181,7 +181,7 @@
|
|
||||||
i = 90;
|
|
||||||
j = 6;
|
|
||||||
f = 10.0F;
|
|
||||||
- if (this.func_110248_bS() && this.func_70874_b() == 0 && this.func_204701_dC()) {
|
|
||||||
+ if (this.func_110248_bS() && this.func_70874_b() == 0 && this.func_213743_em()) {
|
|
||||||
flag = true;
|
|
||||||
this.func_146082_f(p_190678_1_);
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/entity/player/ServerPlayerEntity.java
|
--- a/net/minecraft/entity/player/ServerPlayerEntity.java
|
||||||
+++ b/net/minecraft/entity/player/ServerPlayerEntity.java
|
+++ b/net/minecraft/entity/player/ServerPlayerEntity.java
|
||||||
@@ -471,6 +471,7 @@
|
@@ -475,6 +475,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_70645_a(DamageSource p_70645_1_) {
|
public void func_70645_a(DamageSource p_70645_1_) {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
boolean flag = this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223609_l);
|
boolean flag = this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223609_l);
|
||||||
if (flag) {
|
if (flag) {
|
||||||
ITextComponent itextcomponent = this.func_110142_aN().func_151521_b();
|
ITextComponent itextcomponent = this.func_110142_aN().func_151521_b();
|
||||||
@@ -614,13 +615,14 @@
|
@@ -618,13 +619,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -26,18 +26,17 @@
|
|||||||
if (!this.field_71136_j) {
|
if (!this.field_71136_j) {
|
||||||
this.field_71136_j = true;
|
this.field_71136_j = true;
|
||||||
this.field_71135_a.func_147359_a(new SChangeGameStatePacket(SChangeGameStatePacket.field_241768_e_, this.field_192040_cp ? 0.0F : 1.0F));
|
this.field_71135_a.func_147359_a(new SChangeGameStatePacket(SChangeGameStatePacket.field_241768_e_, this.field_192040_cp ? 0.0F : 1.0F));
|
||||||
@@ -634,14 +636,15 @@
|
@@ -638,14 +640,15 @@
|
||||||
this.field_71135_a.func_147359_a(new SServerDifficultyPacket(iworldinfo.func_176130_y(), iworldinfo.func_176123_z()));
|
this.field_71135_a.func_147359_a(new SServerDifficultyPacket(iworldinfo.func_176130_y(), iworldinfo.func_176123_z()));
|
||||||
PlayerList playerlist = this.field_71133_b.func_184103_al();
|
PlayerList playerlist = this.field_71133_b.func_184103_al();
|
||||||
playerlist.func_187243_f(this);
|
playerlist.func_187243_f(this);
|
||||||
- serverworld.func_217434_e(this);
|
- serverworld.func_217434_e(this);
|
||||||
- this.field_70128_L = false;
|
- this.field_70128_L = false;
|
||||||
- PortalInfo portalinfo = this.func_241829_a(p_241206_1_);
|
- PortalInfo portalinfo = this.func_241829_a(p_241206_1_);
|
||||||
- if (portalinfo != null) {
|
|
||||||
+ serverworld.removeEntity(this, true); //Forge: the player entity is moved to the new world, NOT cloned. So keep the data alive with no matching invalidate call.
|
+ serverworld.removeEntity(this, true); //Forge: the player entity is moved to the new world, NOT cloned. So keep the data alive with no matching invalidate call.
|
||||||
+ this.revive();
|
+ this.revive();
|
||||||
+ PortalInfo portalinfo = teleporter.isVanilla() ? this.func_241829_a(p_241206_1_) : null;
|
+ PortalInfo portalinfo = teleporter.getPortalInfo(this, p_241206_1_, this::func_241829_a);
|
||||||
+ if (portalinfo != null || !teleporter.isVanilla()) {
|
if (portalinfo != null) {
|
||||||
+ Entity e = teleporter.placeEntity(this, serverworld, p_241206_1_, this.field_70177_z, spawnPortal -> {//Forge: Start vanilla logic
|
+ Entity e = teleporter.placeEntity(this, serverworld, p_241206_1_, this.field_70177_z, spawnPortal -> {//Forge: Start vanilla logic
|
||||||
serverworld.func_217381_Z().func_76320_a("moving");
|
serverworld.func_217381_Z().func_76320_a("moving");
|
||||||
if (registrykey == World.field_234918_g_ && p_241206_1_.func_234923_W_() == World.field_234919_h_) {
|
if (registrykey == World.field_234918_g_ && p_241206_1_.func_234923_W_() == World.field_234919_h_) {
|
||||||
@@ -47,7 +46,7 @@
|
|||||||
this.func_242110_a(p_241206_1_, new BlockPos(portalinfo.field_222505_a));
|
this.func_242110_a(p_241206_1_, new BlockPos(portalinfo.field_222505_a));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -653,6 +656,9 @@
|
@@ -657,6 +660,9 @@
|
||||||
this.func_225653_b_(portalinfo.field_222505_a.field_72450_a, portalinfo.field_222505_a.field_72448_b, portalinfo.field_222505_a.field_72449_c);
|
this.func_225653_b_(portalinfo.field_222505_a.field_72450_a, portalinfo.field_222505_a.field_72448_b, portalinfo.field_222505_a.field_72449_c);
|
||||||
serverworld.func_217381_Z().func_76319_b();
|
serverworld.func_217381_Z().func_76319_b();
|
||||||
this.func_213846_b(serverworld);
|
this.func_213846_b(serverworld);
|
||||||
@@ -57,7 +56,7 @@
|
|||||||
this.field_71134_c.func_73080_a(p_241206_1_);
|
this.field_71134_c.func_73080_a(p_241206_1_);
|
||||||
this.field_71135_a.func_147359_a(new SPlayerAbilitiesPacket(this.field_71075_bZ));
|
this.field_71135_a.func_147359_a(new SPlayerAbilitiesPacket(this.field_71075_bZ));
|
||||||
playerlist.func_72354_b(this, p_241206_1_);
|
playerlist.func_72354_b(this, p_241206_1_);
|
||||||
@@ -666,6 +672,7 @@
|
@@ -670,6 +676,7 @@
|
||||||
this.field_71144_ck = -1;
|
this.field_71144_ck = -1;
|
||||||
this.field_71149_ch = -1.0F;
|
this.field_71149_ch = -1.0F;
|
||||||
this.field_71146_ci = -1;
|
this.field_71146_ci = -1;
|
||||||
@@ -65,7 +64,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
@@ -739,6 +746,9 @@
|
@@ -743,6 +750,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Either<PlayerEntity.SleepResult, Unit> func_213819_a(BlockPos p_213819_1_) {
|
public Either<PlayerEntity.SleepResult, Unit> func_213819_a(BlockPos p_213819_1_) {
|
||||||
@@ -75,7 +74,7 @@
|
|||||||
Direction direction = this.field_70170_p.func_180495_p(p_213819_1_).func_177229_b(HorizontalBlock.field_185512_D);
|
Direction direction = this.field_70170_p.func_180495_p(p_213819_1_).func_177229_b(HorizontalBlock.field_185512_D);
|
||||||
if (!this.func_70608_bn() && this.func_70089_S()) {
|
if (!this.func_70608_bn() && this.func_70089_S()) {
|
||||||
if (!this.field_70170_p.func_230315_m_().func_236043_f_()) {
|
if (!this.field_70170_p.func_230315_m_().func_236043_f_()) {
|
||||||
@@ -749,7 +759,7 @@
|
@@ -753,7 +763,7 @@
|
||||||
return Either.left(PlayerEntity.SleepResult.OBSTRUCTED);
|
return Either.left(PlayerEntity.SleepResult.OBSTRUCTED);
|
||||||
} else {
|
} else {
|
||||||
this.func_242111_a(this.field_70170_p.func_234923_W_(), p_213819_1_, this.field_70177_z, false, true);
|
this.func_242111_a(this.field_70170_p.func_234923_W_(), p_213819_1_, this.field_70177_z, false, true);
|
||||||
@@ -84,7 +83,7 @@
|
|||||||
return Either.left(PlayerEntity.SleepResult.NOT_POSSIBLE_NOW);
|
return Either.left(PlayerEntity.SleepResult.NOT_POSSIBLE_NOW);
|
||||||
} else {
|
} else {
|
||||||
if (!this.func_184812_l_()) {
|
if (!this.func_184812_l_()) {
|
||||||
@@ -783,6 +793,7 @@
|
@@ -787,6 +797,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean func_241147_a_(BlockPos p_241147_1_, Direction p_241147_2_) {
|
private boolean func_241147_a_(BlockPos p_241147_1_, Direction p_241147_2_) {
|
||||||
@@ -92,7 +91,7 @@
|
|||||||
return this.func_241158_g_(p_241147_1_) || this.func_241158_g_(p_241147_1_.func_177972_a(p_241147_2_.func_176734_d()));
|
return this.func_241158_g_(p_241147_1_) || this.func_241158_g_(p_241147_1_.func_177972_a(p_241147_2_.func_176734_d()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -882,6 +893,7 @@
|
@@ -886,6 +897,7 @@
|
||||||
this.field_71135_a.func_147359_a(new SOpenWindowPacket(container.field_75152_c, container.func_216957_a(), p_213829_1_.func_145748_c_()));
|
this.field_71135_a.func_147359_a(new SOpenWindowPacket(container.field_75152_c, container.func_216957_a(), p_213829_1_.func_145748_c_()));
|
||||||
container.func_75132_a(this);
|
container.func_75132_a(this);
|
||||||
this.field_71070_bA = container;
|
this.field_71070_bA = container;
|
||||||
@@ -100,7 +99,7 @@
|
|||||||
return OptionalInt.of(this.field_71139_cq);
|
return OptionalInt.of(this.field_71139_cq);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -900,6 +912,7 @@
|
@@ -904,6 +916,7 @@
|
||||||
this.field_71135_a.func_147359_a(new SOpenHorseWindowPacket(this.field_71139_cq, p_184826_2_.func_70302_i_(), p_184826_1_.func_145782_y()));
|
this.field_71135_a.func_147359_a(new SOpenHorseWindowPacket(this.field_71139_cq, p_184826_2_.func_70302_i_(), p_184826_1_.func_145782_y()));
|
||||||
this.field_71070_bA = new HorseInventoryContainer(this.field_71139_cq, this.field_71071_by, p_184826_2_, p_184826_1_);
|
this.field_71070_bA = new HorseInventoryContainer(this.field_71139_cq, this.field_71071_by, p_184826_2_, p_184826_1_);
|
||||||
this.field_71070_bA.func_75132_a(this);
|
this.field_71070_bA.func_75132_a(this);
|
||||||
@@ -108,7 +107,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_184814_a(ItemStack p_184814_1_, Hand p_184814_2_) {
|
public void func_184814_a(ItemStack p_184814_1_, Hand p_184814_2_) {
|
||||||
@@ -957,6 +970,7 @@
|
@@ -961,6 +974,7 @@
|
||||||
|
|
||||||
public void func_71128_l() {
|
public void func_71128_l() {
|
||||||
this.field_71070_bA.func_75134_a(this);
|
this.field_71070_bA.func_75134_a(this);
|
||||||
@@ -116,7 +115,7 @@
|
|||||||
this.field_71070_bA = this.field_71069_bz;
|
this.field_71070_bA = this.field_71069_bz;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1081,6 +1095,13 @@
|
@@ -1085,6 +1099,13 @@
|
||||||
this.field_193110_cw = p_193104_1_.field_193110_cw;
|
this.field_193110_cw = p_193104_1_.field_193110_cw;
|
||||||
this.func_192029_h(p_193104_1_.func_192023_dk());
|
this.func_192029_h(p_193104_1_.func_192023_dk());
|
||||||
this.func_192031_i(p_193104_1_.func_192025_dl());
|
this.func_192031_i(p_193104_1_.func_192025_dl());
|
||||||
@@ -130,7 +129,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void func_70670_a(EffectInstance p_70670_1_) {
|
protected void func_70670_a(EffectInstance p_70670_1_) {
|
||||||
@@ -1187,6 +1208,7 @@
|
@@ -1143,6 +1164,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_71033_a(GameType p_71033_1_) {
|
||||||
|
+ if (!net.minecraftforge.common.ForgeHooks.onChangeGameMode(this, this.field_71134_c.func_73081_b(), p_71033_1_)) return;
|
||||||
|
this.field_71134_c.func_73076_a(p_71033_1_);
|
||||||
|
this.field_71135_a.func_147359_a(new SChangeGameStatePacket(SChangeGameStatePacket.field_241767_d_, (float)p_71033_1_.func_77148_a()));
|
||||||
|
if (p_71033_1_ == GameType.SPECTATOR) {
|
||||||
|
@@ -1191,6 +1213,7 @@
|
||||||
this.field_71140_co = p_147100_1_.func_149520_f();
|
this.field_71140_co = p_147100_1_.func_149520_f();
|
||||||
this.func_184212_Q().func_187227_b(field_184827_bp, (byte)p_147100_1_.func_149521_d());
|
this.func_184212_Q().func_187227_b(field_184827_bp, (byte)p_147100_1_.func_149521_d());
|
||||||
this.func_184212_Q().func_187227_b(field_184828_bq, (byte)(p_147100_1_.func_186991_f() == HandSide.LEFT ? 0 : 1));
|
this.func_184212_Q().func_187227_b(field_184828_bq, (byte)(p_147100_1_.func_186991_f() == HandSide.LEFT ? 0 : 1));
|
||||||
@@ -138,7 +145,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ChatVisibility func_147096_v() {
|
public ChatVisibility func_147096_v() {
|
||||||
@@ -1297,14 +1319,14 @@
|
@@ -1301,14 +1324,14 @@
|
||||||
this.func_184210_p();
|
this.func_184210_p();
|
||||||
if (p_200619_1_ == this.field_70170_p) {
|
if (p_200619_1_ == this.field_70170_p) {
|
||||||
this.field_71135_a.func_147364_a(p_200619_2_, p_200619_4_, p_200619_6_, p_200619_8_, p_200619_9_);
|
this.field_71135_a.func_147364_a(p_200619_2_, p_200619_4_, p_200619_6_, p_200619_8_, p_200619_9_);
|
||||||
@@ -156,7 +163,7 @@
|
|||||||
this.func_70012_b(p_200619_2_, p_200619_4_, p_200619_6_, p_200619_8_, p_200619_9_);
|
this.func_70012_b(p_200619_2_, p_200619_4_, p_200619_6_, p_200619_8_, p_200619_9_);
|
||||||
this.func_70029_a(p_200619_1_);
|
this.func_70029_a(p_200619_1_);
|
||||||
p_200619_1_.func_217446_a(this);
|
p_200619_1_.func_217446_a(this);
|
||||||
@@ -1313,6 +1335,7 @@
|
@@ -1317,6 +1340,7 @@
|
||||||
this.field_71134_c.func_73080_a(p_200619_1_);
|
this.field_71134_c.func_73080_a(p_200619_1_);
|
||||||
this.field_71133_b.func_184103_al().func_72354_b(this, p_200619_1_);
|
this.field_71133_b.func_184103_al().func_72354_b(this, p_200619_1_);
|
||||||
this.field_71133_b.func_184103_al().func_72385_f(this);
|
this.field_71133_b.func_184103_al().func_72385_f(this);
|
||||||
@@ -164,7 +171,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1335,6 +1358,7 @@
|
@@ -1339,6 +1363,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_242111_a(RegistryKey<World> p_242111_1_, @Nullable BlockPos p_242111_2_, float p_242111_3_, boolean p_242111_4_, boolean p_242111_5_) {
|
public void func_242111_a(RegistryKey<World> p_242111_1_, @Nullable BlockPos p_242111_2_, float p_242111_3_, boolean p_242111_4_, boolean p_242111_5_) {
|
||||||
@@ -172,7 +179,7 @@
|
|||||||
if (p_242111_2_ != null) {
|
if (p_242111_2_ != null) {
|
||||||
boolean flag = p_242111_2_.equals(this.field_241138_cr_) && p_242111_1_.equals(this.field_241137_cq_);
|
boolean flag = p_242111_2_.equals(this.field_241138_cr_) && p_242111_1_.equals(this.field_241137_cq_);
|
||||||
if (p_242111_5_ && !flag) {
|
if (p_242111_5_ && !flag) {
|
||||||
@@ -1387,6 +1411,8 @@
|
@@ -1391,6 +1416,8 @@
|
||||||
if (itementity == null) {
|
if (itementity == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
@@ -181,11 +188,10 @@
|
|||||||
this.field_70170_p.func_217376_c(itementity);
|
this.field_70170_p.func_217376_c(itementity);
|
||||||
ItemStack itemstack = itementity.func_92059_d();
|
ItemStack itemstack = itementity.func_92059_d();
|
||||||
if (p_146097_3_) {
|
if (p_146097_3_) {
|
||||||
@@ -1400,4 +1426,13 @@
|
@@ -1405,6 +1432,15 @@
|
||||||
return itementity;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
|
||||||
+ private String language = "en_us";
|
+ private String language = "en_us";
|
||||||
+ /**
|
+ /**
|
||||||
+ * Returns the language last reported by the player as their local language.
|
+ * Returns the language last reported by the player as their local language.
|
||||||
@@ -194,4 +200,7 @@
|
|||||||
+ public String getLanguage() {
|
+ public String getLanguage() {
|
||||||
+ return this.language;
|
+ return this.language;
|
||||||
+ }
|
+ }
|
||||||
}
|
+
|
||||||
|
@Nullable
|
||||||
|
public IChatFilter func_244529_Q() {
|
||||||
|
return this.field_244528_co;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/entity/projectile/FireworkRocketEntity.java
|
--- a/net/minecraft/entity/projectile/FireworkRocketEntity.java
|
||||||
+++ b/net/minecraft/entity/projectile/FireworkRocketEntity.java
|
+++ b/net/minecraft/entity/projectile/FireworkRocketEntity.java
|
||||||
@@ -155,6 +155,13 @@
|
@@ -156,6 +156,13 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
+
|
+
|
||||||
if (!itemstack2.func_190926_b()) {
|
if (!itemstack2.func_190926_b()) {
|
||||||
- boolean flag = itemstack2.func_77973_b() == Items.field_151134_bR && !EnchantedBookItem.func_92110_g(itemstack2).isEmpty();
|
- boolean flag = itemstack2.func_77973_b() == Items.field_151134_bR && !EnchantedBookItem.func_92110_g(itemstack2).isEmpty();
|
||||||
+ if (!net.minecraftforge.common.ForgeHooks.onAnvilChange(this, itemstack, itemstack2, field_234642_c_, field_82857_m, j)) return;
|
+ if (!net.minecraftforge.common.ForgeHooks.onAnvilChange(this, itemstack, itemstack2, field_234642_c_, field_82857_m, j, this.field_234645_f_)) return;
|
||||||
+ flag = itemstack2.func_77973_b() == Items.field_151134_bR && !EnchantedBookItem.func_92110_g(itemstack2).isEmpty();
|
+ flag = itemstack2.func_77973_b() == Items.field_151134_bR && !EnchantedBookItem.func_92110_g(itemstack2).isEmpty();
|
||||||
if (itemstack1.func_77984_f() && itemstack1.func_77973_b().func_82789_a(itemstack, itemstack2)) {
|
if (itemstack1.func_77984_f() && itemstack1.func_77973_b().func_82789_a(itemstack, itemstack2)) {
|
||||||
int l2 = Math.min(itemstack1.func_77952_i(), itemstack1.func_77958_k() / 4);
|
int l2 = Math.min(itemstack1.func_77952_i(), itemstack1.func_77958_k() / 4);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
p_77659_2_.func_71029_a(Stats.field_75929_E.func_199076_b(this));
|
p_77659_2_.func_71029_a(Stats.field_75929_E.func_199076_b(this));
|
||||||
- p_77659_2_.func_184185_a(fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M, 1.0F, 1.0F);
|
- p_77659_2_.func_184185_a(fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M, 1.0F, 1.0F);
|
||||||
+
|
+
|
||||||
+ SoundEvent soundevent = this.field_77876_a.getAttributes().getEmptySound();
|
+ SoundEvent soundevent = this.field_77876_a.getAttributes().getFillSound();
|
||||||
+ if (soundevent == null) soundevent = fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M;
|
+ if (soundevent == null) soundevent = fluid.func_207185_a(FluidTags.field_206960_b) ? SoundEvents.field_187633_N : SoundEvents.field_187630_M;
|
||||||
+ p_77659_2_.func_184185_a(soundevent, 1.0F, 1.0F);
|
+ p_77659_2_.func_184185_a(soundevent, 1.0F, 1.0F);
|
||||||
ItemStack itemstack1 = DrinkHelper.func_242398_a(itemstack, p_77659_2_, new ItemStack(fluid.func_204524_b()));
|
ItemStack itemstack1 = DrinkHelper.func_242398_a(itemstack, p_77659_2_, new ItemStack(fluid.func_204524_b()));
|
||||||
|
|||||||
@@ -214,7 +214,7 @@
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -817,7 +841,7 @@
|
@@ -817,9 +841,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -222,8 +222,11 @@
|
|||||||
+ multimap = this.func_77973_b().getAttributeModifiers(p_111283_1_, this);
|
+ multimap = this.func_77973_b().getAttributeModifiers(p_111283_1_, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ multimap = net.minecraftforge.common.ForgeHooks.getAttributeModifiers(this, p_111283_1_, multimap);
|
||||||
return multimap;
|
return multimap;
|
||||||
@@ -954,6 +978,35 @@
|
}
|
||||||
|
|
||||||
|
@@ -954,6 +979,35 @@
|
||||||
return this.func_77973_b().func_219971_r();
|
return this.func_77973_b().func_219971_r();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/network/NetworkManager.java
|
--- a/net/minecraft/network/NetworkManager.java
|
||||||
+++ b/net/minecraft/network/NetworkManager.java
|
+++ b/net/minecraft/network/NetworkManager.java
|
||||||
@@ -75,6 +75,7 @@
|
@@ -74,6 +74,7 @@
|
||||||
private float field_211397_t;
|
private float field_211397_t;
|
||||||
private int field_211398_u;
|
private int field_211398_u;
|
||||||
private boolean field_211399_v;
|
private boolean field_211399_v;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public NetworkManager(PacketDirection p_i46004_1_) {
|
public NetworkManager(PacketDirection p_i46004_1_) {
|
||||||
this.field_179294_g = p_i46004_1_;
|
this.field_179294_g = p_i46004_1_;
|
||||||
@@ -84,6 +85,7 @@
|
@@ -83,6 +84,7 @@
|
||||||
super.channelActive(p_channelActive_1_);
|
super.channelActive(p_channelActive_1_);
|
||||||
this.field_150746_k = p_channelActive_1_.channel();
|
this.field_150746_k = p_channelActive_1_.channel();
|
||||||
this.field_150743_l = this.field_150746_k.remoteAddress();
|
this.field_150743_l = this.field_150746_k.remoteAddress();
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
this.func_150723_a(ProtocolType.HANDSHAKING);
|
this.func_150723_a(ProtocolType.HANDSHAKING);
|
||||||
@@ -172,7 +174,7 @@
|
@@ -171,7 +173,7 @@
|
||||||
++this.field_211395_r;
|
++this.field_211395_r;
|
||||||
if (protocoltype1 != protocoltype) {
|
if (protocoltype1 != protocoltype) {
|
||||||
field_150735_g.debug("Disabled auto read");
|
field_150735_g.debug("Disabled auto read");
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.field_150746_k.eventLoop().inEventLoop()) {
|
if (this.field_150746_k.eventLoop().inEventLoop()) {
|
||||||
@@ -260,7 +262,9 @@
|
@@ -259,7 +261,9 @@
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public static NetworkManager func_181124_a(InetAddress p_181124_0_, int p_181124_1_, boolean p_181124_2_) {
|
public static NetworkManager func_181124_a(InetAddress p_181124_0_, int p_181124_1_, boolean p_181124_2_) {
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
Class<? extends SocketChannel> oclass;
|
Class<? extends SocketChannel> oclass;
|
||||||
LazyValue<? extends EventLoopGroup> lazyvalue;
|
LazyValue<? extends EventLoopGroup> lazyvalue;
|
||||||
if (Epoll.isAvailable() && p_181124_2_) {
|
if (Epoll.isAvailable() && p_181124_2_) {
|
||||||
@@ -287,6 +291,7 @@
|
@@ -286,6 +290,7 @@
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public static NetworkManager func_150722_a(SocketAddress p_150722_0_) {
|
public static NetworkManager func_150722_a(SocketAddress p_150722_0_) {
|
||||||
final NetworkManager networkmanager = new NetworkManager(PacketDirection.CLIENTBOUND);
|
final NetworkManager networkmanager = new NetworkManager(PacketDirection.CLIENTBOUND);
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
(new Bootstrap()).group(field_179296_e.func_179281_c()).handler(new ChannelInitializer<Channel>() {
|
(new Bootstrap()).group(field_179296_e.func_179281_c()).handler(new ChannelInitializer<Channel>() {
|
||||||
protected void initChannel(Channel p_initChannel_1_) throws Exception {
|
protected void initChannel(Channel p_initChannel_1_) throws Exception {
|
||||||
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);
|
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);
|
||||||
@@ -377,6 +382,14 @@
|
@@ -376,6 +381,14 @@
|
||||||
return this.field_211397_t;
|
return this.field_211397_t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/network/login/ServerLoginNetHandler.java
|
--- a/net/minecraft/network/login/ServerLoginNetHandler.java
|
||||||
+++ b/net/minecraft/network/login/ServerLoginNetHandler.java
|
+++ b/net/minecraft/network/login/ServerLoginNetHandler.java
|
||||||
@@ -53,7 +53,13 @@
|
@@ -55,7 +55,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_73660_a() {
|
public void func_73660_a() {
|
||||||
@@ -15,48 +15,48 @@
|
|||||||
this.func_147326_c();
|
this.func_147326_c();
|
||||||
} else if (this.field_147328_g == ServerLoginNetHandler.State.DELAY_ACCEPT) {
|
} else if (this.field_147328_g == ServerLoginNetHandler.State.DELAY_ACCEPT) {
|
||||||
ServerPlayerEntity serverplayerentity = this.field_147327_f.func_184103_al().func_177451_a(this.field_147337_i.getId());
|
ServerPlayerEntity serverplayerentity = this.field_147327_f.func_184103_al().func_177451_a(this.field_147337_i.getId());
|
||||||
@@ -128,7 +134,7 @@
|
@@ -130,7 +136,7 @@
|
||||||
this.field_147328_g = ServerLoginNetHandler.State.KEY;
|
this.field_147328_g = ServerLoginNetHandler.State.KEY;
|
||||||
this.field_147333_a.func_179290_a(new SEncryptionRequestPacket("", this.field_147327_f.func_71250_E().getPublic(), this.field_147330_e));
|
this.field_147333_a.func_179290_a(new SEncryptionRequestPacket("", this.field_147327_f.func_71250_E().getPublic().getEncoded(), this.field_147330_e));
|
||||||
} else {
|
} else {
|
||||||
- this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
- this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
||||||
+ this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
+ this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -142,7 +148,7 @@
|
@@ -155,7 +161,7 @@
|
||||||
this.field_147335_k = p_147315_1_.func_149300_a(privatekey);
|
throw new IllegalStateException("Protocol error", cryptexception);
|
||||||
this.field_147328_g = ServerLoginNetHandler.State.AUTHENTICATING;
|
}
|
||||||
this.field_147333_a.func_150727_a(this.field_147335_k);
|
|
||||||
- Thread thread = new Thread("User Authenticator #" + field_147331_b.incrementAndGet()) {
|
|
||||||
+ Thread thread = new Thread(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER, "User Authenticator #" + field_147331_b.incrementAndGet()) {
|
|
||||||
public void run() {
|
|
||||||
GameProfile gameprofile = ServerLoginNetHandler.this.field_147337_i;
|
|
||||||
|
|
||||||
@@ -151,11 +157,11 @@
|
- Thread thread = new Thread("User Authenticator #" + field_147331_b.incrementAndGet()) {
|
||||||
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.field_147327_f.func_147130_as().hasJoinedServer(new GameProfile((UUID)null, gameprofile.getName()), s, this.func_191235_a());
|
+ Thread thread = new Thread(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER, "User Authenticator #" + field_147331_b.incrementAndGet()) {
|
||||||
if (ServerLoginNetHandler.this.field_147337_i != null) {
|
public void run() {
|
||||||
ServerLoginNetHandler.field_147332_c.info("UUID of player {} is {}", ServerLoginNetHandler.this.field_147337_i.getName(), ServerLoginNetHandler.this.field_147337_i.getId());
|
GameProfile gameprofile = ServerLoginNetHandler.this.field_147337_i;
|
||||||
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
|
||||||
|
@@ -163,11 +169,11 @@
|
||||||
|
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.field_147327_f.func_147130_as().hasJoinedServer(new GameProfile((UUID)null, gameprofile.getName()), s, this.func_191235_a());
|
||||||
|
if (ServerLoginNetHandler.this.field_147337_i != null) {
|
||||||
|
ServerLoginNetHandler.field_147332_c.info("UUID of player {} is {}", ServerLoginNetHandler.this.field_147337_i.getName(), ServerLoginNetHandler.this.field_147337_i.getId());
|
||||||
|
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
||||||
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
||||||
} else if (ServerLoginNetHandler.this.field_147327_f.func_71264_H()) {
|
} else if (ServerLoginNetHandler.this.field_147327_f.func_71264_H()) {
|
||||||
ServerLoginNetHandler.field_147332_c.warn("Failed to verify username but will let them in anyway!");
|
ServerLoginNetHandler.field_147332_c.warn("Failed to verify username but will let them in anyway!");
|
||||||
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.func_152506_a(gameprofile);
|
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.func_152506_a(gameprofile);
|
||||||
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
||||||
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
||||||
} else {
|
} else {
|
||||||
ServerLoginNetHandler.this.func_194026_b(new TranslationTextComponent("multiplayer.disconnect.unverified_username"));
|
ServerLoginNetHandler.this.func_194026_b(new TranslationTextComponent("multiplayer.disconnect.unverified_username"));
|
||||||
ServerLoginNetHandler.field_147332_c.error("Username '{}' tried to join with an invalid session", (Object)gameprofile.getName());
|
ServerLoginNetHandler.field_147332_c.error("Username '{}' tried to join with an invalid session", (Object)gameprofile.getName());
|
||||||
@@ -164,7 +170,7 @@
|
@@ -176,7 +182,7 @@
|
||||||
if (ServerLoginNetHandler.this.field_147327_f.func_71264_H()) {
|
if (ServerLoginNetHandler.this.field_147327_f.func_71264_H()) {
|
||||||
ServerLoginNetHandler.field_147332_c.warn("Authentication servers are down but will let them in anyway!");
|
ServerLoginNetHandler.field_147332_c.warn("Authentication servers are down but will let them in anyway!");
|
||||||
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.func_152506_a(gameprofile);
|
ServerLoginNetHandler.this.field_147337_i = ServerLoginNetHandler.this.func_152506_a(gameprofile);
|
||||||
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
- ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.READY_TO_ACCEPT;
|
||||||
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
+ ServerLoginNetHandler.this.field_147328_g = ServerLoginNetHandler.State.NEGOTIATING;
|
||||||
} else {
|
} else {
|
||||||
ServerLoginNetHandler.this.func_194026_b(new TranslationTextComponent("multiplayer.disconnect.authservers_down"));
|
ServerLoginNetHandler.this.func_194026_b(new TranslationTextComponent("multiplayer.disconnect.authservers_down"));
|
||||||
ServerLoginNetHandler.field_147332_c.error("Couldn't verify username because servers are unavailable");
|
ServerLoginNetHandler.field_147332_c.error("Couldn't verify username because servers are unavailable");
|
||||||
@@ -185,6 +191,7 @@
|
@@ -196,6 +202,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_209526_a(CCustomPayloadLoginPacket p_209526_1_) {
|
public void func_209526_a(CCustomPayloadLoginPacket p_209526_1_) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/network/play/ServerPlayNetHandler.java
|
--- a/net/minecraft/network/play/ServerPlayNetHandler.java
|
||||||
+++ b/net/minecraft/network/play/ServerPlayNetHandler.java
|
+++ b/net/minecraft/network/play/ServerPlayNetHandler.java
|
||||||
@@ -348,9 +348,11 @@
|
@@ -391,9 +391,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
entity.func_70080_a(d3, d4, d5, f, f1);
|
entity.func_70080_a(d3, d4, d5, f, f1);
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
this.field_147371_a.func_179290_a(new SMoveVehiclePacket(entity));
|
this.field_147371_a.func_179290_a(new SMoveVehiclePacket(entity));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -367,7 +369,7 @@
|
@@ -410,7 +412,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean func_241162_a_(Entity p_241162_1_) {
|
private boolean func_241162_a_(Entity p_241162_1_) {
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_184339_a(CConfirmTeleportPacket p_184339_1_) {
|
public void func_184339_a(CConfirmTeleportPacket p_184339_1_) {
|
||||||
@@ -881,7 +883,9 @@
|
@@ -950,7 +952,9 @@
|
||||||
Direction direction = blockraytraceresult.func_216354_b();
|
Direction direction = blockraytraceresult.func_216354_b();
|
||||||
this.field_147369_b.func_143004_u();
|
this.field_147369_b.func_143004_u();
|
||||||
if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z()) {
|
if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z()) {
|
||||||
@@ -32,18 +32,18 @@
|
|||||||
ActionResultType actionresulttype = this.field_147369_b.field_71134_c.func_219441_a(this.field_147369_b, serverworld, itemstack, hand, blockraytraceresult);
|
ActionResultType actionresulttype = this.field_147369_b.field_71134_c.func_219441_a(this.field_147369_b, serverworld, itemstack, hand, blockraytraceresult);
|
||||||
if (direction == Direction.UP && !actionresulttype.func_226246_a_() && blockpos.func_177956_o() >= this.field_147367_d.func_71207_Z() - 1 && func_241166_a_(this.field_147369_b, itemstack)) {
|
if (direction == Direction.UP && !actionresulttype.func_226246_a_() && blockpos.func_177956_o() >= this.field_147367_d.func_71207_Z() - 1 && func_241166_a_(this.field_147369_b, itemstack)) {
|
||||||
ITextComponent itextcomponent = (new TranslationTextComponent("build.tooHigh", this.field_147367_d.func_71207_Z())).func_240699_a_(TextFormatting.RED);
|
ITextComponent itextcomponent = (new TranslationTextComponent("build.tooHigh", this.field_147367_d.func_71207_Z())).func_240699_a_(TextFormatting.RED);
|
||||||
@@ -1014,7 +1018,9 @@
|
@@ -1097,7 +1101,9 @@
|
||||||
if (s.startsWith("/")) {
|
if (p_244548_1_.startsWith("/")) {
|
||||||
this.func_147361_d(s);
|
this.func_147361_d(p_244548_1_);
|
||||||
} else {
|
} else {
|
||||||
- ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), s);
|
- ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), p_244548_1_);
|
||||||
+ ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), net.minecraftforge.common.ForgeHooks.newChatWithLinks(s));
|
+ ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), net.minecraftforge.common.ForgeHooks.newChatWithLinks(p_244548_1_));
|
||||||
+ itextcomponent = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, s, itextcomponent);
|
+ itextcomponent = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, p_244548_1_, itextcomponent);
|
||||||
+ if (itextcomponent == null) return;
|
+ if (itextcomponent == null) return;
|
||||||
this.field_147367_d.func_184103_al().func_232641_a_(itextcomponent, ChatType.CHAT, this.field_147369_b.func_110124_au());
|
this.field_147367_d.func_184103_al().func_232641_a_(itextcomponent, ChatType.CHAT, this.field_147369_b.func_110124_au());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1104,6 +1110,7 @@
|
@@ -1187,6 +1193,7 @@
|
||||||
if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT) {
|
if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT) {
|
||||||
optional = Optional.of(this.field_147369_b.func_190775_a(entity, hand));
|
optional = Optional.of(this.field_147369_b.func_190775_a(entity, hand));
|
||||||
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT_AT) {
|
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT_AT) {
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
optional = Optional.of(entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), hand));
|
optional = Optional.of(entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), hand));
|
||||||
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.ATTACK) {
|
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.ATTACK) {
|
||||||
if (entity instanceof ItemEntity || entity instanceof ExperienceOrbEntity || entity instanceof AbstractArrowEntity || entity == this.field_147369_b) {
|
if (entity instanceof ItemEntity || entity instanceof ExperienceOrbEntity || entity instanceof AbstractArrowEntity || entity == this.field_147369_b) {
|
||||||
@@ -1315,6 +1322,8 @@
|
@@ -1402,6 +1409,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_147349_a(CCustomPayloadPacket p_147349_1_) {
|
public void func_147349_a(CCustomPayloadPacket p_147349_1_) {
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
--- a/net/minecraft/network/play/server/SCommandListPacket.java
|
|
||||||
+++ b/net/minecraft/network/play/server/SCommandListPacket.java
|
|
||||||
@@ -119,6 +119,9 @@
|
|
||||||
String s = p_197695_0_.func_150789_c(32767);
|
|
||||||
ArgumentType<?> argumenttype = ArgumentTypes.func_197486_a(p_197695_0_);
|
|
||||||
if (argumenttype == null) {
|
|
||||||
+ if ((i & 16) != 0) { // FORGE: Flush unused suggestion data
|
|
||||||
+ p_197695_0_.func_192575_l();
|
|
||||||
+ }
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
RequiredArgumentBuilder<ISuggestionProvider, ?> requiredargumentbuilder = RequiredArgumentBuilder.argument(s, argumenttype);
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
--- a/net/minecraft/network/rcon/ClientThread.java
|
||||||
|
+++ b/net/minecraft/network/rcon/ClientThread.java
|
||||||
|
@@ -116,13 +116,14 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_72655_a(int p_72655_1_, String p_72655_2_) throws IOException {
|
||||||
|
- int i = p_72655_2_.length();
|
||||||
|
-
|
||||||
|
+ byte[] whole = p_72655_2_.getBytes(StandardCharsets.UTF_8);
|
||||||
|
+ int i = whole.length;
|
||||||
|
+ int start = 0;
|
||||||
|
do {
|
||||||
|
int j = 4096 <= i ? 4096 : i;
|
||||||
|
- this.func_72654_a(p_72655_1_, 0, p_72655_2_.substring(0, j));
|
||||||
|
- p_72655_2_ = p_72655_2_.substring(j);
|
||||||
|
- i = p_72655_2_.length();
|
||||||
|
+ this.func_72654_a(p_72655_1_, 0, new String(java.util.Arrays.copyOfRange(whole, start, j+start), StandardCharsets.UTF_8));
|
||||||
|
+ i -= j;
|
||||||
|
+ start += j;
|
||||||
|
} while(0 != i);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/minecraft/network/rcon/RConConsoleSource.java
|
||||||
|
+++ b/net/minecraft/network/rcon/RConConsoleSource.java
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void func_145747_a(ITextComponent p_145747_1_, UUID p_145747_2_) {
|
||||||
|
- this.field_70009_b.append(p_145747_1_.getString());
|
||||||
|
+ this.field_70009_b.append(p_145747_1_.getString()).append("\n"); // FIX MC-7569 - RCON has no newlines in multiline output
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean func_195039_a() {
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
--- a/net/minecraft/pathfinding/PathNavigator.java
|
||||||
|
+++ b/net/minecraft/pathfinding/PathNavigator.java
|
||||||
|
@@ -208,9 +208,9 @@
|
||||||
|
Vector3d vector3d = this.func_75502_i();
|
||||||
|
this.field_188561_o = this.field_75515_a.func_213311_cf() > 0.75F ? this.field_75515_a.func_213311_cf() / 2.0F : 0.75F - this.field_75515_a.func_213311_cf() / 2.0F;
|
||||||
|
Vector3i vector3i = this.field_75514_c.func_242948_g();
|
||||||
|
- double d0 = Math.abs(this.field_75515_a.func_226277_ct_() - ((double)vector3i.func_177958_n() + 0.5D));
|
||||||
|
+ double d0 = Math.abs(this.field_75515_a.func_226277_ct_() - ((double)vector3i.func_177958_n() + (this.field_75515_a.func_213311_cf() + 1) / 2D)); //Forge: Fix MC-94054
|
||||||
|
double d1 = Math.abs(this.field_75515_a.func_226278_cu_() - (double)vector3i.func_177956_o());
|
||||||
|
- double d2 = Math.abs(this.field_75515_a.func_226281_cx_() - ((double)vector3i.func_177952_p() + 0.5D));
|
||||||
|
+ double d2 = Math.abs(this.field_75515_a.func_226281_cx_() - ((double)vector3i.func_177952_p() + (this.field_75515_a.func_213311_cf() + 1) / 2D)); //Forge: Fix MC-94054
|
||||||
|
boolean flag = d0 < (double)this.field_188561_o && d2 < (double)this.field_188561_o && d1 < 1.0D;
|
||||||
|
if (flag || this.field_75515_a.func_233660_b_(this.field_75514_c.func_237225_h_().field_186287_m) && this.func_234112_b_(vector3d)) {
|
||||||
|
this.field_75514_c.func_75875_a();
|
||||||
@@ -1,11 +1,27 @@
|
|||||||
--- a/net/minecraft/potion/Potion.java
|
--- a/net/minecraft/potion/Potion.java
|
||||||
+++ b/net/minecraft/potion/Potion.java
|
+++ b/net/minecraft/potion/Potion.java
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,8 @@
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
|
|
||||||
-public class Potion {
|
-public class Potion {
|
||||||
+public class Potion extends net.minecraftforge.registries.ForgeRegistryEntry<Potion> {
|
+public class Potion extends net.minecraftforge.registries.ForgeRegistryEntry<Potion> {
|
||||||
|
+ private final net.minecraftforge.common.util.ReverseTagWrapper<Potion> reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, () -> net.minecraft.tags.TagCollectionManager.func_242178_a().getCustomTypeCollection(net.minecraftforge.registries.ForgeRegistries.POTION_TYPES));
|
||||||
private final String field_185179_d;
|
private final String field_185179_d;
|
||||||
private final ImmutableList<EffectInstance> field_185180_e;
|
private final ImmutableList<EffectInstance> field_185180_e;
|
||||||
|
|
||||||
|
@@ -23,6 +24,14 @@
|
||||||
|
this.field_185180_e = ImmutableList.copyOf(p_i46740_2_);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public java.util.Set<net.minecraft.util.ResourceLocation> getTags() {
|
||||||
|
+ return reverseTags.getTagNames();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean isIn(net.minecraft.tags.ITag<Potion> tag) {
|
||||||
|
+ return tag.func_230235_a_(this);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public String func_185174_b(String p_185174_1_) {
|
||||||
|
return p_185174_1_ + (this.field_185179_d == null ? Registry.field_212621_j.func_177774_c(this).func_110623_a() : this.field_185179_d);
|
||||||
|
}
|
||||||
@@ -8,3 +8,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public FunctionReloader func_240960_a_() {
|
public FunctionReloader func_240960_a_() {
|
||||||
|
@@ -81,6 +82,7 @@
|
||||||
|
|
||||||
|
public void func_240971_i_() {
|
||||||
|
this.field_240955_e_.func_242231_a().func_242212_e();
|
||||||
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.TagsUpdatedEvent.CustomTagTypes(field_240955_e_.func_242231_a()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void close() {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/server/Main.java
|
--- a/net/minecraft/server/Main.java
|
||||||
+++ b/net/minecraft/server/Main.java
|
+++ b/net/minecraft/server/Main.java
|
||||||
@@ -72,6 +72,8 @@
|
@@ -71,6 +71,8 @@
|
||||||
OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1);
|
OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1);
|
||||||
OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
|
OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
|
||||||
OptionSpec<String> optionspec13 = optionparser.nonOptions();
|
OptionSpec<String> optionspec13 = optionparser.nonOptions();
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
OptionSet optionset = optionparser.parse(p_main_0_);
|
OptionSet optionset = optionparser.parse(p_main_0_);
|
||||||
@@ -79,33 +81,38 @@
|
@@ -78,33 +80,38 @@
|
||||||
optionparser.printHelpOn(System.err);
|
optionparser.printHelpOn(System.err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
File file1 = new File(optionset.valueOf(optionspec9));
|
File file1 = new File(optionset.valueOf(optionspec9));
|
||||||
YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
|
YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(Proxy.NO_PROXY);
|
||||||
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
|
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
|
||||||
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
|
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
|
||||||
PlayerProfileCache playerprofilecache = new PlayerProfileCache(gameprofilerepository, new File(file1, MinecraftServer.field_152367_a.getName()));
|
PlayerProfileCache playerprofilecache = new PlayerProfileCache(gameprofilerepository, new File(file1, MinecraftServer.field_152367_a.getName()));
|
||||||
@@ -55,7 +55,16 @@
|
|||||||
SaveFormat saveformat = SaveFormat.func_237269_a_(file1.toPath());
|
SaveFormat saveformat = SaveFormat.func_237269_a_(file1.toPath());
|
||||||
SaveFormat.LevelSave saveformat$levelsave = saveformat.func_237274_c_(s);
|
SaveFormat.LevelSave saveformat$levelsave = saveformat.func_237274_c_(s);
|
||||||
MinecraftServer.func_240777_a_(saveformat$levelsave);
|
MinecraftServer.func_240777_a_(saveformat$levelsave);
|
||||||
@@ -170,6 +177,7 @@
|
@@ -142,6 +149,8 @@
|
||||||
|
dimensiongeneratorsettings = optionset.has(optionspec3) ? serverproperties.field_241082_U_.func_236230_k_() : serverproperties.field_241082_U_;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Forge: Deserialize the DimensionGeneratorSettings to ensure modded dims are loaded on first server load (see SimpleRegistryCodec#decode). Vanilla behaviour only loads from the server.properties and deserializes only after the 2nd server load.
|
||||||
|
+ dimensiongeneratorsettings = DimensionGeneratorSettings.field_236201_a_.encodeStart(net.minecraft.util.registry.WorldGenSettingsExport.func_240896_a_(NBTDynamicOps.field_210820_a, dynamicregistries$impl), dimensiongeneratorsettings).flatMap(nbt -> DimensionGeneratorSettings.field_236201_a_.parse(worldsettingsimport, nbt)).getOrThrow(false, errorMsg->{});
|
||||||
|
iserverconfiguration = new ServerWorldInfo(worldsettings, dimensiongeneratorsettings, Lifecycle.stable());
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -169,6 +178,7 @@
|
||||||
Thread thread = new Thread("Server Shutdown Thread") {
|
Thread thread = new Thread("Server Shutdown Thread") {
|
||||||
public void run() {
|
public void run() {
|
||||||
dedicatedserver.func_71263_m(true);
|
dedicatedserver.func_71263_m(true);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/server/MinecraftServer.java
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/net/minecraft/server/MinecraftServer.java
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -225,7 +225,7 @@
|
@@ -228,7 +228,7 @@
|
||||||
|
|
||||||
public static <S extends MinecraftServer> S func_240784_a_(Function<Thread, S> p_240784_0_) {
|
public static <S extends MinecraftServer> S func_240784_a_(Function<Thread, S> p_240784_0_) {
|
||||||
AtomicReference<S> atomicreference = new AtomicReference<>();
|
AtomicReference<S> atomicreference = new AtomicReference<>();
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
atomicreference.get().func_240802_v_();
|
atomicreference.get().func_240802_v_();
|
||||||
}, "Server thread");
|
}, "Server thread");
|
||||||
thread.setUncaughtExceptionHandler((p_240779_0_, p_240779_1_) -> {
|
thread.setUncaughtExceptionHandler((p_240779_0_, p_240779_1_) -> {
|
||||||
@@ -373,6 +373,7 @@
|
@@ -376,6 +376,7 @@
|
||||||
worldborder.func_177737_a(new IBorderListener.Impl(serverworld1.func_175723_af()));
|
worldborder.func_177737_a(new IBorderListener.Impl(serverworld1.func_175723_af()));
|
||||||
this.field_71305_c.put(registrykey1, serverworld1);
|
this.field_71305_c.put(registrykey1, serverworld1);
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -384,6 +385,7 @@
|
@@ -387,6 +388,7 @@
|
||||||
} else if (p_240786_3_) {
|
} else if (p_240786_3_) {
|
||||||
p_240786_1_.func_176143_a(BlockPos.field_177992_a.func_177984_a(), 0.0F);
|
p_240786_1_.func_176143_a(BlockPos.field_177992_a.func_177984_a(), 0.0F);
|
||||||
} else {
|
} else {
|
||||||
@@ -25,7 +25,15 @@
|
|||||||
BiomeProvider biomeprovider = chunkgenerator.func_202090_b();
|
BiomeProvider biomeprovider = chunkgenerator.func_202090_b();
|
||||||
Random random = new Random(p_240786_0_.func_72905_C());
|
Random random = new Random(p_240786_0_.func_72905_C());
|
||||||
BlockPos blockpos = biomeprovider.func_225531_a_(0, p_240786_0_.func_181545_F(), 0, 256, (p_244265_0_) -> {
|
BlockPos blockpos = biomeprovider.func_225531_a_(0, p_240786_0_.func_181545_F(), 0, 256, (p_244265_0_) -> {
|
||||||
@@ -563,6 +565,7 @@
|
@@ -452,6 +454,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_213186_a(IChunkStatusListener p_213186_1_) {
|
||||||
|
+ net.minecraftforge.common.world.StructureSpawnManager.gatherEntitySpawns();
|
||||||
|
ServerWorld serverworld = this.func_241755_D_();
|
||||||
|
field_147145_h.info("Preparing start region for dimension {}", (Object)serverworld.func_234923_W_().func_240901_a_());
|
||||||
|
BlockPos blockpos = serverworld.func_241135_u_();
|
||||||
|
@@ -566,6 +569,7 @@
|
||||||
for(ServerWorld serverworld1 : this.func_212370_w()) {
|
for(ServerWorld serverworld1 : this.func_212370_w()) {
|
||||||
if (serverworld1 != null) {
|
if (serverworld1 != null) {
|
||||||
try {
|
try {
|
||||||
@@ -33,7 +41,7 @@
|
|||||||
serverworld1.close();
|
serverworld1.close();
|
||||||
} catch (IOException ioexception1) {
|
} catch (IOException ioexception1) {
|
||||||
field_147145_h.error("Exception closing the level", (Throwable)ioexception1);
|
field_147145_h.error("Exception closing the level", (Throwable)ioexception1);
|
||||||
@@ -611,6 +614,7 @@
|
@@ -614,6 +618,7 @@
|
||||||
protected void func_240802_v_() {
|
protected void func_240802_v_() {
|
||||||
try {
|
try {
|
||||||
if (this.func_71197_b()) {
|
if (this.func_71197_b()) {
|
||||||
@@ -41,7 +49,7 @@
|
|||||||
this.field_211151_aa = Util.func_211177_b();
|
this.field_211151_aa = Util.func_211177_b();
|
||||||
this.field_147147_p.func_151315_a(new StringTextComponent(this.field_71286_C));
|
this.field_147147_p.func_151315_a(new StringTextComponent(this.field_71286_C));
|
||||||
this.field_147147_p.func_151321_a(new ServerStatusResponse.Version(SharedConstants.func_215069_a().getName(), SharedConstants.func_215069_a().getProtocolVersion()));
|
this.field_147147_p.func_151321_a(new ServerStatusResponse.Version(SharedConstants.func_215069_a().getName(), SharedConstants.func_215069_a().getProtocolVersion()));
|
||||||
@@ -640,7 +644,10 @@
|
@@ -643,7 +648,10 @@
|
||||||
this.func_240795_b_(longtickdetector);
|
this.func_240795_b_(longtickdetector);
|
||||||
this.field_71296_Q = true;
|
this.field_71296_Q = true;
|
||||||
}
|
}
|
||||||
@@ -52,7 +60,7 @@
|
|||||||
this.func_71228_a((CrashReport)null);
|
this.func_71228_a((CrashReport)null);
|
||||||
}
|
}
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -659,6 +666,7 @@
|
@@ -662,6 +670,7 @@
|
||||||
field_147145_h.error("We were unable to save this crash report to disk.");
|
field_147145_h.error("We were unable to save this crash report to disk.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,7 +68,7 @@
|
|||||||
this.func_71228_a(crashreport);
|
this.func_71228_a(crashreport);
|
||||||
} finally {
|
} finally {
|
||||||
try {
|
try {
|
||||||
@@ -667,6 +675,7 @@
|
@@ -670,6 +679,7 @@
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
field_147145_h.error("Exception stopping the server", throwable);
|
field_147145_h.error("Exception stopping the server", throwable);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -68,7 +76,7 @@
|
|||||||
this.func_71240_o();
|
this.func_71240_o();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -768,6 +777,7 @@
|
@@ -771,6 +781,7 @@
|
||||||
|
|
||||||
protected void func_71217_p(BooleanSupplier p_71217_1_) {
|
protected void func_71217_p(BooleanSupplier p_71217_1_) {
|
||||||
long i = Util.func_211178_c();
|
long i = Util.func_211178_c();
|
||||||
@@ -76,7 +84,7 @@
|
|||||||
++this.field_71315_w;
|
++this.field_71315_w;
|
||||||
this.func_71190_q(p_71217_1_);
|
this.func_71190_q(p_71217_1_);
|
||||||
if (i - this.field_147142_T >= 5000000000L) {
|
if (i - this.field_147142_T >= 5000000000L) {
|
||||||
@@ -782,6 +792,7 @@
|
@@ -785,6 +796,7 @@
|
||||||
|
|
||||||
Collections.shuffle(Arrays.asList(agameprofile));
|
Collections.shuffle(Arrays.asList(agameprofile));
|
||||||
this.field_147147_p.func_151318_b().func_151330_a(agameprofile);
|
this.field_147147_p.func_151318_b().func_151330_a(agameprofile);
|
||||||
@@ -84,7 +92,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.field_71315_w % 6000 == 0) {
|
if (this.field_71315_w % 6000 == 0) {
|
||||||
@@ -809,6 +820,7 @@
|
@@ -812,6 +824,7 @@
|
||||||
long i1 = Util.func_211178_c();
|
long i1 = Util.func_211178_c();
|
||||||
this.field_213215_ap.func_181747_a(i1 - i);
|
this.field_213215_ap.func_181747_a(i1 - i);
|
||||||
this.field_71304_b.func_76319_b();
|
this.field_71304_b.func_76319_b();
|
||||||
@@ -92,7 +100,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void func_71190_q(BooleanSupplier p_71190_1_) {
|
protected void func_71190_q(BooleanSupplier p_71190_1_) {
|
||||||
@@ -816,7 +828,8 @@
|
@@ -819,7 +832,8 @@
|
||||||
this.func_193030_aL().func_73660_a();
|
this.func_193030_aL().func_73660_a();
|
||||||
this.field_71304_b.func_219895_b("levels");
|
this.field_71304_b.func_219895_b("levels");
|
||||||
|
|
||||||
@@ -102,7 +110,7 @@
|
|||||||
this.field_71304_b.func_194340_a(() -> {
|
this.field_71304_b.func_194340_a(() -> {
|
||||||
return serverworld + " " + serverworld.func_234923_W_().func_240901_a_();
|
return serverworld + " " + serverworld.func_234923_W_().func_240901_a_();
|
||||||
});
|
});
|
||||||
@@ -827,6 +840,7 @@
|
@@ -830,6 +844,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_71304_b.func_76320_a("tick");
|
this.field_71304_b.func_76320_a("tick");
|
||||||
@@ -110,7 +118,7 @@
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
serverworld.func_72835_b(p_71190_1_);
|
serverworld.func_72835_b(p_71190_1_);
|
||||||
@@ -835,9 +849,11 @@
|
@@ -838,9 +853,11 @@
|
||||||
serverworld.func_72914_a(crashreport);
|
serverworld.func_72914_a(crashreport);
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport);
|
||||||
}
|
}
|
||||||
@@ -122,7 +130,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_71304_b.func_219895_b("connection");
|
this.field_71304_b.func_219895_b("connection");
|
||||||
@@ -912,7 +928,7 @@
|
@@ -915,7 +932,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getServerModName() {
|
public String getServerModName() {
|
||||||
@@ -131,7 +139,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
@@ -925,6 +941,7 @@
|
@@ -928,6 +945,7 @@
|
||||||
p_71230_1_.func_85056_g().func_189529_a("Data Packs", () -> {
|
p_71230_1_.func_85056_g().func_189529_a("Data Packs", () -> {
|
||||||
StringBuilder stringbuilder = new StringBuilder();
|
StringBuilder stringbuilder = new StringBuilder();
|
||||||
|
|
||||||
@@ -139,7 +147,7 @@
|
|||||||
for(ResourcePackInfo resourcepackinfo : this.field_195577_ad.func_198980_d()) {
|
for(ResourcePackInfo resourcepackinfo : this.field_195577_ad.func_198980_d()) {
|
||||||
if (stringbuilder.length() > 0) {
|
if (stringbuilder.length() > 0) {
|
||||||
stringbuilder.append(", ");
|
stringbuilder.append(", ");
|
||||||
@@ -1271,6 +1288,7 @@
|
@@ -1280,6 +1298,7 @@
|
||||||
this.func_184103_al().func_193244_w();
|
this.func_184103_al().func_193244_w();
|
||||||
this.field_200258_al.func_240946_a_(this.field_195576_ac.func_240960_a_());
|
this.field_200258_al.func_240946_a_(this.field_195576_ac.func_240960_a_());
|
||||||
this.field_240765_ak_.func_195410_a(this.field_195576_ac.func_240970_h_());
|
this.field_240765_ak_.func_195410_a(this.field_195576_ac.func_240970_h_());
|
||||||
@@ -147,7 +155,7 @@
|
|||||||
}, this);
|
}, this);
|
||||||
if (this.func_213162_bc()) {
|
if (this.func_213162_bc()) {
|
||||||
this.func_213161_c(completablefuture::isDone);
|
this.func_213161_c(completablefuture::isDone);
|
||||||
@@ -1280,10 +1298,13 @@
|
@@ -1289,10 +1308,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public static DatapackCodec func_240772_a_(ResourcePackList p_240772_0_, DatapackCodec p_240772_1_, boolean p_240772_2_) {
|
public static DatapackCodec func_240772_a_(ResourcePackList p_240772_0_, DatapackCodec p_240772_1_, boolean p_240772_2_) {
|
||||||
@@ -163,7 +171,7 @@
|
|||||||
} else {
|
} else {
|
||||||
Set<String> set = Sets.newLinkedHashSet();
|
Set<String> set = Sets.newLinkedHashSet();
|
||||||
|
|
||||||
@@ -1433,6 +1454,31 @@
|
@@ -1442,6 +1464,31 @@
|
||||||
|
|
||||||
public abstract boolean func_213199_b(GameProfile p_213199_1_);
|
public abstract boolean func_213199_b(GameProfile p_213199_1_);
|
||||||
|
|
||||||
@@ -195,7 +203,7 @@
|
|||||||
public void func_223711_a(Path p_223711_1_) throws IOException {
|
public void func_223711_a(Path p_223711_1_) throws IOException {
|
||||||
Path path = p_223711_1_.resolve("levels");
|
Path path = p_223711_1_.resolve("levels");
|
||||||
|
|
||||||
@@ -1561,6 +1607,10 @@
|
@@ -1570,6 +1617,10 @@
|
||||||
return this.field_240768_i_;
|
return this.field_240768_i_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
@@ -76,6 +76,7 @@
|
@@ -81,6 +81,7 @@
|
||||||
public boolean func_71197_b() throws IOException {
|
public boolean func_71197_b() throws IOException {
|
||||||
Thread thread = new Thread("Server console handler") {
|
Thread thread = new Thread("Server console handler") {
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
|
||||||
|
|
||||||
String s1;
|
String s1;
|
||||||
@@ -158,11 +159,13 @@
|
@@ -162,11 +163,13 @@
|
||||||
SkullTileEntity.func_184293_a(this.func_152358_ax());
|
SkullTileEntity.func_184293_a(this.func_152358_ax());
|
||||||
SkullTileEntity.func_184294_a(this.func_147130_as());
|
SkullTileEntity.func_184294_a(this.func_147130_as());
|
||||||
PlayerProfileCache.func_187320_a(this.func_71266_T());
|
PlayerProfileCache.func_187320_a(this.func_71266_T());
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
if (serverproperties.field_219027_u != null) {
|
if (serverproperties.field_219027_u != null) {
|
||||||
this.func_200252_aR().func_223585_a(GameRules.field_223620_w).func_223570_a(serverproperties.field_219027_u, this);
|
this.func_200252_aR().func_223585_a(GameRules.field_223620_w).func_223570_a(serverproperties.field_219027_u, this);
|
||||||
}
|
}
|
||||||
@@ -186,11 +189,12 @@
|
@@ -190,11 +193,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a());
|
Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a());
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -507,6 +511,11 @@
|
@@ -515,6 +519,11 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
--- a/net/minecraft/server/dedicated/ServerHangWatchdog.java
|
--- a/net/minecraft/server/dedicated/ServerHangWatchdog.java
|
||||||
+++ b/net/minecraft/server/dedicated/ServerHangWatchdog.java
|
+++ b/net/minecraft/server/dedicated/ServerHangWatchdog.java
|
||||||
@@ -36,7 +36,7 @@
|
@@ -40,7 +40,7 @@
|
||||||
ThreadMXBean threadmxbean = ManagementFactory.getThreadMXBean();
|
ThreadMXBean threadmxbean = ManagementFactory.getThreadMXBean();
|
||||||
ThreadInfo[] athreadinfo = threadmxbean.dumpAllThreads(true, true);
|
ThreadInfo[] athreadinfo = threadmxbean.dumpAllThreads(true, true);
|
||||||
StringBuilder stringbuilder = new StringBuilder();
|
StringBuilder stringbuilder = new StringBuilder();
|
||||||
- Error error = new Error();
|
- Error error = new Error("Watchdog");
|
||||||
+ Error error = new Error(String.format("ServerHangWatchdog detected that a single server tick took %.2f seconds (should be max 0.05)", k / 1000F)); // Forge: don't just make a crash report with a seemingly-inexplicable Error
|
+ Error error = new Error(String.format("ServerHangWatchdog detected that a single server tick took %.2f seconds (should be max 0.05)", k / 1000F)); // Forge: don't just make a crash report with a seemingly-inexplicable Error
|
||||||
|
|
||||||
for(ThreadInfo threadinfo : athreadinfo) {
|
for(ThreadInfo threadinfo : athreadinfo) {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
--- a/net/minecraft/server/integrated/IntegratedServer.java
|
--- a/net/minecraft/server/integrated/IntegratedServer.java
|
||||||
+++ b/net/minecraft/server/integrated/IntegratedServer.java
|
+++ b/net/minecraft/server/integrated/IntegratedServer.java
|
||||||
@@ -58,9 +58,10 @@
|
@@ -56,9 +56,10 @@
|
||||||
|
this.func_71188_g(true);
|
||||||
this.func_71245_h(true);
|
this.func_71245_h(true);
|
||||||
field_147148_h.info("Generating keypair");
|
this.func_244801_P();
|
||||||
this.func_71253_a(CryptManager.func_75891_b());
|
|
||||||
+ if (!net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerAboutToStart(this)) return false;
|
+ if (!net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerAboutToStart(this)) return false;
|
||||||
this.func_240800_l__();
|
this.func_240800_l__();
|
||||||
this.func_71205_p(this.func_71214_G() + " - " + this.func_240793_aU_().func_76065_j());
|
this.func_71205_p(this.func_71214_G() + " - " + this.func_240793_aU_().func_76065_j());
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_71217_p(BooleanSupplier p_71217_1_) {
|
public void func_71217_p(BooleanSupplier p_71217_1_) {
|
||||||
@@ -174,6 +175,7 @@
|
@@ -172,6 +173,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_71263_m(boolean p_71263_1_) {
|
public void func_71263_m(boolean p_71263_1_) {
|
||||||
|
|||||||
+6
-4
@@ -125,7 +125,7 @@
|
|||||||
public ActionResultType func_219441_a(ServerPlayerEntity p_219441_1_, World p_219441_2_, ItemStack p_219441_3_, Hand p_219441_4_, BlockRayTraceResult p_219441_5_) {
|
public ActionResultType func_219441_a(ServerPlayerEntity p_219441_1_, World p_219441_2_, ItemStack p_219441_3_, Hand p_219441_4_, BlockRayTraceResult p_219441_5_) {
|
||||||
BlockPos blockpos = p_219441_5_.func_216350_a();
|
BlockPos blockpos = p_219441_5_.func_216350_a();
|
||||||
BlockState blockstate = p_219441_2_.func_180495_p(blockpos);
|
BlockState blockstate = p_219441_2_.func_180495_p(blockpos);
|
||||||
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks.onRightClickBlock(p_219441_1_, p_219441_4_, blockpos, p_219441_5_.func_216354_b());
|
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks.onRightClickBlock(p_219441_1_, p_219441_4_, blockpos, p_219441_5_);
|
||||||
+ if (event.isCanceled()) return event.getCancellationResult();
|
+ if (event.isCanceled()) return event.getCancellationResult();
|
||||||
if (this.field_73091_c == GameType.SPECTATOR) {
|
if (this.field_73091_c == GameType.SPECTATOR) {
|
||||||
INamedContainerProvider inamedcontainerprovider = blockstate.func_215699_b(p_219441_2_, blockpos);
|
INamedContainerProvider inamedcontainerprovider = blockstate.func_215699_b(p_219441_2_, blockpos);
|
||||||
@@ -144,15 +144,17 @@
|
|||||||
+ boolean flag1 = (p_219441_1_.func_226563_dT_() && flag) && !(p_219441_1_.func_184614_ca().doesSneakBypassUse(p_219441_2_, blockpos, p_219441_1_) && p_219441_1_.func_184592_cb().doesSneakBypassUse(p_219441_2_, blockpos, p_219441_1_));
|
+ boolean flag1 = (p_219441_1_.func_226563_dT_() && flag) && !(p_219441_1_.func_184614_ca().doesSneakBypassUse(p_219441_2_, blockpos, p_219441_1_) && p_219441_1_.func_184592_cb().doesSneakBypassUse(p_219441_2_, blockpos, p_219441_1_));
|
||||||
ItemStack itemstack = p_219441_3_.func_77946_l();
|
ItemStack itemstack = p_219441_3_.func_77946_l();
|
||||||
- if (!flag1) {
|
- if (!flag1) {
|
||||||
+ if (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1) {
|
+ if (event.getUseBlock() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1)) {
|
||||||
ActionResultType actionresulttype = blockstate.func_227031_a_(p_219441_2_, p_219441_1_, p_219441_4_, p_219441_5_);
|
ActionResultType actionresulttype = blockstate.func_227031_a_(p_219441_2_, p_219441_1_, p_219441_4_, p_219441_5_);
|
||||||
if (actionresulttype.func_226246_a_()) {
|
if (actionresulttype.func_226246_a_()) {
|
||||||
CriteriaTriggers.field_232607_M_.func_226695_a_(p_219441_1_, blockpos, itemstack);
|
CriteriaTriggers.field_232607_M_.func_226695_a_(p_219441_1_, blockpos, itemstack);
|
||||||
@@ -312,7 +343,7 @@
|
@@ -311,8 +342,8 @@
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!p_219441_3_.func_190926_b() && !p_219441_1_.func_184811_cZ().func_185141_a(p_219441_3_.func_77973_b())) {
|
- if (!p_219441_3_.func_190926_b() && !p_219441_1_.func_184811_cZ().func_185141_a(p_219441_3_.func_77973_b())) {
|
||||||
- ItemUseContext itemusecontext = new ItemUseContext(p_219441_1_, p_219441_4_, p_219441_5_);
|
- ItemUseContext itemusecontext = new ItemUseContext(p_219441_1_, p_219441_4_, p_219441_5_);
|
||||||
|
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (!p_219441_3_.func_190926_b() && !p_219441_1_.func_184811_cZ().func_185141_a(p_219441_3_.func_77973_b()))) {
|
||||||
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.DENY) return ActionResultType.PASS;
|
+ if (event.getUseItem() == net.minecraftforge.eventbus.api.Event.Result.DENY) return ActionResultType.PASS;
|
||||||
ActionResultType actionresulttype1;
|
ActionResultType actionresulttype1;
|
||||||
if (this.func_73083_d()) {
|
if (this.func_73083_d()) {
|
||||||
|
|||||||
@@ -106,7 +106,16 @@
|
|||||||
if (flag2) {
|
if (flag2) {
|
||||||
serverplayerentity.field_71135_a.func_147359_a(new SPlaySoundEffectPacket(SoundEvents.field_232818_ms_, SoundCategory.BLOCKS, (double)blockpos.func_177958_n(), (double)blockpos.func_177956_o(), (double)blockpos.func_177952_p(), 1.0F, 1.0F));
|
serverplayerentity.field_71135_a.func_147359_a(new SPlaySoundEffectPacket(SoundEvents.field_232818_ms_, SoundCategory.BLOCKS, (double)blockpos.func_177958_n(), (double)blockpos.func_177956_o(), (double)blockpos.func_177952_p(), 1.0F, 1.0F));
|
||||||
}
|
}
|
||||||
@@ -786,7 +795,7 @@
|
@@ -769,6 +778,8 @@
|
||||||
|
this.field_192055_p.put(uuid, playeradvancements);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Forge: don't overwrite active player with a fake one.
|
||||||
|
+ if (!(p_192054_1_ instanceof net.minecraftforge.common.util.FakePlayer))
|
||||||
|
playeradvancements.func_192739_a(p_192054_1_);
|
||||||
|
return playeradvancements;
|
||||||
|
}
|
||||||
|
@@ -786,7 +797,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ServerPlayerEntity> func_181057_v() {
|
public List<ServerPlayerEntity> func_181057_v() {
|
||||||
@@ -115,7 +124,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -804,6 +813,7 @@
|
@@ -804,6 +815,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.func_148540_a(new STagsListPacket(this.field_72400_f.func_244266_aF()));
|
this.func_148540_a(new STagsListPacket(this.field_72400_f.func_244266_aF()));
|
||||||
@@ -123,7 +132,7 @@
|
|||||||
SUpdateRecipesPacket supdaterecipespacket = new SUpdateRecipesPacket(this.field_72400_f.func_199529_aN().func_199510_b());
|
SUpdateRecipesPacket supdaterecipespacket = new SUpdateRecipesPacket(this.field_72400_f.func_199529_aN().func_199510_b());
|
||||||
|
|
||||||
for(ServerPlayerEntity serverplayerentity : this.field_72404_b) {
|
for(ServerPlayerEntity serverplayerentity : this.field_72404_b) {
|
||||||
@@ -816,4 +826,12 @@
|
@@ -816,4 +828,12 @@
|
||||||
public boolean func_206257_x() {
|
public boolean func_206257_x() {
|
||||||
return this.field_72407_n;
|
return this.field_72407_n;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
--- a/net/minecraft/tags/BlockTags.java
|
--- a/net/minecraft/tags/BlockTags.java
|
||||||
+++ b/net/minecraft/tags/BlockTags.java
|
+++ b/net/minecraft/tags/BlockTags.java
|
||||||
@@ -97,6 +97,10 @@
|
@@ -97,6 +97,14 @@
|
||||||
return field_199899_c.func_232937_a_(p_199894_0_);
|
return field_199899_c.func_232937_a_(p_199894_0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Block> createOptional(ResourceLocation name) {
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Block> createOptional(ResourceLocation name) {
|
||||||
+ return field_199899_c.createOptional(name, () -> null);
|
+ return createOptional(name, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Block> createOptional(ResourceLocation name, @javax.annotation.Nullable java.util.Set<java.util.function.Supplier<Block>> defaults) {
|
||||||
|
+ return field_199899_c.createOptional(name, defaults);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static ITagCollection<Block> func_199896_a() {
|
public static ITagCollection<Block> func_199896_a() {
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
--- a/net/minecraft/tags/EntityTypeTags.java
|
--- a/net/minecraft/tags/EntityTypeTags.java
|
||||||
+++ b/net/minecraft/tags/EntityTypeTags.java
|
+++ b/net/minecraft/tags/EntityTypeTags.java
|
||||||
@@ -16,6 +16,10 @@
|
@@ -16,6 +16,14 @@
|
||||||
return field_219766_c.func_232937_a_(p_232896_0_);
|
return field_219766_c.func_232937_a_(p_232896_0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<EntityType<?>> createOptional(ResourceLocation name) {
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<EntityType<?>> createOptional(ResourceLocation name) {
|
||||||
+ return field_219766_c.createOptional(name, () -> null);
|
+ return createOptional(name, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<EntityType<?>> createOptional(ResourceLocation name, @javax.annotation.Nullable java.util.Set<java.util.function.Supplier<EntityType<?>>> defaults) {
|
||||||
|
+ return field_219766_c.createOptional(name, defaults);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static ITagCollection<EntityType<?>> func_219762_a() {
|
public static ITagCollection<EntityType<?>> func_219762_a() {
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
--- a/net/minecraft/tags/FluidTags.java
|
--- a/net/minecraft/tags/FluidTags.java
|
||||||
+++ b/net/minecraft/tags/FluidTags.java
|
+++ b/net/minecraft/tags/FluidTags.java
|
||||||
@@ -13,7 +13,16 @@
|
@@ -13,7 +13,20 @@
|
||||||
return field_206961_c.func_232937_a_(p_206956_0_);
|
return field_206961_c.func_232937_a_(p_206956_0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Fluid> createOptional(ResourceLocation name) {
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Fluid> createOptional(ResourceLocation name) {
|
||||||
+ return field_206961_c.createOptional(name, () -> null);
|
+ return createOptional(name, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Fluid> createOptional(ResourceLocation name, @javax.annotation.Nullable java.util.Set<java.util.function.Supplier<Fluid>> defaults) {
|
||||||
|
+ return field_206961_c.createOptional(name, defaults);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static List<? extends ITag.INamedTag<Fluid>> func_241280_c_() {
|
public static List<? extends ITag.INamedTag<Fluid>> func_241280_c_() {
|
||||||
|
|||||||
@@ -17,3 +17,36 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
default void func_242210_a(PacketBuffer p_242210_1_) {
|
default void func_242210_a(PacketBuffer p_242210_1_) {
|
||||||
|
@@ -58,4 +59,32 @@
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ static ITagCollectionSupplier reinjectOptionalTags(ITagCollectionSupplier tagCollectionSupplier) {
|
||||||
|
+ ITagCollection<Block> blockTagCollection = BlockTags.field_199899_c.reinjectOptionalTags(tagCollectionSupplier.func_241835_a());
|
||||||
|
+ ITagCollection<Item> itemTagCollection = ItemTags.field_199906_c.reinjectOptionalTags(tagCollectionSupplier.func_241836_b());
|
||||||
|
+ ITagCollection<Fluid> fluidTagCollection = FluidTags.field_206961_c.reinjectOptionalTags(tagCollectionSupplier.func_241837_c());
|
||||||
|
+ ITagCollection<EntityType<?>> entityTypeTagCollection = EntityTypeTags.field_219766_c.reinjectOptionalTags(tagCollectionSupplier.func_241838_d());
|
||||||
|
+ return new ITagCollectionSupplier() {
|
||||||
|
+ @Override
|
||||||
|
+ public ITagCollection<Block> func_241835_a() {
|
||||||
|
+ return blockTagCollection;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public ITagCollection<Item> func_241836_b() {
|
||||||
|
+ return itemTagCollection;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public ITagCollection<Fluid> func_241837_c() {
|
||||||
|
+ return fluidTagCollection;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public ITagCollection<EntityType<?>> func_241838_d() {
|
||||||
|
+ return entityTypeTagCollection;
|
||||||
|
+ }
|
||||||
|
+ };
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,11 +1,15 @@
|
|||||||
--- a/net/minecraft/tags/ItemTags.java
|
--- a/net/minecraft/tags/ItemTags.java
|
||||||
+++ b/net/minecraft/tags/ItemTags.java
|
+++ b/net/minecraft/tags/ItemTags.java
|
||||||
@@ -65,6 +65,10 @@
|
@@ -65,6 +65,14 @@
|
||||||
return field_199906_c.func_232937_a_(p_199901_0_);
|
return field_199906_c.func_232937_a_(p_199901_0_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Item> createOptional(ResourceLocation name) {
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Item> createOptional(ResourceLocation name) {
|
||||||
+ return field_199906_c.createOptional(name, () -> null);
|
+ return createOptional(name, null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static net.minecraftforge.common.Tags.IOptionalNamedTag<Item> createOptional(ResourceLocation name, @javax.annotation.Nullable java.util.Set<java.util.function.Supplier<Item>> defaults) {
|
||||||
|
+ return field_199906_c.createOptional(name, defaults);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static ITagCollection<Item> func_199903_a() {
|
public static ITagCollection<Item> func_199903_a() {
|
||||||
|
|||||||
@@ -23,3 +23,12 @@
|
|||||||
ITagCollectionSupplier itagcollectionsupplier = ITagCollectionSupplier.func_242209_a(itagcollection, itagcollection1, itagcollection2, itagcollection3);
|
ITagCollectionSupplier itagcollectionsupplier = ITagCollectionSupplier.func_242209_a(itagcollection, itagcollection1, itagcollection2, itagcollection3);
|
||||||
Multimap<ResourceLocation, ResourceLocation> multimap = TagRegistryManager.func_242198_b(itagcollectionsupplier);
|
Multimap<ResourceLocation, ResourceLocation> multimap = TagRegistryManager.func_242198_b(itagcollectionsupplier);
|
||||||
if (!multimap.isEmpty()) {
|
if (!multimap.isEmpty()) {
|
||||||
|
@@ -43,6 +46,8 @@
|
||||||
|
return p_232978_0_.getKey() + ":" + p_232978_0_.getValue();
|
||||||
|
}).sorted().collect(Collectors.joining(",")));
|
||||||
|
} else {
|
||||||
|
+ itagcollectionsupplier = ITagCollectionSupplier.reinjectOptionalTags(itagcollectionsupplier);
|
||||||
|
+ net.minecraftforge.common.ForgeTagHandler.reinjectOptionalTagsCustomTypes();
|
||||||
|
TagCollectionManager.func_242180_a(itagcollectionsupplier);
|
||||||
|
this.field_242230_e = itagcollectionsupplier;
|
||||||
|
}
|
||||||
@@ -15,17 +15,17 @@
|
|||||||
+ return add(new TagRegistry.NamedTag<>(new ResourceLocation(p_232937_1_)));
|
+ return add(new TagRegistry.NamedTag<>(new ResourceLocation(p_232937_1_)));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public net.minecraftforge.common.Tags.IOptionalNamedTag<T> createOptional(ResourceLocation key, @Nullable java.util.function.Supplier<Set<T>> defaults) {
|
+ public net.minecraftforge.common.Tags.IOptionalNamedTag<T> createOptional(ResourceLocation key, @Nullable Set<java.util.function.Supplier<T>> defaults) {
|
||||||
+ return add(new TagRegistry.OptionalNamedTag<>(key, defaults));
|
+ return add(new TagRegistry.OptionalNamedTag<>(key, defaults));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** Call via ForgeTagHandler#makeWrapperTag to avoid any exceptions due to calling this after it is safe to call {@link #func_232937_a_(String)} */
|
+ /** Call via ForgeTagHandler#makeWrapperTag to avoid any exceptions due to calling this after it is safe to call {@link #createTag(String)} */
|
||||||
+ public static <T> ITag.INamedTag<T> createDelayedTag(ResourceLocation tagRegistry, ResourceLocation name) {
|
+ public static <T> ITag.INamedTag<T> createDelayedTag(ResourceLocation tagRegistry, ResourceLocation name) {
|
||||||
+ return delayedAdd(tagRegistry, new TagRegistry.NamedTag<>(name));
|
+ return delayedAdd(tagRegistry, new TagRegistry.NamedTag<>(name));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** Call via ForgeTagHandler#createOptionalTag to avoid any exceptions due to calling this after it is safe to call {@link #createOptional(ResourceLocation, java.util.function.Supplier)} */
|
+ /** Call via ForgeTagHandler#createOptionalTag to avoid any exceptions due to calling this after it is safe to call {@link #createOptional(ResourceLocation, Set)} */
|
||||||
+ public static <T> net.minecraftforge.common.Tags.IOptionalNamedTag<T> createDelayedOptional(ResourceLocation tagRegistry, ResourceLocation key, @Nullable java.util.function.Supplier<Set<T>> defaults) {
|
+ public static <T> net.minecraftforge.common.Tags.IOptionalNamedTag<T> createDelayedOptional(ResourceLocation tagRegistry, ResourceLocation key, @Nullable Set<java.util.function.Supplier<T>> defaults) {
|
||||||
+ return delayedAdd(tagRegistry, new TagRegistry.OptionalNamedTag<>(key, defaults));
|
+ return delayedAdd(tagRegistry, new TagRegistry.OptionalNamedTag<>(key, defaults));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@@ -53,7 +53,28 @@
|
|||||||
this.field_232931_c_.add(namedtag);
|
this.field_232931_c_.add(namedtag);
|
||||||
return namedtag;
|
return namedtag;
|
||||||
}
|
}
|
||||||
@@ -56,7 +94,7 @@
|
@@ -46,6 +84,20 @@
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public ITagCollection<T> reinjectOptionalTags(ITagCollection<T> tagCollection) {
|
||||||
|
+ java.util.Map<ResourceLocation, ITag<T>> currentTags = tagCollection.func_241833_a();
|
||||||
|
+ java.util.Map<ResourceLocation, ITag<T>> missingOptionals = this.field_232931_c_.stream().filter(e -> e instanceof OptionalNamedTag && !currentTags.containsKey(e.func_230234_a_())).collect(Collectors.toMap(NamedTag::func_230234_a_, namedTag -> {
|
||||||
|
+ OptionalNamedTag<T> optionalNamedTag = (OptionalNamedTag<T>) namedTag;
|
||||||
|
+ optionalNamedTag.defaulted = true;
|
||||||
|
+ return optionalNamedTag.resolveDefaulted();
|
||||||
|
+ }));
|
||||||
|
+ if (!missingOptionals.isEmpty()) {
|
||||||
|
+ missingOptionals.putAll(currentTags);
|
||||||
|
+ return ITagCollection.func_242202_a(missingOptionals);
|
||||||
|
+ }
|
||||||
|
+ return tagCollection;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public ITagCollection<T> func_232939_b_() {
|
||||||
|
return this.field_232930_b_;
|
||||||
|
}
|
||||||
|
@@ -56,7 +108,7 @@
|
||||||
|
|
||||||
public Set<ResourceLocation> func_242189_b(ITagCollectionSupplier p_242189_1_) {
|
public Set<ResourceLocation> func_242189_b(ITagCollectionSupplier p_242189_1_) {
|
||||||
ITagCollection<T> itagcollection = this.field_242184_c.apply(p_242189_1_);
|
ITagCollection<T> itagcollection = this.field_242184_c.apply(p_242189_1_);
|
||||||
@@ -62,7 +83,7 @@
|
|||||||
ImmutableSet<ResourceLocation> immutableset = ImmutableSet.copyOf(itagcollection.func_199908_a());
|
ImmutableSet<ResourceLocation> immutableset = ImmutableSet.copyOf(itagcollection.func_199908_a());
|
||||||
return Sets.difference(set, immutableset);
|
return Sets.difference(set, immutableset);
|
||||||
}
|
}
|
||||||
@@ -93,5 +131,45 @@
|
@@ -93,5 +145,40 @@
|
||||||
public List<T> func_230236_b_() {
|
public List<T> func_230236_b_() {
|
||||||
return this.func_232944_c_().func_230236_b_();
|
return this.func_232944_c_().func_230236_b_();
|
||||||
}
|
}
|
||||||
@@ -77,10 +98,10 @@
|
|||||||
+
|
+
|
||||||
+ private static class OptionalNamedTag<T> extends NamedTag<T> implements net.minecraftforge.common.Tags.IOptionalNamedTag<T> {
|
+ private static class OptionalNamedTag<T> extends NamedTag<T> implements net.minecraftforge.common.Tags.IOptionalNamedTag<T> {
|
||||||
+ @Nullable
|
+ @Nullable
|
||||||
+ private final java.util.function.Supplier<Set<T>> defaults;
|
+ private final Set<java.util.function.Supplier<T>> defaults;
|
||||||
+ private boolean defaulted = true;
|
+ private boolean defaulted = false;
|
||||||
+
|
+
|
||||||
+ private OptionalNamedTag(ResourceLocation name, @Nullable java.util.function.Supplier<Set<T>> defaults) {
|
+ private OptionalNamedTag(ResourceLocation name, @Nullable Set<java.util.function.Supplier<T>> defaults) {
|
||||||
+ super(name);
|
+ super(name);
|
||||||
+ this.defaults = defaults;
|
+ this.defaults = defaults;
|
||||||
+ }
|
+ }
|
||||||
@@ -90,16 +111,11 @@
|
|||||||
+ return defaulted;
|
+ return defaulted;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ Tag<T> resolveDefaulted() {
|
||||||
+ void func_232943_a_(Function<ResourceLocation, ITag<T>> p_232943_1_) {
|
+ if (defaults == null || defaults.isEmpty()) {
|
||||||
+ super.func_232943_a_(p_232943_1_);
|
+ return Tag.func_241284_a_();
|
||||||
+ if (this.field_232942_b_ == null) {
|
|
||||||
+ this.defaulted = true;
|
|
||||||
+ Set<T> defs = defaults == null ? null : defaults.get();
|
|
||||||
+ this.field_232942_b_ = defs == null ? Tag.func_241284_a_() : Tag.func_241286_a_(defs);
|
|
||||||
+ } else {
|
|
||||||
+ this.defaulted = false;
|
|
||||||
+ }
|
+ }
|
||||||
|
+ return Tag.func_241286_a_(ImmutableSet.copyOf(defaults.stream().map(java.util.function.Supplier::get).collect(Collectors.toSet())));
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
|
|||||||
@@ -118,8 +118,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void func_145843_s() {
|
+ protected void invalidateCaps() {
|
||||||
+ super.func_145843_s();
|
+ super.invalidateCaps();
|
||||||
+ for (int x = 0; x < handlers.length; x++)
|
+ for (int x = 0; x < handlers.length; x++)
|
||||||
+ handlers[x].invalidate();
|
+ handlers[x].invalidate();
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
+ throw new IllegalStateException("Enum not extended");
|
+ throw new IllegalStateException("Enum not extended");
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public static BannerPattern create(String enumName, String fileNameIn, String hashNameIn, boolean p_i231861_5_) {
|
+ public static BannerPattern create(String enumName, String fileNameIn, String hashNameIn, boolean hasPatternItem) {
|
||||||
+ throw new IllegalStateException("Enum not extended");
|
+ throw new IllegalStateException("Enum not extended");
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
if (itemstack.func_190926_b()) {
|
if (itemstack.func_190926_b()) {
|
||||||
return false;
|
return false;
|
||||||
} else if (!PotionBrewing.func_185205_a(itemstack)) {
|
} else if (!PotionBrewing.func_185205_a(itemstack)) {
|
||||||
@@ -163,16 +164,16 @@
|
@@ -163,22 +164,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void func_145940_l() {
|
private void func_145940_l() {
|
||||||
@@ -18,18 +18,26 @@
|
|||||||
- for(int i = 0; i < 3; ++i) {
|
- for(int i = 0; i < 3; ++i) {
|
||||||
- this.field_145945_j.set(i, PotionBrewing.func_185212_d(itemstack, this.field_145945_j.get(i)));
|
- this.field_145945_j.set(i, PotionBrewing.func_185212_d(itemstack, this.field_145945_j.get(i)));
|
||||||
- }
|
- }
|
||||||
|
-
|
||||||
|
- itemstack.func_190918_g(1);
|
||||||
+ net.minecraftforge.common.brewing.BrewingRecipeRegistry.brewPotions(field_145945_j, itemstack, field_145947_i);
|
+ net.minecraftforge.common.brewing.BrewingRecipeRegistry.brewPotions(field_145945_j, itemstack, field_145947_i);
|
||||||
|
|
||||||
itemstack.func_190918_g(1);
|
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPotionBrewed(field_145945_j);
|
+ net.minecraftforge.event.ForgeEventFactory.onPotionBrewed(field_145945_j);
|
||||||
BlockPos blockpos = this.func_174877_v();
|
BlockPos blockpos = this.func_174877_v();
|
||||||
- if (itemstack.func_77973_b().func_77634_r()) {
|
- if (itemstack.func_77973_b().func_77634_r()) {
|
||||||
- ItemStack itemstack1 = new ItemStack(itemstack.func_77973_b().func_77668_q());
|
- ItemStack itemstack1 = new ItemStack(itemstack.func_77973_b().func_77668_q());
|
||||||
+ if (itemstack.hasContainerItem()) {
|
+ if (itemstack.hasContainerItem()) {
|
||||||
+ ItemStack itemstack1 = itemstack.getContainerItem();
|
+ ItemStack itemstack1 = itemstack.getContainerItem();
|
||||||
|
+ itemstack.func_190918_g(1);
|
||||||
if (itemstack.func_190926_b()) {
|
if (itemstack.func_190926_b()) {
|
||||||
itemstack = itemstack1;
|
itemstack = itemstack1;
|
||||||
} else if (!this.field_145850_b.field_72995_K) {
|
} else if (!this.field_145850_b.field_72995_K) {
|
||||||
|
InventoryHelper.func_180173_a(this.field_145850_b, (double)blockpos.func_177958_n(), (double)blockpos.func_177956_o(), (double)blockpos.func_177952_p(), itemstack1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ else itemstack.func_190918_g(1);
|
||||||
|
|
||||||
|
this.field_145945_j.set(3, itemstack);
|
||||||
|
this.field_145850_b.func_217379_c(1035, blockpos, 0);
|
||||||
@@ -229,13 +230,13 @@
|
@@ -229,13 +230,13 @@
|
||||||
|
|
||||||
public boolean func_94041_b(int p_94041_1_, ItemStack p_94041_2_) {
|
public boolean func_94041_b(int p_94041_1_, ItemStack p_94041_2_) {
|
||||||
@@ -68,8 +76,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void func_145843_s() {
|
+ protected void invalidateCaps() {
|
||||||
+ super.func_145843_s();
|
+ super.invalidateCaps();
|
||||||
+ for (int x = 0; x < handlers.length; x++)
|
+ for (int x = 0; x < handlers.length; x++)
|
||||||
+ handlers[x].invalidate();
|
+ handlers[x].invalidate();
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -51,8 +51,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void func_145843_s() {
|
+ protected void invalidateCaps() {
|
||||||
+ super.func_145843_s();
|
+ super.invalidateCaps();
|
||||||
+ if (chestHandler != null)
|
+ if (chestHandler != null)
|
||||||
+ chestHandler.invalidate();
|
+ chestHandler.invalidate();
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/tileentity/LockableTileEntity.java
|
--- a/net/minecraft/tileentity/LockableTileEntity.java
|
||||||
+++ b/net/minecraft/tileentity/LockableTileEntity.java
|
+++ b/net/minecraft/tileentity/LockableTileEntity.java
|
||||||
@@ -81,4 +81,22 @@
|
@@ -81,4 +81,21 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract Container func_213906_a(int p_213906_1_, PlayerInventory p_213906_2_);
|
protected abstract Container func_213906_a(int p_213906_1_, PlayerInventory p_213906_2_);
|
||||||
@@ -10,7 +10,6 @@
|
|||||||
+ return new net.minecraftforge.items.wrapper.InvWrapper(this);
|
+ return new net.minecraftforge.items.wrapper.InvWrapper(this);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @javax.annotation.Nullable
|
|
||||||
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, @javax.annotation.Nullable net.minecraft.util.Direction side) {
|
+ public <T> net.minecraftforge.common.util.LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> cap, @javax.annotation.Nullable net.minecraft.util.Direction side) {
|
||||||
+ if (!this.field_145846_f && cap == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
|
+ if (!this.field_145846_f && cap == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
|
||||||
+ return itemHandler.cast();
|
+ return itemHandler.cast();
|
||||||
@@ -18,8 +17,8 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void func_145843_s() {
|
+ protected void invalidateCaps() {
|
||||||
+ super.func_145843_s();
|
+ super.invalidateCaps();
|
||||||
+ itemHandler.invalidate();
|
+ itemHandler.invalidate();
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
this.field_145850_b.func_175666_e(this.field_174879_c, this.field_195045_e.func_177230_c());
|
this.field_145850_b.func_175666_e(this.field_174879_c, this.field_195045_e.func_177230_c());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,6 +140,8 @@
|
@@ -133,8 +140,15 @@
|
||||||
|
|
||||||
public void func_145843_s() {
|
public void func_145843_s() {
|
||||||
this.field_145846_f = true;
|
this.field_145846_f = true;
|
||||||
@@ -57,8 +57,15 @@
|
|||||||
+ requestModelDataUpdate();
|
+ requestModelDataUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ @Override
|
||||||
|
+ public void onChunkUnloaded() {
|
||||||
|
+ this.invalidateCaps();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
public void func_145829_t() {
|
public void func_145829_t() {
|
||||||
@@ -175,6 +184,13 @@
|
this.field_145846_f = false;
|
||||||
|
}
|
||||||
|
@@ -175,6 +189,13 @@
|
||||||
return this.field_200663_e;
|
return this.field_200663_e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,3 +9,26 @@
|
|||||||
private static final Logger field_206866_A = LogManager.getLogger();
|
private static final Logger field_206866_A = LogManager.getLogger();
|
||||||
public static final TileEntityType<FurnaceTileEntity> field_200971_b = func_200966_a("furnace", TileEntityType.Builder.func_223042_a(FurnaceTileEntity::new, Blocks.field_150460_al));
|
public static final TileEntityType<FurnaceTileEntity> field_200971_b = func_200966_a("furnace", TileEntityType.Builder.func_223042_a(FurnaceTileEntity::new, Blocks.field_150460_al));
|
||||||
public static final TileEntityType<ChestTileEntity> field_200972_c = func_200966_a("chest", TileEntityType.Builder.func_223042_a(ChestTileEntity::new, Blocks.field_150486_ae));
|
public static final TileEntityType<ChestTileEntity> field_200972_c = func_200966_a("chest", TileEntityType.Builder.func_223042_a(ChestTileEntity::new, Blocks.field_150486_ae));
|
||||||
|
@@ -54,6 +54,7 @@
|
||||||
|
private final Supplier<? extends T> field_200995_z;
|
||||||
|
private final Set<Block> field_223046_I;
|
||||||
|
private final Type<?> field_206867_C;
|
||||||
|
+ private final net.minecraftforge.common.util.ReverseTagWrapper<TileEntityType<?>> reverseTags = new net.minecraftforge.common.util.ReverseTagWrapper<>(this, () -> net.minecraft.tags.TagCollectionManager.func_242178_a().getCustomTypeCollection(net.minecraftforge.registries.ForgeRegistries.TILE_ENTITIES));
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public static ResourceLocation func_200969_a(TileEntityType<?> p_200969_0_) {
|
||||||
|
@@ -75,6 +76,14 @@
|
||||||
|
this.field_206867_C = p_i51497_3_;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public java.util.Set<net.minecraft.util.ResourceLocation> getTags() {
|
||||||
|
+ return reverseTags.getTagNames();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean isIn(net.minecraft.tags.ITag<TileEntityType<?>> tag) {
|
||||||
|
+ return tag.func_230235_a_(this);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@Nullable
|
||||||
|
public T func_200968_a() {
|
||||||
|
return this.field_200995_z.get();
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- a/net/minecraft/util/ResourceLocation.java
|
||||||
|
+++ b/net/minecraft/util/ResourceLocation.java
|
||||||
|
@@ -112,6 +112,12 @@
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Normal compare sorts by path first, this compares namespace first.
|
||||||
|
+ public int compareNamespaced(ResourceLocation o) {
|
||||||
|
+ int ret = this.field_110626_a.compareTo(o.field_110626_a);
|
||||||
|
+ return ret != 0 ? ret : this.field_110625_b.compareTo(o.field_110625_b);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public static ResourceLocation func_195826_a(StringReader p_195826_0_) throws CommandSyntaxException {
|
||||||
|
int i = p_195826_0_.getCursor();
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/util/SharedConstants.java
|
--- a/net/minecraft/util/SharedConstants.java
|
||||||
+++ b/net/minecraft/util/SharedConstants.java
|
+++ b/net/minecraft/util/SharedConstants.java
|
||||||
@@ -40,6 +40,7 @@
|
@@ -44,6 +44,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|||||||
Loaded 100 of 340 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user