diff --git a/.github/ISSUE_TEMPLATE/000-report-bug.yml b/.github/ISSUE_TEMPLATE/000-report-bug.yml
index c9e296ed7..4ba0b5f20 100644
--- a/.github/ISSUE_TEMPLATE/000-report-bug.yml
+++ b/.github/ISSUE_TEMPLATE/000-report-bug.yml
@@ -15,7 +15,7 @@ body:
attributes:
label: Cleanroom Version
description: "What version of the Cleanroom are you using?"
- placeholder: "Example: 15.24.0.3000"
+ placeholder: "Example: 0.2.4-alpha"
validations:
required: true
- type: dropdown
@@ -25,13 +25,11 @@ body:
description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
options:
- Java 8
- - Java 9
- - Java 11
- - Java 17
- - Java 19
- - Java 20
- Java 21
- Java 22
+ - Java 23
+ - Java 24 (Release Candidate)
+ - Java 25 (Early Access)
- Other (Please Specify)
validations:
required: true
@@ -65,14 +63,6 @@ body:
placeholder: "List of mods goes here"
validations:
required: true
- - type: textarea
- id: notes
- attributes:
- label: MMC Instance Notes
- description: "Obtain from Notes sections if using MMC instance pack."
- placeholder: "Notes goes here"
- validations:
- required: true
- type: checkboxes
id: final
attributes:
@@ -81,11 +71,13 @@ body:
options:
- label: "I have searched the issues and haven't found a similar issue."
required: true
- - label: "I have read the known incompatibilities and this is not related to one of those."
+ - label: "I have read the readme and know that what is action build and non-MMC based launcher are unsupported."
+ required: true
+ - label: "I have installed [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue) and it does not fix this issue."
required: true
- - label: "I have installed [Fugue](https://github.com/CleanroomMC/Fugue) and it does not fix this issue."
+ - label: "I have installed [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar) and it does not fix this issue."
required: true
- - label: "I am using experimental branch and have installed [Scalar](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1) and it does not fix this issue."
+ - label: "I have switched my Forgelin and LibrarianLib to continuous versions(check readme for more detail)."
required: true
- label: "I am running a test build from Cleanroom Github Actions. (Or, if I've compiled it myself I plan to fix the issue)"
required: true
diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
new file mode 100644
index 000000000..df3bfce57
--- /dev/null
+++ b/.github/workflows/Publish.yml
@@ -0,0 +1,43 @@
+name: Manually Publish
+
+on:
+ workflow_dispatch:
+
+jobs:
+
+ build:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: write
+ steps:
+ - uses: actions/checkout@v4.2.2
+ with:
+ fetch-tags: true
+ fetch-depth: 0
+
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4.5.0
+ with:
+ java-version: '21'
+ distribution: 'temurin'
+
+ - name: Fix Gradle permission
+ run: chmod +x ./gradlew
+
+ - name: Setup Forge env
+ run: ./gradlew setup -Prun_number=${{ github.run_number }}
+
+ - name: Get version
+ run: echo "CLEANROOM_VERSION=$(cat version.txt)" >> $GITHUB_ENV
+
+ - name: Stop Gradle daemon
+ run: ./gradlew --stop
+
+ - name: Build Jars
+ run: ./gradlew installerJar -Prun_number=${{ github.run_number }}
+
+ - name: Stop Gradle daemon again
+ run: ./gradlew --stop
+
+ - name: Publish to maven for mod development
+ run: ./gradlew publish -PoutlandUsername=${{ secrets.MAVEN_USERNAME }} -PoutlandPassword="${{ secrets.MAVEN_PASSWORD }}" -Prun_number=${{ github.run_number }}
\ No newline at end of file
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index ead13b9b9..00ca23713 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -12,13 +12,13 @@ jobs:
permissions:
contents: write
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.2.2
with:
fetch-tags: true
fetch-depth: 0
- name: Set up JDK 21
- uses: actions/setup-java@v4.2.1
+ uses: actions/setup-java@v4.5.0
with:
java-version: '21'
distribution: 'temurin'
@@ -45,13 +45,13 @@ jobs:
run: ./gradlew publish -PoutlandUsername=${{ secrets.MAVEN_USERNAME }} -PoutlandPassword="${{ secrets.MAVEN_PASSWORD }}" -Prun_number=${{ github.run_number }} -Prelease=true
- name: Checkout CleanroomMMC
- uses: actions/checkout@v4.1.4
+ uses: actions/checkout@v4.2.2
with:
repository: CleanroomMC/CleanroomMMC
path: mmc
- name: setup python
- uses: actions/setup-python@v5.1.0
+ uses: actions/setup-python@v5.3.0
with:
python-version: '3.12'
diff --git a/.gitignore b/.gitignore
index 5ebc21673..73d2832d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
-/.idea/
+/.idea/*
/.run/
/.gradle/
/projects/
/buildSrc/.gradle/
/buildSrc/build/
/logs/
+build/
version.txt
-src/main/java/com/cleanroommc/common/CleanroomVersion.java
\ No newline at end of file
+src/main/java/com/cleanroommc/common/CleanroomVersion.java
+build/
+
+!/.idea/icon.svg
diff --git a/.idea/icon.svg b/.idea/icon.svg
new file mode 100644
index 000000000..5f2bd79d0
--- /dev/null
+++ b/.idea/icon.svg
@@ -0,0 +1,14 @@
+
+
diff --git a/README.md b/README.md
index e76514378..145075186 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
### Implemented
- 1.12.2 on Java 21
-- LWJGL3
+- *Latest* LWJGL3
- A working *mod development template/kit*
- Patches for loading incompatible mods
- Built-in Mixin w/ handy bootstrapping
@@ -25,16 +25,20 @@
- Cleanroom Minecraft (Continuation + Revamp of MinecraftForge)
- Customized Mixin
- Bytecode Patcher (Coming Soon) \[Inspired by [Bansoukou](https://github.com/LoliKingdom/Bansoukou) and [Bytecode Patcher](https://github.com/jbredwards/Bytecode-Patcher)]
-- [Fugue](https://github.com/CleanroomMC/Fugue), a mod patches many incompatibilities.
+- [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue), a mod patches many incompatibilities.
- Javassist
-- [Scalar](https://github.com/CleanroomMC/Scalar/releases/tag/2.11.1), a Scala provider. We made Scala libraries become a standalone mod so it can be updated.
+- [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar), a Scala provider. We made Scala libraries become a standalone mod so it can be updated.
+- [Forgelin-Continuous](https://www.curseforge.com/minecraft/mc-mods/forgelin-continuous) and [LibrarianLib-Continuous](https://www.curseforge.com/minecraft/mc-mods/librarianlib-continuous)
## Download & Installation:
- For MultiMC-based launchers (PolyMC, PrismLauncher), download the MMC instance from [release](https://github.com/CleanroomMC/Cleanroom/releases), import it in your launcher(alternatively unzip patches and json inside to your 1.12 instance).
- For regular launcher (official launcher, AT launcher, FTB, HMCL), download the installer jar from release. You could use the installer like the Forge one.
-- **Remember to install Fugue!**
-- **And Scalar!**
+- **WARNING:** Only MultiMC-based launchers are officially supported. This is because of the limit on removing vanilla libraries in other launchers.
+- **Remember to install [Fugue](https://www.curseforge.com/minecraft/mc-mods/fugue)!**
+- **And [Scalar](https://www.curseforge.com/minecraft/mc-mods/scalar)!**
+- If you were told to use **action builds** (aka bleeding edge), here: [Cleanroom jar](https://github.com/CleanroomMC/Cleanroom/actions), [Cleanroom MMC zip](https://github.com/CleanroomMC/CleanroomMMC/actions/), [Fugue](https://github.com/CleanroomMC/Fugue/actions)
+- You need to log-in with a GitHub account to download action artifacts.
## Build Instructions:
@@ -49,7 +53,7 @@
- Run `gradlew genPatches` before commit, or the changes won't exist
- Modifications on `src/` doesn't need generating patches
- [Tips from Forge](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge) are still apply, keep the patches clean!
-- The current patches is full of useless hunks after we switched to VineFlower, we encourage contributors to manual clean up their patches
+- The current patches is full of useless hunks after we switched to VineFlower, we encourage contributors to clean up these patches manually.
## Mod Development:
diff --git a/build.gradle b/build.gradle
index 18084b958..cbf3cae17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -245,8 +245,8 @@ project(':cleanroom') {
// Do not change the order unless it is required so
lwjglLibraries = [
[
- 'lwjgl3-glfw', 'lwjgl3-jemalloc', 'lwjgl3-openal',
- 'lwjgl3-opengl', 'lwjgl3-stb', 'lwjgl3-tinyfd', 'lwjgl3'
+ 'lwjgl-glfw', 'lwjgl-jemalloc', 'lwjgl-openal',
+ 'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-tinyfd', 'lwjgl'
],
[
@@ -290,7 +290,7 @@ project(':cleanroom') {
environment 'FORGE_GROUP', project.group
environment 'FORGE_VERSION', props.last_forge_version
- jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true' + '-Djava.system.class.loader=net.minecraft.launchwrapper.LaunchClassLoader'
+ jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true'
//jvmArgs jvm_arguments
// Lazily supply the Mappings target, createSrg2Mcp.getMappings() doesn't get populated until later
@@ -416,12 +416,14 @@ project(':cleanroom') {
}
dependencies {
+ compileOnly "com.cleanroommc:lwjglx:1.0.0"
+ installer "com.cleanroommc:lwjglxx:1.0.16"
lwjglLibraries[0].each {
- installer "org.lwjgl3:$it:$props.lwjgl_version"
- runtimeOnly "org.lwjgl3:$it::$lwjglArch"
+ installer "org.lwjgl:$it:$props.lwjgl_version"
+ runtimeOnly "org.lwjgl:$it::$lwjglArch"
lwjglLibraries[1].each { arch ->
- lwjglNatives "org.lwjgl3:$it:$props.lwjgl_version:$arch"
+ lwjglNatives "org.lwjgl:$it:$props.lwjgl_version:$arch"
}
}
@@ -435,36 +437,39 @@ project(':cleanroom') {
installer "org.ow2.asm:asm-deprecated:$props.asm_deprecated"
//installer "com.cleanroommc:bouncepad:$props.bouncepad_version"
- installer "top.outlands:foundation:0.13.8"
+ installer "top.outlands:foundation:0.14.3"
installer 'org.burningwave:jvm-driver:8.16.1'
installer 'io.github.toolfactory:jvm-driver:9.7.1'
installer 'io.github.toolfactory:narcissus:1.0.7'
installer 'org.javassist:javassist:3.30.2-GA'
installer "zone.rong:imaginebreaker:2.1"
- installer 'com.ibm.icu:icu4j:75.1'
+ installer 'com.ibm.icu:icu4j:76.1'
- installer 'org.jline:jline:3.26.1'
+ installer 'org.jline:jline:3.29.0'
+ installer 'org.jline:jline-native:3.29.0'
+
+ installer 'net.java.jinput:jinput:2.0.10'
installer 'lzma:lzma:0.0.1'
installer 'java3d:vecmath:1.5.2'
installer 'net.sf.trove4j:trove4j:3.0.3'
- installer 'org.apache.maven:maven-artifact:3.9.7'
+ installer 'org.apache.maven:maven-artifact:3.9.9'
installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
- installer 'org.apache.commons:commons-lang3:3.14.0'
- installer 'org.apache.commons:commons-compress:1.26.2'
+ installer 'org.apache.commons:commons-lang3:3.17.0'
+ installer 'org.apache.commons:commons-compress:1.27.1'
installer 'org.apache.httpcomponents:httpclient:4.5.14'
installer 'org.apache.httpcomponents:httpcore:4.4.16'
- installer 'com.github.oshi:oshi-core:6.5.0'
- installer 'net.java.dev.jna:jna:5.14.0'
- installer 'net.java.dev.jna:jna-platform:5.14.0'
- installer 'it.unimi.dsi:fastutil:8.5.13'
- installer 'commons-codec:commons-codec:1.16.0'
- installer 'commons-io:commons-io:2.16.1'
- installer 'commons-logging:commons-logging:1.3.1'
- installer 'com.google.guava:guava:33.2.1-jre'
+ installer 'com.github.oshi:oshi-core:6.6.6'
+ installer 'net.java.dev.jna:jna:5.16.0'
+ installer 'net.java.dev.jna:jna-platform:5.16.0'
+ installer 'it.unimi.dsi:fastutil:8.5.15'
+ installer 'commons-codec:commons-codec:1.17.2'
+ installer 'commons-io:commons-io:2.18.0'
+ installer 'commons-logging:commons-logging:1.3.4'
+ installer 'com.google.guava:guava:33.4.0-jre'
installer 'com.google.guava:failureaccess:1.0.2'
- installer 'com.google.code.gson:gson:2.11.0'
+ installer 'com.google.code.gson:gson:2.12.1'
installer 'com.google.code.findbugs:jsr305:3.0.2'
// Netty
@@ -482,28 +487,33 @@ project(':cleanroom') {
installer "io.netty:netty-codec-dns:$props.netty_version"
installer "io.netty:netty-resolver-dns:$props.netty_version"
- // installer 'io.netty:netty-all:4.1.93.Final'
-
- // TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version
- installer 'org.apache.logging.log4j:log4j-api:2.23.1'
- installer 'org.apache.logging.log4j:log4j-core:2.23.1'
- installer 'org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1'
- installer 'org.slf4j:slf4j-api:2.0.13'
- installer 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+ installer 'org.apache.logging.log4j:log4j-api:2.24.1'
+ installer 'org.apache.logging.log4j:log4j-core:2.24.1'
+ installer 'org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1'
+ installer 'org.slf4j:slf4j-api:2.0.16'
+ installer 'jakarta.annotation:jakarta.annotation-api:3.0.0'
installer 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+ installer 'org.glassfish.jaxb:jaxb-core:4.0.5'
+ installer 'org.glassfish.jaxb:txw2:4.0.5'
+ installer 'com.sun.istack:istack-commons-runtime:4.2.0'
+ installer 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
+ installer 'org.jvnet.staxex:stax-ex:2.1.0'
+ installer 'com.sun.xml.fastinfoset:FastInfoset:2.1.1'
installer 'jakarta.xml.ws:jakarta.xml.ws-api:4.0.2'
installer 'jakarta.activation:jakarta.activation-api:2.1.3'
installer 'org.glassfish.corba:glassfish-corba-omgapi:4.2.5'
installer 'org.openjdk.nashorn:nashorn-core:15.4'
+ // installer 'ca.weblite:java-objc-bridge:1.2'
+
// Mixin
- installer 'com.cleanroommc:sponge-mixin:0.20.5+mixin.0.8.7'
- installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.4.0')
+ installer 'com.cleanroommc:sponge-mixin:0.20.10+mixin.0.8.7'
+ installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.5.0-beta.5')
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
- testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.1'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
+ testImplementation 'org.junit.vintage:junit-vintage-engine:5.11.0'
testImplementation 'org.opentest4j:opentest4j:1.3.0' // Needed for junit 5
- testImplementation 'org.hamcrest:hamcrest:2.2' // Needs advanced matching for list order
+ testImplementation 'org.hamcrest:hamcrest:3.0' // Needs advanced matching for list order
}
@@ -605,7 +615,7 @@ project(':cleanroom') {
zip.entries().findAll {
!it.directory && it.name.endsWith('.class')
}.each { entry ->
- new ClassReader(zip.getInputStream(entry)).accept(new ClassVisitor(Opcodes.ASM7) {
+ new ClassReader(zip.getInputStream(entry)).accept(new ClassVisitor(Opcodes.ASM9) {
String name
@@ -1045,4 +1055,4 @@ subprojects {
options.compilerArgs += compiler_jvm_arguments
options.encoding = 'UTF-8'
}
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy b/buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy
index a7c3b3a77..4ff247f87 100644
--- a/buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy
+++ b/buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy
@@ -151,7 +151,7 @@ class Util {
"https://maven.minecraftforge.net/",
"https://repo.maven.apache.org/maven2/",
"https://libraries.minecraft.net/",
- "https://maven.outlands.top/releases/"
+ "https://maven.arcseekers.com/releases/"
]
try {
return urlList.stream().map(original -> original + path)
diff --git a/gradle.properties b/gradle.properties
index 1fd47f452..bb75a0351 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ last_forge_version = 14.23.5.2860
mapping_channel = stable
mapping_version = 39-1.12
minecraft_version = 1.12.2
-mcp_version = 20240102.171137
+mcp_version = 20241220.122414
# Related Tooling
special_source = net.md-5:SpecialSource:1.9.0
@@ -16,10 +16,10 @@ binary_patcher = net.minecraftforge:binarypatcher:1.1.1:fatjar
installer_tools_version = 1.4.1
# Libraries
-asm_version = 9.7
+asm_version = 9.7.1
asm_deprecated = 7.1
-netty_version = 4.1.110.Final
-lwjgl_version = 3.3.4-27-CLEANROOM
+netty_version = 4.1.117.Final
+lwjgl_version = 3.3.6
# Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 19cfad969..e382118b0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/patches/minecraft/net/minecraft/advancements/AdvancementManager.java.patch b/patches/minecraft/net/minecraft/advancements/AdvancementManager.java.patch
index 2c7a3b195..f273709ce 100644
--- a/patches/minecraft/net/minecraft/advancements/AdvancementManager.java.patch
+++ b/patches/minecraft/net/minecraft/advancements/AdvancementManager.java.patch
@@ -1,40 +1,6 @@
--- before/net/minecraft/advancements/AdvancementManager.java
+++ after/net/minecraft/advancements/AdvancementManager.java
-@@ -9,6 +9,7 @@
- import com.google.gson.JsonObject;
- import com.google.gson.JsonParseException;
- import java.io.BufferedReader;
-+import java.io.Closeable;
- import java.io.File;
- import java.io.IOException;
- import java.io.Reader;
-@@ -41,23 +42,14 @@
- public class AdvancementManager
- {
- private static final Logger field_192782_a = LogManager.getLogger();
-- public static final Gson field_192783_b = new GsonBuilder()
-- .registerTypeHierarchyAdapter(
-- Advancement.Builder.class,
-- new JsonDeserializer()
-+ public static final Gson field_192783_b = (new GsonBuilder()).registerTypeHierarchyAdapter(Advancement.Builder.class, new JsonDeserializer()
- {
- public Advancement.Builder deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) throws JsonParseException
- {
- JsonObject jsonobject = JsonUtils.func_151210_l(p_deserialize_1_, "advancement");
- return Advancement.Builder.func_192059_a(jsonobject, p_deserialize_3_);
- }
-- }
-- )
-- .registerTypeAdapter(AdvancementRewards.class, new AdvancementRewards.Deserializer())
-- .registerTypeHierarchyAdapter(ITextComponent.class, new ITextComponent.Serializer())
-- .registerTypeHierarchyAdapter(Style.class, new Style.Serializer())
-- .registerTypeAdapterFactory(new EnumTypeAdapterFactory())
-- .create();
-+ }).registerTypeAdapter(AdvancementRewards.class, new AdvancementRewards.Deserializer()).registerTypeHierarchyAdapter(ITextComponent.class, new ITextComponent.Serializer()).registerTypeHierarchyAdapter(Style.class, new Style.Serializer()).registerTypeAdapterFactory(new EnumTypeAdapterFactory()).create();
- private static final AdvancementList field_192784_c = new AdvancementList();
- private final File field_192785_d;
- private boolean field_193768_e;
-@@ -74,6 +66,7 @@
+@@ -74,6 +74,7 @@
field_192784_c.func_192087_a();
Map map = this.func_192781_c();
this.func_192777_a(map);
@@ -42,75 +8,3 @@
field_192784_c.func_192083_a(map);
for (Advancement advancement : field_192784_c.func_192088_b())
-@@ -94,11 +87,11 @@
- {
- if (this.field_192785_d == null)
- {
-- return Maps.newHashMap();
-+ return Maps.newHashMap();
- }
- else
- {
-- Map map = Maps.newHashMap();
-+ Map map = Maps.newHashMap();
- this.field_192785_d.mkdirs();
-
- for (File file1 : FileUtils.listFiles(this.field_192785_d, new String[] {"json"}, true))
-@@ -112,9 +105,7 @@
-
- try
- {
-- Advancement.Builder advancement$builder = JsonUtils.func_188178_a(
-- field_192783_b, FileUtils.readFileToString(file1, StandardCharsets.UTF_8), Advancement.Builder.class
-- );
-+ Advancement.Builder advancement$builder = (Advancement.Builder)JsonUtils.func_188178_a(field_192783_b, FileUtils.readFileToString(file1, StandardCharsets.UTF_8), Advancement.Builder.class);
-
- if (advancement$builder == null)
- {
-@@ -149,12 +140,7 @@
- {
- URL url = AdvancementManager.class.getResource("/assets/.mcassetsroot");
-
-- if (url == null)
-- {
-- field_192782_a.error("Couldn't find .mcassetsroot");
-- this.field_193768_e = true;
-- }
-- else
-+ if (url != null)
- {
- URI uri = url.toURI();
- Path path;
-@@ -195,7 +181,7 @@
- try
- {
- bufferedreader = Files.newBufferedReader(path1);
-- Advancement.Builder advancement$builder = JsonUtils.func_193839_a(field_192783_b, bufferedreader, Advancement.Builder.class);
-+ Advancement.Builder advancement$builder = (Advancement.Builder)JsonUtils.func_193839_a(field_192783_b, bufferedreader, Advancement.Builder.class);
- p_192777_1_.put(resourcelocation, advancement$builder);
- }
- catch (JsonParseException jsonparseexception)
-@@ -215,16 +201,22 @@
- }
- }
- }
-+
-+ return;
- }
-+
-+ field_192782_a.error("Couldn't find .mcassetsroot");
-+ this.field_193768_e = true;
- }
- catch (IOException | URISyntaxException urisyntaxexception)
- {
- field_192782_a.error("Couldn't get a list of all built-in advancement files", (Throwable)urisyntaxexception);
- this.field_193768_e = true;
-+ return;
- }
- finally
- {
-- IOUtils.closeQuietly(filesystem);
-+ IOUtils.closeQuietly((Closeable)filesystem);
- }
- }
-
diff --git a/patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch b/patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch
index 493d3b63e..8820f37d4 100644
--- a/patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch
+++ b/patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch
@@ -129,3 +129,21 @@
}
public static class Deserializer implements JsonDeserializer
+@@ -187,7 +153,7 @@
+ JsonArray jsonarray = JsonUtils.func_151213_a(jsonobject, "loot", new JsonArray());
+ ResourceLocation[] aresourcelocation = new ResourceLocation[jsonarray.size()];
+
+- for (int j = 0; j < aresourcelocation.length; j++)
++ for (int j = 0; j < aresourcelocation.length; ++j)
+ {
+ aresourcelocation[j] = new ResourceLocation(JsonUtils.func_151206_a(jsonarray.get(j), "loot[" + j + "]"));
+ }
+@@ -195,7 +161,7 @@
+ JsonArray jsonarray1 = JsonUtils.func_151213_a(jsonobject, "recipes", new JsonArray());
+ ResourceLocation[] aresourcelocation1 = new ResourceLocation[jsonarray1.size()];
+
+- for (int k = 0; k < aresourcelocation1.length; k++)
++ for (int k = 0; k < aresourcelocation1.length; ++k)
+ {
+ aresourcelocation1[k] = new ResourceLocation(JsonUtils.func_151206_a(jsonarray1.get(k), "recipes[" + k + "]"));
+ IRecipe irecipe = CraftingManager.func_193373_a(aresourcelocation1[k]);
diff --git a/patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch b/patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch
index 79c1b4a72..0f14e5769 100644
--- a/patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch
+++ b/patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch
@@ -172,3 +172,12 @@
}
}
+@@ -424,7 +414,7 @@
+
+ private boolean func_192738_c(Advancement p_192738_1_)
+ {
+- for (int i = 0; p_192738_1_ != null && i <= 2; i++)
++ for (int i = 0; p_192738_1_ != null && i <= 2; ++i)
+ {
+ if (i == 0 && this.func_192746_d(p_192738_1_))
+ {
diff --git a/patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch b/patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch
index 6570abd1e..d8830a867 100644
--- a/patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch
+++ b/patches/minecraft/net/minecraft/advancements/critereon/ItemPredicate.java.patch
@@ -1,39 +1,14 @@
--- before/net/minecraft/advancements/critereon/ItemPredicate.java
+++ after/net/minecraft/advancements/critereon/ItemPredicate.java
-@@ -37,15 +37,7 @@
- this.field_193445_h = NBTPredicate.field_193479_a;
- }
-
-- public ItemPredicate(
-- @Nullable Item p_i47540_1_,
-- @Nullable Integer p_i47540_2_,
-- MinMaxBounds p_i47540_3_,
-- MinMaxBounds p_i47540_4_,
-- EnchantmentPredicate[] p_i47540_5_,
-- @Nullable PotionType p_i47540_6_,
-- NBTPredicate p_i47540_7_
-- )
-+ public ItemPredicate(@Nullable Item p_i47540_1_, @Nullable Integer p_i47540_2_, MinMaxBounds p_i47540_3_, MinMaxBounds p_i47540_4_, EnchantmentPredicate[] p_i47540_5_, @Nullable PotionType p_i47540_6_, NBTPredicate p_i47540_7_)
- {
- this.field_192496_b = p_i47540_1_;
- this.field_192497_c = p_i47540_2_;
-@@ -95,7 +87,15 @@
- }
-
- PotionType potiontype = PotionUtils.func_185191_c(p_192493_1_);
-- return this.field_192500_f == null || this.field_192500_f == potiontype;
-+
-+ if (this.field_192500_f != null && this.field_192500_f != potiontype)
-+ {
-+ return false;
-+ }
-+ else
-+ {
-+ return true;
-+ }
- }
- }
+@@ -86,7 +86,7 @@
+ {
+ Map map = EnchantmentHelper.func_82781_a(p_192493_1_);
+- for (int i = 0; i < this.field_192499_e.length; i++)
++ for (int i = 0; i < this.field_192499_e.length; ++i)
+ {
+ if (!this.field_192499_e[i].func_192463_a(map))
+ {
@@ -104,6 +104,13 @@
if (p_192492_0_ != null && !p_192492_0_.isJsonNull())
{
@@ -48,3 +23,12 @@
MinMaxBounds minmaxbounds = MinMaxBounds.func_192515_a(jsonobject.get("count"));
MinMaxBounds minmaxbounds1 = MinMaxBounds.func_192515_a(jsonobject.get("durability"));
Integer integer = jsonobject.has("data") ? JsonUtils.func_151203_m(jsonobject, "data") : null;
+@@ -151,7 +158,7 @@
+ JsonArray jsonarray = JsonUtils.func_151207_m(p_192494_0_, "items");
+ ItemPredicate[] aitempredicate = new ItemPredicate[jsonarray.size()];
+
+- for (int i = 0; i < aitempredicate.length; i++)
++ for (int i = 0; i < aitempredicate.length; ++i)
+ {
+ aitempredicate[i] = func_192492_a(jsonarray.get(i));
+ }
diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch
index bcf217b0f..8f187b7b3 100644
--- a/patches/minecraft/net/minecraft/block/Block.java.patch
+++ b/patches/minecraft/net/minecraft/block/Block.java.patch
@@ -249,7 +249,7 @@
+ List drops = getDrops(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_); // use the old method until it gets removed, for backward compatibility
+ p_180653_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(drops, p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_, p_180653_4_, false, harvesters.get());
-- for (int j = 0; j < i; ++j)
+- for (int j = 0; j < i; j++)
+ for (ItemStack drop : drops)
{
- if (!(p_180653_1_.field_73012_v.nextFloat() > p_180653_4_))
@@ -3036,7 +3036,7 @@
- {
- if (set.contains(block16))
- {
-- for (int i = 0; i < 15; ++i)
+- for (int i = 0; i < 15; i++)
- {
- int j = field_149771_c.func_148757_b(block16) << 4 | i;
- field_176229_d.func_148746_a(block16.func_176203_a(i), j);
diff --git a/patches/minecraft/net/minecraft/block/BlockBed.java.patch b/patches/minecraft/net/minecraft/block/BlockBed.java.patch
index de317575f..7cad18c17 100644
--- a/patches/minecraft/net/minecraft/block/BlockBed.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockBed.java.patch
@@ -210,7 +210,7 @@
public boolean func_190946_v(IBlockState p_190946_1_)
{
return true;
-@@ -256,7 +231,7 @@
+@@ -256,21 +231,21 @@
@Nullable
public static BlockPos func_176468_a(World p_176468_0_, BlockPos p_176468_1_, int p_176468_2_)
{
@@ -219,6 +219,32 @@
int i = p_176468_1_.func_177958_n();
int j = p_176468_1_.func_177956_o();
int k = p_176468_1_.func_177952_p();
+
+- for (int l = 0; l <= 1; l++)
++ for (int l = 0; l <= 1; ++l)
+ {
+ int i1 = i - enumfacing.func_82601_c() * l - 1;
+ int j1 = k - enumfacing.func_82599_e() * l - 1;
+ int k1 = i1 + 2;
+ int l1 = j1 + 2;
+
+- for (int i2 = i1; i2 <= k1; i2++)
++ for (int i2 = i1; i2 <= k1; ++i2)
+ {
+- for (int j2 = j1; j2 <= l1; j2++)
++ for (int j2 = j1; j2 <= l1; ++j2)
+ {
+ BlockPos blockpos = new BlockPos(i2, j, j2);
+
+@@ -281,7 +256,7 @@
+ return blockpos;
+ }
+
+- p_176468_2_--;
++ --p_176468_2_;
+ }
+ }
+ }
@@ -292,12 +267,9 @@
protected static boolean func_176469_d(World p_176469_0_, BlockPos p_176469_1_)
diff --git a/patches/minecraft/net/minecraft/block/BlockButton.java.patch b/patches/minecraft/net/minecraft/block/BlockButton.java.patch
index 87d472f91..7e8790a4d 100644
--- a/patches/minecraft/net/minecraft/block/BlockButton.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockButton.java.patch
@@ -83,17 +83,20 @@
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{
for (EnumFacing enumfacing : EnumFacing.values())
-@@ -103,7 +98,7 @@
-
- if (p_181088_2_ == EnumFacing.UP)
- {
-- return block == Blocks.field_150438_bZ || !func_193384_b(block) && flag;
+@@ -100,30 +95,25 @@
+ IBlockState iblockstate = p_181088_0_.func_180495_p(blockpos);
+ boolean flag = iblockstate.func_193401_d(p_181088_0_, blockpos, p_181088_2_) == BlockFaceShape.SOLID;
+ Block block = iblockstate.func_177230_c();
+- return p_181088_2_ == EnumFacing.UP ? block == Blocks.field_150438_bZ || !func_193384_b(block) && flag : !func_193382_c(block) && flag;
++
++ if (p_181088_2_ == EnumFacing.UP)
++ {
+ return iblockstate.func_185896_q() || !func_193384_b(block) && flag;
- }
- else
- {
-@@ -111,27 +106,14 @@
- }
++ }
++ else
++ {
++ return !func_193382_c(block) && flag;
++ }
}
- @Override
@@ -123,7 +126,7 @@
{
this.func_176226_b(p_189540_2_, p_189540_3_, p_189540_1_, 0);
p_189540_2_.func_175698_g(p_189540_3_);
-@@ -152,11 +134,10 @@
+@@ -144,11 +134,10 @@
}
}
@@ -137,7 +140,7 @@
switch (enumfacing)
{
-@@ -176,29 +157,18 @@
+@@ -168,29 +157,18 @@
}
}
@@ -171,7 +174,7 @@
p_180639_1_.func_175684_a(p_180639_2_, this, this.func_149738_a(p_180639_1_));
return true;
}
-@@ -208,27 +178,24 @@
+@@ -200,27 +178,24 @@
protected abstract void func_185617_b(World p_185617_1_, BlockPos p_185617_2_);
@@ -203,7 +206,7 @@
{
return 0;
}
-@@ -238,23 +205,20 @@
+@@ -230,23 +205,20 @@
}
}
@@ -228,7 +231,7 @@
{
if (this.field_150047_a)
{
-@@ -262,8 +226,8 @@
+@@ -254,8 +226,8 @@
}
else
{
@@ -239,7 +242,7 @@
this.func_185617_b(p_180650_1_, p_180650_2_);
p_180650_1_.func_175704_b(p_180650_2_, p_180650_2_);
}
-@@ -271,14 +235,13 @@
+@@ -263,14 +235,13 @@
}
}
@@ -255,7 +258,7 @@
{
this.func_185616_e(p_180634_3_, p_180634_1_, p_180634_2_);
}
-@@ -288,22 +251,22 @@
+@@ -280,22 +251,22 @@
private void func_185616_e(IBlockState p_185616_1_, World p_185616_2_, BlockPos p_185616_3_)
{
@@ -285,7 +288,7 @@
p_185616_2_.func_175704_b(p_185616_3_, p_185616_3_);
this.func_185617_b(p_185616_2_, p_185616_3_);
}
-@@ -320,7 +283,6 @@
+@@ -312,7 +283,6 @@
p_176582_1_.func_175685_c(p_176582_2_.func_177972_a(p_176582_3_.func_176734_d()), this, false);
}
@@ -293,7 +296,7 @@
public IBlockState func_176203_a(int p_176203_1_)
{
EnumFacing enumfacing;
-@@ -347,10 +309,9 @@
+@@ -339,10 +309,9 @@
enumfacing = EnumFacing.UP;
}
@@ -305,7 +308,7 @@
public int func_176201_c(IBlockState p_176201_1_)
{
int i;
-@@ -377,7 +338,7 @@
+@@ -369,7 +338,7 @@
i = 0;
}
@@ -314,7 +317,7 @@
{
i |= 8;
}
-@@ -385,25 +346,21 @@
+@@ -377,25 +346,21 @@
return i;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
index 0cf70cc21..4cc1d5691 100644
--- a/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCactus.java.patch
@@ -44,7 +44,7 @@
- while (p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this)
+ for (i = 1; p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this; ++i)
{
-- ++i;
+- i++;
+ ;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockChest.java.patch b/patches/minecraft/net/minecraft/block/BlockChest.java.patch
index 5d2feb4e9..ebde3bec6 100644
--- a/patches/minecraft/net/minecraft/block/BlockChest.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockChest.java.patch
@@ -148,6 +148,42 @@
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{
int i = 0;
+@@ -347,7 +330,7 @@
+ return false;
+ }
+
+- i++;
++ ++i;
+ }
+
+ if (p_176196_1_.func_180495_p(blockpos1).func_177230_c() == this)
+@@ -357,7 +340,7 @@
+ return false;
+ }
+
+- i++;
++ ++i;
+ }
+
+ if (p_176196_1_.func_180495_p(blockpos2).func_177230_c() == this)
+@@ -367,7 +350,7 @@
+ return false;
+ }
+
+- i++;
++ ++i;
+ }
+
+ if (p_176196_1_.func_180495_p(blockpos3).func_177230_c() == this)
+@@ -377,7 +360,7 @@
+ return false;
+ }
+
+- i++;
++ ++i;
+ }
+
+ return i <= 1;
@@ -403,7 +386,6 @@
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch b/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch
index 01140501e..bb1e0c0d7 100644
--- a/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockChorusFlower.java.patch
@@ -40,6 +40,32 @@
{
boolean flag = false;
boolean flag1 = false;
+@@ -71,7 +70,7 @@
+ {
+ int j = 1;
+
+- for (int k = 0; k < 4; k++)
++ for (int k = 0; k < 4; ++k)
+ {
+ Block block1 = p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(j + 1)).func_177230_c();
+
+@@ -85,14 +84,14 @@
+ break;
+ }
+
+- j++;
++ ++j;
+ }
+
+ int i1 = 4;
+
+ if (flag1)
+ {
+- i1++;
++ ++i1;
+ }
+
+ if (j < 2 || p_180650_4_.nextInt(i1) >= j)
@@ -105,7 +104,7 @@
flag = true;
}
@@ -49,7 +75,17 @@
{
p_180650_1_.func_180501_a(p_180650_2_, Blocks.field_185765_cR.func_176223_P(), 2);
this.func_185602_a(p_180650_1_, blockpos, i);
-@@ -125,9 +124,7 @@
+@@ -117,17 +116,15 @@
+
+ if (flag1)
+ {
+- l++;
++ ++l;
+ }
+
+- for (int j1 = 0; j1 < l; j1++)
++ for (int j1 = 0; j1 < l; ++j1)
+ {
EnumFacing enumfacing = EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_);
BlockPos blockpos1 = p_180650_2_.func_177972_a(enumfacing);
@@ -110,6 +146,15 @@
public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_)
{
if (!this.func_185606_b(p_189540_2_, p_189540_3_))
+@@ -222,7 +216,7 @@
+
+ if (block1 == Blocks.field_185765_cR)
+ {
+- i++;
++ ++i;
+ }
+ else if (iblockstate1.func_185904_a() != Material.field_151579_a)
+ {
@@ -243,44 +237,36 @@
}
}
@@ -159,7 +204,16 @@
}
public static void func_185603_a(World p_185603_0_, BlockPos p_185603_1_, Random p_185603_2_, int p_185603_3_)
-@@ -302,7 +288,7 @@
+@@ -295,14 +281,14 @@
+
+ if (p_185601_5_ == 0)
+ {
+- i++;
++ ++i;
+ }
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
{
BlockPos blockpos = p_185601_1_.func_177981_b(j + 1);
@@ -168,7 +222,17 @@
{
return;
}
-@@ -326,11 +312,7 @@
+@@ -318,19 +304,15 @@
+
+ if (p_185601_5_ == 0)
+ {
+- l++;
++ ++l;
+ }
+
+- for (int k = 0; k < l; k++)
++ for (int k = 0; k < l; ++k)
+ {
EnumFacing enumfacing = EnumFacing.Plane.HORIZONTAL.func_179518_a(p_185601_2_);
BlockPos blockpos1 = p_185601_1_.func_177981_b(i).func_177972_a(enumfacing);
diff --git a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
index b466e29f5..38dec612b 100644
--- a/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCocoa.java.patch
@@ -170,9 +170,12 @@
int j = 1;
if (i >= 2)
-@@ -180,62 +150,54 @@
+@@ -178,64 +148,56 @@
+ j = 3;
+ }
- for (int k = 0; k < j; ++k)
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
{
- func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
+ drops.add(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
index 305fbeecb..0f591d978 100644
--- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch
@@ -93,7 +93,16 @@
}
}
}
-@@ -127,11 +118,11 @@
+@@ -120,18 +111,18 @@
+ float f = 1.0F;
+ BlockPos blockpos = p_180672_2_.func_177977_b();
+
+- for (int i = -1; i <= 1; i++)
++ for (int i = -1; i <= 1; ++i)
+ {
+- for (int j = -1; j <= 1; j++)
++ for (int j = -1; j <= 1; ++j)
+ {
float f1 = 0.0F;
IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
@@ -177,6 +186,15 @@
{
int i = this.func_185527_x(p_180653_3_);
+@@ -204,7 +210,7 @@
+ {
+ int j = 3 + p_180653_5_;
+
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
+ {
+ if (p_180653_1_.field_73012_v.nextInt(2 * this.func_185526_g()) <= i)
+ {
@@ -215,51 +221,43 @@
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
index 1fb628724..eea8952a9 100644
--- a/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDoor.java.patch
@@ -151,7 +151,7 @@
{
p_189540_2_.func_175698_g(p_189540_3_);
flag1 = true;
-@@ -252,43 +225,39 @@
+@@ -252,38 +225,39 @@
{
boolean flag = p_189540_2_.func_175640_z(p_189540_3_) || p_189540_2_.func_175640_z(blockpos1);
@@ -184,26 +184,27 @@
- @Override
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{
-- if (p_176196_2_.func_177956_o() >= 255)
+- return p_176196_2_.func_177956_o() >= 255
+- ? false
+- : p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q()
+- && super.func_176196_c(p_176196_1_, p_176196_2_)
+- && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
+ if (p_176196_2_.func_177956_o() >= p_176196_1_.func_72800_K() - 1)
- {
- return false;
- }
- else
- {
-- return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q()
-- && super.func_176196_c(p_176196_1_, p_176196_2_)
-- && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
++ {
++ return false;
++ }
++ else
++ {
+ IBlockState state = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
+ return (state.func_185896_q() || state.func_193401_d(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
- }
++ }
}
- @Override
public EnumPushReaction func_149656_h(IBlockState p_149656_1_)
{
return EnumPushReaction.DESTROY;
-@@ -310,7 +279,6 @@
+@@ -305,7 +279,6 @@
return func_176510_b(k) | (flag ? 8 : 0) | (flag1 ? 16 : 0) | (flag2 ? 32 : 0);
}
@@ -211,7 +212,7 @@
public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
{
return new ItemStack(this.func_176509_j());
-@@ -344,15 +312,12 @@
+@@ -339,15 +312,12 @@
}
}
@@ -228,7 +229,7 @@
{
p_176208_1_.func_175698_g(blockpos);
}
-@@ -369,13 +334,11 @@
+@@ -364,13 +334,11 @@
}
@SideOnly(Side.CLIENT)
@@ -242,7 +243,7 @@
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
{
if (p_176221_1_.func_177229_b(field_176523_O) == BlockDoor.EnumDoorHalf.LOWER)
-@@ -384,8 +347,7 @@
+@@ -379,8 +347,7 @@
if (iblockstate.func_177230_c() == this)
{
@@ -252,7 +253,7 @@
}
}
else
-@@ -394,68 +356,51 @@
+@@ -389,68 +356,51 @@
if (iblockstate1.func_177230_c() == this)
{
@@ -329,7 +330,7 @@
{
i |= 4;
}
-@@ -494,13 +439,11 @@
+@@ -489,13 +439,11 @@
return (p_176518_0_ & 8) != 0;
}
@@ -344,7 +345,7 @@
public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
{
return BlockFaceShape.UNDEFINED;
-@@ -511,13 +454,11 @@
+@@ -506,13 +454,11 @@
UPPER,
LOWER;
@@ -358,7 +359,7 @@
public String func_176610_l()
{
return this == UPPER ? "upper" : "lower";
-@@ -529,13 +470,11 @@
+@@ -524,13 +470,11 @@
LEFT,
RIGHT;
diff --git a/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch b/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch
index b4b3a9b1d..b3b8dd0b0 100644
--- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.java.patch
@@ -96,9 +96,12 @@
public void func_180649_a(World p_180649_1_, BlockPos p_180649_2_, EntityPlayer p_180649_3_)
{
this.func_180684_e(p_180649_1_, p_180649_2_);
-@@ -117,13 +93,9 @@
+@@ -115,36 +91,23 @@
+
+ if (iblockstate.func_177230_c() == this)
{
- for (int i = 0; i < 1000; ++i)
+- for (int i = 0; i < 1000; i++)
++ for (int i = 0; i < 1000; ++i)
{
- BlockPos blockpos = p_180684_2_.func_177982_a(
- p_180684_1_.field_73012_v.nextInt(16) - p_180684_1_.field_73012_v.nextInt(16),
@@ -112,7 +115,10 @@
{
if (p_180684_1_.field_72995_K)
{
-@@ -133,18 +105,9 @@
+- for (int j = 0; j < 128; j++)
++ for (int j = 0; j < 128; ++j)
+ {
+ double d0 = p_180684_1_.field_73012_v.nextDouble();
float f = (p_180684_1_.field_73012_v.nextFloat() - 0.5F) * 0.2F;
float f1 = (p_180684_1_.field_73012_v.nextFloat() - 0.5F) * 0.2F;
float f2 = (p_180684_1_.field_73012_v.nextFloat() - 0.5F) * 0.2F;
diff --git a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch
index 44acac540..a167fc3a7 100644
--- a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch
@@ -128,6 +128,15 @@
}
protected int func_176371_a(World p_176371_1_, BlockPos p_176371_2_, int p_176371_3_)
+@@ -284,7 +281,7 @@
+ {
+ if (i == 0)
+ {
+- this.field_149815_a++;
++ ++this.field_149815_a;
+ }
+
+ if (i >= 8)
@@ -302,7 +299,6 @@
return material != this.field_149764_J && material != Material.field_151587_i && !this.func_176372_g(p_176373_1_, p_176373_2_, p_176373_3_);
}
diff --git a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.java.patch b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.java.patch
index 84935ff71..e9d0b725b 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.java.patch
@@ -9,7 +9,7 @@
protected BlockEnchantmentTable()
{
-@@ -34,20 +34,17 @@
+@@ -34,27 +34,24 @@
this.func_149647_a(CreativeTabs.field_78031_c);
}
@@ -30,7 +30,21 @@
public void func_180655_c(IBlockState p_180655_1_, World p_180655_2_, BlockPos p_180655_3_, Random p_180655_4_)
{
super.func_180655_c(p_180655_1_, p_180655_2_, p_180655_3_, p_180655_4_);
-@@ -67,22 +64,14 @@
+
+- for (int i = -2; i <= 2; i++)
++ for (int i = -2; i <= 2; ++i)
+ {
+- for (int j = -2; j <= 2; j++)
++ for (int j = -2; j <= 2; ++j)
+ {
+ if (i > -2 && i < 2 && j == -1)
+ {
+@@ -63,26 +60,18 @@
+
+ if (p_180655_4_.nextInt(16) == 0)
+ {
+- for (int k = 0; k <= 1; k++)
++ for (int k = 0; k <= 1; ++k)
{
BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);
diff --git a/patches/minecraft/net/minecraft/block/BlockEnderChest.java.patch b/patches/minecraft/net/minecraft/block/BlockEnderChest.java.patch
index 0d2bf0217..94521e49e 100644
--- a/patches/minecraft/net/minecraft/block/BlockEnderChest.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockEnderChest.java.patch
@@ -157,7 +157,8 @@
- @Override
public void func_180655_c(IBlockState p_180655_1_, World p_180655_2_, BlockPos p_180655_3_, Random p_180655_4_)
{
- for (int i = 0; i < 3; ++i)
+- for (int i = 0; i < 3; i++)
++ for (int i = 0; i < 3; ++i)
{
int j = p_180655_4_.nextInt(2) * 2 - 1;
int k = p_180655_4_.nextInt(2) * 2 - 1;
diff --git a/patches/minecraft/net/minecraft/block/BlockFire.java.patch b/patches/minecraft/net/minecraft/block/BlockFire.java.patch
index 39feda561..e02b1d1d0 100644
--- a/patches/minecraft/net/minecraft/block/BlockFire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch
@@ -151,7 +151,7 @@
{
p_180650_1_.func_175698_g(p_180650_2_);
return;
-@@ -204,12 +187,12 @@
+@@ -204,18 +187,18 @@
j = -50;
}
@@ -168,8 +168,17 @@
+ this.tryCatchFire(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i, EnumFacing.SOUTH);
+ this.tryCatchFire(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i, EnumFacing.NORTH);
- for (int k = -1; k <= 1; ++k)
+- for (int k = -1; k <= 1; k++)
++ for (int k = -1; k <= 1; ++k)
{
+- for (int l = -1; l <= 1; l++)
++ for (int l = -1; l <= 1; ++l)
+ {
+- for (int i1 = -1; i1 <= 4; i1++)
++ for (int i1 = -1; i1 <= 4; ++i1)
+ {
+ if (k != 0 || i1 != 0 || l != 0)
+ {
@@ -247,7 +230,7 @@
i2 = 15;
}
@@ -296,7 +305,7 @@
public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
{
if (p_176213_1_.field_73011_w.func_186058_p().func_186068_a() > 0 || !Blocks.field_150427_aO.func_176548_d(p_176213_1_, p_176213_2_))
-@@ -390,79 +373,73 @@
+@@ -390,126 +373,124 @@
}
}
@@ -331,7 +340,8 @@
- if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177976_e()))
+ if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177976_e(), EnumFacing.EAST))
{
- for (int j = 0; j < 2; ++j)
+- for (int j = 0; j < 2; j++)
++ for (int j = 0; j < 2; ++j)
{
- double d3 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble() * 0.1F;
+ double d3 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble() * 0.10000000149011612D;
@@ -345,7 +355,8 @@
- if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177974_f()))
+ if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177974_f(), EnumFacing.WEST))
{
- for (int k = 0; k < 2; ++k)
+- for (int k = 0; k < 2; k++)
++ for (int k = 0; k < 2; ++k)
{
- double d4 = (double)(p_180655_3_.func_177958_n() + 1) - p_180655_4_.nextDouble() * 0.1F;
+ double d4 = (double)(p_180655_3_.func_177958_n() + 1) - p_180655_4_.nextDouble() * 0.10000000149011612D;
@@ -359,7 +370,8 @@
- if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177978_c()))
+ if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177978_c(), EnumFacing.SOUTH))
{
- for (int l = 0; l < 2; ++l)
+- for (int l = 0; l < 2; l++)
++ for (int l = 0; l < 2; ++l)
{
double d5 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
double d10 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
@@ -373,7 +385,8 @@
- if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177968_d()))
+ if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177968_d(), EnumFacing.NORTH))
{
- for (int i1 = 0; i1 < 2; ++i1)
+- for (int i1 = 0; i1 < 2; i1++)
++ for (int i1 = 0; i1 < 2; ++i1)
{
double d6 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
double d11 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
@@ -387,7 +400,8 @@
- if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177984_a()))
+ if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177984_a(), EnumFacing.DOWN))
{
- for (int j1 = 0; j1 < 2; ++j1)
+- for (int j1 = 0; j1 < 2; j1++)
++ for (int j1 = 0; j1 < 2; ++j1)
{
double d7 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
- double d12 = (double)(p_180655_3_.func_177956_o() + 1) - p_180655_4_.nextDouble() * 0.1F;
@@ -398,8 +412,10 @@
}
}
}
-@@ -471,45 +448,49 @@
- for (int i = 0; i < 3; ++i)
+ else
+ {
+- for (int i = 0; i < 3; i++)
++ for (int i = 0; i < 3; ++i)
{
double d0 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
- double d1 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble() * 0.5 + 0.5;
diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
index 9c6b87443..9d3a0a6cd 100644
--- a/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockGrass.java.patch
@@ -37,6 +37,15 @@
{
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
}
+@@ -47,7 +47,7 @@
+ {
+ if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) >= 9)
+ {
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ BlockPos blockpos = p_180650_2_.func_177982_a(p_180650_4_.nextInt(3) - 1, p_180650_4_.nextInt(5) - 3, p_180650_4_.nextInt(3) - 1);
+
@@ -59,10 +59,7 @@
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos.func_177984_a());
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos);
@@ -79,11 +88,12 @@
BlockPos blockpos = p_176474_3_.func_177984_a();
- label38:
- for (int i = 0; i < 128; ++i)
+- for (int i = 0; i < 128; i++)
++ for (int i = 0; i < 128; ++i)
{
BlockPos blockpos1 = blockpos;
-
-- for (int j = 0; j < i / 16; ++j)
+- for (int j = 0; j < i / 16; j++)
- {
- blockpos1 = blockpos1.func_177982_a(
- p_176474_2_.nextInt(3) - 1, (p_176474_2_.nextInt(3) - 1) * p_176474_2_.nextInt(3) / 2, p_176474_2_.nextInt(3) - 1
diff --git a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
index 609aa2765..e1cade7a6 100644
--- a/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch
@@ -80,11 +80,12 @@
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
{
switch (p_185499_2_)
-@@ -179,10 +163,9 @@
+@@ -178,10 +162,10 @@
+ }
}
- @SuppressWarnings("incomplete-switch")
- @Override
++ @SuppressWarnings("incomplete-switch")
public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_)
{
- BlockHugeMushroom.EnumType blockhugemushroom$enumtype = p_185471_1_.func_177229_b(field_176380_a);
@@ -92,7 +93,7 @@
switch (p_185471_2_)
{
-@@ -234,10 +217,23 @@
+@@ -233,10 +217,23 @@
return super.func_185471_a(p_185471_1_, p_185471_2_);
}
@@ -118,7 +119,7 @@
}
public static enum EnumType implements IStringSerializable
-@@ -271,7 +267,6 @@
+@@ -270,7 +267,6 @@
return this.field_176906_o;
}
@@ -126,7 +127,7 @@
public String toString()
{
return this.field_176914_p;
-@@ -288,7 +283,6 @@
+@@ -287,7 +283,6 @@
return blockhugemushroom$enumtype == null ? field_176905_n[0] : blockhugemushroom$enumtype;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch
index 17a837ecc..5ad64c45c 100644
--- a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch
@@ -51,7 +51,24 @@
public boolean func_176198_a(World p_176198_1_, BlockPos p_176198_2_, EnumFacing p_176198_3_)
{
if (this.func_193392_c(p_176198_1_, p_176198_2_.func_177976_e(), p_176198_3_))
-@@ -90,17 +87,7 @@
+@@ -73,11 +70,13 @@
+ {
+ return true;
+ }
++ else if (this.func_193392_c(p_176198_1_, p_176198_2_.func_177978_c(), p_176198_3_))
++ {
++ return true;
++ }
+ else
+ {
+- return this.func_193392_c(p_176198_1_, p_176198_2_.func_177978_c(), p_176198_3_)
+- ? true
+- : this.func_193392_c(p_176198_1_, p_176198_2_.func_177968_d(), p_176198_3_);
++ return this.func_193392_c(p_176198_1_, p_176198_2_.func_177968_d(), p_176198_3_);
+ }
+ }
+
+@@ -88,17 +87,7 @@
return !flag && iblockstate.func_193401_d(p_193392_1_, p_193392_2_, p_193392_3_) == BlockFaceShape.SOLID && !iblockstate.func_185897_m();
}
@@ -70,7 +87,7 @@
{
if (p_180642_3_.func_176740_k().func_176722_c() && this.func_193392_c(p_180642_1_, p_180642_2_.func_177972_a(p_180642_3_.func_176734_d()), p_180642_3_))
{
-@@ -120,10 +107,9 @@
+@@ -118,10 +107,9 @@
}
}
@@ -82,7 +99,7 @@
if (!this.func_193392_c(p_189540_2_, p_189540_3_.func_177972_a(enumfacing.func_176734_d()), enumfacing))
{
-@@ -134,14 +120,6 @@
+@@ -132,14 +120,6 @@
super.func_189540_a(p_189540_1_, p_189540_2_, p_189540_3_, p_189540_4_, p_189540_5_);
}
@@ -97,7 +114,7 @@
public IBlockState func_176203_a(int p_176203_1_)
{
EnumFacing enumfacing = EnumFacing.func_82600_a(p_176203_1_);
-@@ -154,31 +132,34 @@
+@@ -152,31 +132,34 @@
return this.func_176223_P().func_177226_a(field_176382_a, enumfacing);
}
diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
index b79bfd0a3..42e16c54c 100644
--- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch
@@ -17,7 +17,19 @@
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
{
int i = 1;
-@@ -54,9 +53,9 @@
+@@ -45,18 +44,18 @@
+
+ if (p_180663_1_.func_175707_a(new BlockPos(k - 2, l - 2, i1 - 2), new BlockPos(k + 2, l + 2, i1 + 2)))
+ {
+- for (int j1 = -1; j1 <= 1; j1++)
++ for (int j1 = -1; j1 <= 1; ++j1)
+ {
+- for (int k1 = -1; k1 <= 1; k1++)
++ for (int k1 = -1; k1 <= 1; ++k1)
+ {
+- for (int l1 = -1; l1 <= 1; l1++)
++ for (int l1 = -1; l1 <= 1; ++l1)
+ {
BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
@@ -43,7 +55,7 @@
{
int i = 4;
int j = 5;
-@@ -85,7 +83,8 @@
+@@ -85,22 +83,23 @@
this.field_150128_a = new int[32768];
}
@@ -53,7 +65,15 @@
{
BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
-@@ -98,9 +97,9 @@
+- for (int i2 = -4; i2 <= 4; i2++)
++ for (int i2 = -4; i2 <= 4; ++i2)
+ {
+- for (int j2 = -4; j2 <= 4; j2++)
++ for (int j2 = -4; j2 <= 4; ++j2)
+ {
+- for (int k2 = -4; k2 <= 4; k2++)
++ for (int k2 = -4; k2 <= 4; ++k2)
+ {
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2));
Block block = iblockstate.func_177230_c();
@@ -65,6 +85,24 @@
{
this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2;
}
+@@ -117,13 +116,13 @@
+ }
+ }
+
+- for (int i3 = 1; i3 <= 4; i3++)
++ for (int i3 = 1; i3 <= 4; ++i3)
+ {
+- for (int j3 = -4; j3 <= 4; j3++)
++ for (int j3 = -4; j3 <= 4; ++j3)
+ {
+- for (int k3 = -4; k3 <= 4; k3++)
++ for (int k3 = -4; k3 <= 4; ++k3)
+ {
+- for (int l3 = -4; l3 <= 4; l3++)
++ for (int l3 = -4; l3 <= 4; ++l3)
+ {
+ if (this.field_150128_a[(j3 + 16) * 1024 + (k3 + 16) * 32 + l3 + 16] == i3 - 1)
+ {
@@ -167,7 +166,7 @@
if (l2 >= 0)
diff --git a/patches/minecraft/net/minecraft/block/BlockLiquid.java.patch b/patches/minecraft/net/minecraft/block/BlockLiquid.java.patch
index 8bb8399fe..0d5d4154f 100644
--- a/patches/minecraft/net/minecraft/block/BlockLiquid.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockLiquid.java.patch
@@ -88,9 +88,9 @@
- @SideOnly(Side.CLIENT)
- public boolean func_176364_g(IBlockAccess p_176364_1_, BlockPos p_176364_2_)
- {
-- for (int i = -1; i <= 1; ++i)
+- for (int i = -1; i <= 1; i++)
- {
-- for (int j = -1; j <= 1; ++j)
+- for (int j = -1; j <= 1; j++)
- {
- IBlockState iblockstate = p_176364_1_.func_180495_p(p_176364_2_.func_177982_a(i, 0, j));
-
@@ -441,7 +441,8 @@
- );
+ p_180688_1_.func_184133_a((EntityPlayer)null, p_180688_2_, SoundEvents.field_187659_cY, SoundCategory.BLOCKS, 0.5F, 2.6F + (p_180688_1_.field_73012_v.nextFloat() - p_180688_1_.field_73012_v.nextFloat()) * 0.8F);
- for (int i = 0; i < 8; ++i)
+- for (int i = 0; i < 8; i++)
++ for (int i = 0; i < 8; ++i)
{
- p_180688_1_.func_175688_a(EnumParticleTypes.SMOKE_LARGE, d0 + Math.random(), d1 + 1.2, d2 + Math.random(), 0.0, 0.0, 0.0);
+ p_180688_1_.func_175688_a(EnumParticleTypes.SMOKE_LARGE, d0 + Math.random(), d1 + 1.2D, d2 + Math.random(), 0.0D, 0.0D, 0.0D);
diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch
index 1801a01e4..a1dbf3941 100644
--- a/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMushroom.java.patch
@@ -33,6 +33,15 @@
{
return;
}
+@@ -46,7 +46,7 @@
+
+ BlockPos blockpos1 = p_180650_2_.func_177982_a(p_180650_4_.nextInt(3) - 1, p_180650_4_.nextInt(2) - p_180650_4_.nextInt(2), p_180650_4_.nextInt(3) - 1);
+
+- for (int k = 0; k < 4; k++)
++ for (int k = 0; k < 4; ++k)
+ {
+ if (p_180650_1_.func_175623_d(blockpos1) && this.func_180671_f(p_180650_1_, blockpos1, this.func_176223_P()))
+ {
@@ -63,19 +63,16 @@
}
}
@@ -53,16 +62,24 @@
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
{
if (p_180671_2_.func_177956_o() >= 0 && p_180671_2_.func_177956_o() < 256)
-@@ -92,7 +89,7 @@
+@@ -86,11 +83,13 @@
+ {
+ return true;
}
++ else if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL)
++ {
++ return true;
++ }
else
{
-- return p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_185514_i(iblockstate);
+- return iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL
+- ? true
+- : p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_185514_i(iblockstate);
+ return p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate.func_177230_c().canSustainPlant(iblockstate, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
}
}
else
-@@ -126,19 +123,16 @@
+@@ -124,19 +123,16 @@
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
index a92afd194..32bef9cc8 100644
--- a/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockMycelium.java.patch
@@ -37,7 +37,14 @@
{
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
}
-@@ -54,10 +54,7 @@
+@@ -48,16 +48,13 @@
+ {
+ if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) >= 9)
+ {
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ BlockPos blockpos = p_180650_2_.func_177982_a(p_180650_4_.nextInt(3) - 1, p_180650_4_.nextInt(5) - 3, p_180650_4_.nextInt(3) - 1);
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos.func_177984_a());
diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
index fec8ff28f..3ec16550d 100644
--- a/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch
@@ -89,7 +89,15 @@
{
i = 2 + p_180653_1_.field_73012_v.nextInt(3);
-@@ -90,39 +84,50 @@
+@@ -83,46 +77,57 @@
+ }
+ }
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
+ {
+ func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(Items.field_151075_bm));
+ }
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
index 4152ffc7c..ab2d05954 100644
--- a/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.java.patch
@@ -271,16 +271,24 @@
}
else
{
-@@ -382,7 +336,7 @@
+@@ -382,9 +336,9 @@
else
{
List list = blockpistonstructurehelper.func_177254_c();
- List list1 = Lists.newArrayList();
+ List list1 = Lists.newArrayList();
- for (int i = 0; i < list.size(); ++i)
+- for (int i = 0; i < list.size(); i++)
++ for (int i = 0; i < list.size(); ++i)
{
-@@ -399,7 +353,9 @@
+ BlockPos blockpos = list.get(i);
+ list1.add(p_176319_1_.func_180495_p(blockpos).func_185899_b(p_176319_1_, blockpos));
+@@ -395,17 +349,19 @@
+ IBlockState[] aiblockstate = new IBlockState[k];
+ EnumFacing enumfacing = p_176319_4_ ? p_176319_3_ : p_176319_3_.func_176734_d();
+
+- for (int j = list2.size() - 1; j >= 0; j--)
++ for (int j = list2.size() - 1; j >= 0; --j)
{
BlockPos blockpos1 = list2.get(j);
IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
@@ -289,9 +297,26 @@
+ float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
+ iblockstate.func_177230_c().func_180653_a(p_176319_1_, blockpos1, iblockstate, chance, 0);
p_176319_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 4);
- --k;
+- k--;
++ --k;
aiblockstate[k] = iblockstate;
-@@ -421,20 +377,9 @@
+ }
+
+- for (int l = list.size() - 1; l >= 0; l--)
++ for (int l = list.size() - 1; l >= 0; --l)
+ {
+ BlockPos blockpos3 = list.get(l);
+ IBlockState iblockstate2 = p_176319_1_.func_180495_p(blockpos3);
+@@ -413,7 +369,7 @@
+ blockpos3 = blockpos3.func_177972_a(enumfacing);
+ p_176319_1_.func_180501_a(blockpos3, Blocks.field_180384_M.func_176223_P().func_177226_a(field_176387_N, p_176319_3_), 4);
+ p_176319_1_.func_175690_a(blockpos3, BlockPistonMoving.func_185588_a(list1.get(l), p_176319_3_, p_176319_4_, false));
+- k--;
++ --k;
+ aiblockstate[k] = iblockstate2;
+ }
+
+@@ -421,30 +377,19 @@
if (p_176319_4_)
{
@@ -315,6 +340,18 @@
p_176319_1_.func_180501_a(blockpos2, iblockstate1, 4);
p_176319_1_.func_175690_a(blockpos2, BlockPistonMoving.func_185588_a(iblockstate3, p_176319_3_, true, true));
}
+
+- for (int i1 = list2.size() - 1; i1 >= 0; i1--)
++ for (int i1 = list2.size() - 1; i1 >= 0; --i1)
+ {
+ p_176319_1_.func_175685_c(list2.get(i1), aiblockstate[k++].func_177230_c(), false);
+ }
+
+- for (int j1 = list.size() - 1; j1 >= 0; j1--)
++ for (int j1 = list.size() - 1; j1 >= 0; --j1)
+ {
+ p_176319_1_.func_175685_c(list.get(j1), aiblockstate[k++].func_177230_c(), false);
+ }
@@ -458,19 +403,17 @@
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockPortal.java.patch b/patches/minecraft/net/minecraft/block/BlockPortal.java.patch
index 6eea6c45b..84187ffbf 100644
--- a/patches/minecraft/net/minecraft/block/BlockPortal.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPortal.java.patch
@@ -153,7 +153,18 @@
boolean flag4 = flag || flag1 || enumfacing$axis == EnumFacing.Axis.X;
boolean flag5 = flag2 || flag3 || enumfacing$axis == EnumFacing.Axis.Z;
-@@ -226,20 +207,17 @@
+@@ -216,26 +197,27 @@
+ {
+ return true;
+ }
++ else if (flag5 && p_176225_4_ == EnumFacing.NORTH)
++ {
++ return true;
++ }
+ else
+ {
+- return flag5 && p_176225_4_ == EnumFacing.NORTH ? true : flag5 && p_176225_4_ == EnumFacing.SOUTH;
++ return flag5 && p_176225_4_ == EnumFacing.SOUTH;
}
}
@@ -174,7 +185,7 @@
public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
{
if (!p_180634_4_.func_184218_aH() && !p_180634_4_.func_184207_aI() && p_180634_4_.func_184222_aU())
-@@ -249,21 +227,11 @@
+@@ -245,42 +227,31 @@
}
@SideOnly(Side.CLIENT)
@@ -196,8 +207,9 @@
+ p_180655_2_.func_184134_a((double)p_180655_3_.func_177958_n() + 0.5D, (double)p_180655_3_.func_177956_o() + 0.5D, (double)p_180655_3_.func_177952_p() + 0.5D, SoundEvents.field_187810_eg, SoundCategory.BLOCKS, 0.5F, p_180655_4_.nextFloat() * 0.4F + 0.8F, false);
}
- for (int i = 0; i < 4; ++i)
-@@ -271,20 +239,19 @@
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
double d0 = (double)((float)p_180655_3_.func_177958_n() + p_180655_4_.nextFloat());
double d1 = (double)((float)p_180655_3_.func_177956_o() + p_180655_4_.nextFloat());
double d2 = (double)((float)p_180655_3_.func_177952_p() + p_180655_4_.nextFloat());
@@ -224,7 +236,7 @@
d5 = (double)(p_180655_4_.nextFloat() * 2.0F * (float)j);
}
-@@ -292,25 +259,21 @@
+@@ -288,25 +259,21 @@
}
}
@@ -250,7 +262,7 @@
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
{
switch (p_185499_2_)
-@@ -333,10 +296,9 @@
+@@ -329,10 +296,9 @@
}
}
@@ -262,7 +274,7 @@
}
public BlockPattern.PatternHelper func_181089_f(World p_181089_1_, BlockPos p_181089_2_)
-@@ -363,17 +325,7 @@
+@@ -359,27 +325,17 @@
for (EnumFacing.AxisDirection enumfacing$axisdirection : EnumFacing.AxisDirection.values())
{
@@ -279,9 +291,13 @@
- );
+ BlockPattern.PatternHelper blockpattern$patternhelper = new BlockPattern.PatternHelper(enumfacing.func_176743_c() == enumfacing$axisdirection ? blockpos : blockpos.func_177967_a(blockportal$size.field_150866_c, blockportal$size.func_181101_b() - 1), EnumFacing.func_181076_a(enumfacing$axisdirection, enumfacing$axis), EnumFacing.UP, loadingcache, blockportal$size.func_181101_b(), blockportal$size.func_181100_a(), 1);
- for (int i = 0; i < blockportal$size.func_181101_b(); ++i)
+- for (int i = 0; i < blockportal$size.func_181101_b(); i++)
++ for (int i = 0; i < blockportal$size.func_181101_b(); ++i)
{
-@@ -383,7 +335,7 @@
+- for (int j = 0; j < blockportal$size.func_181100_a(); j++)
++ for (int j = 0; j < blockportal$size.func_181100_a(); ++j)
+ {
+ BlockWorldState blockworldstate = blockpattern$patternhelper.func_177670_a(i, j, 1);
if (blockworldstate.func_177509_a() != null && blockworldstate.func_177509_a().func_185904_a() != Material.field_151579_a)
{
@@ -290,7 +306,7 @@
}
}
}
-@@ -399,21 +351,10 @@
+@@ -395,21 +351,10 @@
}
}
@@ -313,7 +329,7 @@
public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
{
return BlockFaceShape.UNDEFINED;
-@@ -446,15 +387,9 @@
+@@ -442,15 +387,9 @@
this.field_150866_c = EnumFacing.SOUTH;
}
@@ -331,7 +347,12 @@
}
int i = this.func_180120_a(p_i45694_2_, this.field_150863_d) - 1;
-@@ -485,8 +420,7 @@
+@@ -477,12 +416,11 @@
+ {
+ int i;
+
+- for (i = 0; i < 22; i++)
++ for (i = 0; i < 22; ++i)
{
BlockPos blockpos = p_180120_1_.func_177967_a(p_180120_2_, i);
@@ -341,9 +362,33 @@
{
break;
}
-@@ -550,8 +484,7 @@
+@@ -506,9 +444,9 @@
+ {
+ label56:
- for (int j = 0; j < this.field_150868_h; ++j)
+- for (this.field_150862_g = 0; this.field_150862_g < 21; this.field_150862_g++)
++ for (this.field_150862_g = 0; this.field_150862_g < 21; ++this.field_150862_g)
+ {
+- for (int i = 0; i < this.field_150868_h; i++)
++ for (int i = 0; i < this.field_150868_h; ++i)
+ {
+ BlockPos blockpos = this.field_150861_f.func_177967_a(this.field_150866_c, i).func_177981_b(this.field_150862_g);
+ Block block = this.field_150867_a.func_180495_p(blockpos).func_177230_c();
+@@ -520,7 +458,7 @@
+
+ if (block == Blocks.field_150427_aO)
+ {
+- this.field_150864_e++;
++ ++this.field_150864_e;
+ }
+
+ if (i == 0)
+@@ -544,10 +482,9 @@
+ }
+ }
+
+- for (int j = 0; j < this.field_150868_h; j++)
++ for (int j = 0; j < this.field_150868_h; ++j)
{
- if (this.field_150867_a.func_180495_p(this.field_150861_f.func_177967_a(this.field_150866_c, j).func_177981_b(this.field_150862_g)).func_177230_c()
- != Blocks.field_150343_Z)
@@ -351,9 +396,17 @@
{
this.field_150862_g = 0;
break;
-@@ -589,10 +522,7 @@
+@@ -579,16 +516,13 @@
+
+ public void func_150859_c()
+ {
+- for (int i = 0; i < this.field_150868_h; i++)
++ for (int i = 0; i < this.field_150868_h; ++i)
+ {
+ BlockPos blockpos = this.field_150861_f.func_177967_a(this.field_150866_c, i);
- for (int j = 0; j < this.field_150862_g; ++j)
+- for (int j = 0; j < this.field_150862_g; j++)
++ for (int j = 0; j < this.field_150862_g; ++j)
{
- this.field_150867_a
- .func_180501_a(
diff --git a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
index a54ee6095..d8fa4de7b 100644
--- a/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockPumpkin.java.patch
@@ -16,7 +16,16 @@
public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
{
super.func_176213_c(p_176213_1_, p_176213_2_, p_176213_3_);
-@@ -73,27 +73,17 @@
+@@ -65,7 +65,7 @@
+
+ if (blockpattern$patternhelper != null)
+ {
+- for (int i = 0; i < this.func_176391_l().func_177685_b(); i++)
++ for (int i = 0; i < this.func_176391_l().func_177685_b(); ++i)
+ {
+ BlockWorldState blockworldstate = blockpattern$patternhelper.func_177670_a(0, i, 0);
+ p_180673_1_.func_180501_a(blockworldstate.func_177508_d(), Blocks.field_150350_a.func_176223_P(), 2);
+@@ -73,30 +73,20 @@
EntitySnowman entitysnowman = new EntitySnowman(p_180673_1_);
BlockPos blockpos1 = blockpattern$patternhelper.func_177670_a(0, 2, 0).func_177508_d();
@@ -32,7 +41,8 @@
CriteriaTriggers.field_192133_m.func_192229_a(entityplayermp, entitysnowman);
}
- for (int l = 0; l < 120; ++l)
+- for (int l = 0; l < 120; l++)
++ for (int l = 0; l < 120; ++l)
{
- p_180673_1_.func_175688_a(
- EnumParticleTypes.SNOW_SHOVEL,
@@ -46,8 +56,24 @@
+ p_180673_1_.func_175688_a(EnumParticleTypes.SNOW_SHOVEL, (double)blockpos1.func_177958_n() + p_180673_1_.field_73012_v.nextDouble(), (double)blockpos1.func_177956_o() + p_180673_1_.field_73012_v.nextDouble() * 2.5D, (double)blockpos1.func_177952_p() + p_180673_1_.field_73012_v.nextDouble(), 0.0D, 0.0D, 0.0D);
}
- for (int i1 = 0; i1 < this.func_176391_l().func_177685_b(); ++i1)
-@@ -119,27 +109,17 @@
+- for (int i1 = 0; i1 < this.func_176391_l().func_177685_b(); i1++)
++ for (int i1 = 0; i1 < this.func_176391_l().func_177685_b(); ++i1)
+ {
+ BlockWorldState blockworldstate2 = blockpattern$patternhelper.func_177670_a(0, i1, 0);
+ p_180673_1_.func_175722_b(blockworldstate2.func_177508_d(), Blocks.field_150350_a, false);
+@@ -108,9 +98,9 @@
+
+ if (blockpattern$patternhelper != null)
+ {
+- for (int j = 0; j < this.func_176388_T().func_177684_c(); j++)
++ for (int j = 0; j < this.func_176388_T().func_177684_c(); ++j)
+ {
+- for (int k = 0; k < this.func_176388_T().func_177685_b(); k++)
++ for (int k = 0; k < this.func_176388_T().func_177685_b(); ++k)
+ {
+ p_180673_1_.func_180501_a(blockpattern$patternhelper.func_177670_a(j, k, 0).func_177508_d(), Blocks.field_150350_a.func_176223_P(), 2);
+ }
+@@ -119,32 +109,22 @@
BlockPos blockpos = blockpattern$patternhelper.func_177670_a(1, 2, 0).func_177508_d();
EntityIronGolem entityirongolem = new EntityIronGolem(p_180673_1_);
entityirongolem.func_70849_f(true);
@@ -63,7 +89,8 @@
CriteriaTriggers.field_192133_m.func_192229_a(entityplayermp1, entityirongolem);
}
- for (int j1 = 0; j1 < 120; ++j1)
+- for (int j1 = 0; j1 < 120; j1++)
++ for (int j1 = 0; j1 < 120; ++j1)
{
- p_180673_1_.func_175688_a(
- EnumParticleTypes.SNOWBALL,
@@ -77,7 +104,14 @@
+ p_180673_1_.func_175688_a(EnumParticleTypes.SNOWBALL, (double)blockpos.func_177958_n() + p_180673_1_.field_73012_v.nextDouble(), (double)blockpos.func_177956_o() + p_180673_1_.field_73012_v.nextDouble() * 3.9D, (double)blockpos.func_177952_p() + p_180673_1_.field_73012_v.nextDouble(), 0.0D, 0.0D, 0.0D);
}
- for (int k1 = 0; k1 < this.func_176388_T().func_177684_c(); ++k1)
+- for (int k1 = 0; k1 < this.func_176388_T().func_177684_c(); k1++)
++ for (int k1 = 0; k1 < this.func_176388_T().func_177684_c(); ++k1)
+ {
+- for (int l1 = 0; l1 < this.func_176388_T().func_177685_b(); l1++)
++ for (int l1 = 0; l1 < this.func_176388_T().func_177685_b(); ++l1)
+ {
+ BlockWorldState blockworldstate1 = blockpattern$patternhelper.func_177670_a(k1, l1, 0);
+ p_180673_1_.func_175722_b(blockworldstate1.func_177508_d(), Blocks.field_150350_a, false);
@@ -154,66 +134,46 @@
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
index 3b1e12bf4..a40cc3700 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRailBase.java.patch
@@ -309,6 +309,15 @@
this.func_180360_a(blockrailbase$enumraildirection);
}
+@@ -326,7 +401,7 @@
+
+ private void func_150651_b()
+ {
+- for (int i = 0; i < this.field_150657_g.size(); i++)
++ for (int i = 0; i < this.field_150657_g.size(); ++i)
+ {
+ BlockRailBase.Rail blockrailbase$rail = this.func_180697_b(this.field_150657_g.get(i));
+
@@ -343,9 +418,7 @@
private boolean func_180359_a(BlockPos p_180359_1_)
@@ -320,6 +329,24 @@
}
@Nullable
+@@ -382,7 +455,7 @@
+
+ private boolean func_180363_c(BlockPos p_180363_1_)
+ {
+- for (int i = 0; i < this.field_150657_g.size(); i++)
++ for (int i = 0; i < this.field_150657_g.size(); ++i)
+ {
+ BlockPos blockpos = this.field_150657_g.get(i);
+
+@@ -403,7 +476,7 @@
+ {
+ if (this.func_180359_a(this.field_180367_c.func_177972_a(enumfacing)))
+ {
+- i++;
++ ++i;
+ }
+ }
+
@@ -461,7 +534,7 @@
}
}
@@ -356,3 +383,12 @@
{
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
{
+@@ -655,7 +728,7 @@
+ {
+ this.field_150660_b.func_180501_a(this.field_180367_c, this.field_180366_e, 3);
+
+- for (int i = 0; i < this.field_150657_g.size(); i++)
++ for (int i = 0; i < this.field_150657_g.size(); ++i)
+ {
+ BlockRailBase.Rail blockrailbase$rail = this.func_180697_b(this.field_150657_g.get(i));
+
diff --git a/patches/minecraft/net/minecraft/block/BlockRailDetector.java.patch b/patches/minecraft/net/minecraft/block/BlockRailDetector.java.patch
index cc7b215d7..18446ebc6 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailDetector.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRailDetector.java.patch
@@ -208,19 +208,21 @@
{
i |= 8;
}
-@@ -245,7 +214,6 @@
+@@ -244,7 +213,7 @@
+ return i;
}
- @SuppressWarnings("incomplete-switch")
- @Override
++ @SuppressWarnings("incomplete-switch")
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
{
switch (p_185499_2_)
-@@ -330,10 +298,9 @@
+@@ -328,10 +297,10 @@
+ }
}
- @SuppressWarnings("incomplete-switch")
- @Override
++ @SuppressWarnings("incomplete-switch")
public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_)
{
- BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185471_1_.func_177229_b(field_176573_b);
@@ -228,7 +230,7 @@
switch (p_185471_2_)
{
-@@ -383,9 +350,8 @@
+@@ -381,9 +350,8 @@
return super.func_185471_a(p_185471_1_, p_185471_2_);
}
diff --git a/patches/minecraft/net/minecraft/block/BlockRailPowered.java.patch b/patches/minecraft/net/minecraft/block/BlockRailPowered.java.patch
index dac617471..d8b43641f 100644
--- a/patches/minecraft/net/minecraft/block/BlockRailPowered.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRailPowered.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/block/BlockRailPowered.java
+++ after/net/minecraft/block/BlockRailPowered.java
-@@ -14,28 +14,27 @@
+@@ -14,30 +14,30 @@
public class BlockRailPowered extends BlockRailBase
{
@@ -40,8 +40,11 @@
+ this.func_180632_j(this.field_176227_L.func_177621_b().func_177226_a(field_176568_b, BlockRailBase.EnumRailDirection.NORTH_SOUTH).func_177226_a(field_176569_M, Boolean.valueOf(false)));
}
- @SuppressWarnings("incomplete-switch")
-@@ -51,7 +50,7 @@
++ @SuppressWarnings("incomplete-switch")
+ protected boolean func_176566_a(World p_176566_1_, BlockPos p_176566_2_, IBlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_)
+ {
+ if (p_176566_5_ >= 8)
+@@ -50,7 +50,7 @@
int j = p_176566_2_.func_177956_o();
int k = p_176566_2_.func_177952_p();
boolean flag = true;
@@ -50,7 +53,117 @@
switch (blockrailbase$enumraildirection)
{
-@@ -155,34 +154,26 @@
+@@ -58,11 +58,11 @@
+
+ if (p_176566_4_)
+ {
+- k++;
++ ++k;
+ }
+ else
+ {
+- k--;
++ --k;
+ }
+
+ break;
+@@ -70,11 +70,11 @@
+
+ if (p_176566_4_)
+ {
+- i--;
++ --i;
+ }
+ else
+ {
+- i++;
++ ++i;
+ }
+
+ break;
+@@ -82,12 +82,12 @@
+
+ if (p_176566_4_)
+ {
+- i--;
++ --i;
+ }
+ else
+ {
+- i++;
+- j++;
++ ++i;
++ ++j;
+ flag = false;
+ }
+
+@@ -97,13 +97,13 @@
+
+ if (p_176566_4_)
+ {
+- i--;
+- j++;
++ --i;
++ ++j;
+ flag = false;
+ }
+ else
+ {
+- i++;
++ ++i;
+ }
+
+ blockrailbase$enumraildirection = BlockRailBase.EnumRailDirection.EAST_WEST;
+@@ -112,12 +112,12 @@
+
+ if (p_176566_4_)
+ {
+- k++;
++ ++k;
+ }
+ else
+ {
+- k--;
+- j++;
++ --k;
++ ++j;
+ flag = false;
+ }
+
+@@ -127,21 +127,26 @@
+
+ if (p_176566_4_)
+ {
+- k++;
+- j++;
++ ++k;
++ ++j;
+ flag = false;
+ }
+ else
+ {
+- k--;
++ --k;
+ }
+
+ blockrailbase$enumraildirection = BlockRailBase.EnumRailDirection.NORTH_SOUTH;
+ }
+
+- return this.func_176567_a(p_176566_1_, new BlockPos(i, j, k), p_176566_4_, p_176566_5_, blockrailbase$enumraildirection)
+- ? true
+- : flag && this.func_176567_a(p_176566_1_, new BlockPos(i, j - 1, k), p_176566_4_, p_176566_5_, blockrailbase$enumraildirection);
++ if (this.func_176567_a(p_176566_1_, new BlockPos(i, j, k), p_176566_4_, p_176566_5_, blockrailbase$enumraildirection))
++ {
++ return true;
++ }
++ else
++ {
++ return flag && this.func_176567_a(p_176566_1_, new BlockPos(i, j - 1, k), p_176566_4_, p_176566_5_, blockrailbase$enumraildirection);
++ }
+ }
+ }
+
+@@ -149,34 +154,26 @@
{
IBlockState iblockstate = p_176567_1_.func_180495_p(p_176567_2_);
@@ -94,7 +207,7 @@
}
else
{
-@@ -196,47 +187,39 @@
+@@ -190,47 +187,39 @@
}
}
@@ -149,19 +262,21 @@
{
i |= 8;
}
-@@ -245,7 +228,6 @@
+@@ -238,7 +227,7 @@
+ return i;
}
- @SuppressWarnings("incomplete-switch")
- @Override
++ @SuppressWarnings("incomplete-switch")
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
{
switch (p_185499_2_)
-@@ -330,10 +312,9 @@
+@@ -322,10 +311,10 @@
+ }
}
- @SuppressWarnings("incomplete-switch")
- @Override
++ @SuppressWarnings("incomplete-switch")
public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_)
{
- BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185471_1_.func_177229_b(field_176568_b);
@@ -169,7 +284,7 @@
switch (p_185471_2_)
{
-@@ -383,9 +364,8 @@
+@@ -375,9 +364,8 @@
return super.func_185471_a(p_185471_1_, p_185471_2_);
}
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
index 6d8611098..deb987213 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneComparator.java.patch
@@ -112,7 +112,20 @@
protected boolean func_176404_e(World p_176404_1_, BlockPos p_176404_2_, IBlockState p_176404_3_)
{
int i = this.func_176397_f(p_176404_1_, p_176404_2_, p_176404_3_);
-@@ -148,11 +124,10 @@
+@@ -136,15 +112,22 @@
+ else
+ {
+ int j = this.func_176407_c(p_176404_1_, p_176404_2_, p_176404_3_);
+- return j == 0 ? true : i >= j;
++
++ if (j == 0)
++ {
++ return true;
++ }
++ else
++ {
++ return i >= j;
++ }
}
}
@@ -125,7 +138,7 @@
BlockPos blockpos = p_176397_2_.func_177972_a(enumfacing);
IBlockState iblockstate = p_176397_1_.func_180495_p(blockpos);
-@@ -186,39 +161,17 @@
+@@ -178,39 +161,17 @@
@Nullable
private EntityItemFrame func_176461_a(World p_176461_1_, final EnumFacing p_176461_2_, BlockPos p_176461_3_)
{
@@ -169,7 +182,7 @@
{
if (!p_180639_4_.field_71075_bZ.field_75099_e)
{
-@@ -235,7 +188,6 @@
+@@ -227,7 +188,6 @@
}
}
@@ -177,7 +190,7 @@
protected void func_176398_g(World p_176398_1_, BlockPos p_176398_2_, IBlockState p_176398_3_)
{
if (!p_176398_1_.func_175691_a(p_176398_2_, this))
-@@ -278,36 +230,33 @@
+@@ -270,36 +230,33 @@
if (flag && !flag1)
{
@@ -217,7 +230,7 @@
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
{
super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
-@@ -315,7 +264,6 @@
+@@ -307,7 +264,6 @@
this.func_176400_h(p_180663_1_, p_180663_2_, p_180663_3_);
}
@@ -225,7 +238,7 @@
public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_)
{
super.func_189539_a(p_189539_1_, p_189539_2_, p_189539_3_, p_189539_4_, p_189539_5_);
-@@ -323,28 +271,22 @@
+@@ -315,28 +271,22 @@
return tileentity == null ? false : tileentity.func_145842_c(p_189539_4_, p_189539_5_);
}
@@ -257,7 +270,7 @@
{
i |= 8;
}
-@@ -357,40 +299,39 @@
+@@ -349,40 +299,39 @@
return i;
}
@@ -321,7 +334,7 @@
}
public static enum Mode implements IStringSerializable
-@@ -405,13 +346,11 @@
+@@ -397,13 +346,11 @@
this.field_177041_c = p_i45731_3_;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
index 7d4adc6b1..ec177c1d1 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneDiode.java.patch
@@ -185,16 +185,27 @@
public boolean func_149662_c(IBlockState p_149662_1_)
{
return false;
-@@ -301,7 +276,7 @@
+@@ -301,9 +276,17 @@
public boolean func_176402_i(World p_176402_1_, BlockPos p_176402_2_, IBlockState p_176402_3_)
{
- EnumFacing enumfacing = p_176402_3_.func_177229_b(field_185512_D).func_176734_d();
+ EnumFacing enumfacing = ((EnumFacing)p_176402_3_.func_177229_b(field_185512_D)).func_176734_d();
BlockPos blockpos = p_176402_2_.func_177972_a(enumfacing);
+- return func_185546_B(p_176402_1_.func_180495_p(blockpos)) ? p_176402_1_.func_180495_p(blockpos).func_177229_b(field_185512_D) != enumfacing : false;
++
++ if (func_185546_B(p_176402_1_.func_180495_p(blockpos)))
++ {
++ return p_176402_1_.func_180495_p(blockpos).func_177229_b(field_185512_D) != enumfacing;
++ }
++ else
++ {
++ return false;
++ }
+ }
- if (func_185546_B(p_176402_1_.func_180495_p(blockpos)))
-@@ -325,20 +300,36 @@
+ protected int func_176399_m(IBlockState p_176399_1_)
+@@ -317,20 +300,36 @@
protected abstract IBlockState func_180675_k(IBlockState p_180675_1_);
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
index 4f8185e28..d761c2bcb 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneOre.java.patch
@@ -94,15 +94,18 @@
public void func_180655_c(IBlockState p_180655_1_, World p_180655_2_, BlockPos p_180655_3_, Random p_180655_4_)
{
if (this.field_150187_a)
-@@ -132,7 +116,7 @@
+@@ -132,9 +116,9 @@
private void func_180691_e(World p_180691_1_, BlockPos p_180691_2_)
{
Random random = p_180691_1_.field_73012_v;
- double d0 = 0.0625;
+ double d0 = 0.0625D;
- for (int i = 0; i < 6; ++i)
+- for (int i = 0; i < 6; i++)
++ for (int i = 0; i < 6; ++i)
{
+ double d1 = (double)((float)p_180691_2_.func_177958_n() + random.nextFloat());
+ double d2 = (double)((float)p_180691_2_.func_177956_o() + random.nextFloat());
@@ -142,53 +126,46 @@
if (i == 0 && !p_180691_1_.func_180495_p(p_180691_2_.func_177984_a()).func_185914_p())
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.java.patch
index 78c305d67..0c5d8a122 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneTorch.java.patch
@@ -27,7 +27,14 @@
if (p_176598_3_)
{
-@@ -46,7 +48,9 @@
+@@ -40,13 +42,15 @@
+
+ int i = 0;
+
+- for (int j = 0; j < list.size(); j++)
++ for (int j = 0; j < list.size(); ++j)
+ {
+ BlockRedstoneTorch.Toggle blockredstonetorch$toggle = list.get(j);
if (blockredstonetorch$toggle.field_180111_a.equals(p_176598_2_))
{
@@ -119,7 +126,8 @@
- );
+ p_180650_1_.func_184133_a((EntityPlayer)null, p_180650_2_, SoundEvents.field_187745_eA, SoundCategory.BLOCKS, 0.5F, 2.6F + (p_180650_1_.field_73012_v.nextFloat() - p_180650_1_.field_73012_v.nextFloat()) * 0.8F);
- for (int i = 0; i < 5; ++i)
+- for (int i = 0; i < 5; i++)
++ for (int i = 0; i < 5; ++i)
{
- double d0 = (double)p_180650_2_.func_177958_n() + p_180650_4_.nextDouble() * 0.6 + 0.2;
- double d1 = (double)p_180650_2_.func_177956_o() + p_180650_4_.nextDouble() * 0.6 + 0.2;
diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
index fffe6597d..11310c9a6 100644
--- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
@@ -149,6 +149,15 @@
int j = 0;
j = this.func_176342_a(p_176345_1_, p_176345_3_, j);
this.field_150181_a = false;
+@@ -247,7 +208,7 @@
+ }
+ else if (j > 0)
+ {
+- j--;
++ --j;
+ }
+ else
+ {
@@ -261,7 +222,7 @@
if (i != j)
@@ -241,16 +250,27 @@
}
}
}
-@@ -456,7 +415,7 @@
+@@ -456,29 +415,26 @@
{
return true;
}
- else if (func_176343_a(iblockstate, p_176339_3_))
+ else if (canConnectTo(iblockstate, p_176339_3_, p_176339_1_, p_176339_2_))
++ {
++ return true;
++ }
++ else if (iblockstate.func_177230_c() == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_185512_D) == p_176339_3_)
{
return true;
}
-@@ -472,15 +431,10 @@
+ else
+ {
+- return iblockstate.func_177230_c() == Blocks.field_150416_aS && iblockstate.func_177229_b(BlockRedstoneDiode.field_185512_D) == p_176339_3_
+- ? true
+- : !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b());
++ return !flag && func_176340_e(p_176339_1_, blockpos.func_177977_b());
+ }
+ }
protected static boolean func_176340_e(IBlockAccess p_176340_0_, BlockPos p_176340_1_)
{
@@ -270,7 +290,7 @@
{
Block block = p_176343_0_.func_177230_c();
-@@ -490,7 +444,7 @@
+@@ -488,18 +444,19 @@
}
else if (Blocks.field_150413_aR.func_185547_C(p_176343_0_))
{
@@ -278,12 +298,15 @@
+ EnumFacing enumfacing = (EnumFacing)p_176343_0_.func_177229_b(BlockRedstoneRepeater.field_185512_D);
return enumfacing == p_176343_1_ || enumfacing.func_176734_d() == p_176343_1_;
}
- else if (Blocks.field_190976_dk == p_176343_0_.func_177230_c())
-@@ -499,11 +453,10 @@
- }
++ else if (Blocks.field_190976_dk == p_176343_0_.func_177230_c())
++ {
++ return p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N);
++ }
else
{
-- return p_176343_0_.func_185897_m() && p_176343_1_ != null;
+- return Blocks.field_190976_dk == p_176343_0_.func_177230_c()
+- ? p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N)
+- : p_176343_0_.func_185897_m() && p_176343_1_ != null;
+ return p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
}
}
@@ -292,7 +315,7 @@
public boolean func_149744_f(IBlockState p_149744_1_)
{
return this.field_150181_a;
-@@ -536,20 +489,19 @@
+@@ -532,20 +489,19 @@
int i = MathHelper.func_76125_a((int)(f1 * 255.0F), 0, 255);
int j = MathHelper.func_76125_a((int)(f2 * 255.0F), 0, 255);
int k = MathHelper.func_76125_a((int)(f3 * 255.0F), 0, 255);
@@ -317,7 +340,7 @@
float f = (float)i / 15.0F;
float f1 = f * 0.6F + 0.4F;
float f2 = Math.max(0.0F, f * f * 0.7F - 0.5F);
-@@ -558,79 +510,60 @@
+@@ -554,79 +510,60 @@
}
}
@@ -409,7 +432,7 @@
public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
{
return BlockFaceShape.UNDEFINED;
-@@ -649,13 +582,11 @@
+@@ -645,13 +582,11 @@
this.field_176820_d = p_i45689_3_;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockReed.java.patch b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
index 8f4d71a42..c6edeb8b5 100644
--- a/patches/minecraft/net/minecraft/block/BlockReed.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockReed.java.patch
@@ -46,7 +46,7 @@
- while (p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this)
+ for (i = 1; p_180650_1_.func_180495_p(p_180650_2_.func_177979_c(i)).func_177230_c() == this; ++i)
{
-- ++i;
+- i++;
+ ;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.java.patch b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch
index db2ad1ab2..0a930535c 100644
--- a/patches/minecraft/net/minecraft/block/BlockSapling.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSapling.java.patch
@@ -65,7 +65,19 @@
WorldGenerator worldgenerator = (WorldGenerator)(p_176476_4_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true));
int i = 0;
int j = 0;
-@@ -112,10 +112,7 @@
+@@ -86,9 +86,9 @@
+ case SPRUCE:
+ label68:
+
+- for (i = 0; i >= -1; i--)
++ for (i = 0; i >= -1; --i)
+ {
+- for (j = 0; j >= -1; j--)
++ for (j = 0; j >= -1; --j)
+ {
+ if (this.func_181624_a(p_176476_1_, p_176476_2_, i, j, BlockPlanks.EnumType.SPRUCE))
+ {
+@@ -112,15 +112,12 @@
break;
case JUNGLE:
IBlockState iblockstate = Blocks.field_150364_r.func_176223_P().func_177226_a(BlockOldLog.field_176301_b, BlockPlanks.EnumType.JUNGLE);
@@ -76,7 +88,26 @@
+ IBlockState iblockstate1 = Blocks.field_150362_t.func_176223_P().func_177226_a(BlockOldLeaf.field_176239_P, BlockPlanks.EnumType.JUNGLE).func_177226_a(BlockLeaves.field_176236_b, Boolean.valueOf(false));
label82:
- for (i = 0; i >= -1; --i)
+- for (i = 0; i >= -1; i--)
++ for (i = 0; i >= -1; --i)
+ {
+- for (j = 0; j >= -1; j--)
++ for (j = 0; j >= -1; --j)
+ {
+ if (this.func_181624_a(p_176476_1_, p_176476_2_, i, j, BlockPlanks.EnumType.JUNGLE))
+ {
+@@ -145,9 +142,9 @@
+ case DARK_OAK:
+ label96:
+
+- for (i = 0; i >= -1; i--)
++ for (i = 0; i >= -1; --i)
+ {
+- for (j = 0; j >= -1; j--)
++ for (j = 0; j >= -1; --j)
+ {
+ if (this.func_181624_a(p_176476_1_, p_176476_2_, i, j, BlockPlanks.EnumType.DARK_OAK))
+ {
@@ -198,10 +195,7 @@
private boolean func_181624_a(World p_181624_1_, BlockPos p_181624_2_, int p_181624_3_, int p_181624_4_, BlockPlanks.EnumType p_181624_5_)
diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
index 9cb7f7b6a..6c2ebdfad 100644
--- a/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSkull.java.patch
@@ -161,19 +161,25 @@
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
{
return Items.field_151144_bL;
-@@ -202,10 +177,7 @@
+@@ -202,35 +177,34 @@
public boolean func_176415_b(World p_176415_1_, BlockPos p_176415_2_, ItemStack p_176415_3_)
{
-- if (p_176415_3_.func_77960_j() == 1
-- && p_176415_2_.func_177956_o() >= 2
-- && p_176415_1_.func_175659_aa() != EnumDifficulty.PEACEFUL
-- && !p_176415_1_.field_72995_K)
+- return p_176415_3_.func_77960_j() == 1
+- && p_176415_2_.func_177956_o() >= 2
+- && p_176415_1_.func_175659_aa() != EnumDifficulty.PEACEFUL
+- && !p_176415_1_.field_72995_K
+- ? this.func_176414_j().func_177681_a(p_176415_1_, p_176415_2_) != null
+- : false;
+ if (p_176415_3_.func_77960_j() == 1 && p_176415_2_.func_177956_o() >= 2 && p_176415_1_.func_175659_aa() != EnumDifficulty.PEACEFUL && !p_176415_1_.field_72995_K)
- {
- return this.func_176414_j().func_177681_a(p_176415_1_, p_176415_2_) != null;
- }
-@@ -217,10 +189,7 @@
++ {
++ return this.func_176414_j().func_177681_a(p_176415_1_, p_176415_2_) != null;
++ }
++ else
++ {
++ return false;
++ }
+ }
public void func_180679_a(World p_180679_1_, BlockPos p_180679_2_, TileEntitySkull p_180679_3_)
{
@@ -185,16 +191,26 @@
{
BlockPattern blockpattern = this.func_176416_l();
BlockPattern.PatternHelper blockpattern$patternhelper = blockpattern.func_177681_a(p_180679_1_, p_180679_2_);
-@@ -230,7 +199,7 @@
- for (int i = 0; i < 3; ++i)
+
+ if (blockpattern$patternhelper != null)
+ {
+- for (int i = 0; i < 3; i++)
++ for (int i = 0; i < 3; ++i)
{
BlockWorldState blockworldstate = blockpattern$patternhelper.func_177670_a(i, 0, 0);
- p_180679_1_.func_180501_a(blockworldstate.func_177508_d(), blockworldstate.func_177509_a().func_177226_a(field_176417_b, true), 2);
+ p_180679_1_.func_180501_a(blockworldstate.func_177508_d(), blockworldstate.func_177509_a().func_177226_a(field_176417_b, Boolean.valueOf(true)), 2);
}
- for (int j = 0; j < blockpattern.func_177684_c(); ++j)
-@@ -245,17 +214,11 @@
+- for (int j = 0; j < blockpattern.func_177684_c(); j++)
++ for (int j = 0; j < blockpattern.func_177684_c(); ++j)
+ {
+- for (int k = 0; k < blockpattern.func_177685_b(); k++)
++ for (int k = 0; k < blockpattern.func_177685_b(); ++k)
+ {
+ BlockWorldState blockworldstate1 = blockpattern$patternhelper.func_177670_a(j, k, 0);
+ p_180679_1_.func_180501_a(blockworldstate1.func_177508_d(), Blocks.field_150350_a.func_176223_P(), 2);
+@@ -240,39 +214,25 @@
BlockPos blockpos = blockpattern$patternhelper.func_177670_a(1, 0, 0).func_177508_d();
EntityWither entitywither = new EntityWither(p_180679_1_);
BlockPos blockpos1 = blockpattern$patternhelper.func_177670_a(1, 2, 0).func_177508_d();
@@ -214,9 +230,11 @@
{
CriteriaTriggers.field_192133_m.func_192229_a(entityplayermp, entitywither);
}
-@@ -264,15 +227,7 @@
- for (int l = 0; l < 120; ++l)
+ p_180679_1_.func_72838_d(entitywither);
+
+- for (int l = 0; l < 120; l++)
++ for (int l = 0; l < 120; ++l)
{
- p_180679_1_.func_175688_a(
- EnumParticleTypes.SNOWBALL,
@@ -230,8 +248,15 @@
+ p_180679_1_.func_175688_a(EnumParticleTypes.SNOWBALL, (double)blockpos.func_177958_n() + p_180679_1_.field_73012_v.nextDouble(), (double)(blockpos.func_177956_o() - 2) + p_180679_1_.field_73012_v.nextDouble() * 3.9D, (double)blockpos.func_177952_p() + p_180679_1_.field_73012_v.nextDouble(), 0.0D, 0.0D, 0.0D);
}
- for (int i1 = 0; i1 < blockpattern.func_177684_c(); ++i1)
-@@ -287,19 +242,17 @@
+- for (int i1 = 0; i1 < blockpattern.func_177684_c(); i1++)
++ for (int i1 = 0; i1 < blockpattern.func_177684_c(); ++i1)
+ {
+- for (int j1 = 0; j1 < blockpattern.func_177685_b(); j1++)
++ for (int j1 = 0; j1 < blockpattern.func_177685_b(); ++j1)
+ {
+ BlockWorldState blockworldstate2 = blockpattern$patternhelper.func_177670_a(i1, j1, 0);
+ p_180679_1_.func_175722_b(blockworldstate2.func_177508_d(), Blocks.field_150350_a, false);
+@@ -282,19 +242,17 @@
}
}
@@ -254,7 +279,7 @@
{
i |= 8;
}
-@@ -307,33 +260,26 @@
+@@ -302,33 +260,26 @@
return i;
}
@@ -292,7 +317,7 @@
}
return this.field_176420_N;
-@@ -343,18 +289,12 @@
+@@ -338,18 +289,12 @@
{
if (this.field_176421_O == null)
{
diff --git a/patches/minecraft/net/minecraft/block/BlockSlab.java.patch b/patches/minecraft/net/minecraft/block/BlockSlab.java.patch
index 4322c72e1..9c05c3825 100644
--- a/patches/minecraft/net/minecraft/block/BlockSlab.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockSlab.java.patch
@@ -127,15 +127,43 @@
{
IBlockState iblockstate = p_176225_2_.func_180495_p(p_176225_3_.func_177972_a(p_176225_4_));
boolean flag = func_185675_i(iblockstate) && iblockstate.func_177229_b(field_176554_a) == BlockSlab.EnumBlockHalf.TOP;
-@@ -172,6 +162,7 @@
- return !func_185675_i(iblockstate) || flag;
+@@ -150,24 +140,29 @@
+ {
+ return true;
+ }
++ else if (p_176225_4_ == EnumFacing.UP && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_))
++ {
++ return true;
++ }
+ else
+ {
+- return p_176225_4_ == EnumFacing.UP && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_)
+- ? true
+- : !func_185675_i(iblockstate) || !flag;
++ return !func_185675_i(iblockstate) || !flag;
+ }
+ }
+ else if (p_176225_4_ == EnumFacing.UP)
+ {
+ return true;
+ }
++ else if (p_176225_4_ == EnumFacing.DOWN && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_))
++ {
++ return true;
++ }
+ else
+ {
+- return p_176225_4_ == EnumFacing.DOWN && super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_)
+- ? true
+- : !func_185675_i(iblockstate) || flag;
++ return !func_185675_i(iblockstate) || flag;
}
}
+ return super.func_176225_a(p_176225_1_, p_176225_2_, p_176225_3_, p_176225_4_);
}
@SideOnly(Side.CLIENT)
-@@ -201,13 +192,11 @@
+@@ -197,13 +192,11 @@
this.field_176988_c = p_i45713_3_;
}
diff --git a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.java.patch b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.java.patch
index 9580b539f..72c3d5138 100644
--- a/patches/minecraft/net/minecraft/block/BlockStaticLiquid.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStaticLiquid.java.patch
@@ -16,7 +16,12 @@
public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
{
if (this.field_149764_J == Material.field_151587_i)
-@@ -54,22 +52,22 @@
+@@ -50,26 +48,26 @@
+ {
+ BlockPos blockpos = p_180650_2_;
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
{
blockpos = blockpos.func_177982_a(p_180650_4_.nextInt(3) - 1, 1, p_180650_4_.nextInt(3) - 1);
@@ -44,6 +49,15 @@
{
return;
}
+@@ -77,7 +75,7 @@
+ }
+ else
+ {
+- for (int k = 0; k < 3; k++)
++ for (int k = 0; k < 3; ++k)
+ {
+ BlockPos blockpos1 = p_180650_2_.func_177982_a(p_180650_4_.nextInt(3) - 1, 0, p_180650_4_.nextInt(3) - 1);
+
@@ -88,7 +86,7 @@
if (p_180650_1_.func_175623_d(blockpos1.func_177984_a()) && this.func_176368_m(p_180650_1_, blockpos1))
diff --git a/patches/minecraft/net/minecraft/block/BlockStem.java.patch b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
index e2090657b..31a2ecdd9 100644
--- a/patches/minecraft/net/minecraft/block/BlockStem.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockStem.java.patch
@@ -136,7 +136,8 @@
- int i = p_180653_3_.func_177229_b(field_176484_a);
+ int i = ((Integer)state.func_177229_b(field_176484_a)).intValue();
- for (int j = 0; j < 3; ++j)
+- for (int j = 0; j < 3; j++)
++ for (int j = 0; j < 3; ++j)
{
- if (p_180653_1_.field_73012_v.nextInt(15) <= i)
+ if (RANDOM.nextInt(15) <= i)
diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
index 9b7fb5318..88bc0a456 100644
--- a/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.java.patch
@@ -72,7 +72,7 @@
}
else
{
-@@ -78,13 +71,11 @@
+@@ -78,34 +71,29 @@
}
}
@@ -85,8 +85,10 @@
- @Override
public void func_149666_a(CreativeTabs p_149666_1_, NonNullList p_149666_2_)
{
- for (int i = 1; i < 3; ++i)
-@@ -93,19 +84,16 @@
+- for (int i = 1; i < 3; i++)
++ for (int i = 1; i < 3; ++i)
+ {
+ p_149666_2_.add(new ItemStack(this, 1, i));
}
}
diff --git a/patches/minecraft/net/minecraft/block/BlockTorch.java.patch b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
index 851a98ccd..ad04fa406 100644
--- a/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockTorch.java.patch
@@ -77,7 +77,18 @@
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{
for (EnumFacing enumfacing : field_176596_a.func_177700_c())
-@@ -134,17 +120,7 @@
+@@ -124,23 +110,17 @@
+ {
+ return true;
+ }
++ else if (p_176595_3_ != EnumFacing.UP && p_176595_3_ != EnumFacing.DOWN)
++ {
++ return !func_193382_c(block) && blockfaceshape == BlockFaceShape.SOLID;
++ }
+ else
+ {
+- return p_176595_3_ != EnumFacing.UP && p_176595_3_ != EnumFacing.DOWN ? !func_193382_c(block) && blockfaceshape == BlockFaceShape.SOLID : false;
++ return false;
}
}
@@ -96,7 +107,7 @@
{
if (this.func_176595_b(p_180642_1_, p_180642_2_, p_180642_3_))
{
-@@ -164,13 +140,11 @@
+@@ -160,13 +140,11 @@
}
}
@@ -110,7 +121,7 @@
public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_)
{
this.func_176592_e(p_189540_2_, p_189540_3_, p_189540_1_);
-@@ -184,7 +158,7 @@
+@@ -180,7 +158,7 @@
}
else
{
@@ -119,7 +130,7 @@
EnumFacing.Axis enumfacing$axis = enumfacing.func_176740_k();
EnumFacing enumfacing1 = enumfacing.func_176734_d();
BlockPos blockpos = p_176592_2_.func_177972_a(enumfacing1);
-@@ -214,7 +188,7 @@
+@@ -210,7 +188,7 @@
protected boolean func_176593_f(World p_176593_1_, BlockPos p_176593_2_, IBlockState p_176593_3_)
{
@@ -128,7 +139,7 @@
{
return true;
}
-@@ -231,47 +205,28 @@
+@@ -227,47 +205,28 @@
}
@SideOnly(Side.CLIENT)
@@ -186,7 +197,7 @@
public IBlockState func_176203_a(int p_176203_1_)
{
IBlockState iblockstate = this.func_176223_P();
-@@ -298,7 +253,12 @@
+@@ -294,7 +253,12 @@
return iblockstate;
}
@@ -200,7 +211,7 @@
public int func_176201_c(IBlockState p_176201_1_)
{
int i = 0;
-@@ -306,45 +266,41 @@
+@@ -302,45 +266,41 @@
switch ((EnumFacing)p_176201_1_.func_177229_b(field_176596_a))
{
case EAST:
diff --git a/patches/minecraft/net/minecraft/block/BlockVine.java.patch b/patches/minecraft/net/minecraft/block/BlockVine.java.patch
index dfcadaaff..801616475 100644
--- a/patches/minecraft/net/minecraft/block/BlockVine.java.patch
+++ b/patches/minecraft/net/minecraft/block/BlockVine.java.patch
@@ -17,7 +17,7 @@
{
public static final PropertyBool field_176277_a = PropertyBool.func_177716_a("up");
public static final PropertyBool field_176273_b = PropertyBool.func_177716_a("north");
-@@ -35,67 +36,57 @@
+@@ -35,103 +36,86 @@
public static final PropertyBool field_176279_N = PropertyBool.func_177716_a("south");
public static final PropertyBool field_176280_O = PropertyBool.func_177716_a("west");
public static final PropertyBool[] field_176274_P = new PropertyBool[] {field_176277_a, field_176273_b, field_176279_N, field_176280_O, field_176278_M};
@@ -67,36 +67,42 @@
+ if (((Boolean)p_185496_1_.func_177229_b(field_176277_a)).booleanValue())
{
axisalignedbb = field_185757_g;
- ++i;
+- i++;
++ ++i;
}
- if (p_185496_1_.func_177229_b(field_176273_b))
+ if (((Boolean)p_185496_1_.func_177229_b(field_176273_b)).booleanValue())
{
axisalignedbb = field_185755_D;
- ++i;
+- i++;
++ ++i;
}
- if (p_185496_1_.func_177229_b(field_176278_M))
+ if (((Boolean)p_185496_1_.func_177229_b(field_176278_M)).booleanValue())
{
axisalignedbb = field_185754_C;
- ++i;
+- i++;
++ ++i;
}
- if (p_185496_1_.func_177229_b(field_176279_N))
+ if (((Boolean)p_185496_1_.func_177229_b(field_176279_N)).booleanValue())
{
axisalignedbb = field_185756_E;
- ++i;
+- i++;
++ ++i;
}
- if (p_185496_1_.func_177229_b(field_176280_O))
+ if (((Boolean)p_185496_1_.func_177229_b(field_176280_O)).booleanValue())
{
axisalignedbb = field_185753_B;
- ++i;
-@@ -104,34 +95,27 @@
+- i++;
++ ++i;
+ }
+
return i == 1 ? axisalignedbb : field_185505_j;
}
@@ -184,7 +190,7 @@
public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_)
{
if (!p_189540_2_.field_72995_K && !this.func_176269_e(p_189540_2_, p_189540_3_, p_189540_1_))
-@@ -207,17 +181,16 @@
+@@ -207,193 +181,168 @@
}
}
@@ -202,9 +208,14 @@
- label179:
+ label181:
- for (int k = -4; k <= 4; ++k)
+- for (int k = -4; k <= 4; k++)
++ for (int k = -4; k <= 4; ++k)
{
-@@ -227,173 +200,149 @@
+- for (int l = -4; l <= 4; l++)
++ for (int l = -4; l <= 4; ++l)
+ {
+- for (int i1 = -1; i1 <= 1; i1++)
++ for (int i1 = -1; i1 <= 1; ++i1)
{
if (p_180650_1_.func_180495_p(p_180650_2_.func_177982_a(k, i1, l)).func_177230_c() == this)
{
@@ -566,16 +577,17 @@
default:
return super.func_185471_a(p_185471_1_, p_185471_2_);
}
-@@ -523,7 +451,7 @@
+@@ -523,16 +451,25 @@
for (PropertyBool propertybool : field_176274_P)
{
- if (p_176268_0_.func_177229_b(propertybool))
+ if (((Boolean)p_176268_0_.func_177229_b(propertybool)).booleanValue())
{
- ++i;
+- i++;
++ ++i;
}
-@@ -531,8 +459,17 @@
+ }
return i;
}
diff --git a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
index ffe206563..98f531270 100644
--- a/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
+++ b/patches/minecraft/net/minecraft/block/state/BlockPistonStructureHelper.java.patch
@@ -11,7 +11,12 @@
public BlockPistonStructureHelper(World p_i45664_1_, BlockPos p_i45664_2_, EnumFacing p_i45664_3_, boolean p_i45664_4_)
{
-@@ -65,7 +65,7 @@
+@@ -61,11 +61,11 @@
+ }
+ else
+ {
+- for (int i = 0; i < this.field_177258_e.size(); i++)
++ for (int i = 0; i < this.field_177258_e.size(); ++i)
{
BlockPos blockpos = this.field_177258_e.get(i);
@@ -55,7 +60,25 @@
{
return false;
}
-@@ -148,7 +148,7 @@
+@@ -127,10 +127,10 @@
+
+ int i1 = 0;
+
+- for (int j = i - 1; j >= 0; j--)
++ for (int j = i - 1; j >= 0; --j)
+ {
+ this.field_177258_e.add(p_177251_1_.func_177967_a(this.field_177257_d.func_176734_d(), j));
+- i1++;
++ ++i1;
+ }
+
+ int j1 = 1;
+@@ -144,11 +144,11 @@
+ {
+ this.func_177255_a(i1, k);
+
+- for (int l = 0; l <= k + i1; l++)
++ for (int l = 0; l <= k + i1; ++l)
{
BlockPos blockpos2 = this.field_177258_e.get(l);
@@ -80,6 +103,17 @@
{
return false;
}
+@@ -182,8 +181,8 @@
+ }
+
+ this.field_177258_e.add(blockpos1);
+- i1++;
+- j1++;
++ ++i1;
++ ++j1;
+ }
+ }
+ }
@@ -191,9 +190,9 @@
private void func_177255_a(int p_177255_1_, int p_177255_2_)
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 74788749e..96aac6873 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -637,6 +637,15 @@
}
this.field_147127_av.func_147685_d();
+@@ -1082,7 +1071,7 @@
+ long l = System.nanoTime();
+ this.field_71424_I.func_76320_a("tick");
+
+- for (int j = 0; j < Math.min(10, this.field_71428_T.field_74280_b); j++)
++ for (int j = 0; j < Math.min(10, this.field_71428_T.field_74280_b); ++j)
+ {
+ this.func_71407_l();
+ }
@@ -1091,7 +1080,7 @@
long i1 = System.nanoTime() - l;
this.func_71361_d("Pre render");
@@ -660,6 +669,15 @@
}
this.field_71424_I.func_76319_b();
+@@ -1140,7 +1131,7 @@
+ this.func_175601_h();
+ Thread.yield();
+ this.func_71361_d("Post render");
+- this.field_71420_M++;
++ ++this.field_71420_M;
+ boolean flag = this.func_71356_B() && this.field_71462_r != null && this.field_71462_r.func_73868_f() && !this.field_71437_Z.func_71344_c();
+
+ if (this.field_71445_n != flag)
@@ -1164,17 +1155,7 @@
while (func_71386_F() >= this.field_71419_L + 1000L)
{
@@ -702,9 +720,12 @@
}
System.gc();
-@@ -1287,14 +1270,14 @@
+@@ -1285,16 +1268,16 @@
+ }
+ else
{
- --p_71383_1_;
+- p_71383_1_--;
++ --p_71383_1_;
- if (p_71383_1_ < list.size() && !"unspecified".equals(list.get(p_71383_1_).field_76331_c))
+ if (p_71383_1_ < list.size() && !"unspecified".equals((list.get(p_71383_1_)).field_76331_c))
@@ -728,7 +749,7 @@
GlStateManager.func_179128_n(5888);
GlStateManager.func_179096_D();
GlStateManager.func_179109_b(0.0F, 0.0F, -2000.0F);
-@@ -1323,31 +1306,31 @@
+@@ -1323,45 +1306,43 @@
int k = this.field_71440_d - 320;
GlStateManager.func_179147_l();
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181706_f);
@@ -745,7 +766,8 @@
- double d0 = 0.0;
+ double d0 = 0.0D;
- for (int l = 0; l < list.size(); ++l)
+- for (int l = 0; l < list.size(); l++)
++ for (int l = 0; l < list.size(); ++l)
{
Profiler.Result profiler$result1 = list.get(l);
- int i1 = MathHelper.func_76128_c(profiler$result1.field_76332_a / 4.0) + 1;
@@ -761,7 +783,8 @@
+ int i2 = j1 & 255;
+ bufferbuilder.func_181662_b((double)j, (double)k, 0.0D).func_181669_b(k1, l1, i2, 255).func_181675_d();
- for (int j2 = i1; j2 >= 0; --j2)
+- for (int j2 = i1; j2 >= 0; j2--)
++ for (int j2 = i1; j2 >= 0; --j2)
{
- float f = (float)((d0 + profiler$result1.field_76332_a * (double)j2 / (double)i1) * (float)(Math.PI * 2) / 100.0);
+ float f = (float)((d0 + profiler$result1.field_76332_a * (double)j2 / (double)i1) * (Math.PI * 2D) / 100.0D);
@@ -772,9 +795,10 @@
}
tessellator.func_78381_a();
-@@ -1355,13 +1338,11 @@
+ bufferbuilder.func_181668_a(5, DefaultVertexFormats.field_181706_f);
- for (int i3 = i1; i3 >= 0; --i3)
+- for (int i3 = i1; i3 >= 0; i3--)
++ for (int i3 = i1; i3 >= 0; --i3)
{
- float f3 = (float)((d0 + profiler$result1.field_76332_a * (double)i3 / (double)i1) * (float)(Math.PI * 2) / 100.0);
+ float f3 = (float)((d0 + profiler$result1.field_76332_a * (double)i3 / (double)i1) * (Math.PI * 2D) / 100.0D);
@@ -789,6 +813,15 @@
}
tessellator.func_78381_a();
+@@ -1391,7 +1372,7 @@
+ s = decimalformat.format(profiler$result.field_76330_b) + "%";
+ this.field_71466_p.func_175063_a(s, (float)(j + 160 - this.field_71466_p.func_78256_a(s)), (float)(k - 80 - 16), 16777215);
+
+- for (int k2 = 0; k2 < list.size(); k2++)
++ for (int k2 = 0; k2 < list.size(); ++k2)
+ {
+ Profiler.Result profiler$result2 = list.get(k2);
+ StringBuilder stringbuilder = new StringBuilder();
@@ -1408,11 +1389,9 @@
String s1 = stringbuilder.append(profiler$result2.field_76331_c).toString();
this.field_71466_p.func_175063_a(s1, (float)(j - 160), (float)(k + 80 + k2 * 8 + 20), profiler$result2.func_76329_a());
@@ -880,7 +913,18 @@
{
this.field_71460_t.field_78516_c.func_187460_a(enumhand);
return;
-@@ -1662,6 +1632,11 @@
+@@ -1614,6 +1584,10 @@
+
+ public void func_71352_k()
+ {
++ if (net.minecraftforge.common.ForgeEarlyConfig.WINDOW_BORDERLESS_REPLACES_FULLSCREEN) {
++ Display.toggleBorderless();
++ return;
++ }
+ try
+ {
+ this.field_71431_Q = !this.field_71431_Q;
+@@ -1662,6 +1636,11 @@
}
Display.setFullscreen(this.field_71431_Q);
@@ -892,16 +936,19 @@
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
this.func_175601_h();
}
-@@ -1708,6 +1683,8 @@
- --this.field_71467_ac;
+@@ -1705,8 +1684,10 @@
+ {
+ if (this.field_71467_ac > 0)
+ {
+- this.field_71467_ac--;
++ --this.field_71467_ac;
}
-
-+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
+
++ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
+
this.field_71424_I.func_76320_a("gui");
- if (!this.field_71445_n)
-@@ -1736,7 +1713,7 @@
+@@ -1736,7 +1717,7 @@
{
if (this.field_71439_g.func_110143_aJ() <= 0.0F && !(this.field_71462_r instanceof GuiGameOver))
{
@@ -910,7 +957,7 @@
}
else if (this.field_71439_g.func_70608_bn() && this.field_71441_e != null)
{
-@@ -1745,7 +1722,7 @@
+@@ -1745,7 +1726,7 @@
}
else if (this.field_71462_r != null && this.field_71462_r instanceof GuiSleepMP && !this.field_71439_g.func_70608_bn())
{
@@ -919,7 +966,25 @@
}
if (this.field_71462_r != null)
-@@ -1892,12 +1869,7 @@
+@@ -1802,7 +1783,7 @@
+
+ if (this.field_71429_W > 0)
+ {
+- this.field_71429_W--;
++ --this.field_71429_W;
+ }
+
+ this.field_71424_I.func_76318_c("keyboard");
+@@ -1813,7 +1794,7 @@
+ {
+ if (this.field_71439_g != null)
+ {
+- this.field_71457_ai++;
++ ++this.field_71457_ai;
+
+ if (this.field_71457_ai == 30)
+ {
+@@ -1892,12 +1873,7 @@
if (!this.field_71445_n && this.field_71441_e != null)
{
@@ -933,7 +998,7 @@
}
this.field_71424_I.func_76318_c("particles");
-@@ -1914,6 +1886,7 @@
+@@ -1914,6 +1890,7 @@
}
this.field_71424_I.func_76319_b();
@@ -941,7 +1006,16 @@
this.field_71423_H = func_71386_F();
}
-@@ -2019,6 +1992,7 @@
+@@ -1992,7 +1969,7 @@
+ this.func_71383_b(0);
+ }
+
+- for (int j = 0; j < 9; j++)
++ for (int j = 0; j < 9; ++j)
+ {
+ if (i == 2 + j)
+ {
+@@ -2019,6 +1996,7 @@
}
}
}
@@ -949,7 +1023,7 @@
}
this.func_184117_aA();
-@@ -2095,16 +2069,16 @@
+@@ -2095,16 +2073,16 @@
{
this.func_190521_a("debug.help.message");
GuiNewChat guinewchat = this.field_71456_v.func_146158_b();
@@ -976,16 +1050,40 @@
return true;
}
else if (p_184122_1_ == 20)
-@@ -2136,7 +2110,7 @@
+@@ -2121,9 +2099,9 @@
+
+ private void func_184117_aA()
+ {
+- while (this.field_71474_y.field_151457_aa.func_151468_f())
++ for (; this.field_71474_y.field_151457_aa.func_151468_f(); this.field_71438_f.func_174979_m())
+ {
+- this.field_71474_y.field_74320_O++;
++ ++this.field_71474_y.field_74320_O;
+
+ if (this.field_71474_y.field_74320_O > 2)
+ {
+@@ -2136,10 +2114,8 @@
}
else if (this.field_71474_y.field_74320_O == 1)
{
- this.field_71460_t.func_175066_a(null);
+ this.field_71460_t.func_175066_a((Entity)null);
}
+-
+- this.field_71438_f.func_174979_m();
}
-@@ -2223,16 +2197,27 @@
+ while (this.field_71474_y.field_151458_ab.func_151468_f())
+@@ -2147,7 +2123,7 @@
+ this.field_71474_y.field_74326_T = !this.field_71474_y.field_74326_T;
+ }
+
+- for (int i = 0; i < 9; i++)
++ for (int i = 0; i < 9; ++i)
+ {
+ boolean flag = this.field_71474_y.field_193629_ap.func_151470_d();
+ boolean flag1 = this.field_71474_y.field_193630_aq.func_151470_d();
+@@ -2225,16 +2201,27 @@
this.field_71442_b.func_78766_c(this.field_71439_g);
}
@@ -1023,7 +1121,7 @@
}
}
else
-@@ -2265,6 +2250,8 @@
+@@ -2267,6 +2254,8 @@
{
while (Mouse.next())
{
@@ -1032,7 +1130,7 @@
int i = Mouse.getEventButton();
KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
-@@ -2320,24 +2307,19 @@
+@@ -2322,24 +2311,19 @@
this.field_71462_r.func_146274_d();
}
}
@@ -1061,7 +1159,7 @@
System.gc();
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
WorldInfo worldinfo = isavehandler.func_75757_d();
-@@ -2358,15 +2340,11 @@
+@@ -2360,15 +2344,11 @@
YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
@@ -1079,7 +1177,7 @@
this.field_71437_Z.func_71256_s();
this.field_71455_al = true;
}
-@@ -2383,6 +2361,12 @@
+@@ -2385,6 +2365,12 @@
while (!this.field_71437_Z.func_71200_ad())
{
@@ -1092,7 +1190,7 @@
String s = this.field_71437_Z.func_71195_b_();
if (s != null)
-@@ -2398,17 +2382,24 @@
+@@ -2400,17 +2386,24 @@
{
Thread.sleep(200L);
}
@@ -1121,7 +1219,7 @@
this.field_71453_ak = networkmanager;
}
-@@ -2419,6 +2410,8 @@
+@@ -2421,6 +2414,8 @@
public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
{
@@ -1130,7 +1228,7 @@
if (p_71353_1_ == null)
{
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2431,6 +2424,18 @@
+@@ -2433,6 +2428,18 @@
if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
{
this.field_71437_Z.func_71263_m();
@@ -1149,7 +1247,7 @@
}
this.field_71437_Z = null;
-@@ -2452,8 +2457,9 @@
+@@ -2454,8 +2461,9 @@
{
this.field_110448_aq.func_148529_f();
this.field_71456_v.func_181029_i();
@@ -1160,7 +1258,7 @@
}
this.field_147127_av.func_147690_c();
-@@ -2470,6 +2476,7 @@
+@@ -2472,6 +2480,7 @@
}
TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_71353_1_);
@@ -1168,7 +1266,7 @@
if (p_71353_1_ != null)
{
-@@ -2478,9 +2485,7 @@
+@@ -2480,9 +2489,7 @@
AuthenticationService authenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
MinecraftSessionService minecraftsessionservice = authenticationservice.createMinecraftSessionService();
GameProfileRepository gameprofilerepository = authenticationservice.createProfileRepository();
@@ -1179,7 +1277,7 @@
TileEntitySkull.func_184293_a(playerprofilecache);
TileEntitySkull.func_184294_a(minecraftsessionservice);
PlayerProfileCache.func_187320_a(false);
-@@ -2524,13 +2529,9 @@
+@@ -2526,13 +2533,9 @@
this.field_175622_Z = null;
EntityPlayerSP entityplayersp = this.field_71439_g;
@@ -1195,7 +1293,7 @@
this.field_71439_g.field_71093_bK = p_71354_1_;
this.field_175622_Z = this.field_71439_g;
this.field_71439_g.func_70065_x();
-@@ -2544,7 +2545,7 @@
+@@ -2546,7 +2549,7 @@
if (this.field_71462_r instanceof GuiGameOver)
{
@@ -1204,7 +1302,7 @@
}
}
-@@ -2578,159 +2579,8 @@
+@@ -2580,159 +2583,8 @@
{
if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
{
@@ -1366,12 +1464,12 @@
}
}
-@@ -2778,7 +2628,14 @@
+@@ -2780,7 +2632,14 @@
{
public String call()
{
- return GlStateManager.func_187416_u(7937) + " GL version " + GlStateManager.func_187416_u(7938) + ", " + GlStateManager.func_187416_u(7936);
-+ if (Minecraft.func_71410_x().func_152345_ab())
++ if (Minecraft.func_71410_x().func_152345_ab() && Display.isCreated())
+ {
+ return GlStateManager.func_187416_u(7937) + " GL version " + GlStateManager.func_187416_u(7938) + ", " + GlStateManager.func_187416_u(7936);
+ }
@@ -1382,7 +1480,7 @@
}
});
p_71396_1_.func_85056_g().func_189529_a("GL Caps", new ICrashReportDetail()
-@@ -2795,10 +2652,7 @@
+@@ -2797,10 +2656,7 @@
return Minecraft.this.field_71474_y.field_178881_t ? "Yes" : "No";
}
});
@@ -1394,7 +1492,7 @@
{
public String call() throws Exception
{
-@@ -2810,13 +2664,10 @@
+@@ -2812,13 +2668,10 @@
}
else
{
@@ -1410,7 +1508,7 @@
p_71396_1_.func_85056_g().func_189529_a("Type", new ICrashReportDetail()
{
public String call() throws Exception
-@@ -2883,11 +2734,11 @@
+@@ -2885,11 +2738,11 @@
return field_71432_P;
}
@@ -1423,7 +1521,7 @@
public void run()
{
Minecraft.this.func_110436_a();
-@@ -2895,21 +2746,20 @@
+@@ -2897,21 +2750,20 @@
});
}
@@ -1451,7 +1549,7 @@
int i = 0;
for (ResourcePackRepository.Entry resourcepackrepository$entry : this.field_110448_aq.func_110613_c())
-@@ -2939,7 +2789,6 @@
+@@ -2941,7 +2793,6 @@
}
}
@@ -1459,7 +1557,7 @@
public void func_70001_b(Snooper p_70001_1_)
{
p_70001_1_.func_152767_b("opengl_version", GlStateManager.func_187416_u(7938));
-@@ -2947,110 +2796,110 @@
+@@ -2949,110 +2800,110 @@
p_70001_1_.func_152767_b("client_brand", ClientBrandRetriever.getClientModName());
p_70001_1_.func_152767_b("launched_version", this.field_110447_Z);
ContextCapabilities contextcapabilities = GLContext.getCapabilities();
@@ -1674,7 +1772,7 @@
GameProfile gameprofile = this.field_71449_j.func_148256_e();
if (gameprofile != null && gameprofile.getId() != null)
-@@ -3061,21 +2910,10 @@
+@@ -3063,21 +2914,10 @@
public static int func_71369_N()
{
@@ -1698,7 +1796,7 @@
public boolean func_70002_Q()
{
return this.field_71474_y.field_74355_t;
-@@ -3205,6 +3043,9 @@
+@@ -3207,6 +3047,9 @@
}
else if (this.field_71439_g != null)
{
@@ -1708,7 +1806,7 @@
if (this.field_71439_g.field_70170_p.field_73011_w instanceof WorldProviderHell)
{
return MusicTicker.MusicType.NETHER;
-@@ -3215,9 +3056,7 @@
+@@ -3217,9 +3060,7 @@
}
else
{
@@ -1719,7 +1817,7 @@
}
}
else
-@@ -3236,19 +3075,15 @@
+@@ -3238,19 +3079,15 @@
{
if (Keyboard.getEventKeyState())
{
@@ -1743,7 +1841,7 @@
{
this.field_71474_y.func_74306_a(GameSettings.Options.NARRATOR, 1);
-@@ -3258,6 +3093,7 @@
+@@ -3260,6 +3097,7 @@
}
}
}
@@ -1751,7 +1849,7 @@
}
}
}
-@@ -3292,16 +3128,16 @@
+@@ -3294,16 +3132,16 @@
{
try
{
@@ -1771,7 +1869,7 @@
synchronized (this.field_152351_aB)
{
-@@ -3311,14 +3147,12 @@
+@@ -3313,14 +3151,12 @@
}
}
@@ -1787,7 +1885,7 @@
public boolean func_152345_ab()
{
return Thread.currentThread() == this.field_152352_aC;
-@@ -3346,7 +3180,7 @@
+@@ -3348,7 +3184,7 @@
public ISearchTree func_193987_a(SearchTreeManager.Key p_193987_1_)
{
@@ -1796,7 +1894,7 @@
}
public static int func_175610_ah()
-@@ -3389,6 +3223,12 @@
+@@ -3391,6 +3227,12 @@
return this.field_184127_aH;
}
@@ -1809,7 +1907,7 @@
public boolean func_189648_am()
{
return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;
-@@ -3402,5 +3242,10 @@
+@@ -3404,5 +3246,10 @@
public Tutorial func_193032_ao()
{
return this.field_193035_aW;
diff --git a/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
index 88fab4f11..68baa83b1 100644
--- a/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
@@ -111,6 +111,15 @@
this.field_148629_h.clear();
this.field_148626_m.clear();
this.field_148625_l.clear();
+@@ -222,7 +228,7 @@
+
+ public void func_148605_d()
+ {
+- this.field_148618_g++;
++ ++this.field_148618_g;
+
+ for (ITickableSound itickablesound : this.field_148625_l)
+ {
@@ -245,13 +251,13 @@
while (iterator.hasNext())
@@ -164,16 +173,24 @@
{
ISound isound1 = entry1.getKey();
-@@ -320,7 +327,7 @@
- }
- else
- {
-- return this.field_148620_e.playing(s) || this.field_148624_n.containsKey(s) && this.field_148624_n.get(s) <= this.field_148618_g;
+@@ -313,7 +320,15 @@
+ else
+ {
+ String s = this.field_148630_i.get(p_148597_1_);
+- return s == null ? false : this.field_148620_e.playing(s) || this.field_148624_n.containsKey(s) && this.field_148624_n.get(s) <= this.field_148618_g;
++
++ if (s == null)
++ {
++ return false;
++ }
++ else
++ {
+ return this.field_148620_e.playing(s) || this.field_148624_n.containsKey(s) && ((Integer)this.field_148624_n.get(s)).intValue() <= this.field_148618_g;
- }
++ }
}
}
-@@ -342,6 +349,9 @@
+
+@@ -334,6 +349,9 @@
{
if (this.field_148617_f)
{
@@ -183,7 +200,7 @@
SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
-@@ -349,7 +359,7 @@
+@@ -341,7 +359,7 @@
{
if (field_188775_c.add(resourcelocation))
{
@@ -192,7 +209,7 @@
}
}
else
-@@ -364,7 +374,7 @@
+@@ -356,7 +374,7 @@
if (this.field_148620_e.getMasterVolume() <= 0.0F)
{
@@ -201,7 +218,7 @@
}
else
{
-@@ -374,7 +384,7 @@
+@@ -366,7 +384,7 @@
{
if (field_188775_c.add(resourcelocation))
{
@@ -210,7 +227,7 @@
}
}
else
-@@ -393,7 +403,7 @@
+@@ -385,7 +403,7 @@
if (f1 == 0.0F)
{
@@ -219,7 +236,7 @@
}
else
{
-@@ -403,42 +413,20 @@
+@@ -395,42 +413,20 @@
if (sound.func_188723_h())
{
@@ -267,7 +284,7 @@
this.field_148629_h.put(s, p_148611_1_);
this.field_188776_k.put(soundcategory, s);
-@@ -472,7 +460,7 @@
+@@ -464,7 +460,7 @@
if (flag)
{
@@ -276,7 +293,7 @@
this.field_148620_e.pause(s);
this.field_189000_p.add(s);
}
-@@ -483,7 +471,7 @@
+@@ -475,7 +471,7 @@
{
for (String s : this.field_189000_p)
{
@@ -285,7 +302,7 @@
this.field_148620_e.play(s);
}
-@@ -492,7 +480,7 @@
+@@ -484,7 +480,7 @@
public void func_148599_a(ISound p_148599_1_, int p_148599_2_)
{
@@ -294,7 +311,7 @@
}
private static URL func_148612_a(final ResourceLocation p_148612_0_)
-@@ -500,16 +488,13 @@
+@@ -492,16 +488,13 @@
String s = String.format("%s:%s:%s", "mcsounddomain", p_148612_0_.func_110624_b(), p_148612_0_.func_110623_a());
URLStreamHandler urlstreamhandler = new URLStreamHandler()
{
@@ -311,7 +328,7 @@
public InputStream getInputStream() throws IOException
{
return Minecraft.func_71410_x().func_110442_L().func_110536_a(p_148612_0_).func_110527_b();
-@@ -520,9 +505,9 @@
+@@ -512,9 +505,9 @@
try
{
@@ -323,7 +340,7 @@
{
throw new Error("TODO: Sanely handle url exception! :D");
}
-@@ -530,21 +515,24 @@
+@@ -522,21 +515,24 @@
public void func_148615_a(EntityPlayer p_148615_1_, float p_148615_2_)
{
@@ -357,7 +374,7 @@
float f8 = f2 * f4;
float f9 = f3 * f4;
float f10 = f2 * f6;
-@@ -595,7 +583,6 @@
+@@ -587,7 +583,6 @@
{
}
@@ -365,12 +382,22 @@
public boolean playing(String p_playing_1_)
{
synchronized (SoundSystemConfig.THREAD_SYNC)
-@@ -606,7 +593,7 @@
+@@ -598,8 +593,16 @@
}
else
{
- Source source = this.soundLibrary.getSources().get(p_playing_1_);
+- return source == null ? false : source.playing() || source.paused() || source.preLoad;
+ Source source = (Source)this.soundLibrary.getSources().get(p_playing_1_);
-
- if (source == null)
- {
++
++ if (source == null)
++ {
++ return false;
++ }
++ else
++ {
++ return source.playing() || source.paused() || source.preLoad;
++ }
+ }
+ }
+ }
diff --git a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
index 67e3b25ef..ca2aee1b8 100644
--- a/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/AbstractClientPlayer.java.patch
@@ -1,51 +1,6 @@
--- before/net/minecraft/client/entity/AbstractClientPlayer.java
+++ after/net/minecraft/client/entity/AbstractClientPlayer.java
-@@ -1,6 +1,7 @@
- package net.minecraft.client.entity;
-
- import com.mojang.authlib.GameProfile;
-+import java.io.File;
- import javax.annotation.Nullable;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.network.NetworkPlayerInfo;
-@@ -33,14 +34,12 @@
- super(p_i45074_1_, p_i45074_2_);
- }
-
-- @Override
- public boolean func_175149_v()
- {
- NetworkPlayerInfo networkplayerinfo = Minecraft.func_71410_x().func_147114_u().func_175102_a(this.func_146103_bH().getId());
- return networkplayerinfo != null && networkplayerinfo.func_178848_b() == GameType.SPECTATOR;
- }
-
-- @Override
- public boolean func_184812_l_()
- {
- NetworkPlayerInfo networkplayerinfo = Minecraft.func_71410_x().func_147114_u().func_175102_a(this.func_146103_bH().getId());
-@@ -101,12 +100,7 @@
-
- if (itextureobject == null)
- {
-- itextureobject = new ThreadDownloadImageData(
-- null,
-- String.format("http://skins.minecraft.net/MinecraftSkins/%s.png", StringUtils.func_76338_a(p_110304_1_)),
-- DefaultPlayerSkin.func_177334_a(func_175147_b(p_110304_1_)),
-- new ImageBufferDownload()
-- );
-+ itextureobject = new ThreadDownloadImageData((File)null, String.format("http://skins.minecraft.net/MinecraftSkins/%s.png", StringUtils.func_76338_a(p_110304_1_)), DefaultPlayerSkin.func_177334_a(func_175147_b(p_110304_1_)), new ImageBufferDownload());
- texturemanager.func_110579_a(p_110304_0_, itextureobject);
- }
-
-@@ -134,14 +128,14 @@
- }
-
- IAttributeInstance iattributeinstance = this.func_110148_a(SharedMonsterAttributes.field_111263_d);
-- f = (float)((double)f * ((iattributeinstance.func_111126_e() / (double)this.field_71075_bZ.func_75094_b() + 1.0) / 2.0));
-+ f = (float)((double)f * ((iattributeinstance.func_111126_e() / (double)this.field_71075_bZ.func_75094_b() + 1.0D) / 2.0D));
-
- if (this.field_71075_bZ.func_75094_b() == 0.0F || Float.isNaN(f) || Float.isInfinite(f))
- {
+@@ -141,7 +141,7 @@
f = 1.0F;
}
@@ -54,14 +9,7 @@
{
int i = this.func_184612_cw();
float f1 = (float)i / 20.0F;
-@@ -152,12 +146,12 @@
- }
- else
- {
-- f1 *= f1;
-+ f1 = f1 * f1;
- }
-
+@@ -158,6 +158,6 @@
f *= 1.0F - f1 * 0.15F;
}
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch
index 8acea2d43..2a802eef0 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch
@@ -44,15 +44,21 @@
public void func_70071_h_()
{
this.field_71082_cx = 0.0F;
-@@ -80,7 +75,6 @@
- this.field_184619_aG += this.field_70721_aZ;
+@@ -76,11 +71,10 @@
+ f = 1.0F;
+ }
+
+- this.field_70721_aZ = this.field_70721_aZ + (f - this.field_70721_aZ) * 0.4F;
+- this.field_184619_aG = this.field_184619_aG + this.field_70721_aZ;
++ this.field_70721_aZ += (f - this.field_70721_aZ) * 0.4F;
++ this.field_184619_aG += this.field_70721_aZ;
}
- @Override
public void func_70636_d()
{
if (this.field_71184_b > 0)
-@@ -88,16 +82,16 @@
+@@ -88,21 +82,21 @@
double d0 = this.field_70165_t + (this.field_71185_c - this.field_70165_t) / (double)this.field_71184_b;
double d1 = this.field_70163_u + (this.field_71182_d - this.field_70163_u) / (double)this.field_71184_b;
double d2 = this.field_70161_v + (this.field_71183_e - this.field_70161_v) / (double)this.field_71184_b;
@@ -74,6 +80,12 @@
}
this.field_70177_z = (float)((double)this.field_70177_z + d3 / (double)this.field_71184_b);
+ this.field_70125_A = (float)((double)this.field_70125_A + (this.field_71181_g - (double)this.field_70125_A) / (double)this.field_71184_b);
+- this.field_71184_b--;
++ --this.field_71184_b;
+ this.func_70107_b(d0, d1, d2);
+ this.func_70101_b(this.field_70177_z, this.field_70125_A);
+ }
@@ -110,7 +104,7 @@
this.field_71107_bF = this.field_71109_bG;
this.func_82168_bl();
@@ -83,7 +95,16 @@
if (f1 > 0.1F)
{
-@@ -134,21 +128,18 @@
+@@ -127,28 +121,25 @@
+ f = 0.0F;
+ }
+
+- this.field_71109_bG = this.field_71109_bG + (f1 - this.field_71109_bG) * 0.4F;
+- this.field_70726_aT = this.field_70726_aT + (f - this.field_70726_aT) * 0.8F;
++ this.field_71109_bG += (f1 - this.field_71109_bG) * 0.4F;
++ this.field_70726_aT += (f - this.field_70726_aT) * 0.8F;
+ this.field_70170_p.field_72984_F.func_76320_a("push");
+ this.func_85033_bc();
this.field_70170_p.field_72984_F.func_76319_b();
}
diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
index 0620a5517..48410ca49 100644
--- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
+++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
@@ -62,12 +62,14 @@
Entity entity = this.func_184208_bv();
if (entity != this && entity.func_184186_bw())
-@@ -246,30 +241,21 @@
+@@ -245,31 +240,22 @@
+ double d2 = this.field_70161_v - this.field_175167_bK;
double d3 = (double)(this.field_70177_z - this.field_175164_bL);
double d4 = (double)(this.field_70125_A - this.field_175165_bM);
- ++this.field_175168_bP;
+- this.field_175168_bP++;
- boolean flag2 = d0 * d0 + d1 * d1 + d2 * d2 > 9.0E-4 || this.field_175168_bP >= 20;
- boolean flag3 = d3 != 0.0 || d4 != 0.0;
++ ++this.field_175168_bP;
+ boolean flag2 = d0 * d0 + d1 * d1 + d2 * d2 > 9.0E-4D || this.field_175168_bP >= 20;
+ boolean flag3 = d3 != 0.0D || d4 != 0.0D;
@@ -510,14 +512,23 @@
}
}
-@@ -821,7 +792,6 @@
+@@ -821,14 +792,13 @@
return this.field_71159_c.func_175606_aa() == this;
}
- @Override
public void func_70636_d()
{
- ++this.field_71157_e;
+- this.field_71157_e++;
++ ++this.field_71157_e;
+
+ if (this.field_71156_d > 0)
+ {
+- this.field_71156_d--;
++ --this.field_71156_d;
+ }
+
+ this.field_71080_cy = this.field_71086_bY;
@@ -842,14 +812,12 @@
this.func_71053_j();
}
@@ -535,6 +546,15 @@
}
this.field_71086_bY += 0.0125F;
+@@ -885,7 +853,7 @@
+
+ if (this.field_71088_bW > 0)
+ {
+- this.field_71088_bW--;
++ --this.field_71088_bW;
+ }
+
+ boolean flag = this.field_71158_b.field_78901_c;
@@ -893,6 +861,7 @@
float f = 0.8F;
boolean flag2 = this.field_71158_b.field_192832_b >= 0.8F;
@@ -543,7 +563,14 @@
this.field_71159_c.func_193032_ao().func_193293_a(this.field_71158_b);
if (this.func_184587_cr() && !this.func_184218_aH())
-@@ -912,28 +881,16 @@
+@@ -906,34 +875,22 @@
+
+ if (this.field_189812_cs > 0)
+ {
+- this.field_189812_cs--;
++ --this.field_189812_cs;
+ flag3 = true;
+ this.field_71158_b.field_78901_c = true;
}
AxisAlignedBB axisalignedbb = this.func_174813_aQ();
@@ -608,17 +635,43 @@
{
ItemStack itemstack = this.func_184582_a(EntityEquipmentSlot.CHEST);
-@@ -1006,8 +953,8 @@
+@@ -1006,14 +953,14 @@
{
if (this.field_71158_b.field_78899_d)
{
- this.field_71158_b.field_78902_a = (float)((double)this.field_71158_b.field_78902_a / 0.3);
- this.field_71158_b.field_192832_b = (float)((double)this.field_71158_b.field_192832_b / 0.3);
+- this.field_70181_x = this.field_70181_x - (double)(this.field_71075_bZ.func_75093_a() * 3.0F);
+ this.field_71158_b.field_78902_a = (float)((double)this.field_71158_b.field_78902_a / 0.3D);
+ this.field_71158_b.field_192832_b = (float)((double)this.field_71158_b.field_192832_b / 0.3D);
- this.field_70181_x -= (double)(this.field_71075_bZ.func_75093_a() * 3.0F);
++ this.field_70181_x -= (double)(this.field_71075_bZ.func_75093_a() * 3.0F);
+ }
+
+ if (this.field_71158_b.field_78901_c)
+ {
+- this.field_70181_x = this.field_70181_x + (double)(this.field_71075_bZ.func_75093_a() * 3.0F);
++ this.field_70181_x += (double)(this.field_71075_bZ.func_75093_a() * 3.0F);
}
+ }
+
+@@ -1023,7 +970,7 @@
+
+ if (this.field_110320_a < 0)
+ {
+- this.field_110320_a++;
++ ++this.field_110320_a;
+ if (this.field_110320_a == 0)
+ {
+@@ -1044,7 +991,7 @@
+ }
+ else if (flag)
+ {
+- this.field_110320_a++;
++ ++this.field_110320_a;
+
+ if (this.field_110320_a < 10)
+ {
@@ -1070,7 +1017,6 @@
}
}
@@ -627,23 +680,21 @@
public void func_70098_U()
{
super.func_70098_U();
-@@ -1079,13 +1025,8 @@
+@@ -1079,11 +1025,8 @@
if (this.func_184187_bx() instanceof EntityBoat)
{
EntityBoat entityboat = (EntityBoat)this.func_184187_bx();
- entityboat.func_184442_a(
- this.field_71158_b.field_187257_e, this.field_71158_b.field_187258_f, this.field_71158_b.field_187255_c, this.field_71158_b.field_187256_d
- );
-- this.field_184844_co |= this.field_71158_b.field_187257_e
-- || this.field_71158_b.field_187258_f
-- || this.field_71158_b.field_187255_c
-- || this.field_71158_b.field_187256_d;
+- this.field_184844_co = this.field_184844_co
+- | (this.field_71158_b.field_187257_e || this.field_71158_b.field_187258_f || this.field_71158_b.field_187255_c || this.field_71158_b.field_187256_d);
+ entityboat.func_184442_a(this.field_71158_b.field_187257_e, this.field_71158_b.field_187258_f, this.field_71158_b.field_187255_c, this.field_71158_b.field_187256_d);
+ this.field_184844_co |= this.field_71158_b.field_187257_e || this.field_71158_b.field_187258_f || this.field_71158_b.field_187255_c || this.field_71158_b.field_187256_d;
}
}
-@@ -1095,7 +1036,6 @@
+@@ -1093,7 +1036,6 @@
}
@Nullable
@@ -651,7 +702,7 @@
public PotionEffect func_184596_c(@Nullable Potion p_184596_1_)
{
if (p_184596_1_ == MobEffects.field_76431_k)
-@@ -1107,7 +1047,6 @@
+@@ -1105,7 +1047,6 @@
return super.func_184596_c(p_184596_1_);
}
@@ -659,7 +710,7 @@
public void func_70091_d(MoverType p_70091_1_, double p_70091_2_, double p_70091_4_, double p_70091_6_)
{
double d0 = this.field_70165_t;
-@@ -1132,8 +1071,10 @@
+@@ -1130,8 +1071,10 @@
if (vec2f.field_189982_i != 0.0F || vec2f.field_189983_j != 0.0F)
{
Vec3d vec3d = new Vec3d(this.field_70165_t, this.func_174813_aQ().field_72338_b, this.field_70161_v);
@@ -672,7 +723,7 @@
float f = this.func_70689_ay();
float f1 = (float)vec3d2.func_189985_c();
-@@ -1141,8 +1082,8 @@
+@@ -1139,8 +1082,8 @@
{
float f2 = f * vec2f.field_189982_i;
float f3 = f * vec2f.field_189983_j;
@@ -683,7 +734,7 @@
vec3d2 = new Vec3d((double)(f2 * f5 - f3 * f4), vec3d2.field_72448_b, (double)(f3 * f5 + f2 * f4));
f1 = (float)vec3d2.func_189985_c();
-@@ -1157,7 +1098,7 @@
+@@ -1155,7 +1098,7 @@
Vec3d vec3d13 = this.func_189651_aD();
float f13 = (float)(vec3d13.field_72450_a * vec3d12.field_72450_a + vec3d13.field_72449_c * vec3d12.field_72449_c);
@@ -692,7 +743,7 @@
{
BlockPos blockpos = new BlockPos(this.field_70165_t, this.func_174813_aQ().field_72337_e, this.field_70161_v);
IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos);
-@@ -1181,11 +1122,10 @@
+@@ -1179,11 +1122,10 @@
Vec3d vec3d4 = vec3d1.func_178787_e(vec3d12.func_186678_a((double)f8));
float f9 = this.field_70130_N;
float f10 = this.field_70131_O;
@@ -708,7 +759,7 @@
Vec3d vec3d6 = vec3d5.func_186678_a((double)(f9 * 0.5F));
Vec3d vec3d7 = lvt_19_1_.func_178788_d(vec3d6);
Vec3d vec3d8 = vec3d4.func_178788_d(vec3d6);
-@@ -1195,9 +1135,11 @@
+@@ -1193,9 +1135,11 @@
if (!list.isEmpty())
{
@@ -720,13 +771,13 @@
for (AxisAlignedBB axisalignedbb2 : list)
{
-@@ -1206,9 +1148,15 @@
+@@ -1204,9 +1148,15 @@
f11 = (float)axisalignedbb2.field_72337_e;
Vec3d vec3d11 = axisalignedbb2.func_189972_c();
BlockPos blockpos1 = new BlockPos(vec3d11);
+ int i = 1;
-- for (int i = 1; (float)i < f7; ++i)
+- for (int i = 1; (float)i < f7; i++)
+ while (true)
{
+ if ((float)i >= f7)
@@ -737,7 +788,7 @@
BlockPos blockpos2 = blockpos1.func_177981_b(i);
IBlockState iblockstate2 = this.field_70170_p.func_180495_p(blockpos2);
AxisAlignedBB axisalignedbb1;
-@@ -1233,9 +1181,9 @@
+@@ -1231,9 +1181,9 @@
return;
}
}
@@ -749,7 +800,7 @@
}
}
-@@ -1243,7 +1191,7 @@
+@@ -1241,7 +1191,7 @@
{
float f14 = (float)((double)f11 - this.func_174813_aQ().field_72338_b);
@@ -758,7 +809,7 @@
{
this.field_189812_cs = 1;
}
-@@ -1254,5 +1202,18 @@
+@@ -1252,5 +1202,18 @@
}
}
}
diff --git a/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch b/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
index 3c357aaeb..81c17a41f 100644
--- a/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
@@ -24,15 +24,18 @@
@SideOnly(Side.CLIENT)
public class FontRenderer implements IResourceManagerReloadListener
-@@ -56,7 +60,7 @@
+@@ -56,9 +60,9 @@
this.field_111273_g = p_i1035_2_;
this.field_78298_i = p_i1035_3_;
this.field_78293_l = p_i1035_4_;
- p_i1035_3_.func_110577_a(this.field_111273_g);
+ bindTexture(this.field_111273_g);
- for (int i = 0; i < 32; ++i)
+- for (int i = 0; i < 32; i++)
++ for (int i = 0; i < 32; ++i)
{
+ int j = (i >> 3 & 1) * 85;
+ int k = (i >> 2 & 1) * 170 + j;
@@ -107,7 +111,7 @@
try
@@ -42,6 +45,30 @@
bufferedimage = TextureUtil.func_177053_a(iresource.func_110527_b());
}
catch (IOException ioexception)
+@@ -128,7 +132,7 @@
+ boolean lvt_8_1_ = true;
+ float lvt_9_1_ = 8.0F / (float)lvt_7_1_;
+
+- for (int lvt_10_1_ = 0; lvt_10_1_ < 256; lvt_10_1_++)
++ for (int lvt_10_1_ = 0; lvt_10_1_ < 256; ++lvt_10_1_)
+ {
+ int j1 = lvt_10_1_ % 16;
+ int k1 = lvt_10_1_ / 16;
+@@ -140,12 +144,12 @@
+
+ int l1;
+
+- for (l1 = lvt_7_1_ - 1; l1 >= 0; l1--)
++ for (l1 = lvt_7_1_ - 1; l1 >= 0; --l1)
+ {
+ int i2 = j1 * lvt_7_1_ + l1;
+ boolean flag1 = true;
+
+- for (int j2 = 0; j2 < lvt_6_1_ && flag1; j2++)
++ for (int j2 = 0; j2 < lvt_6_1_ && flag1; ++j2)
+ {
+ int k2 = (k1 * lvt_7_1_ + j2) * lvt_3_2_;
+
@@ -171,7 +175,7 @@
try
@@ -86,7 +113,12 @@
this.func_78265_b();
int i;
-@@ -326,7 +331,7 @@
+@@ -322,11 +327,11 @@
+
+ private void func_78255_a(String p_78255_1_, boolean p_78255_2_)
+ {
+- for (int i = 0; i < p_78255_1_.length(); i++)
++ for (int i = 0; i < p_78255_1_.length(); ++i)
{
char c0 = p_78255_1_.charAt(i);
@@ -116,7 +148,7 @@
}
else if (i1 == 16)
{
-@@ -379,7 +379,7 @@
+@@ -379,10 +379,10 @@
this.field_78299_w = false;
this.field_78300_v = false;
this.field_78301_u = false;
@@ -124,7 +156,11 @@
+ setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
}
- ++i;
+- i++;
++ ++i;
+ }
+ else
+ {
@@ -409,7 +409,7 @@
c0 = c1;
}
@@ -134,9 +170,12 @@
boolean flag = (c0 == 0 || j == -1 || this.field_78293_l) && p_78255_2_;
if (flag)
-@@ -447,6 +447,15 @@
+@@ -445,8 +445,17 @@
+ this.field_78296_k += f1;
+ }
- ++f;
+- f++;
++ ++f;
}
+ doDraw(f);
+ }
@@ -159,6 +198,24 @@
this.field_78295_j = p_180455_2_;
this.field_78296_k = p_180455_3_;
this.func_78255_a(p_180455_1_, p_180455_5_);
+@@ -545,7 +554,7 @@
+ int i = 0;
+ boolean flag = false;
+
+- for (int j = 0; j < p_78256_1_.length(); j++)
++ for (int j = 0; j < p_78256_1_.length(); ++j)
+ {
+ char c0 = p_78256_1_.charAt(j);
+ int k = this.func_78263_a(c0);
+@@ -570,7 +579,7 @@
+
+ if (flag && k > 0)
+ {
+- i++;
++ ++i;
+ }
+ }
+
@@ -580,6 +589,7 @@
public int func_78263_a(char p_78263_1_)
@@ -167,6 +224,15 @@
if (p_78263_1_ == 167)
{
return -1;
+@@ -602,7 +612,7 @@
+ int j = this.field_78287_e[p_78263_1_] & 255;
+ int k = j >>> 4;
+ int l = j & 15;
+- l++;
++ ++l;
+ return (l - k) / 2 + 1;
+ }
+ else
@@ -635,14 +645,17 @@
{
flag = false;
@@ -190,6 +256,15 @@
}
else if (i1 < 0)
{
+@@ -654,7 +667,7 @@
+
+ if (flag1)
+ {
+- i++;
++ ++i;
+ }
+ }
+
@@ -678,7 +691,7 @@
private String func_78273_d(String p_78273_1_)
@@ -199,7 +274,7 @@
{
p_78273_1_ = p_78273_1_.substring(0, p_78273_1_.length() - 1);
}
-@@ -725,9 +738,95 @@
+@@ -725,9 +738,96 @@
public List func_78271_c(String p_78271_1_, int p_78271_2_)
{
@@ -225,6 +300,7 @@
+ list.add(line.toString());
+ fed = i + 1;
+ line.delete(0, line.length()).append(format);
++ prevFormat = format.length();
+ lineWidth = 0;
+ widths[0] = lineWidth;
+ formats[0] = format.toString();
@@ -278,7 +354,7 @@
+ lineWidth = func_78263_a(current);
+ } else {
+ d = icui - fed;
-+ if (line.charAt(d + prevFormat - 1) == '§') d++;
++ if (line.charAt(d + prevFormat - 2) == '§') d++;
+ list.add(line.substring(0, d + prevFormat));
+ temp = line.substring(d + prevFormat);
+ fed += d;
@@ -296,7 +372,7 @@
String func_78280_d(String p_78280_1_, int p_78280_2_)
{
int i = this.func_78259_e(p_78280_1_, p_78280_2_);
-@@ -746,6 +845,7 @@
+@@ -746,6 +846,7 @@
}
}
@@ -304,7 +380,33 @@
private int func_78259_e(String p_78259_1_, int p_78259_2_)
{
int i = p_78259_1_.length();
-@@ -844,6 +944,26 @@
+@@ -753,14 +854,14 @@
+ int k = 0;
+ int l = -1;
+
+- for (boolean flag = false; k < i; k++)
++ for (boolean flag = false; k < i; ++k)
+ {
+ char c0 = p_78259_1_.charAt(k);
+
+ switch (c0)
+ {
+ case '\n':
+- k--;
++ --k;
+ break;
+ case ' ':
+ l = k;
+@@ -769,7 +870,7 @@
+
+ if (flag)
+ {
+- j++;
++ ++j;
+ }
+
+ break;
+@@ -844,6 +945,26 @@
public boolean func_78260_a()
{
return this.field_78294_m;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch
index 95e4a3b2f..cbaa67de2 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiControls.java.patch
@@ -55,7 +55,8 @@
+ this.field_146292_n.add(new GuiOptionButton(gamesettings$options.func_74381_c(), this.field_146294_l / 2 - 155 + i % 2 * 160, 18 + 24 * (i >> 1), gamesettings$options, this.field_146497_i.func_74297_c(gamesettings$options)));
}
- ++i;
+- i++;
++ ++i;
}
}
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
index 177a79d87..5f03b78da 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
@@ -124,6 +124,24 @@
worldsettings.func_82750_a(this.field_146334_a);
if (this.field_146338_v && !this.field_146337_w)
+@@ -319,7 +285,7 @@
+ }
+ else if (p_146284_1_.field_146127_k == 5)
+ {
+- this.field_146331_K++;
++ ++this.field_146331_K;
+
+ if (this.field_146331_K >= WorldType.field_77139_a.length)
+ {
+@@ -328,7 +294,7 @@
+
+ while (!this.func_175299_g())
+ {
+- this.field_146331_K++;
++ ++this.field_146331_K;
+
+ if (this.field_146331_K >= WorldType.field_77139_a.length)
+ {
@@ -348,14 +314,7 @@
}
else if (p_146284_1_.field_146127_k == 8)
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
index a6fc4e15a..cf0a10960 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
@@ -8,7 +8,7 @@
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ContainerEnchantment;
import net.minecraft.item.ItemStack;
-@@ -50,21 +51,18 @@
+@@ -50,28 +51,25 @@
this.field_175380_I = p_i45502_3_;
}
@@ -30,6 +30,14 @@
protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
{
super.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
+ int i = (this.field_146294_l - this.field_146999_f) / 2;
+ int j = (this.field_146295_m - this.field_147000_g) / 2;
+
+- for (int k = 0; k < 3; k++)
++ for (int k = 0; k < 3; ++k)
+ {
+ int l = p_73864_1_ - (i + 60);
+ int i1 = p_73864_2_ - (j + 14 + 19 * k);
@@ -83,7 +81,6 @@
}
}
@@ -61,6 +69,15 @@
GlStateManager.func_179101_C();
RenderHelper.func_74518_a();
GlStateManager.func_179128_n(5889);
+@@ -158,7 +150,7 @@
+ EnchantmentNameParts.func_178176_a().func_148335_a((long)this.field_147075_G.field_178149_f);
+ int k = this.field_147075_G.func_178147_e();
+
+- for (int l = 0; l < 3; l++)
++ for (int l = 0; l < 3; ++l)
+ {
+ int i1 = i + 60;
+ int j1 = i1 + 20;
@@ -179,7 +171,7 @@
FontRenderer fontrenderer = this.field_146297_k.field_71464_q;
int i2 = 6839882;
@@ -78,7 +95,15 @@
public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
{
p_73863_3_ = this.field_146297_k.func_193989_ak();
-@@ -229,11 +220,12 @@
+@@ -222,18 +213,19 @@
+ boolean flag = this.field_146297_k.field_71439_g.field_71075_bZ.field_75098_d;
+ int i = this.field_147075_G.func_178147_e();
+
+- for (int j = 0; j < 3; j++)
++ for (int j = 0; j < 3; ++j)
+ {
+ int k = this.field_147075_G.field_75167_g[j];
+ Enchantment enchantment = Enchantment.func_185262_c(this.field_147075_G.field_185001_h[j]);
int l = this.field_147075_G.field_185002_i[j];
int i1 = j + 1;
@@ -94,14 +119,15 @@
if (!flag)
{
list.add("");
-@@ -285,11 +277,15 @@
+@@ -285,19 +277,23 @@
{
this.field_147077_B = itemstack;
- do
+ while (true)
{
- this.field_147082_x += (float)(this.field_147074_F.nextInt(4) - this.field_147074_F.nextInt(4));
+- this.field_147082_x = this.field_147082_x + (float)(this.field_147074_F.nextInt(4) - this.field_147074_F.nextInt(4));
++ this.field_147082_x += (float)(this.field_147074_F.nextInt(4) - this.field_147074_F.nextInt(4));
+
+ if (this.field_147071_v > this.field_147082_x + 1.0F || this.field_147071_v < this.field_147082_x - 1.0F)
+ {
@@ -111,4 +137,24 @@
- while (this.field_147071_v <= this.field_147082_x + 1.0F && this.field_147071_v >= this.field_147082_x - 1.0F);
}
- ++this.field_147073_u;
+- this.field_147073_u++;
++ ++this.field_147073_u;
+ this.field_147069_w = this.field_147071_v;
+ this.field_147076_A = this.field_147080_z;
+ boolean flag = false;
+
+- for (int i = 0; i < 3; i++)
++ for (int i = 0; i < 3; ++i)
+ {
+ if (this.field_147075_G.field_75167_g[i] != 0)
+ {
+@@ -318,7 +314,7 @@
+ float f1 = (this.field_147082_x - this.field_147071_v) * 0.4F;
+ float f = 0.2F;
+ f1 = MathHelper.func_76131_a(f1, -0.2F, 0.2F);
+- this.field_147081_y = this.field_147081_y + (f1 - this.field_147081_y) * 0.9F;
+- this.field_147071_v = this.field_147071_v + this.field_147081_y;
++ this.field_147081_y += (f1 - this.field_147081_y) * 0.9F;
++ this.field_147071_v += this.field_147081_y;
+ }
+ }
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.java.patch
index 09d686b3c..e4e71e5f0 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiGameOver.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiGameOver.java.patch
@@ -9,3 +9,12 @@
}
else
{
+@@ -195,7 +195,7 @@
+ public void func_73876_c()
+ {
+ super.func_73876_c();
+- this.field_146347_a++;
++ ++this.field_146347_a;
+
+ if (this.field_146347_a == 20)
+ {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
index 98a65a91e..b1f6fc697 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch
@@ -169,17 +169,20 @@
{
int k = p_184048_1_.func_78326_a();
int l = 1;
-@@ -491,12 +468,12 @@
+@@ -490,13 +467,13 @@
+
if (potion.func_188408_i())
{
- ++i;
+- i++;
- k -= 25 * i;
++ ++i;
+ k = k - 25 * i;
}
else
{
- ++j;
+- j++;
- k -= 25 * j;
++ ++j;
+ k = k - 25 * j;
l += 26;
}
@@ -203,7 +206,7 @@
}
}
}
-@@ -559,12 +537,7 @@
+@@ -559,15 +537,10 @@
this.field_73735_i = f;
GlStateManager.func_179091_B();
GlStateManager.func_179147_l();
@@ -216,7 +219,11 @@
+ GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
RenderHelper.func_74520_c();
- for (int l = 0; l < 9; ++l)
+- for (int l = 0; l < 9; l++)
++ for (int l = 0; l < 9; ++l)
+ {
+ int i1 = i - 90 + l * 20 + 2;
+ int j1 = p_180479_1_.func_78328_b() - 16 - 3;
@@ -702,12 +675,7 @@
{
GlStateManager.func_179094_E();
@@ -231,7 +238,52 @@
this.func_175179_f().func_175063_a(s, (float)i, (float)j, 16777215 + (k << 24));
GlStateManager.func_179084_k();
GlStateManager.func_179121_F();
-@@ -997,8 +965,8 @@
+@@ -774,7 +742,7 @@
+
+ for (Score score1 : collection)
+ {
+- j++;
++ ++j;
+ ScorePlayerTeam scoreplayerteam1 = scoreboard.func_96509_i(score1.func_96653_e());
+ String s1 = ScorePlayerTeam.func_96667_a(scoreplayerteam1, score1.func_96653_e());
+ String s2 = TextFormatting.RED + "" + score1.func_96652_c();
+@@ -846,7 +814,7 @@
+
+ this.field_73839_d.field_71424_I.func_76320_a("armor");
+
+- for (int k3 = 0; k3 < 10; k3++)
++ for (int k3 = 0; k3 < 10; ++k3)
+ {
+ if (i3 > 0)
+ {
+@@ -871,7 +839,7 @@
+
+ this.field_73839_d.field_71424_I.func_76318_c("health");
+
+- for (int j5 = MathHelper.func_76123_f((f + (float)k1) / 2.0F) - 1; j5 >= 0; j5--)
++ for (int j5 = MathHelper.func_76123_f((f + (float)k1) / 2.0F) - 1; j5 >= 0; --j5)
+ {
+ int k5 = 16;
+
+@@ -932,7 +900,7 @@
+ if (l2 == k1 && k1 % 2 == 1)
+ {
+ this.func_73729_b(k4, l4, k5 + 153, 9 * i5, 9, 9);
+- l2--;
++ --l2;
+ }
+ else
+ {
+@@ -960,7 +928,7 @@
+ {
+ this.field_73839_d.field_71424_I.func_76318_c("food");
+
+- for (int l5 = 0; l5 < 10; l5++)
++ for (int l5 = 0; l5 < 10; ++l5)
+ {
+ int j6 = j1;
+ int l6 = 16;
+@@ -997,10 +965,10 @@
if (entityplayer.func_70055_a(Material.field_151586_h))
{
int i6 = this.field_73839_d.field_71439_g.func_70086_ai();
@@ -240,8 +292,20 @@
+ int k6 = MathHelper.func_76143_f((double)(i6 - 2) * 10.0D / 300.0D);
+ int i7 = MathHelper.func_76143_f((double)i6 * 10.0D / 300.0D) - k6;
- for (int k7 = 0; k7 < k6 + i7; ++k7)
+- for (int k7 = 0; k7 < k6 + i7; k7++)
++ for (int k7 = 0; k7 < k6 + i7; ++k7)
{
+ if (k7 < k6)
+ {
+@@ -1047,7 +1015,7 @@
+ int k1 = Math.min(j, 10);
+ j -= k1;
+
+- for (int l1 = 0; l1 < k1; l1++)
++ for (int l1 = 0; l1 < k1; ++l1)
+ {
+ int i2 = 52;
+ int j2 = 0;
@@ -1075,19 +1043,17 @@
{
GlStateManager.func_179097_i();
@@ -353,7 +417,31 @@
tessellator.func_78381_a();
GlStateManager.func_179132_a(true);
GlStateManager.func_179126_j();
-@@ -1240,10 +1196,7 @@
+@@ -1216,12 +1172,12 @@
+ {
+ if (this.field_73845_h > 0)
+ {
+- this.field_73845_h--;
++ --this.field_73845_h;
+ }
+
+ if (this.field_175195_w > 0)
+ {
+- this.field_175195_w--;
++ --this.field_175195_w;
+
+ if (this.field_175195_w <= 0)
+ {
+@@ -1230,7 +1186,7 @@
+ }
+ }
+
+- this.field_73837_f++;
++ ++this.field_73837_f;
+
+ if (this.field_73839_d.field_71439_g != null)
+ {
+@@ -1240,14 +1196,11 @@
{
this.field_92017_k = 0;
}
@@ -365,3 +453,8 @@
{
if (this.field_92017_k > 0)
{
+- this.field_92017_k--;
++ --this.field_92017_k;
+ }
+ }
+ else
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
index 2cc84c760..00ef0fbab 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
@@ -80,7 +80,8 @@
public void func_73876_c()
{
super.func_73876_c();
- ++this.field_146444_f;
+- this.field_146444_f++;
++ ++this.field_146444_f;
}
- @Override
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
index 82e4141fb..522116505 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
@@ -227,7 +227,7 @@
oclass.getMethod("browse", URI.class).invoke(object, new URI(this.field_104024_v));
}
catch (Throwable throwable)
-@@ -359,9 +321,7 @@
+@@ -359,12 +321,10 @@
GlStateManager.func_179118_c();
GlStateManager.func_179129_p();
GlStateManager.func_179132_a(false);
@@ -237,7 +237,20 @@
+ GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
int i = 8;
- for (int j = 0; j < 64; ++j)
+- for (int j = 0; j < 64; j++)
++ for (int j = 0; j < 64; ++j)
+ {
+ GlStateManager.func_179094_E();
+ float f = ((float)(j % 8) / 8.0F - 0.5F) / 64.0F;
+@@ -374,7 +334,7 @@
+ GlStateManager.func_179114_b(MathHelper.func_76126_a(this.field_73979_m / 400.0F) * 25.0F + 20.0F, 1.0F, 0.0F, 0.0F);
+ GlStateManager.func_179114_b(-this.field_73979_m * 0.1F, 0.0F, 1.0F, 0.0F);
+
+- for (int k = 0; k < 6; k++)
++ for (int k = 0; k < 6; ++k)
+ {
+ GlStateManager.func_179094_E();
+
@@ -407,10 +367,10 @@
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
int l = 255 / (j + 1);
@@ -273,7 +286,14 @@
GlStateManager.func_179135_a(true, true, true, false);
Tessellator tessellator = Tessellator.func_178181_a();
BufferBuilder bufferbuilder = tessellator.func_178180_c();
-@@ -453,22 +411,10 @@
+@@ -447,28 +405,16 @@
+ GlStateManager.func_179118_c();
+ int i = 3;
+
+- for (int j = 0; j < 3; j++)
++ for (int j = 0; j < 3; ++j)
+ {
+ float f = 1.0F / (float)(j + 1);
int k = this.field_146294_l;
int l = this.field_146295_m;
float f1 = (float)(j - 1) / 256.0F;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
index cd0ca5a5c..c3666ac3b 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
@@ -16,7 +16,7 @@
import org.lwjgl.opengl.Display;
@SideOnly(Side.CLIENT)
-@@ -59,12 +61,7 @@
+@@ -59,15 +61,10 @@
{
List list = this.call();
list.add("");
@@ -29,9 +29,25 @@
+ list.add("Debug: Pie [shift]: " + (this.field_175242_a.field_71474_y.field_74329_Q ? "visible" : "hidden") + " FPS [alt]: " + (this.field_175242_a.field_71474_y.field_181657_aC ? "visible" : "hidden"));
list.add("For help: press F3 + Q");
- for (int i = 0; i < list.size(); ++i)
-@@ -106,24 +103,11 @@
- @SuppressWarnings("incomplete-switch")
+- for (int i = 0; i < list.size(); i++)
++ for (int i = 0; i < list.size(); ++i)
+ {
+ String s = list.get(i);
+
+@@ -87,7 +84,7 @@
+ {
+ List list = this.func_175238_c();
+
+- for (int i = 0; i < list.size(); i++)
++ for (int i = 0; i < list.size(); ++i)
+ {
+ String s = list.get(i);
+
+@@ -103,26 +100,14 @@
+ }
+ }
+
++ @SuppressWarnings("incomplete-switch")
protected List call()
{
- BlockPos blockpos = new BlockPos(
@@ -57,7 +73,7 @@
}
else
{
-@@ -146,87 +130,40 @@
+@@ -145,87 +130,40 @@
s = "Towards positive X";
}
@@ -166,7 +182,7 @@
}
}
-@@ -235,9 +172,7 @@
+@@ -234,9 +172,7 @@
list.add("Shader: " + this.field_175242_a.field_71460_t.func_147706_e().func_148022_b());
}
@@ -177,7 +193,7 @@
{
BlockPos blockpos1 = this.field_175242_a.field_71476_x.func_178782_a();
list.add(String.format("Looking at: %d %d %d", blockpos1.func_177958_n(), blockpos1.func_177956_o(), blockpos1.func_177952_p()));
-@@ -253,17 +188,10 @@
+@@ -252,17 +188,10 @@
long j = Runtime.getRuntime().totalMemory();
long k = Runtime.getRuntime().freeMemory();
long l = j - k;
@@ -199,7 +215,7 @@
if (this.field_175242_a.func_189648_am())
{
-@@ -271,9 +199,7 @@
+@@ -270,9 +199,7 @@
}
else
{
@@ -210,7 +226,7 @@
{
BlockPos blockpos = this.field_175242_a.field_71476_x.func_178782_a();
IBlockState iblockstate = this.field_175242_a.field_71441_e.func_180495_p(blockpos);
-@@ -285,12 +211,15 @@
+@@ -284,12 +211,15 @@
list.add("");
list.add(String.valueOf(Block.field_149771_c.func_177774_c(iblockstate.func_177230_c())));
@@ -220,7 +236,7 @@
- for (Entry entry : iblockstate.func_177228_b().entrySet())
+ for (UnmodifiableIterator unmodifiableiterator = iblockstate.func_177228_b().entrySet().iterator(); unmodifiableiterator.hasNext(); list.add(iproperty.func_177701_a() + ": " + s))
{
-- IProperty iproperty = (IProperty)entry.getKey();
+- IProperty iproperty = (IProperty)entry.getKey();
+ Entry < IProperty, Comparable> entry = (Entry)unmodifiableiterator.next();
+ iproperty = (IProperty)entry.getKey();
T t = (T)entry.getValue();
@@ -229,7 +245,7 @@
if (Boolean.TRUE.equals(t))
{
-@@ -300,8 +229,6 @@
+@@ -299,8 +229,6 @@
{
s = TextFormatting.RED + s;
}
@@ -238,7 +254,16 @@
}
}
-@@ -350,21 +277,19 @@
+@@ -325,7 +253,7 @@
+ int i1 = frametimer.func_181748_a(along[k], 30);
+ int j1 = this.func_181552_c(MathHelper.func_76125_a(i1, 0, 60), 0, 30, 60);
+ this.func_73728_b(l, scaledresolution.func_78328_b(), scaledresolution.func_78328_b() - i1, j1);
+- l++;
++ ++l;
+ k = frametimer.func_181751_b(k + 1);
+ }
+
+@@ -349,21 +277,19 @@
private int func_181552_c(int p_181552_1_, int p_181552_2_, int p_181552_3_, int p_181552_4_)
{
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
index 396c38d71..04efdd03c 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
@@ -27,13 +27,15 @@
public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
{
- for (int i = 0; i < this.field_146292_n.size(); ++i)
+- for (int i = 0; i < this.field_146292_n.size(); i++)
++ for (int i = 0; i < this.field_146292_n.size(); ++i)
{
- this.field_146292_n.get(i).func_191745_a(this.field_146297_k, p_73863_1_, p_73863_2_, p_73863_3_);
+ ((GuiButton)this.field_146292_n.get(i)).func_191745_a(this.field_146297_k, p_73863_1_, p_73863_2_, p_73863_3_);
}
- for (int j = 0; j < this.field_146293_o.size(); ++j)
+- for (int j = 0; j < this.field_146293_o.size(); j++)
++ for (int j = 0; j < this.field_146293_o.size(); ++j)
{
- this.field_146293_o.get(j).func_146159_a(this.field_146297_k, p_73863_1_, p_73863_2_);
+ ((GuiLabel)this.field_146293_o.get(j)).func_146159_a(this.field_146297_k, p_73863_1_, p_73863_2_);
@@ -68,7 +70,7 @@
}
return "";
-@@ -118,31 +121,32 @@
+@@ -118,35 +121,36 @@
try
{
StringSelection stringselection = new StringSelection(p_146275_0_);
@@ -100,15 +102,21 @@
- );
+ List list = p_191927_1_.func_82840_a(this.field_146297_k.field_71439_g, this.field_146297_k.field_71474_y.field_82882_x ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL);
- for (int i = 0; i < list.size(); ++i)
+- for (int i = 0; i < list.size(); i++)
++ for (int i = 0; i < list.size(); ++i)
{
if (i == 0)
{
-- list.set(i, p_191927_1_.func_77953_t().field_77937_e + (String)list.get(i));
+- list.set(i, p_191927_1_.func_77953_t().field_77937_e + list.get(i));
+ list.set(i, p_191927_1_.func_77973_b().getForgeRarity(p_191927_1_).getColor() + (String)list.get(i));
}
else
{
+- list.set(i, TextFormatting.GRAY + list.get(i));
++ list.set(i, TextFormatting.GRAY + (String)list.get(i));
+ }
+ }
+
@@ -170,7 +174,13 @@
public void func_146283_a(List p_146283_1_, int p_146283_2_, int p_146283_3_)
@@ -124,6 +132,15 @@
{
GlStateManager.func_179101_C();
RenderHelper.func_74518_a();
+@@ -222,7 +232,7 @@
+ this.func_73733_a(l1 - 3, i2 - 3, l1 + i + 3, i2 - 3 + 1, 1347420415, 1347420415);
+ this.func_73733_a(l1 - 3, i2 + k + 2, l1 + i + 3, i2 + k + 3, 1344798847, 1344798847);
+
+- for (int k1 = 0; k1 < p_146283_1_.size(); k1++)
++ for (int k1 = 0; k1 < p_146283_1_.size(); ++k1)
+ {
+ String s1 = p_146283_1_.get(k1);
+ this.field_146289_q.func_175063_a(s1, (float)l1, (float)i2, -1);
@@ -263,8 +273,9 @@
itemstack = new ItemStack((NBTTagCompound)nbtbase);
}
@@ -198,7 +215,14 @@
this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
}
-@@ -424,9 +434,15 @@
+@@ -418,15 +428,21 @@
+ {
+ if (p_73864_3_ == 0)
+ {
+- for (int i = 0; i < this.field_146292_n.size(); i++)
++ for (int i = 0; i < this.field_146292_n.size(); ++i)
+ {
+ GuiButton guibutton = this.field_146292_n.get(i);
if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
{
@@ -289,7 +313,7 @@
public void func_73878_a(boolean p_73878_1_, int p_73878_2_)
{
if (p_73878_2_ == 31102009)
-@@ -611,13 +628,13 @@
+@@ -611,19 +628,26 @@
try
{
Class oclass = Class.forName("java.awt.Desktop");
@@ -305,3 +329,17 @@
}
}
+ public static boolean func_146271_m()
+ {
+- return Minecraft.field_142025_a ? Keyboard.isKeyDown(219) || Keyboard.isKeyDown(220) : Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157);
++ if (Minecraft.field_142025_a)
++ {
++ return Keyboard.isKeyDown(219) || Keyboard.isKeyDown(220);
++ }
++ else
++ {
++ return Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157);
++ }
+ }
+
+ public static boolean func_146272_n()
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
index d143ad47f..5a08fe4b7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
@@ -16,7 +16,8 @@
public void func_73876_c()
{
super.func_73876_c();
- ++this.field_146479_t;
+- this.field_146479_t++;
++ ++this.field_146479_t;
}
- @Override
@@ -54,7 +55,32 @@
this.func_146462_a(false);
}
else if (p_146284_1_.field_146127_k == 3 && this.field_146475_i)
-@@ -218,7 +215,7 @@
+@@ -196,7 +193,7 @@
+ {
+ if (this.field_146484_x < this.field_146476_w - 1)
+ {
+- this.field_146484_x++;
++ ++this.field_146484_x;
+ }
+ else if (this.field_146475_i)
+ {
+@@ -204,7 +201,7 @@
+
+ if (this.field_146484_x < this.field_146476_w - 1)
+ {
+- this.field_146484_x++;
++ ++this.field_146484_x;
+ }
+ }
+ }
+@@ -212,13 +209,13 @@
+ {
+ if (this.field_146484_x > 0)
+ {
+- this.field_146484_x--;
++ --this.field_146484_x;
+ }
+ }
else if (p_146284_1_.field_146127_k == 5 && this.field_146480_s)
{
this.func_146462_a(true);
@@ -63,7 +89,13 @@
}
else if (p_146284_1_.field_146127_k == 4 && this.field_146480_s)
{
-@@ -239,7 +236,6 @@
+@@ -234,12 +231,11 @@
+ if (this.field_146483_y != null && this.field_146483_y.func_74745_c() < 50)
+ {
+ this.field_146483_y.func_74742_a(new NBTTagString(""));
+- this.field_146476_w++;
++ ++this.field_146476_w;
+ this.field_146481_r = true;
}
}
@@ -113,6 +145,15 @@
{
this.field_175386_A = null;
}
+@@ -449,7 +440,7 @@
+ {
+ int k1 = Math.min(128 / this.field_146289_q.field_78288_b, this.field_175386_A.size());
+
+- for (int l1 = 0; l1 < k1; l1++)
++ for (int l1 = 0; l1 < k1; ++l1)
+ {
+ ITextComponent itextcomponent2 = this.field_175386_A.get(l1);
+ this.field_146289_q.func_78276_b(itextcomponent2.func_150260_c(), i + 36, 34 + l1 * this.field_146289_q.field_78288_b, 0);
@@ -467,7 +458,6 @@
super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
}
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
index 971880646..18c465786 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
@@ -23,6 +23,22 @@
}
public void func_148145_f(int p_148145_1_)
+@@ -159,13 +154,13 @@
+ {
+ if (p_148147_1_.field_146127_k == this.field_148159_m)
+ {
+- this.field_148169_q = this.field_148169_q - (float)(this.field_148149_f * 2 / 3);
++ this.field_148169_q -= (float)(this.field_148149_f * 2 / 3);
+ this.field_148157_o = -2;
+ this.func_148121_k();
+ }
+ else if (p_148147_1_.field_146127_k == this.field_148156_n)
+ {
+- this.field_148169_q = this.field_148169_q + (float)(this.field_148149_f * 2 / 3);
++ this.field_148169_q += (float)(this.field_148149_f * 2 / 3);
+ this.field_148157_o = -2;
+ this.func_148121_k();
+ }
@@ -186,27 +181,8 @@
GlStateManager.func_179106_n();
Tessellator tessellator = Tessellator.func_178181_a();
@@ -217,7 +233,7 @@
- (float)((this.field_148154_c - this.field_148153_b) * (this.field_148154_c - this.field_148153_b)) / (float)this.func_148138_e()
- );
- l1 = MathHelper.func_76125_a(l1, 32, this.field_148154_c - this.field_148153_b - 8);
-- this.field_148170_p /= (float)(this.field_148154_c - this.field_148153_b - l1) / (float)k1;
+- this.field_148170_p = this.field_148170_p / ((float)(this.field_148154_c - this.field_148153_b - l1) / (float)k1);
- }
- else
- {
@@ -296,12 +312,30 @@
- else if (this.field_148157_o >= 0)
+ else
{
-- this.field_148169_q -= (float)(this.field_148162_h - this.field_148157_o) * this.field_148170_p;
+- this.field_148169_q = this.field_148169_q - (float)(this.field_148162_h - this.field_148157_o) * this.field_148170_p;
- this.field_148157_o = this.field_148162_h;
+ this.field_148157_o = -1;
}
int i2 = Mouse.getEventDWheel();
+@@ -417,7 +362,7 @@
+ i2 = 1;
+ }
+
+- this.field_148169_q = this.field_148169_q + (float)(i2 * this.field_148149_f / 2);
++ this.field_148169_q += (float)(i2 * this.field_148149_f / 2);
+ }
+ }
+ }
+@@ -443,7 +388,7 @@
+ Tessellator tessellator = Tessellator.func_178181_a();
+ BufferBuilder bufferbuilder = tessellator.func_178180_c();
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
+ {
+ int k = p_192638_2_ + j * this.field_148149_f + this.field_148160_j;
+ int l = this.field_148149_f - 4;
@@ -460,14 +405,14 @@
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.func_179090_x();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.java.patch
index bf7284582..8558c7186 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSpectator.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSpectator.java.patch
@@ -11,6 +11,15 @@
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, p_175258_2_);
this.field_175268_g.func_110434_K().func_110577_a(field_175267_f);
this.func_175174_a((float)(p_175258_3_ - 91), p_175258_4_, 0, 0, 182, 22);
+@@ -88,7 +86,7 @@
+
+ RenderHelper.func_74520_c();
+
+- for (int i = 0; i < 9; i++)
++ for (int i = 0; i < 9; ++i)
+ {
+ this.func_175266_a(i, p_175258_1_.func_78326_a() / 2 - 90 + i * 20 + 2, p_175258_4_ + 3.0F, p_175258_2_, p_175258_5_.func_178680_a(i));
+ }
@@ -111,15 +109,11 @@
GlStateManager.func_179131_c(f, f, f, p_175266_4_);
p_175266_5_.func_178663_a(f, i);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiTextField.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiTextField.java.patch
new file mode 100644
index 000000000..5e1917575
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiTextField.java.patch
@@ -0,0 +1,86 @@
+--- before/net/minecraft/client/gui/GuiTextField.java
++++ after/net/minecraft/client/gui/GuiTextField.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.gui;
+
++import com.cleanroommc.client.IMEHandler;
+ import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
+ import net.minecraft.client.Minecraft;
+@@ -54,7 +55,7 @@
+
+ public void func_146178_a()
+ {
+- this.field_146214_l++;
++ ++this.field_146214_l;
+ }
+
+ public void func_146180_a(String p_146180_1_)
+@@ -214,7 +215,7 @@
+ boolean flag = p_146197_1_ < 0;
+ int j = Math.abs(p_146197_1_);
+
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
+ {
+ if (!flag)
+ {
+@@ -229,7 +230,7 @@
+ {
+ while (p_146197_3_ && i < l && this.field_146216_j.charAt(i) == ' ')
+ {
+- i++;
++ ++i;
+ }
+ }
+ }
+@@ -237,12 +238,12 @@
+ {
+ while (p_146197_3_ && i > 0 && this.field_146216_j.charAt(i - 1) == ' ')
+ {
+- i--;
++ --i;
+ }
+
+ while (i > 0 && this.field_146216_j.charAt(i - 1) != ' ')
+ {
+- i--;
++ --i;
+ }
+ }
+ }
+@@ -513,7 +514,7 @@
+ else if (flag2)
+ {
+ k1 = j1 - 1;
+- j1--;
++ --j1;
+ }
+
+ if (!s.isEmpty() && flag && j < s.length())
+@@ -631,6 +632,7 @@
+ }
+
+ this.field_146213_o = p_146195_1_;
++ IMEHandler.setIME(this.field_146213_o);
+
+ if (Minecraft.func_71410_x().field_71462_r != null)
+ {
+@@ -687,7 +689,7 @@
+
+ if (p_146199_1_ == this.field_146225_q)
+ {
+- this.field_146225_q = this.field_146225_q - this.field_146211_a.func_78262_a(this.field_146216_j, j, true).length();
++ this.field_146225_q -= this.field_146211_a.func_78262_a(this.field_146216_j, j, true).length();
+ }
+
+ if (p_146199_1_ > k)
+@@ -696,7 +698,7 @@
+ }
+ else if (p_146199_1_ <= this.field_146225_q)
+ {
+- this.field_146225_q = this.field_146225_q - (this.field_146225_q - p_146199_1_);
++ this.field_146225_q -= this.field_146225_q - p_146199_1_;
+ }
+
+ this.field_146225_q = MathHelper.func_76125_a(this.field_146225_q, 0, i);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch
index 32fd61d94..97eca75a3 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java.patch
@@ -27,7 +27,7 @@
List list = Lists.newArrayList();
- List list1 = Lists.newArrayList(p_178908_0_);
-
-- for (int j = 0; j < list1.size(); ++j)
+- for (int j = 0; j < list1.size(); j++)
- {
- ITextComponent itextcomponent1 = list1.get(j);
- String s = itextcomponent1.func_150261_e();
@@ -113,7 +113,8 @@
- if (p_178908_3_)
+ if (p_178908_3_ && cleanedLine.charAt(l) == ' ')
{
- ++l;
+- l++;
++ ++l;
}
- s3 = s4.substring(l);
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.java.patch
index 437eda1a8..9cec98886 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.java.patch
@@ -46,8 +46,12 @@
}
else
{
-@@ -69,20 +48,16 @@
- ++i;
+@@ -66,23 +45,19 @@
+ }
+
+ agamesettings$options[i] = gamesettings$options;
+- i++;
++ ++i;
}
- this.field_146501_h = new GuiOptionsRowList(
diff --git a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.java.patch
index 7b827bdaa..83d69264c 100644
--- a/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/MapItemRenderer.java.patch
@@ -9,6 +9,24 @@
public MapItemRenderer(TextureManager p_i45009_1_)
{
+@@ -88,7 +88,7 @@
+ this.field_148241_e = this.field_148243_c.func_110565_c();
+ this.field_148240_d = MapItemRenderer.this.field_148251_b.func_110578_a("map/" + p_i45007_2_.field_76190_i, this.field_148243_c);
+
+- for (int i = 0; i < this.field_148241_e.length; i++)
++ for (int i = 0; i < this.field_148241_e.length; ++i)
+ {
+ this.field_148241_e[i] = 0;
+ }
+@@ -96,7 +96,7 @@
+
+ private void func_148236_a()
+ {
+- for (int i = 0; i < 16384; i++)
++ for (int i = 0; i < 16384; ++i)
+ {
+ int j = this.field_148242_b.field_76198_e[i] & 255;
+
@@ -122,15 +122,13 @@
float f = 0.0F;
MapItemRenderer.this.field_148251_b.func_110577_a(this.field_148240_d);
@@ -44,7 +62,7 @@
GlStateManager.func_179114_b((float)(mapdecoration.func_176111_d() * 360) / 16.0F, 0.0F, 0.0F, 1.0F);
GlStateManager.func_179152_a(4.0F, 4.0F, 3.0F);
GlStateManager.func_179109_b(-0.125F, 0.125F, 0.0F);
-@@ -155,10 +153,10 @@
+@@ -155,13 +153,13 @@
float f4 = (float)(b0 / 4 + 1) / 4.0F;
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181707_g);
float f5 = -0.001F;
@@ -58,4 +76,8 @@
+ bufferbuilder.func_181662_b(-1.0D, -1.0D, (double)((float)k * -0.001F)).func_187315_a((double)f1, (double)f4).func_181675_d();
tessellator.func_78381_a();
GlStateManager.func_179121_F();
- ++k;
+- k++;
++ ++k;
+ }
+ }
+
diff --git a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
index e497e697a..d84de01f1 100644
--- a/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
@@ -60,7 +60,8 @@
- List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_192634_4_ - 32 - 2);
+ List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_192634_4_ - 32 - 2);
- for (int i = 0; i < Math.min(list.size(), 2); ++i)
+- for (int i = 0; i < Math.min(list.size(), 2); i++)
++ for (int i = 0; i < Math.min(list.size(), 2); ++i)
{
- this.field_148300_d
- .field_71466_p
diff --git a/patches/minecraft/net/minecraft/client/gui/advancements/GuiAdvancementTab.java.patch b/patches/minecraft/net/minecraft/client/gui/advancements/GuiAdvancementTab.java.patch
index 2a9a6618e..61ab263f2 100644
--- a/patches/minecraft/net/minecraft/client/gui/advancements/GuiAdvancementTab.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/advancements/GuiAdvancementTab.java.patch
@@ -27,6 +27,18 @@
{
this.field_191802_a = p_i47589_1_;
this.field_193938_f = p_i47589_2_;
+@@ -106,9 +100,9 @@
+ int i = this.field_191811_n % 16;
+ int j = this.field_191812_o % 16;
+
+- for (int k = -1; k <= 15; k++)
++ for (int k = -1; k <= 15; ++k)
+ {
+- for (int l = -1; l <= 8; l++)
++ for (int l = -1; l <= 8; ++l)
+ {
+ func_146110_a(i + 16 * k, j + 16 * l, 0.0F, 0.0F, 16, 16, 16.0F, 16.0F);
+ }
@@ -167,9 +161,9 @@
{
for (AdvancementTabType advancementtabtype : AdvancementTabType.values())
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
index 8a9764462..c6c6a6a08 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
@@ -25,6 +25,15 @@
public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
{
int i = this.field_147003_i;
+@@ -91,7 +89,7 @@
+ OpenGlHelper.func_77475_a(OpenGlHelper.field_77476_b, 240.0F, 240.0F);
+ GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
+
+- for (int i1 = 0; i1 < this.field_147002_h.field_75151_b.size(); i1++)
++ for (int i1 = 0; i1 < this.field_147002_h.field_75151_b.size(); ++i1)
+ {
+ Slot slot = this.field_147002_h.field_75151_b.get(i1);
+
@@ -118,6 +116,7 @@
RenderHelper.func_74518_a();
this.func_146979_b(p_73863_1_, p_73863_2_);
@@ -83,6 +92,24 @@
this.func_175175_a(i, j, textureatlassprite, 16, 16);
GlStateManager.func_179145_e();
flag1 = true;
+@@ -300,7 +297,7 @@
+ itemstack1.func_190920_e(j);
+ }
+
+- this.field_146996_I = this.field_146996_I - (itemstack1.func_190916_E() - i);
++ this.field_146996_I -= itemstack1.func_190916_E() - i;
+ }
+ }
+ }
+@@ -308,7 +305,7 @@
+
+ private Slot func_146975_c(int p_146975_1_, int p_146975_2_)
+ {
+- for (int i = 0; i < this.field_147002_h.field_75151_b.size(); i++)
++ for (int i = 0; i < this.field_147002_h.field_75151_b.size(); ++i)
+ {
+ Slot slot = this.field_147002_h.field_75151_b.get(i);
+
@@ -321,11 +318,10 @@
return null;
}
@@ -259,9 +286,12 @@
{
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
}
-@@ -688,7 +666,7 @@
+@@ -686,9 +664,9 @@
+ {
+ if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b() && this.field_147006_u != null)
{
- for (int i = 0; i < 9; ++i)
+- for (int i = 0; i < 9; i++)
++ for (int i = 0; i < 9; ++i)
{
- if (p_146983_1_ == this.field_146297_k.field_71474_y.field_151456_ac[i].func_151463_i())
+ if (this.field_146297_k.field_71474_y.field_151456_ac[i].isActiveAndMatches(p_146983_1_))
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
index 7cf0fb2f4..736feb7cb 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
@@ -25,6 +25,15 @@
protected void func_184098_a(@Nullable Slot p_184098_1_, int p_184098_2_, int p_184098_3_, ClickType p_184098_4_)
{
this.field_147057_D = true;
+@@ -113,7 +113,7 @@
+
+ if (p_184098_1_ == this.field_147064_C && flag)
+ {
+- for (int j = 0; j < this.field_146297_k.field_71439_g.field_71069_bz.func_75138_a().size(); j++)
++ for (int j = 0; j < this.field_146297_k.field_71439_g.field_71069_bz.func_75138_a().size(); ++j)
+ {
+ this.field_146297_k.field_71442_b.func_78761_a(ItemStack.field_190927_a, j);
+ }
@@ -140,15 +140,7 @@
}
else
@@ -54,7 +63,7 @@
{
if (p_184098_3_ == 0)
{
-@@ -239,8 +228,7 @@
+@@ -239,12 +228,11 @@
else if (this.field_147002_h != null)
{
ItemStack itemstack3 = p_184098_1_ == null ? ItemStack.field_190927_a : this.field_147002_h.func_75139_a(p_184098_1_.field_75222_d).func_75211_c();
@@ -64,6 +73,11 @@
if (Container.func_94532_c(p_184098_3_) == 2)
{
+- for (int k = 0; k < 9; k++)
++ for (int k = 0; k < 9; ++k)
+ {
+ this.field_146297_k.field_71442_b.func_78761_a(this.field_147002_h.func_75139_a(45 + k).func_75211_c(), 36 + k);
+ }
@@ -273,7 +261,6 @@
}
}
@@ -227,6 +241,22 @@
int i = field_147058_w;
field_147058_w = p_147050_1_.func_78021_a();
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
+@@ -455,13 +466,13 @@
+
+ if (p_147050_1_ == CreativeTabs.field_192395_m)
+ {
+- for (int j = 0; j < 9; j++)
++ for (int j = 0; j < 9; ++j)
+ {
+ HotbarSnapshot hotbarsnapshot = this.field_146297_k.field_191950_u.func_192563_a(j);
+
+ if (hotbarsnapshot.isEmpty())
+ {
+- for (int k = 0; k < 9; k++)
++ for (int k = 0; k < 9; ++k)
+ {
+ if (k == j)
+ {
@@ -469,7 +480,7 @@
itemstack.func_190925_c("CustomCreativeLock");
String s = GameSettings.func_74298_c(this.field_146297_k.field_71474_y.field_151456_ac[j].func_151463_i());
@@ -236,15 +266,18 @@
guicontainercreative$containercreative.field_148330_a.add(itemstack);
}
else
-@@ -498,7 +509,7 @@
+@@ -498,9 +509,9 @@
this.field_147063_B = guicontainercreative$containercreative.field_75151_b;
}
- guicontainercreative$containercreative.field_75151_b = Lists.newArrayList();
+ guicontainercreative$containercreative.field_75151_b = Lists.newArrayList();
- for (int l = 0; l < container.field_75151_b.size(); ++l)
+- for (int l = 0; l < container.field_75151_b.size(); l++)
++ for (int l = 0; l < container.field_75151_b.size(); ++l)
{
+ Slot slot = new GuiContainerCreative.CreativeSlot(container.field_75151_b.get(l), l);
+ guicontainercreative$containercreative.field_75151_b.add(slot);
@@ -552,12 +563,14 @@
if (this.field_147062_A != null)
@@ -340,16 +373,22 @@
CreativeTabs creativetabs = p_146285_1_.func_77973_b().func_77640_w();
if (creativetabs == null && p_146285_1_.func_77973_b() == Items.field_151134_bR)
-@@ -690,7 +719,7 @@
+@@ -686,19 +715,22 @@
+ list.add(1, "" + TextFormatting.BOLD + TextFormatting.BLUE + I18n.func_135052_a(creativetabs.func_78024_c()));
+ }
+
+- for (int i = 0; i < list.size(); i++)
++ for (int i = 0; i < list.size(); ++i)
{
if (i == 0)
{
-- list.set(i, p_146285_1_.func_77953_t().field_77937_e + (String)list.get(i));
+- list.set(i, p_146285_1_.func_77953_t().field_77937_e + list.get(i));
+ list.set(i, p_146285_1_.func_77973_b().getForgeRarity(p_146285_1_).getColor() + (String)list.get(i));
}
else
{
-@@ -698,7 +727,10 @@
+- list.set(i, TextFormatting.GRAY + list.get(i));
++ list.set(i, TextFormatting.GRAY + (String)list.get(i));
}
}
@@ -526,16 +565,27 @@
}
public int func_147056_g()
-@@ -889,7 +958,7 @@
+@@ -887,9 +956,9 @@
+
+ if (p_192044_2_)
{
- for (int i = 0; i < InventoryPlayer.func_70451_h(); ++i)
+- for (int i = 0; i < InventoryPlayer.func_70451_h(); i++)
++ for (int i = 0; i < InventoryPlayer.func_70451_h(); ++i)
{
- ItemStack itemstack = hotbarsnapshot.get(i).func_77946_l();
+ ItemStack itemstack = ((ItemStack)hotbarsnapshot.get(i)).func_77946_l();
entityplayersp.field_71071_by.func_70299_a(i, itemstack);
p_192044_0_.field_71442_b.func_78761_a(itemstack, 36 + i);
}
-@@ -905,7 +974,7 @@
+@@ -898,14 +967,14 @@
+ }
+ else if (p_192044_3_)
+ {
+- for (int j = 0; j < InventoryPlayer.func_70451_h(); j++)
++ for (int j = 0; j < InventoryPlayer.func_70451_h(); ++j)
+ {
+ hotbarsnapshot.set(j, entityplayersp.field_71071_by.func_70301_a(j).func_77946_l());
+ }
String s = GameSettings.func_74298_c(p_192044_0_.field_71474_y.field_151456_ac[p_192044_1_].func_151463_i());
String s1 = GameSettings.func_74298_c(p_192044_0_.field_71474_y.field_193630_aq.func_151463_i());
@@ -544,7 +594,7 @@
creativesettings.func_192564_b();
}
}
-@@ -913,7 +982,7 @@
+@@ -913,21 +982,21 @@
@SideOnly(Side.CLIENT)
public static class ContainerCreative extends Container
{
@@ -553,6 +603,23 @@
public ContainerCreative(EntityPlayer p_i1086_1_)
{
+ InventoryPlayer inventoryplayer = p_i1086_1_.field_71071_by;
+
+- for (int i = 0; i < 5; i++)
++ for (int i = 0; i < 5; ++i)
+ {
+- for (int j = 0; j < 9; j++)
++ for (int j = 0; j < 9; ++j)
+ {
+ this.func_75146_a(new GuiContainerCreative.LockedSlot(GuiContainerCreative.field_147060_v, i * 9 + j, 9 + j * 18, 18 + i * 18));
+ }
+ }
+
+- for (int k = 0; k < 9; k++)
++ for (int k = 0; k < 9; ++k)
+ {
+ this.func_75146_a(new Slot(inventoryplayer, k, 9 + k * 18, 112));
+ }
@@ -935,7 +1004,6 @@
this.func_148329_a(0.0F);
}
@@ -561,7 +628,7 @@
public boolean func_75145_c(EntityPlayer p_75145_1_)
{
return true;
-@@ -944,7 +1012,7 @@
+@@ -944,16 +1012,16 @@
public void func_148329_a(float p_148329_1_)
{
int i = (this.field_148330_a.size() + 9 - 1) / 9 - 5;
@@ -570,6 +637,17 @@
if (j < 0)
{
+ j = 0;
+ }
+
+- for (int k = 0; k < 5; k++)
++ for (int k = 0; k < 5; ++k)
+ {
+- for (int l = 0; l < 9; l++)
++ for (int l = 0; l < 9; ++l)
+ {
+ int i1 = l + (k + j) * 9;
+
@@ -974,7 +1042,6 @@
return this.field_148330_a.size() > 45;
}
@@ -711,11 +789,22 @@
}
@SideOnly(Side.CLIENT)
-@@ -1103,7 +1188,6 @@
+@@ -1103,10 +1188,16 @@
super(p_i47453_1_, p_i47453_2_, p_i47453_3_, p_i47453_4_);
}
- @Override
public boolean func_82869_a(EntityPlayer p_82869_1_)
{
- if (super.func_82869_a(p_82869_1_) && this.func_75216_d())
+- return super.func_82869_a(p_82869_1_) && this.func_75216_d() ? this.func_75211_c().func_179543_a("CustomCreativeLock") == null : !this.func_75216_d();
++ if (super.func_82869_a(p_82869_1_) && this.func_75216_d())
++ {
++ return this.func_75211_c().func_179543_a("CustomCreativeLock") == null;
++ }
++ else
++ {
++ return !this.func_75216_d();
++ }
+ }
+ }
+ }
diff --git a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
index 796a119b0..f75c693ab 100644
--- a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
@@ -89,6 +89,15 @@
}
}
+@@ -281,7 +286,7 @@
+ {
+ ItemStack itemstack = null;
+
+- for (int i = 0; i < this.field_191915_z.func_192684_b(); i++)
++ for (int i = 0; i < this.field_191915_z.func_192684_b(); ++i)
+ {
+ GhostRecipe.GhostIngredient ghostrecipe$ghostingredient = this.field_191915_z.func_192681_a(i);
+ int j = ghostrecipe$ghostingredient.func_193713_b() + p_193015_1_;
@@ -308,10 +313,7 @@
{
if (this.func_191878_b() && !this.field_191888_F.field_71439_g.func_175149_v())
@@ -213,7 +222,7 @@
public void func_193001_a(List p_193001_1_)
{
for (IRecipe irecipe : p_193001_1_)
-@@ -487,10 +482,10 @@
+@@ -487,16 +482,16 @@
{
ItemStack itemstack = p_193951_1_.func_77571_b();
this.field_191915_z.func_192685_a(p_193951_1_);
@@ -226,7 +235,15 @@
int l = 1;
Iterator iterator = p_193951_1_.func_192400_c().iterator();
-@@ -505,7 +500,7 @@
+- for (int i1 = 0; i1 < j; i1++)
++ for (int i1 = 0; i1 < j; ++i1)
+ {
+- for (int j1 = 0; j1 < k; j1++)
++ for (int j1 = 0; j1 < k; ++j1)
+ {
+ if (!iterator.hasNext())
+ {
+@@ -505,13 +500,13 @@
Ingredient ingredient = iterator.next();
@@ -235,3 +252,10 @@
{
Slot slot = p_193951_2_.get(l);
this.field_191915_z.func_194187_a(ingredient, slot.field_75223_e, slot.field_75221_f);
+ }
+
+- l++;
++ ++l;
+ }
+
+ if (k < i)
diff --git a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeOverlay.java.patch b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeOverlay.java.patch
index 3037fe58a..12033b0a0 100644
--- a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeOverlay.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeOverlay.java.patch
@@ -27,8 +27,12 @@
{
this.field_191853_k = p_191845_1_;
this.field_191848_f = p_191845_2_;
-@@ -85,12 +76,7 @@
- for (int j1 = 0; j1 < j; ++j1)
+@@ -82,15 +73,10 @@
+ this.field_191850_h = true;
+ this.field_193972_f.clear();
+
+- for (int j1 = 0; j1 < j; j1++)
++ for (int j1 = 0; j1 < j; ++j1)
{
boolean flag1 = j1 < i;
- this.field_193972_f
@@ -73,7 +77,8 @@
+ this.func_73729_b(this.field_191851_i, this.field_191852_j + p_191846_4_ * 2 + p_191846_2_ * p_191846_3_, p_191846_5_, p_191846_6_ + p_191846_3_ + p_191846_4_, p_191846_4_, p_191846_4_);
+ this.func_73729_b(this.field_191851_i + p_191846_4_ * 2 + p_191846_1_ * p_191846_3_, this.field_191852_j + p_191846_4_ * 2 + p_191846_2_ * p_191846_3_, p_191846_5_ + p_191846_3_ + p_191846_4_, p_191846_6_ + p_191846_3_ + p_191846_4_, p_191846_4_, p_191846_4_);
- for (int i = 0; i < p_191846_1_; ++i)
+- for (int i = 0; i < p_191846_1_; i++)
++ for (int i = 0; i < p_191846_1_; ++i)
{
- this.func_73729_b(
- this.field_191851_i + p_191846_4_ + i * p_191846_3_, this.field_191852_j, p_191846_5_ + p_191846_4_, p_191846_6_, p_191846_3_, p_191846_4_
@@ -84,7 +89,8 @@
+ this.func_73729_b(this.field_191851_i + p_191846_4_ + i * p_191846_3_, this.field_191852_j, p_191846_5_ + p_191846_4_, p_191846_6_, p_191846_3_, p_191846_4_);
+ this.func_73729_b(this.field_191851_i + p_191846_4_ + (i + 1) * p_191846_3_, this.field_191852_j, p_191846_5_ + p_191846_4_, p_191846_6_, p_191846_4_, p_191846_4_);
- for (int j = 0; j < p_191846_2_; ++j)
+- for (int j = 0; j < p_191846_2_; j++)
++ for (int j = 0; j < p_191846_2_; ++j)
{
if (i == 0)
{
@@ -202,7 +208,7 @@
int i = 152;
if (!this.field_193925_q)
-@@ -338,11 +230,11 @@
+@@ -338,24 +230,24 @@
int k = 3;
int l = 3;
@@ -218,7 +224,14 @@
}
Iterator iterator = this.field_193924_p.func_192400_c().iterator();
-@@ -355,7 +247,7 @@
+
+- for (int i1 = 0; i1 < l; i1++)
++ for (int i1 = 0; i1 < l; ++i1)
+ {
+ int j1 = 3 + i1 * 7;
+
+- for (int k1 = 0; k1 < k; k1++)
++ for (int k1 = 0; k1 < k; ++k1)
{
if (iterator.hasNext())
{
diff --git a/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
index aa53ed35a..43ec0654a 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/ModelRenderer.java.patch
@@ -107,7 +107,7 @@
public void func_78785_a(float p_78785_1_)
{
if (!this.field_78807_k)
-@@ -130,64 +121,67 @@
+@@ -130,71 +121,75 @@
GlStateManager.func_179109_b(this.field_82906_o, this.field_82908_p, this.field_82907_q);
@@ -162,27 +162,30 @@
if (this.field_78795_f != 0.0F)
{
- GlStateManager.func_179114_b(this.field_78795_f * (180.0F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
-- }
--
-- GlStateManager.func_179148_o(this.field_78811_r);
--
-- if (this.field_78805_m != null)
-- {
-- for (int k = 0; k < this.field_78805_m.size(); ++k)
-- {
++ GlStateManager.func_179114_b(this.field_78795_f * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
+ }
+
+ GlStateManager.func_179148_o(this.field_78811_r);
+
+ if (this.field_78805_m != null)
+ {
+- for (int k = 0; k < this.field_78805_m.size(); k++)
++ for (int i = 0; i < this.field_78805_m.size(); ++i)
+ {
- this.field_78805_m.get(k).func_78785_a(p_78785_1_);
-- }
-- }
--
-- GlStateManager.func_179121_F();
-- }
++ ((ModelRenderer)this.field_78805_m.get(i)).func_78785_a(p_78785_1_);
+ }
+ }
+
+ GlStateManager.func_179121_F();
+ }
- else if (this.field_78800_c == 0.0F && this.field_78797_d == 0.0F && this.field_78798_e == 0.0F)
- {
- GlStateManager.func_179148_o(this.field_78811_r);
-
- if (this.field_78805_m != null)
- {
-- for (int j = 0; j < this.field_78805_m.size(); ++j)
+- for (int j = 0; j < this.field_78805_m.size(); j++)
- {
- this.field_78805_m.get(j).func_78785_a(p_78785_1_);
- }
@@ -191,26 +194,21 @@
- else
- {
- GlStateManager.func_179109_b(this.field_78800_c * p_78785_1_, this.field_78797_d * p_78785_1_, this.field_78798_e * p_78785_1_);
-+ GlStateManager.func_179114_b(this.field_78795_f * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
-+ }
-+
- GlStateManager.func_179148_o(this.field_78811_r);
-
- if (this.field_78805_m != null)
- {
- for (int i = 0; i < this.field_78805_m.size(); ++i)
- {
+- GlStateManager.func_179148_o(this.field_78811_r);
+-
+- if (this.field_78805_m != null)
+- {
+- for (int i = 0; i < this.field_78805_m.size(); i++)
+- {
- this.field_78805_m.get(i).func_78785_a(p_78785_1_);
-+ ((ModelRenderer)this.field_78805_m.get(i)).func_78785_a(p_78785_1_);
- }
- }
-
+- }
+- }
+-
- GlStateManager.func_179109_b(-this.field_78800_c * p_78785_1_, -this.field_78797_d * p_78785_1_, -this.field_78798_e * p_78785_1_);
-+ GlStateManager.func_179121_F();
- }
+- }
GlStateManager.func_179109_b(-this.field_82906_o, -this.field_82908_p, -this.field_82907_q);
-@@ -195,6 +189,7 @@
+ }
}
}
@@ -247,7 +245,7 @@
public void func_78794_c(float p_78794_1_)
{
if (!this.field_78807_k)
-@@ -241,33 +237,37 @@
+@@ -241,42 +237,46 @@
this.func_78788_d(p_78794_1_);
}
@@ -293,9 +291,11 @@
private void func_78788_d(float p_78788_1_)
{
this.field_78811_r = GLAllocation.func_74526_a(1);
-@@ -276,7 +276,7 @@
+ GlStateManager.func_187423_f(this.field_78811_r, 4864);
+ BufferBuilder bufferbuilder = Tessellator.func_178181_a().func_178180_c();
- for (int i = 0; i < this.field_78804_l.size(); ++i)
+- for (int i = 0; i < this.field_78804_l.size(); i++)
++ for (int i = 0; i < this.field_78804_l.size(); ++i)
{
- this.field_78804_l.get(i).func_178780_a(bufferbuilder, p_78788_1_);
+ ((ModelBox)this.field_78804_l.get(i)).func_178780_a(bufferbuilder, p_78788_1_);
diff --git a/patches/minecraft/net/minecraft/client/model/ModelSkeleton.java.patch b/patches/minecraft/net/minecraft/client/model/ModelSkeleton.java.patch
index 5c1ea03b4..6e19384a1 100644
--- a/patches/minecraft/net/minecraft/client/model/ModelSkeleton.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/ModelSkeleton.java.patch
@@ -16,7 +16,7 @@
{
if (p_78086_1_.func_184591_cq() == EnumHandSide.RIGHT)
{
-@@ -64,23 +63,22 @@
+@@ -64,33 +63,31 @@
super.func_78086_a(p_78086_1_, p_78086_2_, p_78086_3_, p_78086_4_);
}
@@ -44,8 +44,14 @@
+ this.field_178724_i.field_78795_f = -((float)Math.PI / 2F);
this.field_178723_h.field_78795_f -= f * 1.2F - f1 * 0.4F;
this.field_178724_i.field_78795_f -= f * 1.2F - f1 * 0.4F;
- this.field_178723_h.field_78808_h += MathHelper.func_76134_b(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
-@@ -90,7 +88,6 @@
+- this.field_178723_h.field_78808_h = this.field_178723_h.field_78808_h + MathHelper.func_76134_b(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
+- this.field_178724_i.field_78808_h = this.field_178724_i.field_78808_h - (MathHelper.func_76134_b(p_78087_3_ * 0.09F) * 0.05F + 0.05F);
+- this.field_178723_h.field_78795_f = this.field_178723_h.field_78795_f + MathHelper.func_76126_a(p_78087_3_ * 0.067F) * 0.05F;
+- this.field_178724_i.field_78795_f = this.field_178724_i.field_78795_f - MathHelper.func_76126_a(p_78087_3_ * 0.067F) * 0.05F;
++ this.field_178723_h.field_78808_h += MathHelper.func_76134_b(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
++ this.field_178724_i.field_78808_h -= MathHelper.func_76134_b(p_78087_3_ * 0.09F) * 0.05F + 0.05F;
++ this.field_178723_h.field_78795_f += MathHelper.func_76126_a(p_78087_3_ * 0.067F) * 0.05F;
++ this.field_178724_i.field_78795_f -= MathHelper.func_76126_a(p_78087_3_ * 0.067F) * 0.05F;
}
}
diff --git a/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch b/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
index 54c8b2a4c..c398b5bef 100644
--- a/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
+++ b/patches/minecraft/net/minecraft/client/model/TexturedQuad.java.patch
@@ -8,6 +8,15 @@
public class TexturedQuad
{
public PositionTextureVertex[] field_78239_a;
+@@ -35,7 +34,7 @@
+ {
+ PositionTextureVertex[] apositiontexturevertex = new PositionTextureVertex[this.field_78239_a.length];
+
+- for (int i = 0; i < this.field_78239_a.length; i++)
++ for (int i = 0; i < this.field_78239_a.length; ++i)
+ {
+ apositiontexturevertex[i] = this.field_78239_a[this.field_78239_a.length - i - 1];
+ }
@@ -43,6 +42,7 @@
this.field_78239_a = apositiontexturevertex;
}
@@ -16,8 +25,12 @@
public void func_178765_a(BufferBuilder p_178765_1_, float p_178765_2_)
{
Vec3d vec3d = this.field_78239_a[1].field_78243_a.func_72444_a(this.field_78239_a[0].field_78243_a);
-@@ -64,14 +64,7 @@
- for (int i = 0; i < 4; ++i)
+@@ -61,17 +61,10 @@
+
+ p_178765_1_.func_181668_a(7, DefaultVertexFormats.field_181703_c);
+
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
{
PositionTextureVertex positiontexturevertex = this.field_78239_a[i];
- p_178765_1_.func_181662_b(
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
index da7a56e1c..68880ba9b 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java.patch
@@ -112,7 +112,14 @@
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.field_178895_c, EnumFacing.DOWN));
this.field_78778_j = false;
this.field_78770_f = 0.0F;
-@@ -284,9 +287,7 @@
+@@ -278,15 +281,13 @@
+
+ if (this.field_78781_i > 0)
+ {
+- this.field_78781_i--;
++ --this.field_78781_i;
+ return true;
+ }
else if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71441_e.func_175723_af().func_177746_a(p_180512_1_))
{
this.field_78781_i = 5;
@@ -123,7 +130,13 @@
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180512_1_, p_180512_2_));
func_178891_a(this.field_78776_a, this, p_180512_1_, p_180512_2_);
return true;
-@@ -307,24 +308,12 @@
+@@ -303,29 +304,16 @@
+ }
+ else
+ {
+- this.field_78770_f = this.field_78770_f
+- + iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180512_1_);
++ this.field_78770_f += iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180512_1_);
if (this.field_78780_h % 4.0F == 0.0F)
{
@@ -143,15 +156,16 @@
+ this.field_78776_a.func_147118_V().func_147682_a(new PositionedSoundRecord(soundtype.func_185846_f(), SoundCategory.NEUTRAL, (soundtype.func_185843_a() + 1.0F) / 8.0F, soundtype.func_185847_b() * 0.5F, p_180512_1_));
}
- ++this.field_78780_h;
+- this.field_78780_h++;
- this.field_78776_a
- .func_193032_ao()
- .func_193294_a(this.field_78776_a.field_71441_e, p_180512_1_, iblockstate, MathHelper.func_76131_a(this.field_78770_f, 0.0F, 1.0F));
++ ++this.field_78780_h;
+ this.field_78776_a.func_193032_ao().func_193294_a(this.field_78776_a.field_71441_e, p_180512_1_, iblockstate, MathHelper.func_76131_a(this.field_78770_f, 0.0F, 1.0F));
if (this.field_78770_f >= 1.0F)
{
-@@ -336,9 +325,7 @@
+@@ -337,9 +325,7 @@
this.field_78781_i = 5;
}
@@ -162,7 +176,7 @@
return true;
}
}
-@@ -350,7 +337,8 @@
+@@ -351,7 +337,8 @@
public float func_78757_d()
{
@@ -172,7 +186,7 @@
}
public void func_78765_e()
-@@ -374,9 +362,7 @@
+@@ -375,9 +362,7 @@
if (!this.field_85183_f.func_190926_b() && !itemstack.func_190926_b())
{
@@ -183,7 +197,7 @@
}
return p_178893_1_.equals(this.field_178895_c) && flag;
-@@ -393,9 +379,7 @@
+@@ -394,9 +379,7 @@
}
}
@@ -194,7 +208,7 @@
{
this.func_78750_j();
ItemStack itemstack = p_187099_1_.func_184586_b(p_187099_6_);
-@@ -410,14 +394,34 @@
+@@ -411,14 +394,34 @@
}
else
{
@@ -232,7 +246,7 @@
}
if (!flag && itemstack.func_77973_b() instanceof ItemBlock)
-@@ -433,44 +437,53 @@
+@@ -434,44 +437,53 @@
this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_3_, p_187099_4_, p_187099_6_, f, f1, f2));
@@ -321,7 +335,7 @@
}
}
-@@ -492,6 +505,8 @@
+@@ -493,6 +505,8 @@
}
else
{
@@ -330,7 +344,7 @@
int i = itemstack.func_190916_E();
ActionResult actionresult = itemstack.func_77957_a(p_187101_2_, p_187101_1_, p_187101_3_);
ItemStack itemstack1 = actionresult.func_188398_b();
-@@ -499,6 +514,10 @@
+@@ -500,6 +514,10 @@
if (itemstack1 != itemstack || itemstack1.func_190916_E() != i)
{
p_187101_1_.func_184611_a(p_187101_3_, itemstack1);
@@ -341,7 +355,7 @@
}
return actionresult.func_188397_a();
-@@ -533,12 +552,11 @@
+@@ -534,12 +552,11 @@
public EnumActionResult func_187102_a(EntityPlayer p_187102_1_, Entity p_187102_2_, RayTraceResult p_187102_3_, EnumHand p_187102_4_)
{
this.func_78750_j();
@@ -358,7 +372,7 @@
return this.field_78779_k == GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_);
}
-@@ -625,6 +643,6 @@
+@@ -626,6 +643,6 @@
public void func_187100_a(int p_187100_1_)
{
diff --git a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
index 3917845c1..8a3d7ea14 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/WorldClient.java.patch
@@ -39,6 +39,15 @@
public void func_72835_b()
{
super.func_72835_b();
+@@ -84,7 +87,7 @@
+
+ this.field_72984_F.func_76320_a("reEntryProcessing");
+
+- for (int i = 0; i < 10 && !this.field_73036_L.isEmpty(); i++)
++ for (int i = 0; i < 10 && !this.field_73036_L.isEmpty(); ++i)
+ {
+ Entity entity = this.field_73036_L.iterator().next();
+ this.field_73036_L.remove(entity);
@@ -106,14 +109,12 @@
{
}
@@ -54,7 +63,7 @@
protected boolean func_175680_a(int p_175680_1_, int p_175680_2_, boolean p_175680_3_)
{
return p_175680_3_ || !this.func_72863_F().func_186025_d(p_175680_1_, p_175680_2_).func_76621_g();
-@@ -124,8 +125,8 @@
+@@ -124,12 +125,12 @@
this.field_184157_a.clear();
int i = this.field_73037_M.field_71474_y.field_151451_c;
this.field_72984_F.func_76320_a("buildList");
@@ -63,9 +72,15 @@
+ int j = MathHelper.func_76128_c(this.field_73037_M.field_71439_g.field_70165_t / 16.0D);
+ int k = MathHelper.func_76128_c(this.field_73037_M.field_71439_g.field_70161_v / 16.0D);
- for (int l = -i; l <= i; ++l)
+- for (int l = -i; l <= i; l++)
++ for (int l = -i; l <= i; ++l)
{
-@@ -138,7 +139,6 @@
+- for (int i1 = -i; i1 <= i; i1++)
++ for (int i1 = -i; i1 <= i; ++i1)
+ {
+ this.field_184157_a.add(new ChunkPos(l + j, i1 + k));
+ }
+@@ -138,14 +139,13 @@
this.field_72984_F.func_76319_b();
}
@@ -73,6 +88,14 @@
protected void func_147456_g()
{
this.func_184154_a();
+
+ if (this.field_184158_M > 0)
+ {
+- this.field_184158_M--;
++ --this.field_184158_M;
+ }
+
+ this.field_73038_N.retainAll(this.field_184157_a);
@@ -168,8 +168,9 @@
this.func_147467_a(j, k, chunk);
this.field_72984_F.func_76319_b();
@@ -180,7 +203,7 @@
this.field_184158_M = this.field_73012_v.nextInt(12000) + 6000;
}
}
-@@ -354,9 +336,7 @@
+@@ -354,21 +336,17 @@
int i = 32;
Random random = new Random();
ItemStack itemstack = this.field_73037_M.field_71439_g.func_184614_ca();
@@ -190,8 +213,11 @@
+ boolean flag = this.field_73037_M.field_71442_b.func_178889_l() == GameType.CREATIVE && !itemstack.func_190926_b() && itemstack.func_77973_b() == Item.func_150898_a(Blocks.field_180401_cv);
BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
- for (int j = 0; j < 667; ++j)
-@@ -366,9 +346,7 @@
+- for (int j = 0; j < 667; j++)
++ for (int j = 0; j < 667; ++j)
+ {
+ this.func_184153_a(p_73029_1_, p_73029_2_, p_73029_3_, 16, random, flag, blockpos$mutableblockpos);
+ this.func_184153_a(p_73029_1_, p_73029_2_, p_73029_3_, 32, random, flag, blockpos$mutableblockpos);
}
}
@@ -213,6 +239,32 @@
}
}
+@@ -389,7 +365,7 @@
+ {
+ this.field_72996_f.removeAll(this.field_72997_g);
+
+- for (int i = 0; i < this.field_72997_g.size(); i++)
++ for (int i = 0; i < this.field_72997_g.size(); ++i)
+ {
+ Entity entity = this.field_72997_g.get(i);
+ int j = entity.field_70176_ah;
+@@ -401,14 +377,14 @@
+ }
+ }
+
+- for (int i1 = 0; i1 < this.field_72997_g.size(); i1++)
++ for (int i1 = 0; i1 < this.field_72997_g.size(); ++i1)
+ {
+ this.func_72847_b(this.field_72997_g.get(i1));
+ }
+
+ this.field_72997_g.clear();
+
+- for (int j1 = 0; j1 < this.field_72996_f.size(); j1++)
++ for (int j1 = 0; j1 < this.field_72996_f.size(); ++j1)
+ {
+ Entity entity1 = this.field_72996_f.get(j1);
+ Entity entity2 = entity1.func_184187_bx();
@@ -439,7 +415,6 @@
}
}
diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
index fe13fabeb..e673f79f7 100644
--- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
@@ -293,13 +293,19 @@
public void func_147259_a(SPacketEntity p_147259_1_)
{
PacketThreadUtil.func_180031_a(p_147259_1_, this, this.field_147299_f);
-@@ -698,9 +624,9 @@
- entity.field_70118_ct += (long)p_147259_1_.func_186952_a();
- entity.field_70117_cu += (long)p_147259_1_.func_186953_b();
- entity.field_70116_cv += (long)p_147259_1_.func_186951_c();
+@@ -695,12 +621,12 @@
+
+ if (entity != null)
+ {
+- entity.field_70118_ct = entity.field_70118_ct + (long)p_147259_1_.func_186952_a();
+- entity.field_70117_cu = entity.field_70117_cu + (long)p_147259_1_.func_186953_b();
+- entity.field_70116_cv = entity.field_70116_cv + (long)p_147259_1_.func_186951_c();
- double d0 = (double)entity.field_70118_ct / 4096.0;
- double d1 = (double)entity.field_70117_cu / 4096.0;
- double d2 = (double)entity.field_70116_cv / 4096.0;
++ entity.field_70118_ct += (long)p_147259_1_.func_186952_a();
++ entity.field_70117_cu += (long)p_147259_1_.func_186953_b();
++ entity.field_70116_cv += (long)p_147259_1_.func_186951_c();
+ double d0 = (double)entity.field_70118_ct / 4096.0D;
+ double d1 = (double)entity.field_70117_cu / 4096.0D;
+ double d2 = (double)entity.field_70116_cv / 4096.0D;
@@ -314,7 +320,7 @@
public void func_147267_a(SPacketEntityHeadLook p_147267_1_)
{
PacketThreadUtil.func_180031_a(p_147267_1_, this, this.field_147299_f);
-@@ -725,7 +650,6 @@
+@@ -725,18 +650,16 @@
}
}
@@ -322,7 +328,11 @@
public void func_147238_a(SPacketDestroyEntities p_147238_1_)
{
PacketThreadUtil.func_180031_a(p_147238_1_, this, this.field_147299_f);
-@@ -736,7 +660,6 @@
+
+- for (int i = 0; i < p_147238_1_.func_149098_c().length; i++)
++ for (int i = 0; i < p_147238_1_.func_149098_c().length; ++i)
+ {
+ this.field_147300_g.func_73028_b(p_147238_1_.func_149098_c()[i]);
}
}
@@ -680,9 +690,12 @@
- );
+ Explosion explosion = new Explosion(this.field_147299_f.field_71441_e, (Entity)null, p_147283_1_.func_149148_f(), p_147283_1_.func_149143_g(), p_147283_1_.func_149145_h(), p_147283_1_.func_149146_i(), p_147283_1_.func_149150_j());
explosion.func_77279_a(true);
- this.field_147299_f.field_71439_g.field_70159_w += (double)p_147283_1_.func_149149_c();
- this.field_147299_f.field_71439_g.field_70181_x += (double)p_147283_1_.func_149144_d();
- this.field_147299_f.field_71439_g.field_70179_y += (double)p_147283_1_.func_149147_e();
+- this.field_147299_f.field_71439_g.field_70159_w = this.field_147299_f.field_71439_g.field_70159_w + (double)p_147283_1_.func_149149_c();
+- this.field_147299_f.field_71439_g.field_70181_x = this.field_147299_f.field_71439_g.field_70181_x + (double)p_147283_1_.func_149144_d();
+- this.field_147299_f.field_71439_g.field_70179_y = this.field_147299_f.field_71439_g.field_70179_y + (double)p_147283_1_.func_149147_e();
++ this.field_147299_f.field_71439_g.field_70159_w += (double)p_147283_1_.func_149149_c();
++ this.field_147299_f.field_71439_g.field_70181_x += (double)p_147283_1_.func_149144_d();
++ this.field_147299_f.field_71439_g.field_70179_y += (double)p_147283_1_.func_149147_e();
}
- @Override
@@ -1492,7 +1505,7 @@
}
else
{
-- for (int i = 0; i < p_147289_1_.func_149222_k(); ++i)
+- for (int i = 0; i < p_147289_1_.func_149222_k(); i++)
+ for (int k = 0; k < p_147289_1_.func_149222_k(); ++k)
{
double d1 = this.field_147306_l.nextGaussian() * (double)p_147289_1_.func_149221_g();
diff --git a/patches/minecraft/net/minecraft/client/particle/Particle.java.patch b/patches/minecraft/net/minecraft/client/particle/Particle.java.patch
index ac830f0f1..962f4acbf 100644
--- a/patches/minecraft/net/minecraft/client/particle/Particle.java.patch
+++ b/patches/minecraft/net/minecraft/client/particle/Particle.java.patch
@@ -84,7 +84,7 @@
this.func_187112_i();
}
-- this.field_187130_j -= 0.04 * (double)this.field_70545_g;
+- this.field_187130_j = this.field_187130_j - 0.04 * (double)this.field_70545_g;
+ this.field_187130_j -= 0.04D * (double)this.field_70545_g;
this.func_187110_a(this.field_187129_i, this.field_187130_j, this.field_187131_k);
- this.field_187129_i *= 0.98F;
@@ -132,9 +132,12 @@
if (this.field_190014_F != 0.0F)
{
-@@ -214,32 +202,14 @@
+@@ -212,34 +200,16 @@
+ float f12 = MathHelper.func_76126_a(f8 * 0.5F) * (float)field_190016_K.field_72449_c;
+ Vec3d vec3d = new Vec3d((double)f10, (double)f11, (double)f12);
- for (int l = 0; l < 4; ++l)
+- for (int l = 0; l < 4; l++)
++ for (int l = 0; l < 4; ++l)
{
- avec3d[l] = vec3d.func_186678_a(2.0 * avec3d[l].func_72430_b(vec3d))
- .func_178787_e(avec3d[l].func_186678_a((double)(f9 * f9) - vec3d.func_72430_b(vec3d)))
@@ -170,8 +173,12 @@
}
public int func_70537_b()
-@@ -279,26 +249,9 @@
- ++this.field_94054_b;
+@@ -276,29 +246,12 @@
+
+ public void func_94053_h()
+ {
+- this.field_94054_b++;
++ ++this.field_94054_b;
}
- @Override
diff --git a/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch b/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch
index 88c1f4375..b9b51363d 100644
--- a/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/client/particle/ParticleManager.java
+++ after/net/minecraft/client/particle/ParticleManager.java
-@@ -41,11 +41,11 @@
+@@ -41,22 +41,22 @@
private static final ResourceLocation field_110737_b = new ResourceLocation("textures/particle/particles.png");
protected World field_78878_a;
private final ArrayDeque[][] field_78876_b = new ArrayDeque[4][];
@@ -15,6 +15,19 @@
public ParticleManager(World p_i1220_1_, TextureManager p_i1220_2_)
{
+ this.field_78878_a = p_i1220_1_;
+ this.field_78877_c = p_i1220_2_;
+
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ this.field_78876_b[i] = new ArrayDeque[2];
+
+- for (int j = 0; j < 2; j++)
++ for (int j = 0; j < 2; ++j)
+ {
+ this.field_78876_b[i][j] = Queues.newArrayDeque();
+ }
@@ -119,7 +119,7 @@
public void func_178929_a(int p_178929_1_, IParticleFactory p_178929_2_)
@@ -52,7 +65,7 @@
if (particle != null)
{
-@@ -164,6 +153,7 @@
+@@ -164,19 +153,20 @@
public void func_78873_a(Particle p_78873_1_)
{
@@ -60,7 +73,13 @@
this.field_187241_h.add(p_78873_1_);
}
-@@ -176,7 +166,7 @@
+ public void func_78868_a()
+ {
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ this.func_178922_a(i);
+ }
if (!this.field_178933_d.isEmpty())
{
@@ -69,7 +88,30 @@
for (ParticleEmitter particleemitter : this.field_178933_d)
{
-@@ -379,12 +369,12 @@
+@@ -212,7 +202,7 @@
+ {
+ this.field_78878_a.field_72984_F.func_76320_a(String.valueOf(p_178922_1_));
+
+- for (int i = 0; i < 2; i++)
++ for (int i = 0; i < 2; ++i)
+ {
+ this.field_78878_a.field_72984_F.func_76320_a(String.valueOf(i));
+ this.func_187240_a(this.field_78876_b[p_178922_1_][i]);
+@@ -296,11 +286,11 @@
+ GlStateManager.func_187401_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+ GlStateManager.func_179092_a(516, 0.003921569F);
+
+- for (int i_nf = 0; i_nf < 3; i_nf++)
++ for (int i_nf = 0; i_nf < 3; ++i_nf)
+ {
+ final int i = i_nf;
+
+- for (int j = 0; j < 2; j++)
++ for (int j = 0; j < 2; ++j)
+ {
+ if (!this.field_78876_b[i][j].isEmpty())
+ {
+@@ -379,14 +369,14 @@
public void func_78872_b(Entity p_78872_1_, float p_78872_2_)
{
@@ -86,9 +128,24 @@
+ float f4 = f1 * MathHelper.func_76126_a(p_78872_1_.field_70125_A * 0.017453292F);
+ float f5 = MathHelper.func_76134_b(p_78872_1_.field_70125_A * 0.017453292F);
- for (int i = 0; i < 2; ++i)
+- for (int i = 0; i < 2; i++)
++ for (int i = 0; i < 2; ++i)
{
-@@ -420,7 +410,7 @@
+ Queue queue = this.field_78876_b[3][i];
+
+@@ -407,9 +397,9 @@
+ {
+ this.field_78878_a = p_78870_1_;
+
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+- for (int j = 0; j < 2; j++)
++ for (int j = 0; j < 2; ++j)
+ {
+ this.field_78876_b[i][j].clear();
+ }
+@@ -420,33 +410,21 @@
public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
{
@@ -97,9 +154,15 @@
{
p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
int i = 4;
-@@ -431,22 +421,10 @@
+
+- for (int j = 0; j < 4; j++)
++ for (int j = 0; j < 4; ++j)
+ {
+- for (int k = 0; k < 4; k++)
++ for (int k = 0; k < 4; ++k)
{
- for (int l = 0; l < 4; ++l)
+- for (int l = 0; l < 4; l++)
++ for (int l = 0; l < 4; ++l)
{
- double d0 = ((double)j + 0.5) / 4.0;
- double d1 = ((double)k + 0.5) / 4.0;
@@ -187,6 +250,18 @@
}
}
+@@ -517,9 +484,9 @@
+ {
+ int i = 0;
+
+- for (int j = 0; j < 4; j++)
++ for (int j = 0; j < 4; ++j)
+ {
+- for (int k = 0; k < 2; k++)
++ for (int k = 0; k < 2; ++k)
+ {
+ i += this.field_78876_b[j][k].size();
+ }
@@ -527,4 +494,13 @@
return "" + i;
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java.patch
index ae13618d3..b8a5cdd41 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockFluidRenderer.java.patch
@@ -97,7 +97,7 @@
}
}
-@@ -185,26 +147,10 @@
+@@ -185,52 +147,36 @@
int l1 = p_178270_2_.func_185889_a(p_178270_1_, p_178270_3_.func_177977_b());
int i2 = l1 >> 16 & 65535;
int j2 = l1 & 65535;
@@ -128,6 +128,37 @@
flag3 = true;
}
+- for (int i1 = 0; i1 < 4; i1++)
++ for (int i1 = 0; i1 < 4; ++i1)
+ {
+ int j1 = 0;
+ int k1 = 0;
+
+ if (i1 == 0)
+ {
+- k1--;
++ --k1;
+ }
+
+ if (i1 == 1)
+ {
+- k1++;
++ ++k1;
+ }
+
+ if (i1 == 2)
+ {
+- j1--;
++ --j1;
+ }
+
+ if (i1 == 3)
+ {
+- j1++;
++ ++j1;
+ }
+
+ BlockPos blockpos = p_178270_3_.func_177982_a(j1, 0, k1);
@@ -238,9 +184,9 @@
if (!flag)
@@ -258,6 +289,15 @@
}
}
}
+@@ -361,7 +275,7 @@
+ int i = 0;
+ float f = 0.0F;
+
+- for (int j = 0; j < 4; j++)
++ for (int j = 0; j < 4; ++j)
+ {
+ BlockPos blockpos = p_178269_2_.func_177982_a(-(j & 1), 0, -(j >> 1 & 1));
+
@@ -373,9 +287,17 @@
IBlockState iblockstate = p_178269_1_.func_180495_p(blockpos);
Material material = iblockstate.func_185904_a();
@@ -279,15 +319,17 @@
if (k >= 8 || k == 0)
{
-@@ -384,11 +306,6 @@
+@@ -384,12 +306,7 @@
}
f += BlockLiquid.func_149801_b(k);
-- ++i;
+- i++;
- }
- else if (!material.func_76220_a())
- {
-- ++f;
- ++i;
+- f++;
+- i++;
++ ++i;
}
}
+
diff --git a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
index b547abb84..a0074a321 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BlockModelRenderer.java.patch
@@ -110,7 +110,15 @@
{
Vec3d vec3d = p_187492_2_.func_191059_e(p_187492_1_, p_187492_3_);
double d0 = (double)p_187492_3_.func_177958_n() + vec3d.field_72450_a;
-@@ -165,7 +128,14 @@
+@@ -158,14 +121,21 @@
+ double d2 = (double)p_187492_3_.func_177952_p() + vec3d.field_72449_c;
+ int i = 0;
+
+- for (int j = p_187492_5_.size(); i < j; i++)
++ for (int j = p_187492_5_.size(); i < j; ++i)
+ {
+ BakedQuad bakedquad = p_187492_5_.get(i);
+ this.func_187494_a(p_187492_2_, bakedquad.func_178209_a(), bakedquad.func_178210_d(), p_187492_6_, p_187492_7_);
p_187492_8_.func_187491_a(p_187492_1_, p_187492_2_, p_187492_3_, bakedquad.func_178210_d(), p_187492_6_, p_187492_7_);
p_187492_4_.func_178981_a(bakedquad.func_178209_a());
p_187492_4_.func_178962_a(p_187492_8_.field_178207_c[0], p_187492_8_.field_178207_c[1], p_187492_8_.field_178207_c[2], p_187492_8_.field_178207_c[3]);
@@ -139,6 +147,15 @@
p_187492_4_.func_178978_a(p_187492_8_.field_178206_b[0] * f, p_187492_8_.field_178206_b[0] * f1, p_187492_8_.field_178206_b[0] * f2, 4);
p_187492_4_.func_178978_a(p_187492_8_.field_178206_b[1] * f, p_187492_8_.field_178206_b[1] * f1, p_187492_8_.field_178206_b[1] * f2, 3);
p_187492_4_.func_178978_a(p_187492_8_.field_178206_b[2] * f, p_187492_8_.field_178206_b[2] * f1, p_187492_8_.field_178206_b[2] * f2, 2);
+@@ -204,7 +174,7 @@
+ float f4 = -32.0F;
+ float f5 = -32.0F;
+
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ float f6 = Float.intBitsToFloat(p_187494_2_[i * 7]);
+ float f7 = Float.intBitsToFloat(p_187494_2_[i * 7 + 1]);
@@ -265,16 +235,7 @@
}
}
@@ -157,7 +174,14 @@
{
Vec3d vec3d = p_187496_2_.func_191059_e(p_187496_1_, p_187496_3_);
double d0 = (double)p_187496_3_.func_177958_n() + vec3d.field_72450_a;
-@@ -288,7 +249,7 @@
+@@ -282,13 +243,13 @@
+ double d2 = (double)p_187496_3_.func_177952_p() + vec3d.field_72449_c;
+ int i = 0;
+
+- for (int j = p_187496_7_.size(); i < j; i++)
++ for (int j = p_187496_7_.size(); i < j; ++i)
+ {
+ BakedQuad bakedquad = p_187496_7_.get(i);
if (p_187496_5_)
{
@@ -237,6 +261,15 @@
if (!p_178266_4_)
{
+@@ -362,7 +338,7 @@
+ BufferBuilder bufferbuilder = tessellator.func_178180_c();
+ int i = 0;
+
+- for (int j = p_178264_5_.size(); i < j; i++)
++ for (int j = p_178264_5_.size(); i < j; ++i)
+ {
+ BakedQuad bakedquad = p_178264_5_.get(i);
+ bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_176599_b);
@@ -389,25 +365,15 @@
private final float[] field_178206_b = new float[4];
private final int[] field_178207_c = new int[4];
diff --git a/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch b/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch
index 410b0f86d..5ae2107d6 100644
--- a/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch
@@ -38,9 +38,12 @@
}
}
-@@ -74,14 +72,7 @@
+@@ -72,21 +70,14 @@
+ int i = this.field_178997_d / 4;
+ final float[] afloat = new float[i];
- for (int j = 0; j < i; ++j)
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
{
- afloat[j] = func_181665_a(
- this.field_179000_c,
@@ -54,6 +57,12 @@
}
Integer[] ainteger = new Integer[i];
+
+- for (int k = 0; k < ainteger.length; k++)
++ for (int k = 0; k < ainteger.length; ++k)
+ {
+ ainteger[k] = k;
+ }
@@ -95,7 +86,7 @@
{
public int compare(Integer p_compare_1_, Integer p_compare_2_)
@@ -143,6 +152,15 @@
}
}
+@@ -280,7 +273,7 @@
+ int i = this.field_179011_q.func_181719_f();
+ int j = (this.field_178997_d - 4) * i;
+
+- for (int k = 0; k < 4; k++)
++ for (int k = 0; k < 4; ++k)
+ {
+ int l = j + k * i;
+ int i1 = l + 1;
@@ -307,19 +300,19 @@
if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN)
@@ -200,7 +218,7 @@
}
}
-@@ -424,8 +417,8 @@
+@@ -424,15 +417,15 @@
public void func_178981_a(int[] p_178981_1_)
{
@@ -209,8 +227,28 @@
+ this.func_181670_b(p_178981_1_.length * 4 + this.field_179011_q.func_177338_f());//Forge, fix MC-122110
+ this.field_178999_b.position(this.func_181664_j());
this.field_178999_b.put(p_178981_1_);
- this.field_178997_d += p_178981_1_.length / this.field_179011_q.func_181719_f();
+- this.field_178997_d = this.field_178997_d + p_178981_1_.length / this.field_179011_q.func_181719_f();
++ this.field_178997_d += p_178981_1_.length / this.field_179011_q.func_181719_f();
}
+
+ public void func_181675_d()
+ {
+- this.field_178997_d++;
++ ++this.field_178997_d;
+ this.func_181670_b(this.field_179011_q.func_177338_f());
+ }
+
+@@ -486,8 +479,8 @@
+
+ private void func_181667_k()
+ {
+- this.field_181678_g++;
+- this.field_181678_g = this.field_181678_g % this.field_179011_q.func_177345_h();
++ ++this.field_181678_g;
++ this.field_181678_g %= this.field_179011_q.func_177345_h();
+ this.field_181677_f = this.field_179011_q.func_177348_c(this.field_181678_g);
+
+ if (this.field_181677_f.func_177375_c() == VertexFormatElement.EnumUsage.PADDING)
@@ -515,15 +508,15 @@
break;
case USHORT:
@@ -244,6 +282,24 @@
}
}
+@@ -573,7 +566,7 @@
+
+ public void func_178968_d(int p_178968_1_)
+ {
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ this.func_192836_a(p_178968_1_, i + 1);
+ }
+@@ -581,7 +574,7 @@
+
+ public void func_178990_f(float p_178990_1_, float p_178990_2_, float p_178990_3_)
+ {
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ this.func_178994_b(p_178990_1_, p_178990_2_, p_178990_3_, i + 1);
+ }
@@ -613,5 +606,28 @@
{
return this.field_179018_e;
diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
index e8abfac2d..94e18fd4a 100644
--- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -71,6 +71,18 @@
this.field_78531_r = p_i45076_1_;
this.field_147711_ac = p_i45076_2_;
this.field_78516_c = p_i45076_1_.func_175597_ag();
+@@ -178,9 +154,9 @@
+ this.field_78504_Q = this.field_78513_d.func_110565_c();
+ this.field_147707_d = null;
+
+- for (int i = 0; i < 32; i++)
++ for (int i = 0; i < 32; ++i)
+ {
+- for (int j = 0; j < 32; j++)
++ for (int j = 0; j < 32; ++j)
+ {
+ float f = (float)(j - 16);
+ float f1 = (float)(i - 16);
@@ -235,6 +211,7 @@
{
this.func_175069_a(new ResourceLocation("shaders/post/invert.json"));
@@ -87,7 +99,7 @@
public void func_110549_a(IResourceManager p_110549_1_)
{
if (this.field_147707_d != null)
-@@ -315,7 +291,7 @@
+@@ -315,11 +291,11 @@
this.field_78531_r.func_175607_a(this.field_78531_r.field_71439_g);
}
@@ -95,7 +107,22 @@
+ float f3 = this.field_78531_r.field_71441_e.func_175724_o(new BlockPos(this.field_78531_r.func_175606_aa().func_174824_e(1F))); // Forge: fix MC-51150
float f4 = (float)this.field_78531_r.field_71474_y.field_151451_c / 32.0F;
float f2 = f3 * (1.0F - f4) + f4;
- this.field_78539_ae += (f2 - this.field_78539_ae) * 0.1F;
+- this.field_78539_ae = this.field_78539_ae + (f2 - this.field_78539_ae) * 0.1F;
+- this.field_78529_t++;
++ this.field_78539_ae += (f2 - this.field_78539_ae) * 0.1F;
++ ++this.field_78529_t;
+ this.field_78516_c.func_78441_a();
+ this.func_78484_h();
+ this.field_82832_V = this.field_82831_U;
+@@ -340,7 +316,7 @@
+
+ if (this.field_190567_ac > 0)
+ {
+- this.field_190567_ac--;
++ --this.field_190567_ac;
+
+ if (this.field_190567_ac == 0)
+ {
@@ -386,12 +362,12 @@
if (this.field_78531_r.field_71442_b.func_78749_i())
@@ -111,7 +138,7 @@
{
flag = true;
}
-@@ -407,21 +383,13 @@
+@@ -407,24 +383,16 @@
this.field_78528_u = null;
Vec3d vec3d3 = null;
float f = 1.0F;
@@ -134,7 +161,11 @@
+ }));
double d2 = d1;
- for (int j = 0; j < list.size(); ++j)
+- for (int j = 0; j < list.size(); j++)
++ for (int j = 0; j < list.size(); ++j)
+ {
+ Entity entity1 = list.get(j);
+ AxisAlignedBB axisalignedbb = entity1.func_174813_aQ().func_186662_g((double)entity1.func_70111_Y());
@@ -432,22 +400,22 @@
if (axisalignedbb.func_72318_a(vec3d))
@@ -176,6 +207,15 @@
}
if (this.field_78528_u != null && (d2 < d1 || this.field_78531_r.field_71476_x == null))
+@@ -495,7 +463,7 @@
+ }
+
+ this.field_78506_S = this.field_78507_R;
+- this.field_78507_R = this.field_78507_R + (f - this.field_78507_R) * 0.5F;
++ this.field_78507_R += (f - this.field_78507_R) * 0.5F;
+
+ if (this.field_78507_R > 1.5F)
+ {
@@ -522,7 +490,7 @@
if (p_78481_2_)
{
@@ -254,7 +294,8 @@
+ double d5 = (double)(MathHelper.func_76134_b(f1 * 0.017453292F) * MathHelper.func_76134_b(f2 * 0.017453292F)) * d3;
+ double d6 = (double)(-MathHelper.func_76126_a(f2 * 0.017453292F)) * d3;
- for (int i = 0; i < 8; ++i)
+- for (int i = 0; i < 8; i++)
++ for (int i = 0; i < 8; ++i)
{
float f3 = (float)((i & 1) * 2 - 1);
float f4 = (float)((i >> 1 & 1) * 2 - 1);
@@ -378,15 +419,26 @@
{
this.func_180436_i();
this.field_78516_c.func_78440_a(p_78476_1_);
-@@ -879,7 +821,7 @@
+@@ -879,8 +821,8 @@
private void func_78470_f()
{
this.field_175075_L = (float)((double)this.field_175075_L + (Math.random() - Math.random()) * Math.random() * Math.random());
- this.field_175075_L = (float)((double)this.field_175075_L * 0.9);
+- this.field_78514_e = this.field_78514_e + (this.field_175075_L - this.field_78514_e);
+ this.field_175075_L = (float)((double)this.field_175075_L * 0.9D);
- this.field_78514_e += this.field_175075_L - this.field_78514_e;
++ this.field_78514_e += this.field_175075_L - this.field_78514_e;
this.field_78536_aa = true;
}
+
+@@ -896,7 +838,7 @@
+ float f = world.func_72971_b(1.0F);
+ float f1 = f * 0.95F + 0.05F;
+
+- for (int i = 0; i < 256; i++)
++ for (int i = 0; i < 256; ++i)
+ {
+ float f2 = world.field_73011_w.func_177497_p()[i / 16] * f1;
+ float f3 = world.field_73011_w.func_177497_p()[i % 16] * (this.field_78514_e * 0.1F + 1.5F);
@@ -932,6 +874,15 @@
f10 = 0.25F + f7 * 0.75F;
}
@@ -669,9 +721,12 @@
int j = 0;
int k = (int)(100.0F * f * f);
-@@ -1558,60 +1494,36 @@
+@@ -1556,62 +1492,38 @@
+ k = 0;
+ }
- for (int l = 0; l < k; ++l)
+- for (int l = 0; l < k; l++)
++ for (int l = 0; l < k; ++l)
{
- BlockPos blockpos1 = world.func_175725_q(
- blockpos.func_177982_a(
@@ -791,8 +846,15 @@
GlStateManager.func_179092_a(516, 0.1F);
double d0 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_78474_1_;
double d1 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_78474_1_;
-@@ -1679,8 +1592,8 @@
- for (int l1 = i - i1; l1 <= i + i1; ++l1)
+@@ -1674,13 +1587,13 @@
+ GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
+ BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
+
+- for (int k1 = k - i1; k1 <= k + i1; k1++)
++ for (int k1 = k - i1; k1 <= k + i1; ++k1)
+ {
+- for (int l1 = i - i1; l1 <= i + i1; l1++)
++ for (int l1 = i - i1; l1 <= i + i1; ++l1)
{
int i2 = (k1 - k + 16) * 32 + l1 - i + 16;
- double d3 = (double)this.field_175076_N[i2] * 0.5;
@@ -933,6 +995,19 @@
this.field_175080_Q = this.field_175080_Q * (1.0F - f5) + afloat[0] * f5;
this.field_175082_R = this.field_175082_R * (1.0F - f5) + afloat[1] * f5;
this.field_175081_S = this.field_175081_S * (1.0F - f5) + afloat[2] * f5;
+@@ -1875,9 +1754,9 @@
+ }
+ }
+
+- this.field_175080_Q = this.field_175080_Q + (f1 - this.field_175080_Q) * f;
+- this.field_175082_R = this.field_175082_R + (f2 - this.field_175082_R) * f;
+- this.field_175081_S = this.field_175081_S + (f3 - this.field_175081_S) * f;
++ this.field_175080_Q += (f1 - this.field_175080_Q) * f;
++ this.field_175082_R += (f2 - this.field_175082_R) * f;
++ this.field_175081_S += (f3 - this.field_175081_S) * f;
+ float f8 = world.func_72867_j(p_78466_1_);
+
+ if (f8 > 0.0F)
@@ -1908,29 +1787,16 @@
this.field_175082_R = (float)vec3d3.field_72448_b;
this.field_175081_S = (float)vec3d3.field_72449_c;
diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
index 2c27111ff..ee5e2d8ce 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch
@@ -212,14 +212,18 @@
}
GlStateManager.func_179121_F();
-@@ -455,6 +442,7 @@
+@@ -455,9 +442,10 @@
if (this.field_78455_a.field_71439_g.func_70094_T())
{
IBlockState iblockstate = this.field_78455_a.field_71441_e.func_180495_p(new BlockPos(this.field_78455_a.field_71439_g));
+ BlockPos overlayPos = new BlockPos(this.field_78455_a.field_71439_g);
EntityPlayer entityplayer = this.field_78455_a.field_71439_g;
- for (int i = 0; i < 8; ++i)
+- for (int i = 0; i < 8; i++)
++ for (int i = 0; i < 8; ++i)
+ {
+ double d0 = entityplayer.field_70165_t + (double)(((float)((i >> 0) % 2) - 0.5F) * entityplayer.field_70130_N * 0.8F);
+ double d1 = entityplayer.field_70163_u + (double)(((float)((i >> 1) % 2) - 0.5F) * 0.1F);
@@ -468,11 +456,13 @@
if (iblockstate1.func_191058_s())
{
@@ -289,7 +293,7 @@
tessellator.func_78381_a();
GlStateManager.func_179121_F();
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
-@@ -559,9 +549,7 @@
+@@ -559,12 +549,10 @@
GlStateManager.func_179143_c(519);
GlStateManager.func_179132_a(false);
GlStateManager.func_179147_l();
@@ -299,7 +303,11 @@
+ GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
float f = 1.0F;
- for (int i = 0; i < 2; ++i)
+- for (int i = 0; i < 2; i++)
++ for (int i = 0; i < 2; ++i)
+ {
+ GlStateManager.func_179094_E();
+ TextureAtlasSprite textureatlassprite = this.field_78455_a.func_147117_R().func_110572_b("minecraft:blocks/fire_layer_1");
@@ -581,10 +569,10 @@
GlStateManager.func_179109_b((float)(-(i * 2 - 1)) * 0.24F, -0.3F, 0.0F);
GlStateManager.func_179114_b((float)(i * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F);
@@ -315,12 +323,14 @@
tessellator.func_78381_a();
GlStateManager.func_179121_F();
}
-@@ -611,8 +599,17 @@
+@@ -611,10 +599,17 @@
else
{
float f = entityplayersp.func_184825_o(1.0F);
-- this.field_187469_f += MathHelper.func_76131_a((Objects.equals(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
-- this.field_187471_h += MathHelper.func_76131_a((float)(Objects.equals(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
+- this.field_187469_f = this.field_187469_f
+- + MathHelper.func_76131_a((Objects.equals(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F);
+- this.field_187471_h = this.field_187471_h
+- + MathHelper.func_76131_a((float)(Objects.equals(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F);
+
+ boolean requipM = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187467_d, itemstack, entityplayersp.field_71071_by.field_70461_c);
+ boolean requipO = net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187468_e, itemstack1, -1);
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
index f0d040125..62fc4b07b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
@@ -49,6 +49,15 @@
public void func_110549_a(IResourceManager p_110549_1_)
{
this.func_174971_n();
+@@ -191,7 +191,7 @@
+ {
+ TextureMap texturemap = this.field_72777_q.func_147117_R();
+
+- for (int i = 0; i < this.field_94141_F.length; i++)
++ for (int i = 0; i < this.field_94141_F.length; ++i)
+ {
+ this.field_94141_F[i] = texturemap.func_110572_b("minecraft:blocks/destroy_stage_" + i);
+ }
@@ -210,9 +210,7 @@
try
@@ -74,6 +83,15 @@
this.field_175015_z.func_178038_a(this.field_72777_q.field_71443_c, this.field_72777_q.field_71440_d, false);
GlStateManager.func_179084_k();
}
+@@ -393,7 +386,7 @@
+ Random random = new Random(10842L);
+ p_180444_1_.func_181668_a(7, DefaultVertexFormats.field_181705_e);
+
+- for (int i = 0; i < 1500; i++)
++ for (int i = 0; i < 1500; ++i)
+ {
+ double d0 = (double)(random.nextFloat() * 2.0F - 1.0F);
+ double d1 = (double)(random.nextFloat() * 2.0F - 1.0F);
@@ -401,35 +394,35 @@
double d3 = (double)(0.15F + random.nextFloat() * 0.1F);
double d4 = d0 * d0 + d1 * d1 + d2 * d2;
@@ -106,7 +124,8 @@
double d15 = Math.sin(d14);
double d16 = Math.cos(d14);
- for (int j = 0; j < 4; ++j)
+- for (int j = 0; j < 4; j++)
++ for (int j = 0; j < 4; ++j)
{
- double d17 = 0.0;
+ double d17 = 0.0D;
@@ -123,17 +142,19 @@
double d25 = d24 * d9 - d22 * d10;
double d26 = d22 * d9 + d24 * d10;
p_180444_1_.func_181662_b(d5 + d25, d6 + d23, d7 + d26).func_181675_d();
-@@ -560,8 +553,10 @@
+@@ -560,9 +553,11 @@
public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float p_180446_3_)
{
+ int pass = net.minecraftforge.client.MinecraftForgeClient.getRenderPass();
if (this.field_72740_G > 0)
{
+- this.field_72740_G--;
+ if (pass > 0) return;
- --this.field_72740_G;
++ --this.field_72740_G;
}
else
+ {
@@ -570,27 +565,14 @@
double d1 = p_180446_1_.field_70167_r + (p_180446_1_.field_70163_u - p_180446_1_.field_70167_r) * (double)p_180446_3_;
double d2 = p_180446_1_.field_70166_s + (p_180446_1_.field_70161_v - p_180446_1_.field_70166_s) * (double)p_180446_3_;
@@ -167,7 +188,7 @@
Entity entity = this.field_72777_q.func_175606_aa();
double d3 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_180446_3_;
double d4 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_180446_3_;
-@@ -602,11 +584,15 @@
+@@ -602,12 +584,16 @@
this.field_72777_q.field_71460_t.func_180436_i();
this.field_72769_h.field_72984_F.func_76318_c("global");
List list = this.field_72769_h.func_72910_y();
@@ -176,14 +197,17 @@
this.field_72748_H = list.size();
+ }
- for (int i = 0; i < this.field_72769_h.field_73007_j.size(); ++i)
+- for (int i = 0; i < this.field_72769_h.field_73007_j.size(); i++)
++ for (int i = 0; i < this.field_72769_h.field_73007_j.size(); ++i)
{
Entity entity1 = this.field_72769_h.field_73007_j.get(i);
+- this.field_72749_I++;
+ if (!entity1.shouldRenderInPass(pass)) continue;
- ++this.field_72749_I;
++ ++this.field_72749_I;
if (entity1.func_145770_h(d0, d1, d2))
-@@ -616,36 +602,27 @@
+ {
+@@ -616,38 +602,29 @@
}
this.field_72769_h.field_72984_F.func_76318_c("entities");
@@ -224,8 +248,11 @@
- ))
+ if ((entity2 != this.field_72777_q.func_175606_aa() || this.field_72777_q.field_71474_y.field_74320_O != 0 || flag1) && (entity2.field_70163_u < 0.0D || entity2.field_70163_u >= 256.0D || this.field_72769_h.func_175667_e(blockpos$pooledmutableblockpos.func_189535_a(entity2))))
{
- ++this.field_72749_I;
+- this.field_72749_I++;
++ ++this.field_72749_I;
this.field_175010_j.func_188388_a(entity2, p_180446_3_, false);
+
+ if (this.func_184383_a(entity2, entity, p_180446_2_))
@@ -675,6 +652,7 @@
}
}
@@ -234,6 +261,15 @@
if (this.func_174985_d() && (!list1.isEmpty() || this.field_184386_ad))
{
this.field_72769_h.field_72984_F.func_76318_c("entityOutlines");
+@@ -689,7 +667,7 @@
+ RenderHelper.func_74518_a();
+ this.field_175010_j.func_178632_c(true);
+
+- for (int j = 0; j < list1.size(); j++)
++ for (int j = 0; j < list1.size(); ++j)
+ {
+ this.field_175010_j.func_188388_a(list1.get(j), p_180446_3_, false);
+ }
@@ -714,6 +692,7 @@
this.field_72769_h.field_72984_F.func_76318_c("blockentities");
RenderHelper.func_74519_b();
@@ -262,23 +298,28 @@
this.func_180443_s();
-@@ -788,13 +770,9 @@
+@@ -788,15 +770,13 @@
{
return true;
}
-- else if (this.field_72777_q.field_71439_g.func_175149_v()
-- && this.field_72777_q.field_71474_y.field_178883_an.func_151470_d()
-- && p_184383_1_ instanceof EntityPlayer)
+ else if (this.field_72777_q.field_71439_g.func_175149_v() && this.field_72777_q.field_71474_y.field_178883_an.func_151470_d() && p_184383_1_ instanceof EntityPlayer)
- {
-- return p_184383_1_.field_70158_ak
-- || p_184383_3_.func_78546_a(p_184383_1_.func_174813_aQ())
-- || p_184383_1_.func_184215_y(this.field_72777_q.field_71439_g);
++ {
+ return p_184383_1_.field_70158_ak || p_184383_3_.func_78546_a(p_184383_1_.func_174813_aQ()) || p_184383_1_.func_184215_y(this.field_72777_q.field_71439_g);
- }
++ }
else
{
-@@ -806,15 +784,7 @@
+- return this.field_72777_q.field_71439_g.func_175149_v()
+- && this.field_72777_q.field_71474_y.field_178883_an.func_151470_d()
+- && p_184383_1_ instanceof EntityPlayer
+- ? p_184383_1_.field_70158_ak
+- || p_184383_3_.func_78546_a(p_184383_1_.func_174813_aQ())
+- || p_184383_1_.func_184215_y(this.field_72777_q.field_71439_g)
+- : false;
++ return false;
+ }
+ }
+
+@@ -804,15 +784,7 @@
{
int i = this.field_175008_n.field_178164_f.length;
int j = this.func_184382_g();
@@ -295,7 +336,16 @@
}
protected int func_184382_g()
-@@ -851,10 +821,7 @@
+@@ -825,7 +797,7 @@
+
+ if (compiledchunk != CompiledChunk.field_178502_a && !compiledchunk.func_178489_a())
+ {
+- i++;
++ ++i;
+ }
+ }
+
+@@ -849,10 +821,7 @@
double d1 = p_174970_1_.field_70163_u - this.field_174993_C;
double d2 = p_174970_1_.field_70161_v - this.field_174987_D;
@@ -307,7 +357,7 @@
{
this.field_174992_B = p_174970_1_.field_70165_t;
this.field_174993_C = p_174970_1_.field_70163_u;
-@@ -882,16 +849,8 @@
+@@ -880,16 +849,8 @@
this.field_72777_q.field_71424_I.func_76318_c("culling");
BlockPos blockpos1 = new BlockPos(d3, d4 + (double)p_174970_1_.func_70047_e(), d5);
RenderChunk renderchunk = this.field_175008_n.func_178161_a(blockpos1);
@@ -326,7 +376,7 @@
this.field_174997_H = p_174970_1_.field_70165_t;
this.field_174998_I = p_174970_1_.field_70163_u;
this.field_174999_J = p_174970_1_.field_70161_v;
-@@ -903,17 +862,15 @@
+@@ -901,17 +862,15 @@
if (!flag && this.field_147595_R)
{
this.field_147595_R = false;
@@ -348,7 +398,15 @@
Set set1 = this.func_174978_c(blockpos1);
if (set1.size() == 1)
-@@ -953,10 +910,10 @@
+@@ -945,16 +904,16 @@
+ {
+ int i = blockpos1.func_177956_o() > 0 ? 248 : 8;
+
+- for (int j = -this.field_72739_F; j <= this.field_72739_F; j++)
++ for (int j = -this.field_72739_F; j <= this.field_72739_F; ++j)
+ {
+- for (int k = -this.field_72739_F; k <= this.field_72739_F; k++)
++ for (int k = -this.field_72739_F; k <= this.field_72739_F; ++k)
{
RenderChunk renderchunk1 = this.field_175008_n.func_178161_a(new BlockPos((j << 4) + 8, i, (k << 4) + 8));
@@ -361,7 +419,7 @@
}
}
}
-@@ -975,15 +932,9 @@
+@@ -973,15 +932,9 @@
{
RenderChunk renderchunk2 = this.func_181562_a(blockpos, renderchunk3, enumfacing1);
@@ -379,7 +437,7 @@
renderglobal$containerlocalrenderinformation.func_189561_a(renderglobal$containerlocalrenderinformation1.field_178035_c, enumfacing1);
queue.add(renderglobal$containerlocalrenderinformation);
}
-@@ -1003,7 +954,7 @@
+@@ -1001,7 +954,7 @@
this.field_72777_q.field_71424_I.func_76318_c("rebuildNear");
Set set = this.field_175009_l;
@@ -388,7 +446,7 @@
for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation2 : this.field_72755_R)
{
-@@ -1013,9 +964,9 @@
+@@ -1011,9 +964,9 @@
{
this.field_147595_R = true;
BlockPos blockpos2 = renderchunk4.func_178568_j().func_177982_a(8, 8, 8);
@@ -400,7 +458,7 @@
{
this.field_175009_l.add(renderchunk4);
}
-@@ -1059,15 +1010,13 @@
+@@ -1057,15 +1010,13 @@
{
return null;
}
@@ -419,7 +477,24 @@
}
}
-@@ -1114,10 +1063,10 @@
+@@ -1092,12 +1043,12 @@
+ this.field_175004_V[6] = new Vector4f(1.0F, 1.0F, 1.0F, 1.0F);
+ this.field_175004_V[7] = new Vector4f(-1.0F, 1.0F, 1.0F, 1.0F);
+
+- for (int i = 0; i < 8; i++)
++ for (int i = 0; i < 8; ++i)
+ {
+ Matrix4f.transform(matrix4f2, this.field_175004_V[i], this.field_175004_V[i]);
+- this.field_175004_V[i].x = this.field_175004_V[i].x / this.field_175004_V[i].w;
+- this.field_175004_V[i].y = this.field_175004_V[i].y / this.field_175004_V[i].w;
+- this.field_175004_V[i].z = this.field_175004_V[i].z / this.field_175004_V[i].w;
++ this.field_175004_V[i].x /= this.field_175004_V[i].w;
++ this.field_175004_V[i].y /= this.field_175004_V[i].w;
++ this.field_175004_V[i].z /= this.field_175004_V[i].w;
+ this.field_175004_V[i].w = 1.0F;
+ }
+ }
+@@ -1112,10 +1063,10 @@
f += 180.0F;
}
@@ -434,7 +509,7 @@
return new Vector3f(f3 * f4, f5, f2 * f4);
}
-@@ -1132,7 +1081,7 @@
+@@ -1130,7 +1081,7 @@
double d1 = p_174977_5_.field_70163_u - this.field_147597_g;
double d2 = p_174977_5_.field_70161_v - this.field_147602_h;
@@ -443,7 +518,7 @@
{
this.field_147596_f = p_174977_5_.field_70165_t;
this.field_147597_g = p_174977_5_.field_70163_u;
-@@ -1160,7 +1109,7 @@
+@@ -1158,16 +1109,19 @@
for (int j = i1; j != i; j += j1)
{
@@ -452,7 +527,9 @@
if (!renderchunk.func_178571_g().func_178491_b(p_174977_1_))
{
-@@ -1169,7 +1118,10 @@
+- l++;
++ ++l;
+ this.field_174996_N.func_178002_a(renderchunk, p_174977_1_);
}
}
@@ -464,7 +541,7 @@
this.func_174982_a(p_174977_1_);
this.field_72777_q.field_71424_I.func_76319_b();
return l;
-@@ -1198,7 +1150,7 @@
+@@ -1196,7 +1150,7 @@
for (VertexFormatElement vertexformatelement : DefaultVertexFormats.field_176600_a.func_177343_g())
{
VertexFormatElement.EnumUsage vertexformatelement$enumusage = vertexformatelement.func_177375_c();
@@ -473,7 +550,7 @@
switch (vertexformatelement$enumusage)
{
-@@ -1206,7 +1158,7 @@
+@@ -1204,7 +1158,7 @@
GlStateManager.func_187429_p(32884);
break;
case UV:
@@ -482,7 +559,7 @@
GlStateManager.func_187429_p(32888);
OpenGlHelper.func_77472_b(OpenGlHelper.field_77478_a);
break;
-@@ -1225,9 +1177,9 @@
+@@ -1223,9 +1177,9 @@
while (p_174965_1_.hasNext())
{
DestroyBlockProgress destroyblockprogress = p_174965_1_.next();
@@ -494,7 +571,16 @@
{
p_174965_1_.remove();
}
-@@ -1251,10 +1203,10 @@
+@@ -1234,7 +1188,7 @@
+
+ public void func_72734_e()
+ {
+- this.field_72773_u++;
++ ++this.field_72773_u;
+
+ if (this.field_72773_u % 20 == 0)
+ {
+@@ -1249,10 +1203,10 @@
{
BlockPos blockpos = iterator.next();
iterator.remove();
@@ -509,7 +595,7 @@
}
}
}
-@@ -1264,49 +1216,47 @@
+@@ -1262,49 +1216,47 @@
GlStateManager.func_179106_n();
GlStateManager.func_179118_c();
GlStateManager.func_179147_l();
@@ -523,7 +609,7 @@
Tessellator tessellator = Tessellator.func_178181_a();
BufferBuilder bufferbuilder = tessellator.func_178180_c();
-- for (int i = 0; i < 6; ++i)
+- for (int i = 0; i < 6; i++)
+ for (int k1 = 0; k1 < 6; ++k1)
{
GlStateManager.func_179094_E();
@@ -570,7 +656,7 @@
tessellator.func_78381_a();
GlStateManager.func_179121_F();
}
-@@ -1318,6 +1268,13 @@
+@@ -1316,6 +1268,13 @@
public void func_174976_a(float p_174976_1_, int p_174976_2_)
{
@@ -584,7 +670,7 @@
if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1)
{
this.func_180448_r();
-@@ -1364,12 +1321,7 @@
+@@ -1362,12 +1321,7 @@
GlStateManager.func_179106_n();
GlStateManager.func_179118_c();
GlStateManager.func_179147_l();
@@ -598,7 +684,7 @@
RenderHelper.func_74518_a();
float[] afloat = this.field_72769_h.field_73011_w.func_76560_a(this.field_72769_h.func_72826_c(p_174976_1_), p_174976_1_);
-@@ -1396,17 +1348,15 @@
+@@ -1394,17 +1348,15 @@
}
bufferbuilder.func_181668_a(6, DefaultVertexFormats.field_181706_f);
@@ -607,7 +693,7 @@
+ bufferbuilder.func_181662_b(0.0D, 100.0D, 0.0D).func_181666_a(f6, f7, f8, afloat[3]).func_181675_d();
+ int l1 = 16;
-- for (int l = 0; l <= 16; ++l)
+- for (int l = 0; l <= 16; l++)
+ for (int j2 = 0; j2 <= 16; ++j2)
{
- float f21 = (float)l * (float)(Math.PI * 2) / 16.0F;
@@ -621,7 +707,7 @@
}
tessellator.func_78381_a();
-@@ -1415,9 +1365,7 @@
+@@ -1413,9 +1365,7 @@
}
GlStateManager.func_179098_w();
@@ -632,7 +718,7 @@
GlStateManager.func_179094_E();
float f16 = 1.0F - this.field_72769_h.func_72867_j(p_174976_1_);
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f16);
-@@ -1426,25 +1374,25 @@
+@@ -1424,25 +1374,25 @@
float f17 = 30.0F;
this.field_72770_i.func_110577_a(field_110928_i);
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181707_g);
@@ -673,7 +759,7 @@
tessellator.func_78381_a();
GlStateManager.func_179090_x();
float f15 = this.field_72769_h.func_72880_h(p_174976_1_) * f16;
-@@ -1475,9 +1423,9 @@
+@@ -1473,9 +1423,9 @@
GlStateManager.func_179121_F();
GlStateManager.func_179090_x();
GlStateManager.func_179124_c(0.0F, 0.0F, 0.0F);
@@ -685,7 +771,7 @@
{
GlStateManager.func_179094_E();
GlStateManager.func_179109_b(0.0F, 12.0F, 0.0F);
-@@ -1498,29 +1446,29 @@
+@@ -1496,29 +1446,29 @@
GlStateManager.func_179121_F();
float f18 = 1.0F;
@@ -736,7 +822,7 @@
tessellator.func_78381_a();
}
-@@ -1534,7 +1482,7 @@
+@@ -1532,7 +1482,7 @@
}
GlStateManager.func_179094_E();
@@ -745,7 +831,7 @@
GlStateManager.func_179148_o(this.field_72781_x);
GlStateManager.func_179121_F();
GlStateManager.func_179098_w();
-@@ -1544,6 +1492,7 @@
+@@ -1542,6 +1492,7 @@
public void func_180447_b(float p_180447_1_, int p_180447_2_, double p_180447_3_, double p_180447_5_, double p_180447_7_)
{
@@ -753,7 +839,7 @@
if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d())
{
if (this.field_72777_q.field_71474_y.func_181147_e() == 2)
-@@ -1553,18 +1502,13 @@
+@@ -1551,18 +1502,13 @@
else
{
GlStateManager.func_179129_p();
@@ -775,7 +861,7 @@
Vec3d vec3d = this.field_72769_h.func_72824_f(p_180447_1_);
float f = (float)vec3d.field_72450_a;
float f1 = (float)vec3d.field_72448_b;
-@@ -1581,37 +1525,25 @@
+@@ -1579,37 +1525,25 @@
}
float f9 = 4.8828125E-4F;
@@ -827,7 +913,7 @@
}
}
-@@ -1635,19 +1567,17 @@
+@@ -1633,19 +1567,17 @@
BufferBuilder bufferbuilder = tessellator.func_178180_c();
float f = 12.0F;
float f1 = 4.0F;
@@ -855,7 +941,7 @@
Vec3d vec3d = this.field_72769_h.func_72824_f(p_180445_1_);
float f3 = (float)vec3d.field_72450_a;
float f4 = (float)vec3d.field_72448_b;
-@@ -1673,18 +1603,18 @@
+@@ -1671,18 +1603,18 @@
float f13 = f4 * 0.8F;
float f14 = f5 * 0.8F;
float f15 = 0.00390625F;
@@ -874,7 +960,7 @@
float f20 = 9.765625E-4F;
GlStateManager.func_179152_a(12.0F, 1.0F, 12.0F);
-- for (int i1 = 0; i1 < 2; ++i1)
+- for (int i1 = 0; i1 < 2; i1++)
+ for (int k2 = 0; k2 < 2; ++k2)
{
- if (i1 == 0)
@@ -882,14 +968,14 @@
{
GlStateManager.func_179135_a(false, false, false, false);
}
-@@ -1703,169 +1633,73 @@
+@@ -1701,169 +1633,73 @@
}
}
-- for (int j1 = -3; j1 <= 4; ++j1)
+- for (int j1 = -3; j1 <= 4; j1++)
+ for (int l2 = -3; l2 <= 4; ++l2)
{
-- for (int k1 = -3; k1 <= 4; ++k1)
+- for (int k1 = -3; k1 <= 4; k1++)
+ for (int i3 = -3; i3 <= 4; ++i3)
{
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181712_l);
@@ -954,7 +1040,7 @@
-
- if (j1 > -1)
- {
-- for (int l1 = 0; l1 < 8; ++l1)
+- for (int l1 = 0; l1 < 8; l1++)
- {
- bufferbuilder.func_181662_b((double)(f23 + (float)l1 + 0.0F), (double)(f2 + 0.0F), (double)(f24 + 8.0F))
- .func_187315_a((double)((f21 + (float)l1 + 0.5F) * 0.00390625F + f16), (double)((f22 + 8.0F) * 0.00390625F + f17))
@@ -981,7 +1067,7 @@
-
- if (j1 <= 1)
- {
-- for (int i2 = 0; i2 < 8; ++i2)
+- for (int i2 = 0; i2 < 8; i2++)
- {
- bufferbuilder.func_181662_b((double)(f23 + (float)i2 + 1.0F - 9.765625E-4F), (double)(f2 + 0.0F), (double)(f24 + 8.0F))
- .func_187315_a((double)((f21 + (float)i2 + 0.5F) * 0.00390625F + f16), (double)((f22 + 8.0F) * 0.00390625F + f17))
@@ -1008,7 +1094,7 @@
-
- if (k1 > -1)
- {
-- for (int j2 = 0; j2 < 8; ++j2)
+- for (int j2 = 0; j2 < 8; j2++)
- {
- bufferbuilder.func_181662_b((double)(f23 + 0.0F), (double)(f2 + 4.0F), (double)(f24 + (float)j2 + 0.0F))
- .func_187315_a((double)((f21 + 0.0F) * 0.00390625F + f16), (double)((f22 + (float)j2 + 0.5F) * 0.00390625F + f17))
@@ -1035,7 +1121,7 @@
-
- if (k1 <= 1)
- {
-- for (int k2 = 0; k2 < 8; ++k2)
+- for (int k2 = 0; k2 < 8; k2++)
- {
- bufferbuilder.func_181662_b((double)(f23 + 0.0F), (double)(f2 + 4.0F), (double)(f24 + (float)k2 + 1.0F - 9.765625E-4F))
- .func_187315_a((double)((f21 + 0.0F) * 0.00390625F + f16), (double)((f22 + (float)k2 + 0.5F) * 0.00390625F + f17))
@@ -1107,7 +1193,16 @@
}
}
-@@ -1889,28 +1723,28 @@
+@@ -1879,7 +1715,7 @@
+
+ public void func_174967_a(long p_174967_1_)
+ {
+- this.field_147595_R = this.field_147595_R | this.field_174995_M.func_178516_a(p_174967_1_);
++ this.field_147595_R |= this.field_174995_M.func_178516_a(p_174967_1_);
+
+ if (!this.field_175009_l.isEmpty())
+ {
+@@ -1887,28 +1723,28 @@
while (iterator.hasNext())
{
@@ -1145,7 +1240,7 @@
{
break;
}
-@@ -1923,30 +1757,25 @@
+@@ -1921,30 +1757,25 @@
Tessellator tessellator = Tessellator.func_178181_a();
BufferBuilder bufferbuilder = tessellator.func_178180_c();
WorldBorder worldborder = this.field_72769_h.func_175723_af();
@@ -1189,7 +1284,7 @@
GlStateManager.func_179136_a(-3.0F, -3.0F);
GlStateManager.func_179088_q();
GlStateManager.func_179092_a(516, 0.1F);
-@@ -1957,95 +1786,79 @@
+@@ -1955,95 +1786,79 @@
float f5 = 0.0F;
float f6 = 128.0F;
bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181707_g);
@@ -1218,7 +1313,7 @@
- .func_187315_a((double)(f3 + f8 + f7), (double)(f3 + 128.0F))
- .func_181675_d();
- bufferbuilder.func_181662_b(worldborder.func_177728_d(), 0.0, d7).func_187315_a((double)(f3 + f7), (double)(f3 + 128.0F)).func_181675_d();
-- ++d7;
+- d7++;
+ double d11 = Math.min(1.0D, d9 - d10);
+ float f8 = (float)d11 * 0.5F;
+ bufferbuilder.func_181662_b(worldborder.func_177728_d(), 256.0D, d10).func_187315_a((double)(f3 + f7), (double)(f3 + 0.0F)).func_181675_d();
@@ -1247,7 +1342,7 @@
- .func_187315_a((double)(f3 + f12 + f9), (double)(f3 + 128.0F))
- .func_181675_d();
- bufferbuilder.func_181662_b(worldborder.func_177726_b(), 0.0, d9).func_187315_a((double)(f3 + f9), (double)(f3 + 128.0F)).func_181675_d();
-- ++d9;
+- d9++;
+ double d15 = Math.min(1.0D, d9 - d12);
+ float f12 = (float)d15 * 0.5F;
+ bufferbuilder.func_181662_b(worldborder.func_177726_b(), 256.0D, d12).func_187315_a((double)(f3 + f9), (double)(f3 + 0.0F)).func_181675_d();
@@ -1281,7 +1376,7 @@
- .func_187315_a((double)(f3 + f13 + f10), (double)(f3 + 128.0F))
- .func_181675_d();
- bufferbuilder.func_181662_b(d10, 0.0, worldborder.func_177733_e()).func_187315_a((double)(f3 + f10), (double)(f3 + 128.0F)).func_181675_d();
-- ++d10;
+- d10++;
+ double d16 = Math.min(1.0D, d9 - d13);
+ float f13 = (float)d16 * 0.5F;
+ bufferbuilder.func_181662_b(d13, 256.0D, worldborder.func_177733_e()).func_187315_a((double)(f3 + f10), (double)(f3 + 0.0F)).func_181675_d();
@@ -1310,7 +1405,7 @@
- .func_187315_a((double)(f3 + f14 + f11), (double)(f3 + 128.0F))
- .func_181675_d();
- bufferbuilder.func_181662_b(d11, 0.0, worldborder.func_177736_c()).func_187315_a((double)(f3 + f11), (double)(f3 + 128.0F)).func_181675_d();
-- ++d11;
+- d11++;
+ double d17 = Math.min(1.0D, d9 - d14);
+ float f14 = (float)d17 * 0.5F;
+ bufferbuilder.func_181662_b(d14, 256.0D, worldborder.func_177736_c()).func_187315_a((double)(f3 + f11), (double)(f3 + 0.0F)).func_181675_d();
@@ -1327,7 +1422,7 @@
GlStateManager.func_179089_o();
GlStateManager.func_179118_c();
GlStateManager.func_179136_a(0.0F, 0.0F);
-@@ -2059,12 +1872,11 @@
+@@ -2057,12 +1872,11 @@
private void func_180443_s()
{
@@ -1343,7 +1438,7 @@
GlStateManager.func_179088_q();
GlStateManager.func_179092_a(516, 0.1F);
GlStateManager.func_179141_d();
-@@ -2083,16 +1895,16 @@
+@@ -2081,16 +1895,16 @@
public void func_174981_a(Tessellator p_174981_1_, BufferBuilder p_174981_2_, Entity p_174981_3_, float p_174981_4_)
{
@@ -1364,7 +1459,7 @@
p_174981_2_.func_78914_f();
Iterator iterator = this.field_72738_E.values().iterator();
-@@ -2100,14 +1912,17 @@
+@@ -2098,14 +1912,17 @@
{
DestroyBlockProgress destroyblockprogress = iterator.next();
BlockPos blockpos = destroyblockprogress.func_180246_b();
@@ -1387,7 +1482,7 @@
{
iterator.remove();
}
-@@ -2117,8 +1932,8 @@
+@@ -2115,8 +1932,8 @@
if (iblockstate.func_185904_a() != Material.field_151579_a)
{
@@ -1398,7 +1493,7 @@
BlockRendererDispatcher blockrendererdispatcher = this.field_72777_q.func_175602_ab();
blockrendererdispatcher.func_175020_a(iblockstate, blockpos, textureatlassprite, this.field_72769_h);
}
-@@ -2127,7 +1942,7 @@
+@@ -2125,7 +1942,7 @@
}
p_174981_1_.func_78381_a();
@@ -1407,7 +1502,7 @@
this.func_174969_t();
}
}
-@@ -2137,12 +1952,7 @@
+@@ -2135,12 +1952,7 @@
if (p_72731_3_ == 0 && p_72731_2_.field_72313_a == RayTraceResult.Type.BLOCK)
{
GlStateManager.func_179147_l();
@@ -1421,7 +1516,7 @@
GlStateManager.func_187441_d(2.0F);
GlStateManager.func_179090_x();
GlStateManager.func_179132_a(false);
-@@ -2151,10 +1961,10 @@
+@@ -2149,10 +1961,10 @@
if (iblockstate.func_185904_a() != Material.field_151579_a && this.field_72769_h.func_175723_af().func_177746_a(blockpos))
{
@@ -1436,7 +1531,7 @@
}
GlStateManager.func_179132_a(true);
-@@ -2165,55 +1975,19 @@
+@@ -2163,55 +1975,19 @@
public static void func_189697_a(AxisAlignedBB p_189697_0_, float p_189697_1_, float p_189697_2_, float p_189697_3_, float p_189697_4_)
{
@@ -1496,7 +1591,7 @@
{
p_189698_0_.func_181662_b(p_189698_1_, p_189698_3_, p_189698_5_).func_181666_a(p_189698_13_, p_189698_14_, p_189698_15_, 0.0F).func_181675_d();
p_189698_0_.func_181662_b(p_189698_1_, p_189698_3_, p_189698_5_).func_181666_a(p_189698_13_, p_189698_14_, p_189698_15_, p_189698_16_).func_181675_d();
-@@ -2237,55 +2011,19 @@
+@@ -2235,55 +2011,19 @@
public static void func_189696_b(AxisAlignedBB p_189696_0_, float p_189696_1_, float p_189696_2_, float p_189696_3_, float p_189696_4_)
{
@@ -1556,7 +1651,7 @@
{
p_189693_0_.func_181662_b(p_189693_1_, p_189693_3_, p_189693_5_).func_181666_a(p_189693_13_, p_189693_14_, p_189693_15_, p_189693_16_).func_181675_d();
p_189693_0_.func_181662_b(p_189693_1_, p_189693_3_, p_189693_5_).func_181666_a(p_189693_13_, p_189693_14_, p_189693_15_, p_189693_16_).func_181675_d();
-@@ -2324,28 +2062,24 @@
+@@ -2322,28 +2062,24 @@
this.field_175008_n.func_187474_a(p_184385_1_, p_184385_2_, p_184385_3_, p_184385_4_, p_184385_5_, p_184385_6_, p_184385_7_);
}
@@ -1589,7 +1684,7 @@
public void func_184377_a(@Nullable SoundEvent p_184377_1_, BlockPos p_184377_2_)
{
ISound isound = this.field_147593_P.get(p_184377_2_);
-@@ -2365,9 +2099,7 @@
+@@ -2363,9 +2099,7 @@
this.field_72777_q.field_71456_v.func_73833_a(itemrecord.func_150927_i());
}
@@ -1600,7 +1695,7 @@
this.field_147593_P.put(p_184377_2_, positionedsoundrecord);
this.field_72777_q.func_147118_V().func_147682_a(positionedsoundrecord);
}
-@@ -2377,67 +2109,32 @@
+@@ -2375,67 +2109,32 @@
private void func_193054_a(World p_193054_1_, BlockPos p_193054_2_, boolean p_193054_3_)
{
@@ -1674,7 +1769,7 @@
if (p_190570_16_ != null)
{
-@@ -2455,78 +2152,40 @@
+@@ -2453,78 +2152,40 @@
}
}
@@ -1764,7 +1859,7 @@
}
}
else
-@@ -2537,27 +2196,25 @@
+@@ -2535,27 +2196,25 @@
private int func_190572_a(boolean p_190572_1_)
{
@@ -1805,7 +1900,7 @@
public void func_72709_b(Entity p_72709_1_)
{
}
-@@ -2566,7 +2223,6 @@
+@@ -2564,7 +2223,6 @@
{
}
@@ -1813,7 +1908,7 @@
public void func_180440_a(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_)
{
switch (p_180440_1_)
-@@ -2578,38 +2234,39 @@
+@@ -2576,38 +2234,39 @@
if (entity != null)
{
@@ -1868,7 +1963,7 @@
public void func_180439_a(EntityPlayer p_180439_1_, int p_180439_2_, BlockPos p_180439_3_, int p_180439_4_)
{
Random random = this.field_72769_h.field_73012_v;
-@@ -2632,34 +2289,19 @@
+@@ -2630,34 +2289,19 @@
this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187634_bp, SoundCategory.NEUTRAL, 1.0F, 1.2F, false);
break;
case 1005:
@@ -1908,7 +2003,7 @@
break;
case 1010:
-@@ -2669,128 +2311,69 @@
+@@ -2667,128 +2311,69 @@
}
else
{
@@ -2058,7 +2153,7 @@
break;
case 1033:
this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187542_ac, SoundCategory.BLOCKS, 1.0F, 1.0F, false);
-@@ -2802,169 +2385,119 @@
+@@ -2800,169 +2385,119 @@
this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187621_J, SoundCategory.BLOCKS, 1.0F, 1.0F, false);
break;
case 1036:
@@ -2087,7 +2182,7 @@
+ double d13 = (double)p_180439_3_.func_177956_o() + 0.5D;
+ double d15 = (double)p_180439_3_.func_177952_p() + (double)k1 * 0.6D + 0.5D;
-- for (int j1 = 0; j1 < 10; ++j1)
+- for (int j1 = 0; j1 < 10; j1++)
+ for (int l2 = 0; l2 < 10; ++l2)
{
- double d13 = random.nextDouble() * 0.2 + 0.01;
@@ -2141,7 +2236,7 @@
+ double d10 = (double)p_180439_3_.func_177956_o();
+ double d12 = (double)p_180439_3_.func_177952_p();
-- for (int i1 = 0; i1 < 8; ++i1)
+- for (int i1 = 0; i1 < 8; i1++)
+ for (int k2 = 0; k2 < 8; ++k2)
{
- this.func_174972_a(
@@ -2165,7 +2260,7 @@
+ float f1 = (float)(p_180439_4_ >> 0 & 255) / 255.0F;
EnumParticleTypes enumparticletypes = p_180439_2_ == 2007 ? EnumParticleTypes.SPELL_INSTANT : EnumParticleTypes.SPELL;
-- for (int l1 = 0; l1 < 100; ++l1)
+- for (int l1 = 0; l1 < 100; l1++)
+ for (int j3 = 0; j3 < 100; ++j3)
{
- double d15 = random.nextDouble() * 4.0;
@@ -2203,7 +2298,7 @@
- double d1 = (double)p_180439_3_.func_177956_o();
- double d2 = (double)p_180439_3_.func_177952_p() + 0.5;
-
-- for (int j = 0; j < 8; ++j)
+- for (int j = 0; j < 8; j++)
- {
- this.func_174972_a(
- EnumParticleTypes.ITEM_CRACK,
@@ -2246,7 +2341,7 @@
+ return;
case 2004:
-- for (int k1 = 0; k1 < 20; ++k1)
+- for (int k1 = 0; k1 < 20; k1++)
+ for (int i3 = 0; i3 < 20; ++i3)
{
- double d14 = (double)p_180439_3_.func_177958_n() + 0.5 + ((double)this.field_72769_h.field_73012_v.nextFloat() - 0.5) * 2.0;
@@ -2268,7 +2363,7 @@
break;
case 2006:
-- for (int k = 0; k < 200; ++k)
+- for (int k = 0; k < 200; k++)
+ for (int i2 = 0; i2 < 200; ++i2)
{
float f2 = random.nextFloat() * 4.0F;
@@ -2294,7 +2389,7 @@
if (particle != null)
{
-@@ -2972,56 +2505,27 @@
+@@ -2970,56 +2505,27 @@
}
}
@@ -2358,7 +2453,7 @@
}
destroyblockprogress.func_73107_a(p_180441_3_);
-@@ -3029,7 +2533,7 @@
+@@ -3027,7 +2533,7 @@
}
else
{
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch
index fc49db110..397c9b3b3 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderItem.java.patch
@@ -50,6 +50,15 @@
}
else
{
+@@ -200,7 +206,7 @@
+ boolean flag = p_191970_3_ == -1 && !p_191970_4_.func_190926_b();
+ int i = 0;
+
+- for (int j = p_191970_2_.size(); i < j; i++)
++ for (int j = p_191970_2_.size(); i < j; ++i)
+ {
+ BakedQuad bakedquad = p_191970_2_.get(i);
+ int k = p_191970_3_;
@@ -214,10 +220,10 @@
k = TextureUtil.func_177054_c(k);
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch b/patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch
index dfa6eaf2d..a62807dcd 100644
--- a/patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/WorldVertexBufferUploader.java.patch
@@ -7,7 +7,14 @@
import java.nio.ByteBuffer;
import java.util.List;
import net.minecraft.client.renderer.vertex.VertexFormat;
-@@ -26,28 +25,10 @@
+@@ -20,62 +19,29 @@
+ ByteBuffer bytebuffer = p_181679_1_.func_178966_f();
+ List list = vertexformat.func_177343_g();
+
+- for (int j = 0; j < list.size(); j++)
++ for (int j = 0; j < list.size(); ++j)
+ {
+ VertexFormatElement vertexformatelement = list.get(j);
VertexFormatElement.EnumUsage vertexformatelement$enumusage = vertexformatelement.func_177375_c();
int k = vertexformatelement.func_177367_b().func_177397_c();
int l = vertexformatelement.func_177369_e();
@@ -39,7 +46,12 @@
}
GlStateManager.func_187439_f(p_181679_1_.func_178979_i(), 0, p_181679_1_.func_178989_h());
-@@ -59,23 +40,8 @@
+ int i1 = 0;
+
+- for (int j1 = list.size(); i1 < j1; i1++)
++ for (int j1 = list.size(); i1 < j1; ++i1)
+ {
+ VertexFormatElement vertexformatelement1 = list.get(i1);
VertexFormatElement.EnumUsage vertexformatelement$enumusage1 = vertexformatelement1.func_177375_c();
int k1 = vertexformatelement1.func_177369_e();
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java.patch
index 9c455f19e..db3cca075 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java
+++ after/net/minecraft/client/renderer/block/model/BakedQuadRetextured.java
-@@ -12,12 +12,7 @@
+@@ -12,27 +12,25 @@
public BakedQuadRetextured(BakedQuad p_i46217_1_, TextureAtlasSprite p_i46217_2_)
{
@@ -14,9 +14,11 @@
this.field_178218_d = p_i46217_2_;
this.func_178217_e();
}
-@@ -26,13 +21,16 @@
+
+ private void func_178217_e()
{
- for (int i = 0; i < 4; ++i)
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
{
- int j = 7 * i;
- this.field_178215_a[j + 4] = Float.floatToRawIntBits(
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
index 75116321a..58fd65cbb 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
@@ -107,7 +107,8 @@
{
int[] aint = new int[28];
- for (int i = 0; i < 4; ++i)
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
{
- this.func_188015_a(aint, i, p_188012_3_, p_188012_1_, p_188012_4_, p_188012_2_, p_188012_5_, p_188012_6_, p_188012_7_);
+ this.fillVertexData(aint, i, orientation, uvs, p_188012_4_, sprite, rotationIn, partRotation, shade);
@@ -220,6 +221,19 @@
}
}
+@@ -245,9 +226,9 @@
+ {
+ Vector4f vector4f = new Vector4f(p_178406_1_.x - p_178406_2_.x, p_178406_1_.y - p_178406_2_.y, p_178406_1_.z - p_178406_2_.z, 1.0F);
+ Matrix4f.transform(p_178406_3_, vector4f, vector4f);
+- vector4f.x = vector4f.x * p_178406_4_.x;
+- vector4f.y = vector4f.y * p_178406_4_.y;
+- vector4f.z = vector4f.z * p_178406_4_.z;
++ vector4f.x *= p_178406_4_.x;
++ vector4f.y *= p_178406_4_.y;
++ vector4f.z *= p_178406_4_.z;
+ p_178406_1_.set(vector4f.x + p_178406_2_.x, vector4f.y + p_178406_2_.y, vector4f.z + p_178406_2_.z);
+ }
+
@@ -289,7 +270,14 @@
}
}
@@ -236,3 +250,30 @@
}
private void func_178408_a(int[] p_178408_1_, EnumFacing p_178408_2_)
+@@ -304,7 +292,7 @@
+ afloat[EnumFaceDirection.Constants.field_179179_b] = -999.0F;
+ afloat[EnumFaceDirection.Constants.field_179181_a] = -999.0F;
+
+- for (int i = 0; i < 4; i++)
++ for (int i = 0; i < 4; ++i)
+ {
+ int j = 7 * i;
+ float f = Float.intBitsToFloat(aint[j]);
+@@ -344,7 +332,7 @@
+
+ EnumFaceDirection enumfacedirection = EnumFaceDirection.func_179027_a(p_178408_2_);
+
+- for (int i1 = 0; i1 < 4; i1++)
++ for (int i1 = 0; i1 < 4; ++i1)
+ {
+ int j1 = 7 * i1;
+ EnumFaceDirection.VertexInformation enumfacedirection$vertexinformation = enumfacedirection.func_179025_a(i1);
+@@ -355,7 +343,7 @@
+ p_178408_1_[j1 + 1] = Float.floatToRawIntBits(f3);
+ p_178408_1_[j1 + 2] = Float.floatToRawIntBits(f4);
+
+- for (int k = 0; k < 4; k++)
++ for (int k = 0; k < 4; ++k)
+ {
+ int l = 7 * k;
+ float f5 = Float.intBitsToFloat(aint[l]);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch
index 0ac06697d..18a68f3df 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemOverrideList.java.patch
@@ -9,7 +9,15 @@
private ItemOverrideList()
{
-@@ -29,6 +29,7 @@
+@@ -22,13 +22,14 @@
+
+ public ItemOverrideList(List p_i46570_1_)
+ {
+- for (int i = p_i46570_1_.size() - 1; i >= 0; i--)
++ for (int i = p_i46570_1_.size() - 1; i >= 0; --i)
+ {
+ this.field_188023_b.add(p_i46570_1_.get(i));
+ }
}
@Nullable
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
index f92ac0394..00a878e38 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
@@ -46,3 +46,12 @@
}
@SideOnly(Side.CLIENT)
+@@ -97,7 +99,7 @@
+ {
+ float[] afloat = new float[3];
+
+- for (int i = 0; i < afloat.length; i++)
++ for (int i = 0; i < afloat.length; ++i)
+ {
+ afloat[i] = JsonUtils.func_151220_d(jsonarray.get(i), p_178358_2_ + "[" + i + "]");
+ }
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
index 5261443cc..af07df896 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
@@ -620,7 +620,7 @@
- if (ibakedmodel != null)
- {
-- ++i;
+- i++;
- weightedbakedmodel$builder.func_177677_a(ibakedmodel, variant.func_188047_d());
+ if (ibakedmodel != null)
+ {
@@ -840,7 +840,23 @@
for (ResourceLocation resourcelocation : this.field_177615_s.values())
{
-@@ -1189,5 +941,24 @@
+@@ -1124,7 +876,14 @@
+
+ protected boolean func_177581_b(@Nullable ModelBlock p_177581_1_)
+ {
+- return p_177581_1_ == null ? false : p_177581_1_.func_178310_f() == field_177606_o;
++ if (p_177581_1_ == null)
++ {
++ return false;
++ }
++ else
++ {
++ return p_177581_1_.func_178310_f() == field_177606_o;
++ }
+ }
+
+ protected boolean func_177587_c(@Nullable ModelBlock p_177587_1_)
+@@ -1182,5 +941,24 @@
field_177600_d.put("missing", field_188641_d);
field_177606_o.field_178317_b = "generation marker";
field_177616_r.field_178317_b = "block entity marker";
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
index 4f61195ed..451a6c035 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
@@ -32,6 +32,32 @@
this.field_177542_u = MathHelper.func_76130_a(p_i46087_4_ / 90);
Matrix4f.mul(matrix4f1, matrix4f, this.field_177544_s);
}
+@@ -64,14 +64,14 @@
+ {
+ EnumFacing enumfacing = p_177523_1_;
+
+- for (int i = 0; i < this.field_177543_t; i++)
++ for (int i = 0; i < this.field_177543_t; ++i)
+ {
+ enumfacing = enumfacing.func_176732_a(EnumFacing.Axis.X);
+ }
+
+ if (enumfacing.func_176740_k() != EnumFacing.Axis.Y)
+ {
+- for (int j = 0; j < this.field_177542_u; j++)
++ for (int j = 0; j < this.field_177542_u; ++j)
+ {
+ enumfacing = enumfacing.func_176732_a(EnumFacing.Axis.Y);
+ }
+@@ -91,7 +91,7 @@
+
+ EnumFacing enumfacing = p_177520_1_;
+
+- for (int j = 0; j < this.field_177543_t; j++)
++ for (int j = 0; j < this.field_177543_t; ++j)
+ {
+ enumfacing = enumfacing.func_176732_a(EnumFacing.Axis.X);
+ }
@@ -106,14 +106,19 @@
public static ModelRotation func_177524_a(int p_177524_0_, int p_177524_1_)
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch
index 2997670e9..05cc53b42 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
+++ after/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
-@@ -31,22 +31,28 @@
+@@ -31,26 +31,32 @@
public class ChunkRenderDispatcher
{
private static final Logger field_178523_a = LogManager.getLogger();
@@ -36,15 +36,23 @@
if (j > 1)
{
-@@ -60,7 +66,7 @@
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
+ {
+ ChunkRenderWorker chunkrenderworker = new ChunkRenderWorker(this);
+ Thread thread = field_178521_b.newThread(chunkrenderworker);
+@@ -60,9 +66,9 @@
}
}
- this.field_178520_e = Queues.newArrayBlockingQueue(this.field_188249_c);
+ this.field_178520_e = Queues.newArrayBlockingQueue(this.field_188249_c);
- for (int l = 0; l < this.field_188249_c; ++l)
+- for (int l = 0; l < this.field_188249_c; l++)
++ for (int l = 0; l < this.field_188249_c; ++l)
{
+ this.field_178520_e.add(new RegionRenderCacheBuilder());
+ }
@@ -72,19 +78,16 @@
public String func_178504_a()
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java.patch b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java.patch
index c73653720..66d89c008 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java.patch
@@ -129,7 +129,7 @@
{
ChunkRenderWorker.this.func_178473_b(p_178474_1_);
p_178474_1_.func_178540_f().lock();
-- label41:
+- label43:
+ label49:
{
try
@@ -137,7 +137,7 @@
if (p_178474_1_.func_178546_a() == ChunkCompileTaskGenerator.Status.UPLOADING)
{
p_178474_1_.func_178535_a(ChunkCompileTaskGenerator.Status.DONE);
-- break label41;
+- break label43;
+ break label49;
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch
index e31e1f50b..14fdb7d3b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch
@@ -9,6 +9,24 @@
private final int field_178596_j;
private final FloatBuffer field_178597_k = GLAllocation.func_74529_h(16);
private final VertexBuffer[] field_178594_l = new VertexBuffer[BlockRenderLayer.values().length];
+@@ -56,7 +56,7 @@
+
+ public RenderChunk(World p_i47120_1_, RenderGlobal p_i47120_2_, int p_i47120_3_)
+ {
+- for (int i = 0; i < this.field_181702_p.length; i++)
++ for (int i = 0; i < this.field_181702_p.length; ++i)
+ {
+ this.field_181702_p[i] = new BlockPos.MutableBlockPos();
+ }
+@@ -67,7 +67,7 @@
+
+ if (OpenGlHelper.func_176075_f())
+ {
+- for (int j = 0; j < BlockRenderLayer.values().length; j++)
++ for (int j = 0; j < BlockRenderLayer.values().length; ++j)
+ {
+ this.field_178594_l[j] = new VertexBuffer(DefaultVertexFormats.field_176600_a);
+ }
@@ -94,15 +94,11 @@
public void func_189562_a(int p_189562_1_, int p_189562_2_, int p_189562_3_)
@@ -43,6 +61,15 @@
}
}
+@@ -159,7 +148,7 @@
+
+ if (!this.field_189564_r.func_72806_N())
+ {
+- field_178592_a++;
++ ++field_178592_a;
+ boolean[] aboolean = new boolean[BlockRenderLayer.values().length];
+ BlockRendererDispatcher blockrendererdispatcher = Minecraft.func_71410_x().func_175602_ab();
+
@@ -173,27 +162,29 @@
lvt_9_1_.func_178606_a(blockpos$mutableblockpos);
}
@@ -160,6 +187,15 @@
{
if (p_178584_1_ == BlockRenderLayer.TRANSLUCENT && !p_178584_6_.func_178491_b(p_178584_1_))
{
+@@ -400,7 +392,7 @@
+ this.func_178585_h();
+ this.field_178588_d = null;
+
+- for (int i = 0; i < BlockRenderLayer.values().length; i++)
++ for (int i = 0; i < BlockRenderLayer.values().length; ++i)
+ {
+ if (this.field_178594_l[i] != null)
+ {
@@ -440,6 +432,26 @@
{
return this.field_178593_n && this.field_188284_q;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java.patch
index 9584d44e2..872e68810 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderEntityItem.java.patch
@@ -52,6 +52,15 @@
GlStateManager.func_179109_b(f3, f4, f5);
}
+@@ -124,7 +120,7 @@
+ GlStateManager.func_187431_e(this.func_188298_c(p_76986_1_));
+ }
+
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
+ {
+ if (flag1)
+ {
@@ -135,11 +131,11 @@
float f7 = (this.field_177079_e.nextFloat() * 2.0F - 1.0F) * 0.15F;
float f9 = (this.field_177079_e.nextFloat() * 2.0F - 1.0F) * 0.15F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.java.patch
index f208610f9..ee7f9424d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderFish.java.patch
@@ -95,8 +95,12 @@
double d9 = p_76986_1_.field_70166_s + (p_76986_1_.field_70161_v - p_76986_1_.field_70166_s) * (double)p_76986_9_;
double d10 = (double)((float)(d4 - d13));
double d11 = (double)((float)(d5 - d8)) + d7;
-@@ -138,11 +128,7 @@
- for (int i1 = 0; i1 <= 16; ++i1)
+@@ -135,14 +125,10 @@
+ bufferbuilder.func_181668_a(3, DefaultVertexFormats.field_181706_f);
+ int l = 16;
+
+- for (int i1 = 0; i1 <= 16; i1++)
++ for (int i1 = 0; i1 <= 16; ++i1)
{
float f11 = (float)i1 / 16.0F;
- bufferbuilder.func_181662_b(
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch
index 9a492218d..a9298b26e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java.patch
@@ -162,3 +162,12 @@
}
protected boolean func_177070_b(T p_177070_1_)
+@@ -510,7 +514,7 @@
+ {
+ int[] aint = field_177096_e.func_110565_c();
+
+- for (int i = 0; i < 256; i++)
++ for (int i = 0; i < 256; ++i)
+ {
+ aint[i] = -1;
+ }
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch
index 861d4171d..6b48fb8c2 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderManager.java.patch
@@ -51,6 +51,15 @@
}
public void func_178628_a(double p_178628_1_, double p_178628_3_, double p_178628_5_)
+@@ -245,7 +251,7 @@
+ this.field_78729_o.put(p_78715_1_, render);
+ }
+
+- return (Render)render;
++ return render;
+ }
+
+ @Nullable
@@ -259,7 +265,7 @@
}
else
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch
index 5cfa936f5..9276d3d99 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch
@@ -102,6 +102,15 @@
}
}
}
+@@ -116,7 +91,7 @@
+
+ public T func_188360_a(EntityEquipmentSlot p_188360_1_)
+ {
+- return this.func_188363_b(p_188360_1_) ? this.field_177189_c : this.field_177186_d;
++ return (T)(this.func_188363_b(p_188360_1_) ? this.field_177189_c : this.field_177186_d);
+ }
+
+ private boolean func_188363_b(EntityEquipmentSlot p_188363_1_)
@@ -124,18 +99,7 @@
return p_188363_1_ == EntityEquipmentSlot.LEGS;
}
@@ -122,6 +131,15 @@
{
float f = (float)p_188364_1_.field_70173_aa + p_188364_5_;
p_188364_0_.func_110776_a(field_177188_b);
+@@ -146,7 +110,7 @@
+ float f1 = 0.5F;
+ GlStateManager.func_179131_c(0.5F, 0.5F, 0.5F, 1.0F);
+
+- for (int i = 0; i < 2; i++)
++ for (int i = 0; i < 2; ++i)
+ {
+ GlStateManager.func_179140_f();
+ GlStateManager.func_187401_a(GlStateManager.SourceFactor.SRC_COLOR, GlStateManager.DestFactor.ONE);
@@ -173,19 +137,16 @@
Minecraft.func_71410_x().field_71460_t.func_191514_d(false);
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java.patch
index 574a321ed..66a21d026 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArrow.java.patch
@@ -19,6 +19,15 @@
{
int i = p_177141_1_.func_85035_bI();
+@@ -43,7 +33,7 @@
+ Random random = new Random((long)p_177141_1_.func_145782_y());
+ RenderHelper.func_74518_a();
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
+ {
+ GlStateManager.func_179094_E();
+ ModelRenderer modelrenderer = this.field_177168_a.func_177087_b().func_85181_a(random);
@@ -59,18 +49,18 @@
f = f * 2.0F - 1.0F;
f1 = f1 * 2.0F - 1.0F;
diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java.patch
index ae2faf5ff..4bd944e33 100644
--- a/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
+++ after/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java
-@@ -14,7 +14,6 @@
+@@ -14,13 +14,13 @@
super(p_i46116_1_);
}
@@ -8,7 +8,14 @@
protected void func_177177_a()
{
this.field_177189_c = new ModelBiped(0.5F);
-@@ -51,5 +50,11 @@
+ this.field_177186_d = new ModelBiped(1.0F);
+ }
+
++ @SuppressWarnings("incomplete-switch")
+ protected void func_188359_a(ModelBiped p_188359_1_, EntityEquipmentSlot p_188359_2_)
+ {
+ this.func_177194_a(p_188359_1_);
+@@ -50,5 +50,11 @@
protected void func_177194_a(ModelBiped p_177194_1_)
{
p_177194_1_.func_178719_a(false);
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java.patch
index 58abc8008..dc0787807 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java.patch
@@ -41,7 +41,7 @@
}
IResource iresource1 = null;
-@@ -66,16 +67,12 @@
+@@ -66,26 +67,22 @@
try
{
String s = this.field_174949_h.get(j);
@@ -59,9 +59,11 @@
+ BufferedImage bufferedimage2 = net.minecraftforge.client.MinecraftForgeClient.getImageLayer(new ResourceLocation(s), p_110551_1_);
+ if (bufferedimage2.getWidth() == bufferedimage.getWidth() && bufferedimage2.getHeight() == bufferedimage.getHeight() && bufferedimage2.getType() == 6)
{
- for (int l = 0; l < bufferedimage2.getHeight(); ++l)
+- for (int l = 0; l < bufferedimage2.getHeight(); l++)
++ for (int l = 0; l < bufferedimage2.getHeight(); ++l)
{
-@@ -83,9 +80,9 @@
+- for (int i1 = 0; i1 < bufferedimage2.getWidth(); i1++)
++ for (int i1 = 0; i1 < bufferedimage2.getWidth(); ++i1)
{
int j1 = bufferedimage2.getRGB(i1, l);
@@ -73,7 +75,7 @@
int l1 = bufferedimage1.getRGB(i1, l);
int i2 = MathHelper.func_180188_d(l1, k) & 16777215;
bufferedimage2.setRGB(i1, l, k1 | i2);
-@@ -93,13 +90,13 @@
+@@ -93,16 +90,16 @@
}
}
@@ -88,7 +90,11 @@
+ IOUtils.closeQuietly((Closeable)iresource1);
}
- ++j;
+- j++;
++ ++j;
+ }
+ }
+ catch (IOException ioexception)
@@ -111,7 +108,7 @@
}
finally
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
index d10ac69fb..8d4b2be31 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
@@ -68,9 +68,12 @@
list1.add(textureatlassprite);
}
-@@ -111,7 +110,7 @@
+@@ -109,9 +108,9 @@
+ TextureAtlasSprite textureatlassprite = p_94310_1_.func_98150_a();
+ boolean flag = textureatlassprite.func_94211_a() != textureatlassprite.func_94216_b();
- for (int i = 0; i < this.field_94317_b.size(); ++i)
+- for (int i = 0; i < this.field_94317_b.size(); i++)
++ for (int i = 0; i < this.field_94317_b.size(); ++i)
{
- if (this.field_94317_b.get(i).func_94182_a(p_94310_1_))
+ if (((Stitcher.Slot)this.field_94317_b.get(i)).func_94182_a(p_94310_1_))
@@ -95,6 +98,21 @@
}
else
{
+@@ -177,12 +176,12 @@
+ }
+
+ stitcher$slot = new Stitcher.Slot(this.field_94318_c, 0, p_94311_1_.func_94197_a(), this.field_94315_d);
+- this.field_94318_c = this.field_94318_c + p_94311_1_.func_94197_a();
++ this.field_94318_c += p_94311_1_.func_94197_a();
+ }
+ else
+ {
+ stitcher$slot = new Stitcher.Slot(0, this.field_94315_d, this.field_94318_c, p_94311_1_.func_94199_b());
+- this.field_94315_d = this.field_94315_d + p_94311_1_.func_94199_b();
++ this.field_94315_d += p_94311_1_.func_94199_b();
+ }
+
+ stitcher$slot.func_94182_a(p_94311_1_);
@@ -245,10 +244,9 @@
}
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch
index 79a27538e..13f319210 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java.patch
@@ -34,6 +34,15 @@
}
public void func_94217_a(TextureAtlasSprite p_94217_1_)
+@@ -141,7 +140,7 @@
+
+ public void func_94219_l()
+ {
+- this.field_110983_h++;
++ ++this.field_110983_h;
+
+ if (this.field_110983_h >= this.field_110982_k.func_110472_a(this.field_110973_g))
+ {
@@ -153,9 +152,7 @@
if (i != k && k >= 0 && k < this.field_110976_a.size())
@@ -45,7 +54,7 @@
}
}
else if (this.field_110982_k.func_177219_e())
-@@ -166,15 +163,15 @@
+@@ -166,7 +163,7 @@
private void func_180599_n()
{
@@ -54,17 +63,21 @@
int i = this.field_110982_k.func_110468_c(this.field_110973_g);
int j = this.field_110982_k.func_110473_c() == 0 ? this.field_110976_a.size() : this.field_110982_k.func_110473_c();
int k = this.field_110982_k.func_110468_c((this.field_110973_g + 1) % j);
+@@ -181,7 +178,7 @@
+ this.field_176605_b = new int[aint.length][];
+ }
- if (i != k && k >= 0 && k < this.field_110976_a.size())
- {
-- int[][] aint = (int[][])this.field_110976_a.get(i);
-- int[][] aint1 = (int[][])this.field_110976_a.get(k);
-+ int[][] aint = this.field_110976_a.get(i);
-+ int[][] aint1 = this.field_110976_a.get(k);
-
- if (this.field_176605_b == null || this.field_176605_b.length != aint.length)
+- for (int l = 0; l < aint.length; l++)
++ for (int l = 0; l < aint.length; ++l)
{
-@@ -194,10 +191,10 @@
+ if (this.field_176605_b[l] == null)
+ {
+@@ -190,14 +187,14 @@
+
+ if (l < aint1.length && aint1[l].length == aint[l].length)
+ {
+- for (int i1 = 0; i1 < aint[l].length; i1++)
++ for (int i1 = 0; i1 < aint[l].length; ++i1)
{
int j1 = aint[l][i1];
int k1 = aint1[l][i1];
@@ -111,16 +124,17 @@
if (j >= i)
{
throw new RuntimeException("invalid frameindex " + j);
-@@ -280,7 +281,7 @@
+@@ -280,26 +281,24 @@
}
else
{
- List list = Lists.newArrayList();
+ List list = Lists.newArrayList();
- for (int k = 0; k < i; ++k)
+- for (int k = 0; k < i; k++)
++ for (int k = 0; k < i; ++k)
{
-@@ -288,20 +289,18 @@
+ this.field_110976_a.add(func_147962_a(aint, this.field_130223_c, this.field_130223_c, k));
list.add(new AnimationFrame(k, -1));
}
@@ -137,13 +151,11 @@
- List list = Lists.newArrayList();
+ List list = Lists.newArrayList();
- for (int i = 0; i < this.field_110976_a.size(); ++i)
+- for (int i = 0; i < this.field_110976_a.size(); i++)
++ for (int i = 0; i < this.field_110976_a.size(); ++i)
{
-- final int[][] aint = (int[][])this.field_110976_a.get(i);
-+ final int[][] aint = this.field_110976_a.get(i);
+ final int[][] aint = this.field_110976_a.get(i);
- if (aint != null)
- {
@@ -313,7 +312,7 @@
{
CrashReport crashreport = CrashReport.func_85055_a(throwable, "Generating mipmaps for frame");
@@ -153,6 +165,24 @@
crashreportcategory.func_189529_a("Frame sizes", new ICrashReportDetail()
{
public String call() throws Exception
+@@ -345,7 +344,7 @@
+ {
+ if (this.field_110976_a.size() <= p_130099_1_)
+ {
+- for (int i = this.field_110976_a.size(); i <= p_130099_1_; i++)
++ for (int i = this.field_110976_a.size(); i <= p_130099_1_; ++i)
+ {
+ this.field_110976_a.add(null);
+ }
+@@ -356,7 +355,7 @@
+ {
+ int[][] aint = new int[p_147962_0_.length][];
+
+- for (int i = 0; i < p_147962_0_.length; i++)
++ for (int i = 0; i < p_147962_0_.length; ++i)
+ {
+ int[] aint1 = p_147962_0_[i];
+
@@ -393,32 +392,43 @@
this.field_110983_h = 0;
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
index 60e739b3b..2c9e643e4 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
@@ -259,7 +259,7 @@
{
ResourceLocation resourcelocation = this.func_184396_a(p_184397_2_);
IResource iresource = null;
-- label52:
+- label45:
+ label62:
{
- boolean lvt_6_1_;
@@ -270,7 +270,7 @@
{
iresource = p_184397_1_.func_110536_a(resourcelocation);
p_184397_2_.func_188539_a(iresource, this.field_147636_j + 1);
-- break label52;
+- break label45;
+ break label62;
}
catch (RuntimeException runtimeexception)
diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch
index f75e8b149..901fd998e 100644
--- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch
@@ -24,12 +24,21 @@
{
boolean flag = false;
-- for (int i = 0; i < p_147949_2_.length; ++i)
+- for (int i = 0; i < p_147949_2_.length; i++)
+ for (int i = 0; i < p_147949_2_[0].length; ++i)
{
if (p_147949_2_[0][i] >> 24 == 0)
{
-@@ -83,6 +83,7 @@
+@@ -72,7 +72,7 @@
+ }
+ }
+
+- for (int l1 = 1; l1 <= p_147949_0_; l1++)
++ for (int l1 = 1; l1 <= p_147949_0_; ++l1)
+ {
+ if (p_147949_2_[l1] != null)
+ {
+@@ -83,17 +83,19 @@
int[] aint1 = aint[l1 - 1];
int[] aint2 = new int[aint1.length >> 2];
int j = p_147949_1_ >> l1;
@@ -37,7 +46,13 @@
int k = aint2.length / j;
int l = j << 1;
-@@ -94,6 +95,7 @@
+- for (int i1 = 0; i1 < j; i1++)
++ for (int i1 = 0; i1 < j; ++i1)
+ {
+- for (int j1 = 0; j1 < k; j1++)
++ for (int j1 = 0; j1 < k; ++j1)
+ {
+ int k1 = 2 * (i1 + j1 * l);
aint2[i1 + j1 * j] = func_147943_a(aint1[k1 + 0], aint1[k1 + 1], aint1[k1 + 0 + l], aint1[k1 + 1 + l], flag);
}
}
@@ -45,6 +60,15 @@
aint[l1] = aint2;
}
+@@ -116,7 +118,7 @@
+ float f2 = 0.0F;
+ float f3 = 0.0F;
+
+- for (int i1 = 0; i1 < 4; i1++)
++ for (int i1 = 0; i1 < 4; ++i1)
+ {
+ if (field_147957_g[i1] >> 24 != 0)
+ {
@@ -127,14 +129,14 @@
}
}
@@ -68,7 +92,7 @@
if (i2 < 96)
{
-@@ -159,32 +161,21 @@
+@@ -159,46 +161,34 @@
float f1 = func_188543_d(p_147944_1_ >> p_147944_4_);
float f2 = func_188543_d(p_147944_2_ >> p_147944_4_);
float f3 = func_188543_d(p_147944_3_ >> p_147944_4_);
@@ -83,7 +107,8 @@
- )
+ public static void func_147955_a(int[][] p_147955_0_, int p_147955_1_, int p_147955_2_, int p_147955_3_, int p_147955_4_, boolean p_147955_5_, boolean p_147955_6_)
{
- for (int i = 0; i < p_147955_0_.length; ++i)
+- for (int i = 0; i < p_147955_0_.length; i++)
++ for (int i = 0; i < p_147955_0_.length; ++i)
{
int[] aint = p_147955_0_[i];
+ if ((p_147955_1_ >> i <= 0) || (p_147955_2_ >> i <= 0)) break;
@@ -106,7 +131,24 @@
{
int i = 4194304 / p_147947_2_;
func_147954_b(p_147947_6_, p_147947_8_);
-@@ -214,9 +205,11 @@
+ func_110997_a(p_147947_7_);
+- int j = 0;
++ int l;
+
+- while (j < p_147947_2_ * p_147947_3_)
++ for (int j = 0; j < p_147947_2_ * p_147947_3_; j += p_147947_2_ * l)
+ {
+ int k = j / p_147947_2_;
+- int l = Math.min(i, p_147947_3_ - k);
++ l = Math.min(i, p_147947_3_ - k);
+ int i1 = p_147947_2_ * l;
+ func_110994_a(p_147947_1_, j, i1);
+ GlStateManager.func_187414_b(3553, p_147947_0_, p_147947_4_, p_147947_5_ + k, p_147947_2_, l, 32993, 33639, field_111000_c);
+- j += p_147947_2_ * l;
+ }
+ }
+
+@@ -215,9 +205,11 @@
public static void func_180600_a(int p_180600_0_, int p_180600_1_, int p_180600_2_, int p_180600_3_)
{
@@ -119,16 +161,19 @@
if (p_180600_1_ >= 0)
{
GlStateManager.func_187421_b(3553, 33085, p_180600_1_);
-@@ -227,7 +220,7 @@
+@@ -226,9 +218,9 @@
+ GlStateManager.func_187403_b(3553, 34049, 0.0F);
+ }
- for (int i = 0; i <= p_180600_1_; ++i)
+- for (int i = 0; i <= p_180600_1_; i++)
++ for (int i = 0; i <= p_180600_1_; ++i)
{
- GlStateManager.func_187419_a(3553, i, 6408, p_180600_2_ >> i, p_180600_3_ >> i, 0, 32993, 33639, null);
+ GlStateManager.func_187419_a(3553, i, 6408, p_180600_2_ >> i, p_180600_3_ >> i, 0, 32993, 33639, (IntBuffer)null);
}
}
-@@ -305,9 +298,9 @@
+@@ -306,9 +298,9 @@
aint = func_110985_a(p_110994_0_);
}
@@ -140,7 +185,7 @@
}
static void func_94277_a(int p_94277_0_)
-@@ -332,7 +325,7 @@
+@@ -333,7 +325,7 @@
}
finally
{
@@ -149,7 +194,16 @@
}
return aint1;
-@@ -368,10 +361,10 @@
+@@ -359,7 +351,7 @@
+ {
+ int[] aint = new int[p_110985_0_.length];
+
+- for (int i = 0; i < p_110985_0_.length; i++)
++ for (int i = 0; i < p_110985_0_.length; ++i)
+ {
+ aint[i] = func_177054_c(p_110985_0_[i]);
+ }
+@@ -369,10 +361,10 @@
public static int func_177054_c(int p_177054_0_)
{
@@ -164,9 +218,30 @@
int i1 = (j * 30 + k * 59 + l * 11) / 100;
int j1 = (j * 30 + k * 70) / 100;
int k1 = (j * 30 + l * 70) / 100;
-@@ -410,7 +403,7 @@
+@@ -384,7 +376,7 @@
+ int[] aint = new int[p_147953_1_];
+ int i = p_147953_2_ / 2;
- for (int i1 = 0; i1 < field_188544_e.length; ++i1)
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
+ {
+ System.arraycopy(p_147953_0_, j * p_147953_1_, aint, 0, p_147953_1_);
+ System.arraycopy(p_147953_0_, (p_147953_2_ - 1 - j) * p_147953_1_, p_147953_0_, j * p_147953_1_, p_147953_1_);
+@@ -400,7 +392,7 @@
+ int[] aint1 = new int[] { -16777216, -16777216, -16777216, -16777216, -16777216, -16777216, -16777216, -16777216};
+ int k = aint.length;
+
+- for (int l = 0; l < 16; l++)
++ for (int l = 0; l < 16; ++l)
+ {
+ System.arraycopy(l < k ? aint : aint1, 0, field_110999_b, 16 * l, k);
+ System.arraycopy(l < k ? aint1 : aint, 0, field_110999_b, 16 * l + k, k);
+@@ -409,9 +401,9 @@
+ field_111001_a.func_110564_a();
+ field_188544_e = new float[256];
+
+- for (int i1 = 0; i1 < field_188544_e.length; i1++)
++ for (int i1 = 0; i1 < field_188544_e.length; ++i1)
{
- field_188544_e[i1] = (float)Math.pow((double)((float)i1 / 255.0F), 2.2);
+ field_188544_e[i1] = (float)Math.pow((double)((float)i1 / 255.0F), 2.2D);
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
index 151c0ffc0..551f45cab 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
@@ -22,14 +22,14 @@
this.field_147559_m.put(p_147546_1_, tileentityspecialrenderer);
}
-- return (TileEntitySpecialRenderer) tileentityspecialrenderer;
+- return (TileEntitySpecialRenderer)tileentityspecialrenderer;
+ return tileentityspecialrenderer;
}
@Nullable
public TileEntitySpecialRenderer func_147547_b(@Nullable TileEntity p_147547_1_)
{
-- return p_147547_1_ == null ? null : this.func_147546_a(p_147547_1_.getClass());
+- return p_147547_1_ == null ? null : this.func_147546_a((Class )p_147547_1_.getClass());
+ return p_147547_1_ == null || p_147547_1_.func_145837_r() ? null : this.func_147546_a(p_147547_1_.getClass()); // Forge: fix MC-123363
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java.patch b/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java.patch
index 091bf43b4..3a7659757 100644
--- a/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormat.java.patch
@@ -1,6 +1,6 @@
--- before/net/minecraft/client/renderer/vertex/VertexFormat.java
+++ after/net/minecraft/client/renderer/vertex/VertexFormat.java
-@@ -11,12 +11,13 @@
+@@ -11,18 +11,19 @@
public class VertexFormat
{
private static final Logger field_177357_a = LogManager.getLogger();
@@ -19,6 +19,13 @@
public VertexFormat(VertexFormat p_i46097_1_)
{
+ this();
+
+- for (int i = 0; i < p_i46097_1_.func_177345_h(); i++)
++ for (int i = 0; i < p_i46097_1_.func_177345_h(); ++i)
+ {
+ this.func_181721_a(p_i46097_1_.func_177348_c(i));
+ }
@@ -32,6 +33,11 @@
public VertexFormat()
@@ -56,7 +63,8 @@
+ this.field_177351_f.add(p_181721_1_.func_177369_e(), Integer.valueOf(this.field_177353_d));
}
- this.field_177353_d += p_181721_1_.func_177368_f();
+- this.field_177353_d = this.field_177353_d + p_181721_1_.func_177368_f();
++ this.field_177353_d += p_181721_1_.func_177368_f();
+ this.hashCode = 0;
return this;
}
@@ -74,13 +82,23 @@
{
String s = "format: " + this.field_177355_b.size() + " elements: ";
- for (int i = 0; i < this.field_177355_b.size(); ++i)
+- for (int i = 0; i < this.field_177355_b.size(); i++)
++ for (int i = 0; i < this.field_177355_b.size(); ++i)
{
- s = s + this.field_177355_b.get(i).toString();
+ s = s + ((VertexFormatElement)this.field_177355_b.get(i)).toString();
if (i != this.field_177355_b.size() - 1)
{
+@@ -126,7 +133,7 @@
+ {
+ int i = 0;
+
+- for (int j = this.field_177355_b.size(); i < j; i++)
++ for (int j = this.field_177355_b.size(); i < j; ++i)
+ {
+ VertexFormatElement vertexformatelement = this.field_177355_b.get(i);
+
@@ -166,10 +173,9 @@
public int func_181720_d(int p_181720_1_)
@@ -93,7 +111,22 @@
public boolean equals(Object p_equals_1_)
{
if (this == p_equals_1_)
-@@ -199,11 +205,13 @@
+@@ -184,9 +190,13 @@
+ {
+ return false;
+ }
++ else if (!this.field_177355_b.equals(vertexformat.field_177355_b))
++ {
++ return false;
++ }
+ else
+ {
+- return !this.field_177355_b.equals(vertexformat.field_177355_b) ? false : this.field_177356_c.equals(vertexformat.field_177356_c);
++ return this.field_177356_c.equals(vertexformat.field_177356_c);
+ }
+ }
+ else
+@@ -195,11 +205,13 @@
}
}
diff --git a/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java.patch b/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java.patch
index 97b61acfa..daf0ce380 100644
--- a/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/vertex/VertexFormatElement.java.patch
@@ -16,7 +16,22 @@
public boolean equals(Object p_equals_1_)
{
if (this == p_equals_1_)
-@@ -106,13 +104,13 @@
+@@ -91,9 +89,13 @@
+ {
+ return false;
+ }
++ else if (this.field_177379_b != vertexformatelement.field_177379_b)
++ {
++ return false;
++ }
+ else
+ {
+- return this.field_177379_b != vertexformatelement.field_177379_b ? false : this.field_177380_c == vertexformatelement.field_177380_c;
++ return this.field_177380_c == vertexformatelement.field_177380_c;
+ }
+ }
+ else
+@@ -102,13 +104,13 @@
}
}
@@ -32,7 +47,7 @@
}
@SideOnly(Side.CLIENT)
-@@ -160,9 +158,16 @@
+@@ -156,9 +158,16 @@
NORMAL("Normal"),
COLOR("Vertex Color"),
UV("UV"),
diff --git a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch
index 1206b4abd..184b12ad1 100644
--- a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch
@@ -9,7 +9,7 @@
private final MetadataSerializer field_110539_b;
public FallbackResourceManager(MetadataSerializer p_i1289_1_)
-@@ -33,13 +33,11 @@
+@@ -33,20 +33,18 @@
this.field_110540_a.add(p_110538_1_);
}
@@ -24,6 +24,14 @@
public IResource func_110536_a(ResourceLocation p_110536_1_) throws IOException
{
this.func_188552_d(p_110536_1_);
+ IResourcePack iresourcepack = null;
+ ResourceLocation resourcelocation = func_110537_b(p_110536_1_);
+
+- for (int i = this.field_110540_a.size() - 1; i >= 0; i--)
++ for (int i = this.field_110540_a.size() - 1; i >= 0; --i)
+ {
+ IResourcePack iresourcepack1 = this.field_110540_a.get(i);
+
@@ -64,21 +62,18 @@
inputstream = this.func_177245_a(resourcelocation, iresourcepack);
}
diff --git a/patches/minecraft/net/minecraft/client/resources/Locale.java.patch b/patches/minecraft/net/minecraft/client/resources/Locale.java.patch
index 9b29ca474..d9e36a610 100644
--- a/patches/minecraft/net/minecraft/client/resources/Locale.java.patch
+++ b/patches/minecraft/net/minecraft/client/resources/Locale.java.patch
@@ -13,11 +13,11 @@
- int k = s.length();
- j += k;
-
-- for (int l = 0; l < k; ++l)
+- for (int l = 0; l < k; l++)
- {
- if (s.charAt(l) >= 256)
- {
-- ++i;
+- i++;
- }
- }
- }
diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
index 94d488a63..76e86229e 100644
--- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
+++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
@@ -23,7 +23,7 @@
-
- if (keybinding != null)
- {
-- ++keybinding.field_151474_i;
+- keybinding.field_151474_i++;
- }
+ field_74514_b.lookupActives(p_74507_0_).forEach($ -> ++$.field_151474_i);
}
@@ -79,6 +79,15 @@
}
public String func_151466_e()
+@@ -117,7 +113,7 @@
+ }
+ else
+ {
+- this.field_151474_i--;
++ --this.field_151474_i;
+ return true;
+ }
+ }
@@ -150,25 +146,166 @@
public int compareTo(KeyBinding p_compareTo_1_)
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
index ef9d7d312..3ee28c281 100644
--- a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
@@ -21,6 +21,24 @@
private Matrix4f field_148030_g;
private int field_148038_h;
private int field_148039_i;
+@@ -81,7 +82,7 @@
+ throw jsonexception1;
+ }
+
+- i++;
++ ++i;
+ }
+ }
+
+@@ -103,7 +104,7 @@
+ throw jsonexception2;
+ }
+
+- j++;
++ ++j;
+ }
+ }
+ }
@@ -115,7 +116,7 @@
}
finally
@@ -84,7 +102,12 @@
}
else
{
-@@ -229,7 +231,7 @@
+@@ -225,11 +227,11 @@
+ throw jsonexception;
+ }
+
+- i++;
++ ++i;
}
}
@@ -93,6 +116,15 @@
if (jsonarray1 != null)
{
+@@ -248,7 +250,7 @@
+ throw jsonexception1;
+ }
+
+- l++;
++ ++l;
+ }
+ }
+ }
@@ -258,7 +260,7 @@
{
JsonObject jsonobject = JsonUtils.func_151210_l(p_148028_1_, "uniform");
@@ -102,8 +134,27 @@
if (shaderuniform == null)
{
-@@ -386,11 +388,9 @@
- this.field_148036_j += p_148018_1_ - this.field_148037_k;
+@@ -282,7 +284,7 @@
+ throw jsonexception;
+ }
+
+- i++;
++ ++i;
+ }
+
+ switch (i)
+@@ -378,19 +380,17 @@
+ {
+ if (p_148018_1_ < this.field_148037_k)
+ {
+- this.field_148036_j = this.field_148036_j + (1.0F - this.field_148037_k);
++ this.field_148036_j += 1.0F - this.field_148037_k;
+ this.field_148036_j += p_148018_1_;
+ }
+ else
+ {
+- this.field_148036_j = this.field_148036_j + (p_148018_1_ - this.field_148037_k);
++ this.field_148036_j += p_148018_1_ - this.field_148037_k;
}
- this.field_148037_k = p_148018_1_;
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
index 53d0f99dc..f1d1e5696 100644
--- a/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
@@ -10,6 +10,22 @@
import java.nio.ByteBuffer;
import java.util.Map;
import net.minecraft.client.renderer.OpenGlHelper;
+@@ -34,13 +34,13 @@
+
+ public void func_148056_a(ShaderManager p_148056_1_)
+ {
+- this.field_148058_d++;
++ ++this.field_148058_d;
+ OpenGlHelper.func_153178_b(p_148056_1_.func_147986_h(), this.field_148060_c);
+ }
+
+ public void func_148054_b(ShaderManager p_148054_1_)
+ {
+- this.field_148058_d--;
++ --this.field_148058_d;
+
+ if (this.field_148058_d <= 0)
+ {
@@ -56,11 +56,12 @@
public static ShaderLoader func_148057_a(IResourceManager p_148057_0_, ShaderLoader.ShaderType p_148057_1_, String p_148057_2_) throws IOException
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch
index cac9dffb4..e9f6607c3 100644
--- a/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch
@@ -46,7 +46,12 @@
if (jsonarray != null)
{
-@@ -86,13 +88,13 @@
+@@ -82,17 +84,17 @@
+ throw jsonexception1;
+ }
+
+- i++;
++ ++i;
}
}
@@ -63,6 +68,15 @@
for (JsonElement jsonelement1 : jsonarray1)
{
+@@ -107,7 +109,7 @@
+ throw jsonexception2;
+ }
+
+- j++;
++ ++j;
+ }
+ }
+ else
@@ -116,7 +118,7 @@
this.field_148014_r = null;
}
@@ -72,7 +86,12 @@
if (jsonarray2 != null)
{
-@@ -139,7 +141,7 @@
+@@ -135,11 +137,11 @@
+ throw jsonexception3;
+ }
+
+- k++;
++ ++k;
}
}
@@ -99,6 +118,24 @@
}
this.func_147985_d();
+@@ -182,7 +184,7 @@
+ field_148002_c = null;
+ field_148000_e = true;
+
+- for (int i = 0; i < this.field_148010_h.size(); i++)
++ for (int i = 0; i < this.field_148010_h.size(); ++i)
+ {
+ if (this.field_147997_f.get(this.field_147998_g.get(i)) != null)
+ {
+@@ -213,7 +215,7 @@
+ GlStateManager.func_179129_p();
+ }
+
+- for (int i = 0; i < this.field_148010_h.size(); i++)
++ for (int i = 0; i < this.field_148010_h.size(); ++i)
+ {
+ if (this.field_147997_f.get(this.field_147998_g.get(i)) != null)
+ {
@@ -232,7 +234,7 @@
}
else if (object instanceof Integer)
@@ -108,7 +145,21 @@
}
if (j != -1)
-@@ -284,7 +286,7 @@
+@@ -270,7 +272,7 @@
+ {
+ int i = 0;
+
+- for (int j = 0; i < this.field_147998_g.size(); j++)
++ for (int j = 0; i < this.field_147998_g.size(); ++j)
+ {
+ String s = this.field_147998_g.get(i);
+ int k = OpenGlHelper.func_153194_a(this.field_148006_l, s);
+@@ -280,14 +282,14 @@
+ field_148003_a.warn("Shader {}could not find sampler named {} in the specified shader program.", this.field_148007_m, s);
+ this.field_147997_f.remove(s);
+ this.field_147998_g.remove(j);
+- j--;
++ --j;
}
else
{
@@ -116,7 +167,11 @@
+ this.field_148010_h.add(Integer.valueOf(k));
}
- ++i;
+- i++;
++ ++i;
+ }
+
+ for (ShaderUniform shaderuniform : this.field_148011_i)
@@ -297,11 +299,11 @@
if (l == -1)
@@ -140,3 +195,21 @@
this.field_147998_g.add(s);
}
else
+@@ -365,7 +367,7 @@
+ throw jsonexception;
+ }
+
+- k++;
++ ++k;
+ }
+
+ if (j > 1 && jsonarray.size() == 1)
+@@ -373,7 +375,7 @@
+ while (k < j)
+ {
+ afloat[k] = afloat[0];
+- k++;
++ ++k;
+ }
+ }
+
diff --git a/patches/minecraft/net/minecraft/client/util/RecipeBookClient.java.patch b/patches/minecraft/net/minecraft/client/util/RecipeBookClient.java.patch
index 31f589fde..fb554db42 100644
--- a/patches/minecraft/net/minecraft/client/util/RecipeBookClient.java.patch
+++ b/patches/minecraft/net/minecraft/client/util/RecipeBookClient.java.patch
@@ -21,8 +21,8 @@
{
RecipeList recipelist = new RecipeList();
field_194087_f.add(recipelist);
-- field_194086_e.computeIfAbsent(p_194082_0_, p_194085_0_ -> new ArrayList()).add(recipelist);
-- field_194086_e.computeIfAbsent(CreativeTabs.field_78027_g, p_194083_0_ -> new ArrayList()).add(recipelist);
+- field_194086_e.computeIfAbsent(p_194082_0_, p_194085_0_ -> new ArrayList<>()).add(recipelist);
+- field_194086_e.computeIfAbsent(CreativeTabs.field_78027_g, p_194083_0_ -> new ArrayList<>()).add(recipelist);
+ (field_194086_e.computeIfAbsent(p_194082_0_, (p_194085_0_) ->
+ {
+ return new ArrayList();
diff --git a/patches/minecraft/net/minecraft/client/util/RecipeItemHelper.java.patch b/patches/minecraft/net/minecraft/client/util/RecipeItemHelper.java.patch
index ab6a958df..db211aec4 100644
--- a/patches/minecraft/net/minecraft/client/util/RecipeItemHelper.java.patch
+++ b/patches/minecraft/net/minecraft/client/util/RecipeItemHelper.java.patch
@@ -46,7 +46,7 @@
}
public static ItemStack func_194115_b(int p_194115_0_)
-@@ -106,7 +113,10 @@
+@@ -106,17 +113,20 @@
{
this.field_194105_b = p_i47608_2_;
this.field_194106_c.addAll(p_i47608_2_.func_192400_c());
@@ -58,6 +58,70 @@
this.field_194107_d = this.field_194106_c.size();
this.field_194108_e = this.func_194097_a();
this.field_194109_f = this.field_194108_e.length;
+ this.field_194110_g = new BitSet(this.field_194107_d + this.field_194109_f + this.field_194107_d + this.field_194107_d * this.field_194109_f);
+
+- for (int i = 0; i < this.field_194106_c.size(); i++)
++ for (int i = 0; i < this.field_194106_c.size(); ++i)
+ {
+ IntList intlist = this.field_194106_c.get(i).func_194139_b();
+
+- for (int j = 0; j < this.field_194109_f; j++)
++ for (int j = 0; j < this.field_194109_f; ++j)
+ {
+ if (intlist.contains(this.field_194108_e[j]))
+ {
+@@ -136,13 +146,13 @@
+ {
+ int i;
+
+- for (i = 0; this.func_194098_a(p_194092_1_); i++)
++ for (i = 0; this.func_194098_a(p_194092_1_); ++i)
+ {
+ RecipeItemHelper.this.func_194122_a(this.field_194108_e[this.field_194111_h.getInt(0)], p_194092_1_);
+ int j = this.field_194111_h.size() - 1;
+ this.func_194096_c(this.field_194111_h.getInt(j));
+
+- for (int k = 0; k < j; k++)
++ for (int k = 0; k < j; ++k)
+ {
+ this.func_194089_c((k & 1) == 0, this.field_194111_h.get(k), this.field_194111_h.get(k + 1));
+ }
+@@ -163,7 +173,7 @@
+ int l = 0;
+ List list = this.field_194105_b.func_192400_c();
+
+- for (int i1 = 0; i1 < list.size(); i1++)
++ for (int i1 = 0; i1 < list.size(); ++i1)
+ {
+ if (flag1 && list.get(i1) == Ingredient.field_193370_a)
+ {
+@@ -171,7 +181,7 @@
+ }
+ else
+ {
+- for (int j1 = 0; j1 < this.field_194109_f; j1++)
++ for (int j1 = 0; j1 < this.field_194109_f; ++j1)
+ {
+ if (this.func_194100_b(false, l, j1))
+ {
+@@ -185,7 +195,7 @@
+ }
+ }
+
+- l++;
++ ++l;
+ }
+ }
+
+@@ -219,7 +229,7 @@
+ {
+ int i = this.field_194109_f;
+
+- for (int j = 0; j < i; j++)
++ for (int j = 0; j < i; ++j)
+ {
+ if (RecipeItemHelper.this.field_194124_a.get(this.field_194108_e[j]) >= p_194098_1_)
+ {
@@ -237,29 +247,21 @@
}
@@ -72,7 +136,7 @@
{
- if (this.func_194101_b(flag, j1) || !this.func_194093_a(flag, l, j1) || !this.func_194100_b(flag, l, j1))
- {
-- ++j1;
+- j1++;
- continue;
- }
-
diff --git a/patches/minecraft/net/minecraft/command/CommandBase.java.patch b/patches/minecraft/net/minecraft/command/CommandBase.java.patch
index 796dd83b9..d0b6e34da 100644
--- a/patches/minecraft/net/minecraft/command/CommandBase.java.patch
+++ b/patches/minecraft/net/minecraft/command/CommandBase.java.patch
@@ -1,139 +1,6 @@
--- before/net/minecraft/command/CommandBase.java
+++ after/net/minecraft/command/CommandBase.java
-@@ -56,7 +56,7 @@
- }
- }
-
-- return new SyntaxErrorException("commands.tellraw.jsonException", s);
-+ return new SyntaxErrorException("commands.tellraw.jsonException", new Object[] {s});
- }
-
- public static NBTTagCompound func_184887_a(Entity p_184887_0_)
-@@ -81,22 +81,19 @@
- return 4;
- }
-
-- @Override
- public List func_71514_a()
- {
-- return Collections.emptyList();
-+ return Collections.emptyList();
- }
-
-- @Override
- public boolean func_184882_a(MinecraftServer p_184882_1_, ICommandSender p_184882_2_)
- {
- return p_184882_2_.func_70003_b(this.func_82362_a(), this.func_71517_b());
- }
-
-- @Override
- public List func_184883_a(MinecraftServer p_184883_1_, ICommandSender p_184883_2_, String[] p_184883_3_, @Nullable BlockPos p_184883_4_)
- {
-- return Collections.emptyList();
-+ return Collections.emptyList();
- }
-
- public static int func_175755_a(String p_175755_0_) throws NumberInvalidException
-@@ -105,9 +102,9 @@
- {
- return Integer.parseInt(p_175755_0_);
- }
-- catch (NumberFormatException numberformatexception)
-+ catch (NumberFormatException var2)
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175755_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175755_0_});
- }
- }
-
-@@ -122,11 +119,11 @@
-
- if (i < p_175764_1_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", i, p_175764_1_);
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {i, p_175764_1_});
- }
- else if (i > p_175764_2_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooBig", i, p_175764_2_);
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {i, p_175764_2_});
- }
- else
- {
-@@ -140,9 +137,9 @@
- {
- return Long.parseLong(p_175766_0_);
- }
-- catch (NumberFormatException numberformatexception)
-+ catch (NumberFormatException var2)
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175766_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175766_0_});
- }
- }
-
-@@ -152,11 +149,11 @@
-
- if (i < p_175760_1_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", i, p_175760_1_);
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {i, p_175760_1_});
- }
- else if (i > p_175760_3_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooBig", i, p_175760_3_);
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {i, p_175760_3_});
- }
- else
- {
-@@ -167,11 +164,7 @@
- public static BlockPos func_175757_a(ICommandSender p_175757_0_, String[] p_175757_1_, int p_175757_2_, boolean p_175757_3_) throws NumberInvalidException
- {
- BlockPos blockpos = p_175757_0_.func_180425_c();
-- return new BlockPos(
-- func_175769_b((double)blockpos.func_177958_n(), p_175757_1_[p_175757_2_], -30000000, 30000000, p_175757_3_),
-- func_175769_b((double)blockpos.func_177956_o(), p_175757_1_[p_175757_2_ + 1], 0, 256, false),
-- func_175769_b((double)blockpos.func_177952_p(), p_175757_1_[p_175757_2_ + 2], -30000000, 30000000, p_175757_3_)
-- );
-+ return new BlockPos(func_175769_b((double)blockpos.func_177958_n(), p_175757_1_[p_175757_2_], -30000000, 30000000, p_175757_3_), func_175769_b((double)blockpos.func_177956_o(), p_175757_1_[p_175757_2_ + 1], 0, 256, false), func_175769_b((double)blockpos.func_177952_p(), p_175757_1_[p_175757_2_ + 2], -30000000, 30000000, p_175757_3_));
- }
-
- public static double func_175765_c(String p_175765_0_) throws NumberInvalidException
-@@ -182,16 +175,16 @@
-
- if (!Doubles.isFinite(d0))
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175765_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175765_0_});
- }
- else
- {
- return d0;
- }
- }
-- catch (NumberFormatException numberformatexception)
-+ catch (NumberFormatException var3)
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175765_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175765_0_});
- }
- }
-
-@@ -206,11 +199,11 @@
-
- if (d0 < p_175756_1_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", String.format("%.2f", d0), String.format("%.2f", p_175756_1_));
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {String.format("%.2f", d0), String.format("%.2f", p_175756_1_)});
- }
- else if (d0 > p_175756_3_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooBig", String.format("%.2f", d0), String.format("%.2f", p_175756_3_));
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {String.format("%.2f", d0), String.format("%.2f", p_175756_3_)});
- }
- else
- {
-@@ -220,18 +213,21 @@
+@@ -220,18 +220,21 @@
public static boolean func_180527_d(String p_180527_0_) throws CommandException
{
@@ -164,70 +31,15 @@
}
public static EntityPlayerMP func_71521_c(ICommandSender p_71521_0_) throws PlayerNotFoundException
-@@ -249,7 +245,7 @@
- public static List func_193513_a(MinecraftServer p_193513_0_, ICommandSender p_193513_1_, String p_193513_2_) throws CommandException
- {
- List list = EntitySelector.func_193531_b(p_193513_1_, p_193513_2_);
-- return (List)(list.isEmpty() ? Lists.newArrayList(func_193512_a(p_193513_0_, null, p_193513_2_)) : list);
-+ return (List)(list.isEmpty() ? Lists.newArrayList(func_193512_a(p_193513_0_, (EntityPlayerMP)null, p_193513_2_)) : list);
- }
-
- public static EntityPlayerMP func_184888_a(MinecraftServer p_184888_0_, ICommandSender p_184888_1_, String p_184888_2_) throws PlayerNotFoundException, CommandException
-@@ -265,8 +261,9 @@
- {
- p_193512_1_ = p_193512_0_.func_184103_al().func_177451_a(UUID.fromString(p_193512_2_));
- }
-- catch (IllegalArgumentException illegalargumentexception)
-+ catch (IllegalArgumentException var4)
- {
-+ ;
- }
- }
-
-@@ -277,7 +274,7 @@
-
- if (p_193512_1_ == null)
- {
-- throw new PlayerNotFoundException("commands.generic.player.notFound", p_193512_2_);
-+ throw new PlayerNotFoundException("commands.generic.player.notFound", new Object[] {p_193512_2_});
- }
- else
- {
-@@ -311,11 +308,11 @@
- entity = p_184884_0_.func_184103_al().func_177451_a(uuid);
- }
- }
-- catch (IllegalArgumentException illegalargumentexception)
-+ catch (IllegalArgumentException var6)
- {
- if (p_184884_2_.split("-").length == 5)
- {
-- throw new EntityNotFoundException("commands.generic.entity.invalidUuid", p_184884_2_);
-+ throw new EntityNotFoundException("commands.generic.entity.invalidUuid", new Object[] {p_184884_2_});
- }
- }
- }
-@@ -332,9 +329,7 @@
-
- public static List func_184890_c(MinecraftServer p_184890_0_, ICommandSender p_184890_1_, String p_184890_2_) throws EntityNotFoundException, CommandException
+@@ -391,14 +394,14 @@
{
-- return (List)(EntitySelector.func_82378_b(p_184890_2_)
-- ? EntitySelector.func_179656_b(p_184890_1_, p_184890_2_, Entity.class)
-- : Lists.newArrayList(func_184885_b(p_184890_0_, p_184890_1_, p_184890_2_)));
-+ return (List)(EntitySelector.func_82378_b(p_184890_2_) ? EntitySelector.func_179656_b(p_184890_1_, p_184890_2_, Entity.class) : Lists.newArrayList(func_184885_b(p_184890_0_, p_184890_1_, p_184890_2_)));
- }
+ ITextComponent itextcomponent = new TextComponentString("");
- public static String func_184886_d(MinecraftServer p_184886_0_, ICommandSender p_184886_1_, String p_184886_2_) throws PlayerNotFoundException, CommandException
-@@ -362,7 +357,7 @@
+- for (int i = p_147176_2_; i < p_147176_1_.length; i++)
++ for (int i = p_147176_2_; i < p_147176_1_.length; ++i)
{
- return func_184888_a(p_184891_0_, p_184891_1_, p_184891_2_).func_70005_c_();
- }
-- catch (PlayerNotFoundException playernotfoundexception)
-+ catch (PlayerNotFoundException var6)
- {
- try
+ if (i > p_147176_2_)
{
-@@ -398,7 +393,7 @@
itextcomponent.func_150258_a(" ");
}
@@ -236,221 +48,48 @@
if (p_147176_3_)
{
-@@ -408,7 +403,7 @@
- {
- if (EntitySelector.func_82378_b(p_147176_1_[i]))
- {
-- throw new PlayerNotFoundException("commands.generic.selector.notFound", p_147176_1_[i]);
-+ throw new PlayerNotFoundException("commands.generic.selector.notFound", new Object[] {p_147176_1_[i]});
- }
- }
- else
-@@ -452,11 +447,11 @@
-
- if (flag && Double.isNaN(p_175767_0_))
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175767_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175767_0_});
- }
- else
- {
-- double d0 = 0.0;
-+ double d0 = 0.0D;
-
- if (!flag || p_175767_2_.length() > 1)
- {
-@@ -471,22 +466,22 @@
-
- if (!flag1 && !flag && p_175767_5_)
- {
-- d0 += 0.5;
-+ d0 += 0.5D;
- }
- }
-
-- double d1 = d0 + (flag ? p_175767_0_ : 0.0);
-+ double d1 = d0 + (flag ? p_175767_0_ : 0.0D);
-
- if (p_175767_3_ != 0 || p_175767_4_ != 0)
- {
- if (d1 < (double)p_175767_3_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", String.format("%.2f", d1), p_175767_3_);
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {String.format("%.2f", d1), p_175767_3_});
- }
-
- if (d1 > (double)p_175767_4_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooBig", String.format("%.2f", d1), p_175767_4_);
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {String.format("%.2f", d1), p_175767_4_});
- }
- }
-
-@@ -505,11 +500,11 @@
+@@ -427,7 +430,7 @@
+ {
+ StringBuilder stringbuilder = new StringBuilder();
- if (flag && Double.isNaN(p_175769_0_))
- {
-- throw new NumberInvalidException("commands.generic.num.invalid", p_175769_0_);
-+ throw new NumberInvalidException("commands.generic.num.invalid", new Object[] {p_175769_0_});
- }
- else
+- for (int i = p_180529_1_; i < p_180529_0_.length; i++)
++ for (int i = p_180529_1_; i < p_180529_0_.length; ++i)
{
-- double d0 = flag ? p_175769_0_ : 0.0;
-+ double d0 = flag ? p_175769_0_ : 0.0D;
-
- if (!flag || p_175769_2_.length() > 1)
+ if (i > p_180529_1_)
{
-@@ -524,7 +519,7 @@
-
- if (!flag1 && !flag && p_175769_5_)
- {
-- d0 += 0.5;
-+ d0 += 0.5D;
+@@ -702,7 +705,7 @@
+ break;
}
- }
-@@ -532,12 +527,12 @@
- {
- if (d0 < (double)p_175769_3_)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", String.format("%.2f", d0), p_175769_3_);
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {String.format("%.2f", d0), p_175769_3_});
- }
+- Comparable comparable = func_190792_a((IProperty)iproperty, iterator1.next());
++ Comparable comparable = func_190792_a(iproperty, iterator1.next());
- if (d0 > (double)p_175769_4_)
+ if (comparable == null)
{
-- throw new NumberInvalidException("commands.generic.num.tooBig", String.format("%.2f", d0), p_175769_4_);
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {String.format("%.2f", d0), p_175769_4_});
- }
- }
-
-@@ -552,7 +547,7 @@
-
- if (item == null)
- {
-- throw new NumberInvalidException("commands.give.item.notFound", resourcelocation);
-+ throw new NumberInvalidException("commands.give.item.notFound", new Object[] {resourcelocation});
- }
- else
- {
-@@ -566,7 +561,7 @@
-
- if (!Block.field_149771_c.func_148741_d(resourcelocation))
- {
-- throw new NumberInvalidException("commands.give.block.notFound", resourcelocation);
-+ throw new NumberInvalidException("commands.give.block.notFound", new Object[] {resourcelocation});
- }
- else
- {
-@@ -582,18 +577,18 @@
-
- if (i < 0)
- {
-- throw new NumberInvalidException("commands.generic.num.tooSmall", i, 0);
-+ throw new NumberInvalidException("commands.generic.num.tooSmall", new Object[] {i, Integer.valueOf(0)});
- }
- else if (i > 15)
- {
-- throw new NumberInvalidException("commands.generic.num.tooBig", i, 15);
-+ throw new NumberInvalidException("commands.generic.num.tooBig", new Object[] {i, Integer.valueOf(15)});
- }
- else
- {
- return p_190794_0_.func_176203_a(Integer.parseInt(p_190794_1_));
- }
- }
-- catch (RuntimeException runtimeexception1)
-+ catch (RuntimeException var7)
- {
- try
- {
-@@ -607,16 +602,16 @@
-
- return iblockstate;
- }
-- catch (RuntimeException runtimeexception)
-+ catch (RuntimeException var6)
- {
-- throw new InvalidBlockStateException("commands.generic.blockstate.invalid", p_190794_1_, Block.field_149771_c.func_177774_c(p_190794_0_));
-+ throw new InvalidBlockStateException("commands.generic.blockstate.invalid", new Object[] {p_190794_1_, Block.field_149771_c.func_177774_c(p_190794_0_)});
- }
- }
- }
-
- private static > IBlockState func_190793_a(IBlockState p_190793_0_, IProperty p_190793_1_, Comparable p_190793_2_)
- {
-- return p_190793_0_.func_177226_a(p_190793_1_, (T) p_190793_2_);
-+ return p_190793_0_.func_177226_a(p_190793_1_, (T)p_190793_2_);
- }
-
- public static Predicate func_190791_b(final Block p_190791_0_, String p_190791_1_) throws InvalidBlockStateException
-@@ -634,7 +629,7 @@
- }
- };
- }
-- catch (RuntimeException runtimeexception)
-+ catch (RuntimeException var3)
- {
- final Map < IProperty, Comparable> map = func_190795_c(p_190791_0_, p_190791_1_);
- return new Predicate()
-@@ -669,7 +664,7 @@
-
- private static Map < IProperty, Comparable> func_190795_c(Block p_190795_0_, String p_190795_1_) throws InvalidBlockStateException
+@@ -726,7 +729,7 @@
{
-- Map < IProperty, Comparable> map = Maps.newHashMap();
-+ Map < IProperty, Comparable> map = Maps. < IProperty, Comparable> newHashMap();
+ StringBuilder stringbuilder = new StringBuilder();
- if ("default".equals(p_190795_1_))
+- for (int i = 0; i < p_71527_0_.length; i++)
++ for (int i = 0; i < p_71527_0_.length; ++i)
{
-@@ -712,14 +707,14 @@
- map.put(iproperty, comparable);
- }
-
-- throw new InvalidBlockStateException("commands.generic.blockstate.invalid", p_190795_1_, Block.field_149771_c.func_177774_c(p_190795_0_));
-+ throw new InvalidBlockStateException("commands.generic.blockstate.invalid", new Object[] {p_190795_1_, Block.field_149771_c.func_177774_c(p_190795_0_)});
- }
- }
+ String s = p_71527_0_[i].toString();
- @Nullable
- private static > T func_190792_a(IProperty p_190792_0_, String p_190792_1_)
+@@ -752,7 +755,7 @@
{
-- return p_190792_0_.func_185929_b(p_190792_1_).orNull();
-+ return (T)(p_190792_0_.func_185929_b(p_190792_1_).orNull());
- }
-
- public static String func_71527_a(Object[] p_71527_0_)
-@@ -800,7 +795,7 @@
- {
- if (i != p_175771_1_ + 2)
- {
-- return Collections.emptyList();
-+ return Collections.emptyList();
- }
+ ITextComponent itextcomponent = new TextComponentString("");
- s = Integer.toString(p_175771_2_.func_177952_p());
-@@ -829,7 +824,7 @@
+- for (int i = 0; i < p_180530_0_.size(); i++)
++ for (int i = 0; i < p_180530_0_.size(); ++i)
+ {
+ if (i > 0)
{
- if (i != p_181043_1_ + 1)
- {
-- return Collections.emptyList();
-+ return Collections.emptyList();
- }
-
- s = Integer.toString(p_181043_2_.func_177952_p());
-@@ -852,7 +847,7 @@
- public static List func_175762_a(String[] p_175762_0_, Collection p_175762_1_)
- {
- String s = p_175762_0_[p_175762_0_.length - 1];
-- List list = Lists.newArrayList();
-+ List list = Lists.newArrayList();
+@@ -856,7 +859,7 @@
if (!p_175762_1_.isEmpty())
{
-@@ -879,7 +874,6 @@
- return list;
- }
-
-- @Override
- public boolean func_82358_a(String[] p_82358_1_, int p_82358_2_)
- {
- return false;
+- for (String s1 : Iterables.transform((Iterable