From 24787e8e5617dbdc248a5e5a9ff4daa400326e9b Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 22 Apr 2020 01:26:06 -0300 Subject: [PATCH] renaming getTicketManager to de-conflict with other mods --- src/main/java/carpet/fakes/ServerChunkManagerInterface.java | 2 +- src/main/java/carpet/mixins/ServerChunkManagerMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/utils/SpawnChunks.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/fakes/ServerChunkManagerInterface.java b/src/main/java/carpet/fakes/ServerChunkManagerInterface.java index 9f7daddc..f63cb266 100644 --- a/src/main/java/carpet/fakes/ServerChunkManagerInterface.java +++ b/src/main/java/carpet/fakes/ServerChunkManagerInterface.java @@ -4,5 +4,5 @@ import net.minecraft.server.world.ChunkTicketManager; public interface ServerChunkManagerInterface { - ChunkTicketManager getTicketManager(); + ChunkTicketManager getCMTicketManager(); } diff --git a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java b/src/main/java/carpet/mixins/ServerChunkManagerMixin.java index ce4b9132..f0fab105 100644 --- a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java +++ b/src/main/java/carpet/mixins/ServerChunkManagerMixin.java @@ -35,7 +35,7 @@ public abstract class ServerChunkManagerMixin implements ServerChunkManagerInter @Shadow @Final private ChunkTicketManager ticketManager; @Override // shared between scarpet and spawnChunks setting - public ChunkTicketManager getTicketManager() + public ChunkTicketManager getCMTicketManager() { return ticketManager; } diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 5692dbe7..30c3f3e4 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -713,7 +713,7 @@ public class CarpetExpression ServerWorld world = ((CarpetContext) c).s.getWorld(); Long2ObjectOpenHashMap>> levelTickets = ( (ChunkTicketManagerInterface) ((ServerChunkManagerInterface) world.getChunkManager()) - .getTicketManager() + .getCMTicketManager() ).getTicketsByPosition(); List res = new ArrayList<>(); if (lv.size() == 0) diff --git a/src/main/java/carpet/utils/SpawnChunks.java b/src/main/java/carpet/utils/SpawnChunks.java index e97cb531..f2e8f117 100644 --- a/src/main/java/carpet/utils/SpawnChunks.java +++ b/src/main/java/carpet/utils/SpawnChunks.java @@ -10,7 +10,7 @@ public class SpawnChunks { public static void changeSpawnChunks(ServerChunkManager chunkManager, ChunkPos pos, int size) { - ChunkTicketManager ticketManager = ((ServerChunkManagerInterface)chunkManager).getTicketManager(); + ChunkTicketManager ticketManager = ((ServerChunkManagerInterface)chunkManager).getCMTicketManager(); ((ChunkTicketManagerInterface)ticketManager).changeSpawnChunks(pos, size); } }