Support 1.12.1

diff --git a/java/com/irtimaled/bbor/ClientProxy.java b/java/com/irtimaled/bbor/ClientProxy.java
index 618defe8a6aa91524787c19ba64ec81482eb402e..c51d39b8d54b185f238e6d9edf52997b3773e204 100644 (file)
--- a/java/com/irtimaled/bbor/ClientProxy.java
+++ b/java/com/irtimaled/bbor/ClientProxy.java
@@ -529,13 +529,13 @@ public class ClientProxy extends CommonProxy {
     }
 
     private AxisAlignedBB offsetAxisAlignedBB(AxisAlignedBB axisAlignedBB) {
-        double expandXZ = 0.001F;
-        double expandY = 0;
+        double growXZ = 0.001F;
+        double growY = 0;
         if (axisAlignedBB.minY != axisAlignedBB.maxY) {
-            expandY = expandXZ;
+            growY = growXZ;
         }
         return axisAlignedBB
-                .expand(expandXZ, expandY, expandXZ)
+                .grow(growXZ, growY, growXZ)
                 .offset(-playerX, -playerY, -playerZ);
     }
 

diff --git a/patches/net.minecraft.client.Minecraft.java.patch b/patches/net.minecraft.client.Minecraft.java.patch
index 11cdb920ee1afdf538d720548f6ccbedb2d1c539..c87d6ab2752aec42b0286eabbedf27c2c261da96 100644 (file)
--- a/patches/net.minecraft.client.Minecraft.java.patch
+++ b/patches/net.minecraft.client.Minecraft.java.patch
@@ -1,7 +1,7 @@
-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();
@@ -9,8 +9,8 @@ diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/client/Minecraft.java mcp94
 +        com.irtimaled.bbor.BoundingBoxOutlineReloaded.init();
      }
  
-     private void func_193986_ar()
-@@ -2242,6 +2244,8 @@
+     /**
+@@ -2276,6 +2278,8 @@
              this.gameSettings.smoothCamera = !this.gameSettings.smoothCamera;
          }
  
@@ -18,4 +18,4 @@ diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/client/Minecraft.java mcp94
 +
          for (int i = 0; i < 9; ++i)
          {
-             boolean flag = this.gameSettings.field_193629_ap.isKeyDown();
+             boolean flag = this.gameSettings.keyBindSaveToolbar.isKeyDown();

diff --git a/patches/net.minecraft.client.multiplayer.WorldClient.java.patch b/patches/net.minecraft.client.multiplayer.WorldClient.java.patch
index 8a9260beac1589ef65d9e7e7ddc579fc81e1d52b..4cf1fa363d585123d7e5bd2c1880fc699fc08ab4 100644 (file)
--- a/patches/net.minecraft.client.multiplayer.WorldClient.java.patch
+++ b/patches/net.minecraft.client.multiplayer.WorldClient.java.patch
@@ -1,6 +1,6 @@
-diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java mcp940-pre1_1.12/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java
---- mcp940-pre1/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java 2017-07-04 17:36:38.000000000 -0700
-+++ mcp940-pre1_1.12/src/minecraft/net/minecraft/client/multiplayer/WorldClient.java  2017-07-04 16:04:51.000000000 -0700
+diff -r -u a/net/minecraft/client/multiplayer/WorldClient.java b/net/minecraft/client/multiplayer/WorldClient.java
+--- a/net/minecraft/client/multiplayer/WorldClient.java 2017-09-27 12:01:40.000000000 -0700
++++ b/net/minecraft/client/multiplayer/WorldClient.java 2017-09-27 11:53:37.000000000 -0700
 @@ -320,6 +320,7 @@
      public void sendQuittingDisconnectingPacket()
      {

diff --git a/patches/net.minecraft.client.renderer.EntityRenderer.java.patch b/patches/net.minecraft.client.renderer.EntityRenderer.java.patch
index a17788acc5215cf6ed87a2ac3da994d5faccff6e..64061ffeceecd11c87997148c99c7449c8edb48a 100644 (file)
--- a/patches/net.minecraft.client.renderer.EntityRenderer.java.patch
+++ b/patches/net.minecraft.client.renderer.EntityRenderer.java.patch
@@ -1,6 +1,6 @@
-diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java mcp940-pre1_1.12/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java
---- mcp940-pre1/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java 2017-07-04 17:36:38.000000000 -0700
-+++ mcp940-pre1_1.12/src/minecraft/net/minecraft/client/renderer/EntityRenderer.java  2017-07-04 16:04:15.000000000 -0700
+diff -r -u a/net/minecraft/client/renderer/EntityRenderer.java b/net/minecraft/client/renderer/EntityRenderer.java
+--- a/net/minecraft/client/renderer/EntityRenderer.java 2017-09-27 12:01:40.000000000 -0700
++++ b/net/minecraft/client/renderer/EntityRenderer.java 2017-09-27 11:53:37.000000000 -0700
 @@ -1483,6 +1483,8 @@
              this.renderCloudsCheck(renderglobal, partialTicks, pass, d0, d1, d2);
          }

diff --git a/patches/net.minecraft.client.settings.KeyBinding.java.patch b/patches/net.minecraft.client.settings.KeyBinding.java.patch
new file mode 100644 (file)
index 0000000..61d3792
--- /dev/null
+++ b/patches/net.minecraft.client.settings.KeyBinding.java.patch
@@ -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));
+     }
+ }

diff --git a/patches/net.minecraft.network.NetworkManager.java.patch b/patches/net.minecraft.network.NetworkManager.java.patch
index 73cdaaf8196615e880726384565bf361f6e8f004..bf165f8dd26b262b688b9b95f12e405c8ca4b077 100644 (file)
--- a/patches/net.minecraft.network.NetworkManager.java.patch
+++ b/patches/net.minecraft.network.NetworkManager.java.patch
@@ -1,6 +1,6 @@
-diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/network/NetworkManager.java mcp940-pre1_1.12/src/minecraft/net/minecraft/network/NetworkManager.java
---- mcp940-pre1/src/minecraft/net/minecraft/network/NetworkManager.java 2017-07-04 17:36:38.000000000 -0700
-+++ mcp940-pre1_1.12/src/minecraft/net/minecraft/network/NetworkManager.java  2017-07-04 17:54:02.000000000 -0700
+diff -r -u a/net/minecraft/network/NetworkManager.java b/net/minecraft/network/NetworkManager.java
+--- a/net/minecraft/network/NetworkManager.java 2017-09-27 12:01:41.000000000 -0700
++++ b/net/minecraft/network/NetworkManager.java 2017-09-27 11:53:38.000000000 -0700
 @@ -32,6 +32,7 @@
  import java.util.concurrent.locks.ReentrantReadWriteLock;
  import javax.annotation.Nullable;

diff --git a/patches/net.minecraft.server.integrated.IntegratedServer.java.patch b/patches/net.minecraft.server.integrated.IntegratedServer.java.patch
index 133051ed04aed63b9d95756a9fd2d49b00ff43e9..1f36b77e1f94b8fb1e1e823f105ca8b61ce8132c 100644 (file)
--- a/patches/net.minecraft.server.integrated.IntegratedServer.java.patch
+++ b/patches/net.minecraft.server.integrated.IntegratedServer.java.patch
@@ -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]));
          }
  

diff --git a/patches/net.minecraft.world.chunk.Chunk.java.patch b/patches/net.minecraft.world.chunk.Chunk.java.patch
index 27c45f57bfe5465d8da191b7ce49424cdc2e3f19..52d41bafb6c8f92796714d128c7b17a58a40fbbc 100644 (file)
--- a/patches/net.minecraft.world.chunk.Chunk.java.patch
+++ b/patches/net.minecraft.world.chunk.Chunk.java.patch
@@ -1,10 +1,9 @@
-Only in mcp940-pre1_1.12/src/minecraft/net/minecraft/util: .DS_Store
-diff -r -U 3 mcp940-pre1/src/minecraft/net/minecraft/world/chunk/Chunk.java mcp940-pre1_1.12/src/minecraft/net/minecraft/world/chunk/Chunk.java
---- mcp940-pre1/src/minecraft/net/minecraft/world/chunk/Chunk.java  2017-07-04 17:36:38.000000000 -0700
-+++ mcp940-pre1_1.12/src/minecraft/net/minecraft/world/chunk/Chunk.java 2017-07-04 16:07:38.000000000 -0700
+diff -r -u a/net/minecraft/world/chunk/Chunk.java b/net/minecraft/world/chunk/Chunk.java
+--- a/net/minecraft/world/chunk/Chunk.java  2017-09-27 12:01:41.000000000 -0700
++++ b/net/minecraft/world/chunk/Chunk.java  2017-09-27 11:34:42.000000000 -0700
 @@ -935,6 +935,7 @@
          {
-             this.worldObj.loadEntities(classinheritancemultimap);
+             this.world.loadEntities(classinheritancemultimap);
          }
 +        com.irtimaled.bbor.BoundingBoxOutlineReloaded.chunkLoaded(this);
      }