diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java index 7f2b8df..4b179be 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java @@ -18,8 +18,6 @@ import java.util.concurrent.ConcurrentHashMap; * Created by makeo @ 09.11.2015 21:20 */ public class TileOverrideEldritchLock extends TileEldritchLock { - private int count = 0; - private Entity[] bosses = null; @Override public void updateEntity() { @@ -34,33 +32,23 @@ public class TileOverrideEldritchLock extends TileEldritchLock { super.updateEntity(); int count = Entity.nextEntityID - nextEntityId; - bosses = new Entity[count]; + Entity[] bosses = new Entity[count]; for(int i = 0; i < count; i++) { bosses[i] = worldObj.getEntityByID(nextEntityId + i); } MazeHandler.labyrinth = old; + for(TCMazeSession session : TCMazeHandler.getSessions().values()) { + if(session.chunksAffected != null && session.chunksAffected.containsKey(new CellLoc(xCoord >> 4, zCoord >> 4))) { + TCMazeHandler.putBosses(session, bosses); + break; + } + } return; } } } super.updateEntity(); - - if(bosses != null && ++count % 20 == 0) { - for(Entity entity : bosses) { - if(entity != null && !entity.isDead) { - return; - } - } - - for(TCMazeSession session : TCMazeHandler.getSessions().values()) { - if(session.chunksAffected != null && session.chunksAffected.containsKey(new CellLoc(xCoord >> 4, zCoord >> 4))) { - TCMazeHandler.handleBossFinish(session); - break; - } - } - bosses = null; - } } } diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index bdbea92..e6d40b0 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -122,11 +122,6 @@ public class EventHandlerWorld { @SubscribeEvent public void on(TickEvent.ServerTickEvent event) { if(event.phase != TickEvent.Phase.END) return; - WorldServer worldServer = DimensionManager.getWorld(ModConfig.dimOuterId); - if(worldServer == null) return; - if (!worldServer.isRemote && (worldServer.provider.dimensionId == 0 || worldServer.provider.dimensionId == ModConfig.dimOuterId)) { - TCMazeHandler.tick(); - } TCMazeHandler.scheduleTick(); } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index 3b01987..f5c6f34 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -2,12 +2,17 @@ package makeo.gadomancy.common.utils.world; import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; import makeo.gadomancy.common.data.ModConfig; +import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.LongHashMap; +import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.WorldServer; @@ -16,7 +21,9 @@ import net.minecraft.world.gen.ChunkProviderServer; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; +import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.world.dim.CellLoc; +import thaumcraft.common.lib.world.dim.GenCommon; import thaumcraft.common.lib.world.dim.MazeHandler; import thaumcraft.common.lib.world.dim.MazeThread; @@ -46,12 +53,14 @@ public class TCMazeHandler { //Our map to work with. public static ConcurrentHashMap labyrinthCopy = new ConcurrentHashMap(); public static final int TELEPORT_LAYER_Y = 55; + private static int tickCounter = 0; public static final FakeWorldTCGeneration GEN = new FakeWorldTCGeneration(); private static List flaggedSessions = new ArrayList(); private static Map runningSessions = new HashMap(); + private static Map watchedBosses = new HashMap(); public static void closeAllSessionsAndCleanup() { for (EntityPlayer pl : runningSessions.keySet()) { @@ -72,8 +81,7 @@ public class TCMazeHandler { if (!hasOpenSession(player)) { WorldUtil.tryTeleportBack((EntityPlayerMP) player, 0); ChunkCoordinates cc = out.getSpawnPoint(); - //TODO return something valid - int y = w.getTopSolidOrLiquidBlock(cc.posX, cc.posZ); + int y = out.getTopSolidOrLiquidBlock(cc.posX, cc.posZ); player.setPositionAndUpdate(cc.posX + 0.5, y, cc.posZ + 0.5); } } @@ -86,8 +94,14 @@ public class TCMazeHandler { } public static void handleBossFinish(TCMazeSession session) { - - + CellLoc spawnChunk = session.portalCell; + WorldServer world = MinecraftServer.getServer().worldServerForDimension(ModConfig.dimOuterId); + int lX = (spawnChunk.x << 4) + 8; + int lZ = (spawnChunk.z << 4) + 8; + world.setBlock(lX, 52, lZ, ConfigBlocks.blockEldritch, 3, 3); + world.setBlock(lX, 53, lZ, RegisteredBlocks.blockAdditionalEldrichPortal); + GenCommon.genObelisk(world, lX, 54, lZ); + session.player.addChatMessage(new ChatComponentText(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.GRAY + StatCollector.translateToLocal("gadomancy.eldritch.portalSpawned"))); } /* @@ -188,6 +202,8 @@ public class TCMazeHandler { } public static void scheduleTick() { + tickCounter++; + Iterator it = flaggedSessions.iterator(); while(it.hasNext()) { TCMazeSession s = it.next(); @@ -195,12 +211,34 @@ public class TCMazeHandler { s.startSession(); runningSessions.put(s.player, s); } + + if((tickCounter & 15) == 0) { + Iterator> iterator = watchedBosses.entrySet().iterator(); + labelWhile: while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + TCMazeSession session = entry.getKey(); + Entity[] bosses = entry.getValue(); + for(Entity entity : bosses) { + if(entity != null && !entity.isDead) { + continue labelWhile; + } + } + TCMazeHandler.handleBossFinish(session); + iterator.remove(); + } + } + + tick(); } public static void flagSessionForStart(TCMazeSession session) { flaggedSessions.add(session); } + public static void putBosses(TCMazeSession session, Entity[] bosses) { + watchedBosses.put(session, bosses); + } + public static class MazeBuilderThread extends Thread { private final EntityPlayerMP player; diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 64fc34f..5ed0643 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -104,6 +104,7 @@ gadomancy.lore.remotejar=ยง7Network: %s gadomancy.eldritch.noflyCreative=(even in creative) gadomancy.eldritch.nobreakPortalNothing=This portal cannot be broken +gadomancy.eldritch.portalSpawned=You sense the opening of a portal in the distance. tile.BlockStickyJar.name=Sticky Jar tile.BlockArcaneDropper.name=Arcane Dropper