Upgrade to 1.14.4

diff --git a/build.gradle b/build.gradle
index 0346daf4a2256f7d8068215f51e401ad5314b03c..712bd6bc050966dea14fcb5afc762f055e30db24 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 
 minecraft {
     version = project.mcVersion
-    mappings = 'snapshot_20190624'
+    mappings = 'snapshot_20200119'
     runDir = 'run'
     tweakClass = 'com.irtimaled.bbor.launch.ClientTweaker'
     makeObfSourceJar = false

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

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SearchField.java b/src/main/java/com/irtimaled/bbor/client/gui/SearchField.java
index d5fd4e23fb797c36a9c56fe4c17c3562c84ea23e..a0577f566e733cf1f80e0f1409b371407ee7c29e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/SearchField.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SearchField.java
@@ -10,7 +10,7 @@ public class SearchField extends TextFieldWidget implements IControl {
         super(fontRenderer, left, top, width, height, "");
 
         this.controlList = controlList;
-        this.func_212954_a(text -> this.controlList.filter(removeLeadingSpaces(text.toLowerCase())));
+        this.setResponder(text -> this.controlList.filter(removeLeadingSpaces(text.toLowerCase())));
         this.setTextFormatter((text, id) -> removeLeadingSpaces(text));
         this.setFocused(true);
     }

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
index 581215fa51e8a81abb394803119182a7556715d7..67809c3e933615f5036287fd3f3f4c235879b487 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
@@ -37,7 +37,7 @@ public class ClientInterop {
         if (message.startsWith("/bbor:")) {
             ClientPlayNetHandler connection = Minecraft.getInstance().getConnection();
             if (connection != null) {
-                CommandDispatcher<ISuggestionProvider> commandDispatcher = connection.func_195515_i();
+                CommandDispatcher<ISuggestionProvider> commandDispatcher = connection.getCommandDispatcher();
                 CommandSource commandSource = Minecraft.getInstance().player.getCommandSource();
                 try {
                     commandDispatcher.execute(message.substring(1), commandSource);

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
index 55e89681e0155f250ef9f6be5e6913f9f3739b9e..c3b6b473c97dc67a0225dbdb075b3ad41d55c600 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
@@ -3,6 +3,7 @@ package com.irtimaled.bbor.client.providers;
 import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper;
 import com.irtimaled.bbor.client.models.BoundingBoxWorldSpawn;
 import com.irtimaled.bbor.common.BoundingBoxType;
+import com.irtimaled.bbor.common.MathHelper;
 import com.irtimaled.bbor.common.models.Coords;
 import com.irtimaled.bbor.common.models.DimensionId;
 
@@ -17,8 +18,8 @@ public class WorldSpawnProvider implements IBoundingBoxProvider<BoundingBoxWorld
 
     public static void setWorldSpawn(int spawnX, int spawnZ) {
         worldSpawn = getWorldSpawnBoundingBox(spawnX, spawnZ);
-        spawnChunks = buildSpawnChunksBoundingBox(spawnX, spawnZ, 12, BoundingBoxType.SpawnChunks);
-        lazyChunks = buildSpawnChunksBoundingBox(spawnX, spawnZ, 16, BoundingBoxType.LazySpawnChunks);
+        spawnChunks = buildSpawnChunksBoundingBox(spawnX, spawnZ, 19, BoundingBoxType.SpawnChunks);
+        lazyChunks = buildSpawnChunksBoundingBox(spawnX, spawnZ, 21, BoundingBoxType.LazySpawnChunks);
     }
 
     public void clearCache() {
@@ -35,17 +36,18 @@ public class WorldSpawnProvider implements IBoundingBoxProvider<BoundingBoxWorld
     }
 
     private static BoundingBoxWorldSpawn buildSpawnChunksBoundingBox(int spawnX, int spawnZ, int size, BoundingBoxType type) {
-        double midOffset = CHUNK_SIZE * (size / 2.0);
-        double midX = Math.round((float) (spawnX / CHUNK_SIZE)) * CHUNK_SIZE;
-        double midZ = Math.round((float) (spawnZ / CHUNK_SIZE)) * CHUNK_SIZE;
-        Coords maxCoords = new Coords(midX + midOffset, 0, midZ + midOffset);
-        if ((spawnX / CHUNK_SIZE) % 1.0D == 0.5D) {
-            midX -= CHUNK_SIZE;
-        }
-        if ((spawnZ / CHUNK_SIZE) % 1.0D == 0.5D) {
-            midZ -= CHUNK_SIZE;
-        }
-        Coords minCoords = new Coords(midX - midOffset, 0, midZ - midOffset);
+        int spawnChunkX = MathHelper.floor(spawnX / CHUNK_SIZE);
+        int spawnChunkZ = MathHelper.floor(spawnZ / CHUNK_SIZE);
+        int midOffset = ((size - 1) / 2);
+
+        int minX = spawnChunkX - midOffset;
+        int maxX = spawnChunkX + midOffset;
+        int minZ = spawnChunkZ - midOffset;
+        int maxZ = spawnChunkZ + midOffset;
+
+
+        Coords maxCoords = new Coords(minX * CHUNK_SIZE, 0, minZ * CHUNK_SIZE);
+        Coords minCoords = new Coords(16 + (maxX * CHUNK_SIZE), 0, 16 + (maxZ * CHUNK_SIZE));
         return new BoundingBoxWorldSpawn(minCoords, maxCoords, type);
     }
 

diff --git a/src/main/java/com/irtimaled/bbor/common/events/WorldLoaded.java b/src/main/java/com/irtimaled/bbor/common/events/WorldLoaded.java
index 9370f5c0b55fe4b74e0602f42c1c3de122f5b504..6a84aa81d722c789ba038c7082204df85bc6b52f 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/events/WorldLoaded.java
+++ b/src/main/java/com/irtimaled/bbor/common/events/WorldLoaded.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.common.events;
 
 import com.irtimaled.bbor.common.models.DimensionId;
-import net.minecraft.world.ServerWorld;
+import net.minecraft.world.server.ServerWorld;
 import net.minecraft.world.storage.WorldInfo;
 
 public class WorldLoaded {

diff --git a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
index 5d8b2b0bff8457df6071a119c3433c61f88781fc..b5c1eab084e60c7b816fc28fc2a1cacbf3e25245 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
+++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
@@ -7,9 +7,9 @@ import com.irtimaled.bbor.common.models.ServerPlayer;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.ServerPlayNetHandler;
-import net.minecraft.world.ServerWorld;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.feature.structure.StructureStart;
+import net.minecraft.world.server.ServerWorld;
 
 import java.util.Collection;
 import java.util.Map;

diff --git a/src/main/java/com/irtimaled/bbor/common/models/DimensionId.java b/src/main/java/com/irtimaled/bbor/common/models/DimensionId.java
index b40cdcc7dd7e33f448c3cbaad994309f36d19090..fd81a223922a4dcb58880d7cc3d72eb6ff4a573b 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/models/DimensionId.java
+++ b/src/main/java/com/irtimaled/bbor/common/models/DimensionId.java
@@ -18,7 +18,7 @@ public class DimensionId {
     }
 
     public static DimensionId OVERWORLD = DimensionId.from(DimensionType.OVERWORLD);
-    public static DimensionId NETHER = DimensionId.from(DimensionType.NETHER);
+    public static DimensionId NETHER = DimensionId.from(DimensionType.THE_NETHER);
 
     private final ResourceLocation value;
 

diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java
index 726350921780c457d5e6ed0c69d66edc35db1874..6fbb58bc867956cc0a113b44a5418d4287487dcb 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java
@@ -15,6 +15,7 @@ public class MixinSCommandListPacket {
     @Inject(method = "processPacket", at = @At("RETURN"))
     private void processPacket(IClientPlayNetHandler netHandlerPlayClient, CallbackInfo ci) {
         TypeHelper.doIfType(netHandlerPlayClient, ClientPlayNetHandler.class, handler ->
-                ClientInterop.registerClientCommands(handler.func_195515_i()));
+                ClientInterop.registerClientCommands(handler.getCommandDispatcher())
+        );
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java b/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
index 08cb9b773ca0177d8bece1ec2a88671fcae3537b..b669222c06eab5bdfe3b0550d758ef768d2d7764 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
@@ -2,8 +2,8 @@ package com.irtimaled.bbor.mixin.server;
 
 import com.irtimaled.bbor.common.interop.CommonInterop;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.ServerWorld;
 import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.server.ServerWorld;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -19,7 +19,7 @@ public class MixinMinecraftServer {
     @Final
     private Map<DimensionType, ServerWorld> worlds;
 
-    @Inject(method = "func_213186_a", at = @At("HEAD"))
+    @Inject(method = "loadInitialChunks", at = @At("HEAD"))
     private void initialWorldChunkLoad(CallbackInfo ci) {
         CommonInterop.loadWorlds(worlds.values());
     }

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index b6a1cab9d5377aee6f3921ffc108171fc4721790..79aa871b53f4c1e50649b1399c108a0f128c6ce2 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
+++ b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
@@ -30,6 +30,7 @@ public class ServerRunner {
     private static final ThrowableConsumer<URL> addURL;
 
     static {
+        VANILLA_SERVER_JARS.put("1.14.4", "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar");
         VANILLA_SERVER_JARS.put("1.14.2", "https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar");
         VANILLA_SERVER_JARS.put("1.13.2", "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar");