- TC Eldritch Challenge: Update

This commit is contained in:
HellFirePvP committed 2015-11-09 21:17:23 +01:00
1 parent 9f1d0a3a19
commit 2a0322003e
4 files changed
+4 -24

No files matched your search

@@ -71,6 +71,7 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal {
public static void informSessionStart(EntityPlayer player) {
if(trackedPortalActivity.containsKey(player)) {
ExtendedChunkCoordinates tileCoords = trackedPortalActivity.get(player);
trackedPortalActivity.remove(player);
if(tileCoords != null) {
ChunkCoordinates cc = tileCoords.coordinates;
WorldServer ws = MinecraftServer.getServer().worldServerForDimension(tileCoords.dimId);
@@ -23,16 +23,14 @@ public class RegisteredMultiblocks {
.addBlock(1, 1, 1, RegisteredBlocks.blockStoneMachine, 11).addBlock(-1, 1, 1, RegisteredBlocks.blockStoneMachine, 11).addBlock(-1, 1, -1, RegisteredBlocks.blockStoneMachine, 11).addBlock(1, 1, -1, RegisteredBlocks.blockStoneMachine, 11);
public static final MultiblockHelper.MultiblockPattern incompleteEldritchPortalCreator = new MultiblockHelper.MultiblockPattern(RegisteredBlocks.blockNodeManipulator, 5)
.addBlock(0, 2, 0, RegisteredBlocks.blockNode, 0)
.addBlock(0, 2, 0, RegisteredBlocks.blockNode, 0).addBlock(0, 1, 0, RegisteredBlocks.blockStoneMachine, 3)
.addBlock(3, 0, 0, RegisteredBlocks.blockStoneMachine, 1).addBlock(0, 0, 3, RegisteredBlocks.blockStoneMachine, 1)
.addBlock(-3, 0, 0, RegisteredBlocks.blockStoneMachine, 1).addBlock(0, 0, -3, RegisteredBlocks.blockStoneMachine, 1)
//TODO add focus here.
.addBlock(1, 0, 1, ConfigBlocks.blockCosmeticSolid, 15).addBlock(-1, 0, 1, ConfigBlocks.blockCosmeticSolid, 15).addBlock(-1, 0, -1, ConfigBlocks.blockCosmeticSolid, 15).addBlock(1, 0, -1, ConfigBlocks.blockCosmeticSolid, 15)
.addBlock(1, 1, 1, ConfigBlocks.blockCosmeticSolid, 11).addBlock(-1, 1, 1, ConfigBlocks.blockCosmeticSolid, 11).addBlock(-1, 1, -1, ConfigBlocks.blockCosmeticSolid, 11).addBlock(1, 1, -1, ConfigBlocks.blockCosmeticSolid, 11);
public static final MultiblockHelper.MultiblockPattern completeEldritchPortalCreator = new MultiblockHelper.MultiblockPattern(RegisteredBlocks.blockNodeManipulator, 5)
//TODO add focus here.
.addBlock(0, 2, 0, RegisteredBlocks.blockNode, 0)
.addBlock(0, 2, 0, RegisteredBlocks.blockNode, 0).addBlock(0, 1, 0, RegisteredBlocks.blockStoneMachine, 3)
.addBlock(3, 0, 0, RegisteredBlocks.blockStoneMachine, 1).addBlock(0, 0, 3, RegisteredBlocks.blockStoneMachine, 1)
.addBlock(-3, 0, 0, RegisteredBlocks.blockStoneMachine, 1).addBlock(0, 0, -3, RegisteredBlocks.blockStoneMachine, 1)
.addBlock(1, 0, 1, RegisteredBlocks.blockStoneMachine, 15).addBlock(-1, 0, 1, RegisteredBlocks.blockStoneMachine, 15).addBlock(-1, 0, -1, RegisteredBlocks.blockStoneMachine, 15).addBlock(1, 0, -1, RegisteredBlocks.blockStoneMachine, 15)
@@ -175,25 +175,9 @@ public class TCMazeHandler {
public static void free(Map<CellLoc, Short> locations) {
if (locations == null) return;
WorldServer ws = DimensionManager.getWorld(ModConfig.dimOuterId);
for (CellLoc loc : locations.keySet()) {
labyrinthCopy.remove(loc);
forceChunkUnloading(ws, loc.x, loc.z);
}
System.out.println("new weight: " + labyrinthCopy.size());
}
private static void forceChunkUnloading(WorldServer ws, int chX, int chZ) {
if (ws == null) return;
long chunkPair = ChunkCoordIntPair.chunkXZ2Int(chX, chZ);
ChunkProviderServer serverChProvider = ws.theChunkProviderServer;
LongHashMap chunks = serverChProvider.loadedChunkHashMap;
Chunk c = (Chunk) chunks.getValueByKey(chunkPair);
serverChProvider.loadedChunkHashMap.remove(chunkPair);
if (c != null) {
c.onChunkUnload();
serverChProvider.loadedChunks.remove(c);
//forceChunkUnloading(ws, loc.x, loc.z);
}
}
@@ -70,15 +70,12 @@ class TCMazeSession {
final void startSession() {
WorldServer ws = DimensionManager.getWorld(ModConfig.dimOuterId);
int chunkCount = 0;
for(CellLoc loc : chunksAffected.keySet()) {
long k = ChunkCoordIntPair.chunkXZ2Int(loc.x, loc.z);
if(ws.theChunkProviderServer.loadedChunkHashMap.containsItem(k)) {
ws.theChunkProviderServer.loadedChunkHashMap.remove(k);
chunkCount++;
}
}
LogManager.getLogger().info("Removed " + chunkCount + " of " + chunksAffected.keySet().size() + " chunks from Eldritch dimension.");
if(portalCell == null) {
LogManager.getLogger().error("Thaumcraft didn't generate a portal! Stopping instance!", new IllegalStateException());