Update for 1.14.2

diff --git a/build.gradle b/build.gradle
index 55fa7ef4dae4c6901320c5ce39650761fa5e7a57..80a121a5c539ffcb9bd568e61cc17e54a348dcec 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ dependencies {
 
 minecraft {
     version = project.mcVersion
-    mappings = 'snapshot_20190227'
+    mappings = 'snapshot_20190624'
     runDir = 'run'
     tweakClass = 'com.irtimaled.bbor.launch.ClientTweaker'
     makeObfSourceJar = false

diff --git a/gradle.properties b/gradle.properties
index 3cb4b19fa94ad44e3077c8dde3effc5fbbaf454f..6c1610d089d0ff6da2263d23f2b5e0c04a28c88b 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 name=bbor
 buildVersion=1.0.13
 # leave a space to reduce merge conflicts on version change
-mcVersion=1.14.1
+mcVersion=1.14.2

diff --git a/src/main/java/com/irtimaled/bbor/client/CameraCoords.java b/src/main/java/com/irtimaled/bbor/client/CameraCoords.java
index 86bddaa53a78db06a494c7f5d59358241add59bc..b0065d75098a677421594b9a96ba65c7c1a6945d 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/CameraCoords.java
+++ b/src/main/java/com/irtimaled/bbor/client/CameraCoords.java
@@ -5,7 +5,7 @@ import net.minecraft.util.math.Vec3d;
 
 public class CameraCoords {
     private static Vec3d getCameraPos() {
-        return Minecraft.getInstance().gameRenderer.func_215316_n().func_216785_c();
+        return Minecraft.getInstance().gameRenderer.getActiveRenderInfo().getProjectedView();
     }
 
     public static double getX() {

diff --git a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
index b6def1a51a7a54a44a152224ab49d64042d9b88d..75af3e4e86a67122b5d2efc5a9369020facb67e8 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
+++ b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
@@ -25,7 +25,7 @@ public class KeyListener {
     }
 
     private static void onKeyEvent(long windowHandle, int keyCode, int scanCode, int action, int modifiers) {
-        if (windowHandle == mainWindowHandle && minecraft.currentScreen == null && keyCode != -1 && !InputMappings.func_216506_a(mainWindowHandle, 292)) {
+        if (windowHandle == mainWindowHandle && minecraft.currentScreen == null && keyCode != -1 && !InputMappings.isKeyDown(mainWindowHandle, 292)) {
             InputMappings.Input input = InputMappings.getInputByCode(keyCode, scanCode);
             for (Key key : keys) {
                 if (key.getInput() == input) {

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index 798412b09b5c01faa0c3c4545ada91ee5c2b170c..4361806c34aa7f1e26d91081c4057d0a6f5f281d 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
+++ b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
@@ -29,6 +29,7 @@ public class ServerRunner {
     private static final ThrowableConsumer<URL> addURL;
 
     static {
+        VANILLA_SERVER_JARS.put("1.14.2", "https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar");
         VANILLA_SERVER_JARS.put("1.14.1", "https://launcher.mojang.com/v1/objects/ed76d597a44c5266be2a7fcd77a8270f1f0bc118/server.jar");
         VANILLA_SERVER_JARS.put("1.14", "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar");
         VANILLA_SERVER_JARS.put("1.13.2", "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar");