Update for 1.14.4

diff --git a/gradle.properties b/gradle.properties
index 87bd845581241e107eef986216da52af1ddbf6de..68e89f4902bad642b8d55b251842978ae5d63eeb 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.3
+mcVersion=1.14.4

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 33f44e98fb493dcb5b495befc6f8687b3bdde670..32dd7b84285655842cf498ffec3725e358d0d79c 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,6 +1,6 @@
 package com.irtimaled.bbor.common.events;
 
-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 ea043bec346a9103328b5c189a820594d7f009bc..28db3728abc7a7c856b9a1015b1be51abf54edf6 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
+++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
@@ -11,9 +11,9 @@ import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.ServerPlayNetHandler;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ServerWorld;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.server.ServerWorld;
 
 import java.io.File;
 import java.util.Collection;

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 9673ce5f8fb6201ef25c1bae7171bcd71c84e5f9..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;

diff --git a/src/main/java/com/irtimaled/bbor/mixin/server/management/MixinPlayerInteractionManager.java b/src/main/java/com/irtimaled/bbor/mixin/server/management/MixinPlayerInteractionManager.java
index 6285832fcf56d9cf92cc5e62ef26ce2aab705d8f..2fa564439f77044c90cba42793c53d6aaca47e29 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/server/management/MixinPlayerInteractionManager.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/server/management/MixinPlayerInteractionManager.java
@@ -4,7 +4,7 @@ import com.irtimaled.bbor.common.interop.CommonInterop;
 import net.minecraft.block.Block;
 import net.minecraft.server.management.PlayerInteractionManager;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ServerWorld;
+import net.minecraft.world.server.ServerWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index 3918c92f95b419a6fe597fb55f04afd965e11878..ff2224d500bcc6c3eea5d31a5e044d38baf60bba 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.4", "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar");
         VANILLA_SERVER_JARS.put("1.14.3", "https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar");
         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");