Upgrade to 1.13.2

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

diff --git a/gradle.properties b/gradle.properties
index 1e16e9f1bbc0c867032335a2896a687412fe0a99..d279fba8a4b5b580a4d1d7227d7767101c73fb19 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 name=bbor
 buildVersion=1.0.14
 # leave a space to reduce merge conflicts on version change
-mcVersion=1.13
+mcVersion=1.13.2

diff --git a/src/main/java/com/irtimaled/bbor/Main.java b/src/main/java/com/irtimaled/bbor/Main.java
index 0449b17ae7f08e9f862d69072469fda68685c1ff..4d706b6cd6ca9805b056d6f4561f09d1c6bf8516 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/Main.java
+++ b/src/main/java/com/irtimaled/bbor/Main.java
@@ -12,7 +12,6 @@ public class Main {
             ServerRunner.run("@MC_VERSION@", Arrays.asList(args).subList(1, args.length));
         } else {
             Installer.install("@VERSION@", "@MC_VERSION@");
-
         }
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/client/PlayerCoords.java b/src/main/java/com/irtimaled/bbor/client/PlayerCoords.java
index d7e7455da97ca40167df87ab058b8f96e58e37ef..8075dcb7e75978b8aaf7f3421dc8db9574ed79a4 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/PlayerCoords.java
+++ b/src/main/java/com/irtimaled/bbor/client/PlayerCoords.java
@@ -14,7 +14,7 @@ public class PlayerCoords {
         x = entityPlayer.lastTickPosX + (entityPlayer.posX - entityPlayer.lastTickPosX) * partialTicks;
         y = entityPlayer.lastTickPosY + (entityPlayer.posY - entityPlayer.lastTickPosY) * partialTicks;
         z = entityPlayer.lastTickPosZ + (entityPlayer.posZ - entityPlayer.lastTickPosZ) * partialTicks;
-        dimensionId = entityPlayer.dimension;
+        dimensionId = entityPlayer.dimension.getId();
     }
 
     static void setActiveY() {

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
index 2626b0163e9abf67a4468f897a2bf4817c2be9eb..f2af58f5a86e05825bc4fc8eb1e273f73a20e8e3 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
@@ -39,7 +39,7 @@ public class SettingsScreen extends GuiScreen {
 
     private void addControl(IRenderableControl control) {
         this.controls.add(control);
-        TypeHelper.doIfType(control, IGuiEventListener.class, this.eventListeners::add);
+        TypeHelper.doIfType(control, IGuiEventListener.class, this.children::add);
     }
 
     private void addTabs(String... labels) {

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/BiomeBorderHelper.java b/src/main/java/com/irtimaled/bbor/client/interop/BiomeBorderHelper.java
index fbc2442301f658563711332b6dc9f6cc1693785a..07cf63e1deed0de06e8c9666ab717229fa9c0dac 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/BiomeBorderHelper.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/BiomeBorderHelper.java
@@ -3,6 +3,7 @@ package com.irtimaled.bbor.client.interop;
 import com.irtimaled.bbor.common.models.Coords;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.IRegistry;
 import net.minecraft.world.biome.Biome;
 
 public class BiomeBorderHelper {
@@ -13,6 +14,6 @@ public class BiomeBorderHelper {
     public static int getBiomeId(int x, int y, int z) {
         BlockPos pos = new BlockPos(x, y, z);
         Biome biome = Minecraft.getInstance().world.getBiome(pos);
-        return Biome.getIdForBiome(biome);
+        return IRegistry.BIOME.getId(biome);
     }
 }

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 ddcf85efb0f889d2dbd9ac9c0f9b854797cdfd0e..b313e2db33f60bb25f0f7f9b476f4bb08710d3be 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
@@ -29,7 +29,7 @@ public class ClientInterop {
 
     public static void render(float partialTicks, EntityPlayerSP player) {
         PlayerCoords.setPlayerPosition(partialTicks, player);
-        EventBus.publish(new Render(player.dimension));
+        EventBus.publish(new Render(player.dimension.getId()));
     }
 
     public static boolean interceptChatMessage(String message) {

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java b/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
index fd8653a293dbf40a249a4d48f68424611dcda14f..c3116ce7b19097cb5a852b72d824d437fd3459c5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
@@ -60,7 +60,7 @@ public class SpawningSphereHelper {
         BlockPos pos = new BlockPos(x, y, z);
         Biome biome = world.getBiome(pos);
         return  biome.getSpawningChance() > 0 &&
-                !biome.getSpawnableList(EnumCreatureType.MONSTER).isEmpty() &&
+                !biome.getSpawns(EnumCreatureType.MONSTER).isEmpty() &&
                 isSpawnable(pos, world);
     }
 

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 ed16c7c5dfcd8f165f5d5e1d1312d415b5c7302b..f0a82190bb6692d103112c5c5cf6fde7eca6e439 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
+++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
@@ -16,6 +16,7 @@ import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
 
 import java.io.File;
+import java.util.Collection;
 
 public class CommonInterop {
     public static void init() {
@@ -26,7 +27,7 @@ public class CommonInterop {
         EventBus.publish(new ChunkLoaded(chunk));
     }
 
-    public static void loadWorlds(WorldServer[] worlds) {
+    public static void loadWorlds(Collection<WorldServer> worlds) {
         for (WorldServer world : worlds) {
             loadWorld(world);
         }

diff --git a/src/main/java/com/irtimaled/bbor/common/models/ServerPlayer.java b/src/main/java/com/irtimaled/bbor/common/models/ServerPlayer.java
index d4c5eba845dc1faa9ccb56b8304fab7ae8fa3726..1496b16a1dc9c628809f1264d1236c676cea663c 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/models/ServerPlayer.java
+++ b/src/main/java/com/irtimaled/bbor/common/models/ServerPlayer.java
@@ -11,7 +11,7 @@ public class ServerPlayer {
     private final Consumer<Packet<?>> packetConsumer;
 
     public ServerPlayer(EntityPlayerMP player) {
-        this.dimensionId = player.dimension;
+        this.dimensionId = player.dimension.getId();
         this.packetConsumer = player.connection::sendPacket;
     }
 

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java
index 44f66c1197d2b36a745b1f46e991e8e502f85758..ac93d6659fb271832021df39c8321fdb9d4da515 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java
@@ -2,7 +2,7 @@ package com.irtimaled.bbor.mixin.client.renderer;
 
 import com.irtimaled.bbor.client.interop.ClientInterop;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(EntityRenderer.class)
+@Mixin(GameRenderer.class)
 public class MixinEntityRenderer {
     @Shadow
     @Final

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 6c2a90d72aaa635fdd41d53dbd16ca5daabed1c5..21a1b4aeb53fd6cd0fbda083aac7c9652a1cddaa 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
@@ -3,20 +3,25 @@ package com.irtimaled.bbor.mixin.server;
 import com.irtimaled.bbor.common.interop.CommonInterop;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.dimension.DimensionType;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Map;
+
 @Mixin(MinecraftServer.class)
 public class MixinMinecraftServer {
     @Shadow
-    public WorldServer[] worlds;
+    @Final
+    private Map<DimensionType, WorldServer> worlds;
 
     @Inject(method = "initialWorldChunkLoad", at = @At("HEAD"))
     private void initialWorldChunkLoad(CallbackInfo ci) {
-        CommonInterop.loadWorlds(worlds);
+        CommonInterop.loadWorlds(worlds.values());
     }
 
     @Inject(method = "tick", at = @At("RETURN"))

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index d92819a4275a19da5b203df422a9b34aa20f8faf..4ae6f48a9d09391f8b793d930772f663831274b8 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
+++ b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
@@ -29,7 +29,7 @@ public class ServerRunner {
     private static final ThrowableConsumer<URL> addURL;
 
     static {
-        VANILLA_SERVER_JARS.put("1.13", "https://launcher.mojang.com/v1/objects/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar");
+        VANILLA_SERVER_JARS.put("1.13.2", "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar");
 
         try {
             Method method = URLClassLoader.class