Skip to content

Commit 2c5510e

Browse files
committed
Upgrade to 1.13.2
1 parent 8b82c83 commit 2c5510e

File tree

13 files changed

+21
-15
lines changed

13 files changed

+21
-15
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838

3939
minecraft {
4040
version = project.mcVersion
41-
mappings = 'snapshot_20180908'
41+
mappings = 'snapshot_20190227'
4242
runDir = 'run'
4343
tweakClass = 'com.irtimaled.bbor.launch.ClientTweaker'
4444
makeObfSourceJar = false

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name=bbor
22
buildVersion=1.0.14
33
# leave a space to reduce merge conflicts on version change
4-
mcVersion=1.13
4+
mcVersion=1.13.2

src/main/java/com/irtimaled/bbor/Main.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public static void main(String... args) throws IOException {
1212
ServerRunner.run("@MC_VERSION@", Arrays.asList(args).subList(1, args.length));
1313
} else {
1414
Installer.install("@VERSION@", "@MC_VERSION@");
15-
1615
}
1716
}
1817
}

src/main/java/com/irtimaled/bbor/client/PlayerCoords.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static void setPlayerPosition(double partialTicks, EntityPlayer entityPla
1414
x = entityPlayer.lastTickPosX + (entityPlayer.posX - entityPlayer.lastTickPosX) * partialTicks;
1515
y = entityPlayer.lastTickPosY + (entityPlayer.posY - entityPlayer.lastTickPosY) * partialTicks;
1616
z = entityPlayer.lastTickPosZ + (entityPlayer.posZ - entityPlayer.lastTickPosZ) * partialTicks;
17-
dimensionId = entityPlayer.dimension;
17+
dimensionId = entityPlayer.dimension.getId();
1818
}
1919

2020
static void setActiveY() {

src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private int getY(double row) {
3939

4040
private void addControl(IRenderableControl control) {
4141
this.controls.add(control);
42-
TypeHelper.doIfType(control, IGuiEventListener.class, this.eventListeners::add);
42+
TypeHelper.doIfType(control, IGuiEventListener.class, this.children::add);
4343
}
4444

4545
private void addTabs(String... labels) {

src/main/java/com/irtimaled/bbor/client/interop/BiomeBorderHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.irtimaled.bbor.common.models.Coords;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.util.math.BlockPos;
6+
import net.minecraft.util.registry.IRegistry;
67
import net.minecraft.world.biome.Biome;
78

89
public class BiomeBorderHelper {
@@ -13,6 +14,6 @@ public static int getBiomeId(Coords coords) {
1314
public static int getBiomeId(int x, int y, int z) {
1415
BlockPos pos = new BlockPos(x, y, z);
1516
Biome biome = Minecraft.getInstance().world.getBiome(pos);
16-
return Biome.getIdForBiome(biome);
17+
return IRegistry.BIOME.getId(biome);
1718
}
1819
}

src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void disconnectedFromRemoteServer() {
2929

3030
public static void render(float partialTicks, EntityPlayerSP player) {
3131
PlayerCoords.setPlayerPosition(partialTicks, player);
32-
EventBus.publish(new Render(player.dimension));
32+
EventBus.publish(new Render(player.dimension.getId()));
3333
}
3434

3535
public static boolean interceptChatMessage(String message) {

src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private static boolean isSpawnable(int x, int y, int z) {
6060
BlockPos pos = new BlockPos(x, y, z);
6161
Biome biome = world.getBiome(pos);
6262
return biome.getSpawningChance() > 0 &&
63-
!biome.getSpawnableList(EnumCreatureType.MONSTER).isEmpty() &&
63+
!biome.getSpawns(EnumCreatureType.MONSTER).isEmpty() &&
6464
isSpawnable(pos, world);
6565
}
6666

src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.minecraft.world.chunk.Chunk;
1717

1818
import java.io.File;
19+
import java.util.Collection;
1920

2021
public class CommonInterop {
2122
public static void init() {
@@ -26,7 +27,7 @@ public static void chunkLoaded(Chunk chunk) {
2627
EventBus.publish(new ChunkLoaded(chunk));
2728
}
2829

29-
public static void loadWorlds(WorldServer[] worlds) {
30+
public static void loadWorlds(Collection<WorldServer> worlds) {
3031
for (WorldServer world : worlds) {
3132
loadWorld(world);
3233
}

src/main/java/com/irtimaled/bbor/common/models/ServerPlayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ServerPlayer {
1111
private final Consumer<Packet<?>> packetConsumer;
1212

1313
public ServerPlayer(EntityPlayerMP player) {
14-
this.dimensionId = player.dimension;
14+
this.dimensionId = player.dimension.getId();
1515
this.packetConsumer = player.connection::sendPacket;
1616
}
1717

0 commit comments

Comments
 (0)