From 9b9750280c6fe40167d8e25a4f73a40b5f612343 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 13 Apr 2020 01:18:39 -0300 Subject: [PATCH] fixes for 1.16 --- src/main/java/carpet/fakes/ChunkTicketManagerInterface.java | 2 +- .../java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java | 2 +- .../java/carpet/mixins/PlayerManager_scarpetEventsMixin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/fakes/ChunkTicketManagerInterface.java b/src/main/java/carpet/fakes/ChunkTicketManagerInterface.java index 37c4ec65..c31d2902 100644 --- a/src/main/java/carpet/fakes/ChunkTicketManagerInterface.java +++ b/src/main/java/carpet/fakes/ChunkTicketManagerInterface.java @@ -2,7 +2,7 @@ package carpet.fakes; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.server.world.ChunkTicket; -import net.minecraft.util.SortedArraySet; +import net.minecraft.util.collection.SortedArraySet; import net.minecraft.util.math.ChunkPos; public interface ChunkTicketManagerInterface diff --git a/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java b/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java index 53987e95..e2e0592a 100644 --- a/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java +++ b/src/main/java/carpet/mixins/ChunkTicketManager_spawnChunksMixin.java @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.server.world.ChunkTicket; import net.minecraft.server.world.ChunkTicketManager; import net.minecraft.server.world.ChunkTicketType; -import net.minecraft.util.SortedArraySet; +import net.minecraft.util.collection.SortedArraySet; import net.minecraft.util.Unit; import net.minecraft.util.math.ChunkPos; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java b/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java index 9b03218d..af989650 100644 --- a/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/PlayerManager_scarpetEventsMixin.java @@ -14,7 +14,7 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_RESPAWNS; public class PlayerManager_scarpetEventsMixin { @Inject(method = "respawnPlayer", at = @At("HEAD")) - private void onRespawn(ServerPlayerEntity player, DimensionType dimension, boolean alive, CallbackInfoReturnable cir) + private void onRespawn(ServerPlayerEntity player, boolean olive, CallbackInfoReturnable cir) { PLAYER_RESPAWNS.onPlayerEvent(player); }