-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
42 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/client/Minecraft.java mcp940-pre1_1.12/src/minecraft/net/minecraft/client/Minecraft.java | ||
| --- mcp940-pre1/src/minecraft/net/minecraft/client/Minecraft.java 2017-07-04 17:36:37.000000000 -0700 | ||
| +++ mcp940-pre1_1.12/src/minecraft/net/minecraft/client/Minecraft.java 2017-07-04 16:03:22.000000000 -0700 | ||
| @@ -633,6 +633,8 @@ | ||
| diff -r -u a/net/minecraft/client/Minecraft.java b/net/minecraft/client/Minecraft.java | ||
| --- a/net/minecraft/client/Minecraft.java 2017-09-27 12:01:40.000000000 -0700 | ||
| +++ b/net/minecraft/client/Minecraft.java 2017-09-27 11:30:01.000000000 -0700 | ||
| @@ -643,6 +643,8 @@ | ||
| } | ||
|
|
||
| this.renderGlobal.makeEntityOutlineShader(); | ||
| + | ||
| + com.irtimaled.bbor.BoundingBoxOutlineReloaded.init(); | ||
| } | ||
|
|
||
| private void func_193986_ar() | ||
| @@ -2242,6 +2244,8 @@ | ||
| /** | ||
| @@ -2276,6 +2278,8 @@ | ||
| this.gameSettings.smoothCamera = !this.gameSettings.smoothCamera; | ||
| } | ||
|
|
||
| + com.irtimaled.bbor.BoundingBoxOutlineReloaded.keyPressed(); | ||
| + | ||
| for (int i = 0; i < 9; ++i) | ||
| { | ||
| boolean flag = this.gameSettings.field_193629_ap.isKeyDown(); | ||
| boolean flag = this.gameSettings.keyBindSaveToolbar.isKeyDown(); |
6 changes: 3 additions & 3 deletions
6
patches/net.minecraft.client.multiplayer.WorldClient.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
patches/net.minecraft.client.renderer.EntityRenderer.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
patches/net.minecraft.client.settings.KeyBinding.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| diff -r -u a/net/minecraft/client/settings/KeyBinding.java b/net/minecraft/client/settings/KeyBinding.java | ||
| --- a/net/minecraft/client/settings/KeyBinding.java 2017-09-27 12:01:40.000000000 -0700 | ||
| +++ b/net/minecraft/client/settings/KeyBinding.java 2017-09-27 11:52:47.000000000 -0700 | ||
| @@ -184,5 +184,6 @@ | ||
| CATEGORY_ORDER.put("key.categories.multiplayer", Integer.valueOf(5)); | ||
| CATEGORY_ORDER.put("key.categories.ui", Integer.valueOf(6)); | ||
| CATEGORY_ORDER.put("key.categories.misc", Integer.valueOf(7)); | ||
| + CATEGORY_ORDER.put("Bounding Box Outline Reloaded", Integer.valueOf(0)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 8 additions & 7 deletions
15
patches/net.minecraft.server.integrated.IntegratedServer.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java mcp940-pre1_1.12/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java | ||
| --- mcp940-pre1/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2017-07-04 17:36:38.000000000 -0700 | ||
| +++ mcp940-pre1_1.12/src/minecraft/net/minecraft/server/integrated/IntegratedServer.java 2017-07-04 16:07:03.000000000 -0700 | ||
| @@ -114,6 +114,7 @@ | ||
| this.worldServers[i] = (WorldServer)(new WorldServerMulti(this, isavehandler, j, this.worldServers[0], this.theProfiler)).init(); | ||
| diff -r -u a/net/minecraft/server/integrated/IntegratedServer.java b/net/minecraft/server/integrated/IntegratedServer.java | ||
| --- a/net/minecraft/server/integrated/IntegratedServer.java 2017-09-27 12:01:41.000000000 -0700 | ||
| +++ b/net/minecraft/server/integrated/IntegratedServer.java 2017-09-27 11:37:50.000000000 -0700 | ||
| @@ -114,6 +114,8 @@ | ||
| this.worlds[i] = (WorldServer)(new WorldServerMulti(this, isavehandler, j, this.worlds[0], this.profiler)).init(); | ||
| } | ||
|
|
||
| + com.irtimaled.bbor.BoundingBoxOutlineReloaded.worldLoaded(this.worldServers[i]); | ||
| this.worldServers[i].addEventListener(new ServerWorldEventHandler(this, this.worldServers[i])); | ||
| + com.irtimaled.bbor.BoundingBoxOutlineReloaded.worldLoaded(this.worlds[i]); | ||
| + | ||
| this.worlds[i].addEventListener(new ServerWorldEventHandler(this, this.worlds[i])); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters