diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java
index 1977d05..5a2223e 100644
--- a/src/main/java/makeo/gadomancy/client/ClientProxy.java
+++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java
@@ -13,7 +13,13 @@ import makeo.gadomancy.client.renderers.block.BlockExtendedNodeJarRenderer;
import makeo.gadomancy.client.renderers.block.RenderBlockStoneMachine;
import makeo.gadomancy.client.renderers.block.RenderBlockTransparent;
import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase;
-import makeo.gadomancy.client.renderers.item.*;
+import makeo.gadomancy.client.renderers.item.ItemCreativeNodeRenderer;
+import makeo.gadomancy.client.renderers.item.ItemExNodeRenderer;
+import makeo.gadomancy.client.renderers.item.ItemJarExtendedNodeRenderer;
+import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar;
+import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar;
+import makeo.gadomancy.client.renderers.item.ItemRenderStoneMachine;
+import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity;
import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNodeJar;
@@ -24,7 +30,16 @@ import makeo.gadomancy.client.renderers.tile.RenderTileNodeManipulator;
import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar;
import makeo.gadomancy.client.renderers.tile.RenderTileStickyJar;
import makeo.gadomancy.common.CommonProxy;
-import makeo.gadomancy.common.blocks.tiles.*;
+import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal;
+import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper;
+import makeo.gadomancy.common.blocks.tiles.TileExtendedNode;
+import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar;
+import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw;
+import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus;
+import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar;
+import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator;
+import makeo.gadomancy.common.blocks.tiles.TileRemoteJar;
+import makeo.gadomancy.common.blocks.tiles.TileStickyJar;
import makeo.gadomancy.common.registration.RegisteredBlocks;
import makeo.gadomancy.common.registration.RegisteredItems;
import makeo.gadomancy.common.utils.Injector;
diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
index 2b49f7c..d2cf166 100644
--- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
+++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
@@ -2,7 +2,7 @@ package makeo.gadomancy.client.renderers.item;
import makeo.gadomancy.client.util.FamiliarHandlerClient;
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
-import makeo.gadomancy.common.utils.FakeWorld;
+import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java
index 1ba8c81..0ad9076 100644
--- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java
+++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java
@@ -1,6 +1,6 @@
package makeo.gadomancy.client.renderers.item;
-import makeo.gadomancy.common.utils.FakeWorld;
+import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java
index cec28ff..c9f94e1 100644
--- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java
+++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java
@@ -2,8 +2,8 @@ package makeo.gadomancy.client.renderers.tile;
import makeo.gadomancy.client.models.ModelJarPot;
import makeo.gadomancy.common.blocks.BlockRemoteJar;
-import makeo.gadomancy.common.utils.FakeWorld;
import makeo.gadomancy.common.utils.SimpleResourceLocation;
+import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
index fbc7550..2f304c0 100644
--- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
+++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
@@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import makeo.gadomancy.common.network.packets.PacketFamiliar;
-import makeo.gadomancy.common.utils.FakeWorld;
+import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.Entity;
diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java
index c20d685..3b7345f 100644
--- a/src/main/java/makeo/gadomancy/common/CommonProxy.java
+++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java
@@ -81,7 +81,7 @@ public class CommonProxy implements IGuiHandler {
RegisteredPotions.init();
- DimensionManager.registerProviderType(ModConfig.dimOuterId, WorldProviderTCEldrich.class, false);
+ DimensionManager.registerProviderType(ModConfig.dimOuterId, WorldProviderTCEldrich.class, true);
DimensionManager.registerDimension(ModConfig.dimOuterId, ModConfig.dimOuterId);
}
diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java
index cc48a55..c031f9e 100644
--- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java
+++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java
@@ -7,7 +7,6 @@ import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar;
import makeo.gadomancy.common.registration.RegisteredBlocks;
import makeo.gadomancy.common.registration.RegisteredItems;
import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java
index a6e3a2c..863818b 100644
--- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java
+++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java
@@ -1,27 +1,31 @@
package makeo.gadomancy.common.blocks.tiles;
-import cpw.mods.fml.common.FMLCommonHandler;
import makeo.gadomancy.common.data.ModConfig;
+import makeo.gadomancy.common.utils.world.TCMazeHandler;
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
-import thaumcraft.api.ThaumcraftApiHelper;
-import thaumcraft.common.Thaumcraft;
-import thaumcraft.common.lib.network.PacketHandler;
-import thaumcraft.common.lib.network.playerdata.PacketResearchComplete;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.WorldServer;
import thaumcraft.common.tiles.TileEldritchPortal;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* This class is part of the Gadomancy Mod
* Gadomancy is Open Source and distributed under the
* GNU LESSER GENERAL PUBLIC LICENSE
* for more read the LICENSE file
- *
+ *
* Created by makeo @ 06.11.2015 23:32
*/
public class TileAdditionalEldritchPortal extends TileEldritchPortal {
+
+ private static Map trackedPortalActivity = new HashMap();
+ private EntityPlayer toTeleport;
private int count = 0;
@Override
@@ -34,30 +38,58 @@ public class TileAdditionalEldritchPortal extends TileEldritchPortal {
this.opencount += 1;
}
- if ((!this.worldObj.isRemote) && (this.count % 5 == 0)) {
+ if ((!this.worldObj.isRemote) && (this.count % 5 == 0) && toTeleport == null) {
List players = this.worldObj.getEntitiesWithinAABB(EntityPlayerMP.class, AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1).expand(0.5D, 1.0D, 0.5D));
- for (EntityPlayerMP player : players) {
- if ((player.ridingEntity == null) && (player.riddenByEntity == null)) {
- if (player.timeUntilPortal > 0) {
- player.timeUntilPortal = 100;
- } else if (player.dimension != ModConfig.dimOuterId) {
- player.timeUntilPortal = 100;
+ if(players != null && !players.isEmpty()) {
+ EntityPlayerMP toTeleport = players.get(0);
- //TODO: Teleport to dim
- //player.mcServer.getConfigurationManager().transferPlayerToDimension(player, Config.dimensionOuterId, new TeleporterThaumcraft(mServer.worldServerForDimension(Config.dimensionOuterId)));
+ if(toTeleport.timeUntilPortal > 0) return;
- if (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "ENTEROUTER")) {
- PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("ENTEROUTER"), player);
- Thaumcraft.proxy.getResearchManager().completeResearch(player, "ENTEROUTER");
- }
- } else {
- player.timeUntilPortal = 100;
+ this.toTeleport = toTeleport;
+ toTeleport.timeUntilPortal = 200;
- //TODO: Teleport out
- //player.mcServer.getConfigurationManager().transferPlayerToDimension(player, 0, new TeleporterThaumcraft(mServer.worldServerForDimension(0)));
- }
+ if(toTeleport.dimension != ModConfig.dimOuterId) {
+ //Teleporting there.
+
+ startTracking(toTeleport, new ExtendedChunkCoordinates(new ChunkCoordinates(xCoord, yCoord, zCoord), toTeleport.dimension));
+ TCMazeHandler.createSessionWaitForTeleport(toTeleport, toTeleport.posX, toTeleport.posY, toTeleport.posZ);
+ } else {
+ //Teleporting back.
+
+ TCMazeHandler.closeSession(toTeleport, true);
}
}
}
}
+
+ public static void startTracking(EntityPlayer player, ExtendedChunkCoordinates tileCoords) {
+ if(!trackedPortalActivity.containsKey(player)) {
+ trackedPortalActivity.put(player, tileCoords);
+ }
+ }
+
+ public static void informSessionStart(EntityPlayer player) {
+ if(trackedPortalActivity.containsKey(player)) {
+ ExtendedChunkCoordinates tileCoords = trackedPortalActivity.get(player);
+ if(tileCoords != null) {
+ ChunkCoordinates cc = tileCoords.coordinates;
+ WorldServer ws = MinecraftServer.getServer().worldServerForDimension(tileCoords.dimId);
+ ws.removeTileEntity(cc.posX, cc.posY, cc.posZ);
+ ws.setBlockToAir(cc.posX, cc.posY, cc.posZ);
+ ws.markBlockForUpdate(cc.posX, cc.posY, cc.posZ);
+ }
+ }
+ }
+
+ public static class ExtendedChunkCoordinates {
+
+ private ChunkCoordinates coordinates;
+ private int dimId;
+
+ public ExtendedChunkCoordinates(ChunkCoordinates coordinates, int dimId) {
+ this.coordinates = coordinates;
+ this.dimId = dimId;
+ }
+ }
+
}
diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java
index 84a968b..7cb6219 100644
--- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java
+++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java
@@ -1,14 +1,10 @@
package makeo.gadomancy.common.blocks.tiles;
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.aspects.IAspectSource;
import thaumcraft.api.aspects.IEssentiaTransport;
import thaumcraft.common.tiles.TileJarFillable;
diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java
index 52c774c..f2e9372 100644
--- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java
+++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java
@@ -74,6 +74,17 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
}
private void multiblockTick() {
+ if(multiblockType == null) {
+ if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) {
+ multiblockType = MultiblockType.E_PORTAL_CREATOR;
+ } else if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator)) {
+ multiblockType = MultiblockType.NODE_MANIPULATOR;
+ }
+ }
+ if(multiblockType == null) {
+ breakMultiblock();
+ return;
+ }
switch (multiblockType) {
case NODE_MANIPULATOR:
if(!isWorking) {
@@ -93,7 +104,6 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
}
private void eldritchPortalCreationTick() {
-
workTick++;
if(workTick < 10) {
if(workTick % 16 == 0) {
@@ -122,7 +132,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1).expand(15, 15, 15));
if(!players.isEmpty()) {
EntityPlayer player = (EntityPlayer) players.get(0);
- TCMazeHandler.createSessionAndTeleport(player, (int) player.posX, (int) player.posY, (int) player.posZ);
+ TCMazeHandler.createSessionWaitForTeleport(player, (int) player.posX, (int) player.posY, (int) player.posZ);
}
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
@@ -303,6 +313,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
public void formMultiblock() {
MultiblockHelper.MultiblockPattern toBuild;
+ if(multiblockType == null) return;
switch (multiblockType) {
case NODE_MANIPULATOR:
toBuild = RegisteredMultiblocks.completeNodeManipulatorMultiblock;
@@ -390,6 +401,17 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
boolean prevState = isMultiblockStructurePresent();
if(prevState) { //If there is already a multiblock formed...
if(isInMultiblock()) { //If we were actually in multiblock before
+ if(multiblockType == null) {
+ if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock)) {
+ multiblockType = MultiblockType.E_PORTAL_CREATOR;
+ } else if(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeEldritchPortalCreator)) {
+ multiblockType = MultiblockType.NODE_MANIPULATOR;
+ }
+ }
+ if(multiblockType == null) {
+ breakMultiblock();
+ return false;
+ }
switch (multiblockType) {
case NODE_MANIPULATOR:
setMultiblockStructurePresent(MultiblockHelper.isMultiblockPresent(worldObj, xCoord, yCoord, zCoord, RegisteredMultiblocks.completeNodeManipulatorMultiblock), MultiblockType.NODE_MANIPULATOR);
@@ -498,7 +520,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
public static enum MultiblockType {
NODE_MANIPULATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR"),
- E_PORTAL_CREATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR"); //Change sometime.
+ E_PORTAL_CREATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR"); //TODO Change sometime.
private String research;
diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
index b879e2a..d718f67 100644
--- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
+++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
/**
* This class is part of the Gadomancy Mod
diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java
index 91d82ff..c87166b 100644
--- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java
+++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java
@@ -15,7 +15,6 @@ import makeo.gadomancy.common.utils.JarMultiblockHandler;
import makeo.gadomancy.common.utils.world.TCMazeHandler;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
@@ -23,7 +22,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
import net.minecraft.world.Explosion;
import net.minecraft.world.GameRules;
-import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.ForgeDirection;
@@ -31,7 +29,6 @@ import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.ExplosionEvent;
import net.minecraftforge.event.world.WorldEvent;
import thaumcraft.common.items.wands.ItemWandCasting;
@@ -127,6 +124,8 @@ public class EventHandlerWorld {
if (!worldServer.isRemote && (worldServer.provider.dimensionId == 0 || worldServer.provider.dimensionId == ModConfig.dimOuterId)) {
TCMazeHandler.tick();
}
+
+ TCMazeHandler.scheduleTick();
}
private Map interacts = null;
diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java
index 183f416..fcb9425 100644
--- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java
+++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java
@@ -5,7 +5,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import io.netty.buffer.ByteBuf;
-import makeo.gadomancy.common.utils.FakeWorld;
+import makeo.gadomancy.common.utils.world.fake.FakeWorld;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java
index 5427d9f..4e301d4 100644
--- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java
+++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java
@@ -2,8 +2,25 @@ package makeo.gadomancy.common.registration;
import cpw.mods.fml.common.registry.GameRegistry;
import makeo.gadomancy.api.ClickBehavior;
-import makeo.gadomancy.common.blocks.*;
-import makeo.gadomancy.common.blocks.tiles.*;
+import makeo.gadomancy.common.blocks.BlockAdditionalEldritchPortal;
+import makeo.gadomancy.common.blocks.BlockArcaneDropper;
+import makeo.gadomancy.common.blocks.BlockExtendedNodeJar;
+import makeo.gadomancy.common.blocks.BlockInfusionClaw;
+import makeo.gadomancy.common.blocks.BlockNode;
+import makeo.gadomancy.common.blocks.BlockNodeManipulator;
+import makeo.gadomancy.common.blocks.BlockRemoteJar;
+import makeo.gadomancy.common.blocks.BlockStickyJar;
+import makeo.gadomancy.common.blocks.BlockStoneMachine;
+import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal;
+import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper;
+import makeo.gadomancy.common.blocks.tiles.TileExtendedNode;
+import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar;
+import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw;
+import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus;
+import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar;
+import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator;
+import makeo.gadomancy.common.blocks.tiles.TileRemoteJar;
+import makeo.gadomancy.common.blocks.tiles.TileStickyJar;
import makeo.gadomancy.common.items.ItemBlockAdditionalEldritchPortal;
import makeo.gadomancy.common.items.ItemBlockRemoteJar;
import makeo.gadomancy.common.items.ItemBlockStoneMachine;
diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java
index f650e9d..2d78db0 100644
--- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java
+++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java
@@ -2,7 +2,13 @@ package makeo.gadomancy.common.registration;
import cpw.mods.fml.common.registry.GameRegistry;
import makeo.gadomancy.common.Gadomancy;
-import makeo.gadomancy.common.items.*;
+import makeo.gadomancy.common.items.ItemCreativeNode;
+import makeo.gadomancy.common.items.ItemExtendedNodeJar;
+import makeo.gadomancy.common.items.ItemFakeGolemPlacer;
+import makeo.gadomancy.common.items.ItemFakeGolemShield;
+import makeo.gadomancy.common.items.ItemFakeModIcon;
+import makeo.gadomancy.common.items.ItemGolemCoreBreak;
+import makeo.gadomancy.common.items.ItemTransformationFocus;
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
diff --git a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java
index 845dafa..88ce807 100644
--- a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java
+++ b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java
@@ -1,19 +1,28 @@
package makeo.gadomancy.common.utils.world;
+import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration;
import net.minecraft.block.Block;
import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.IProgressUpdate;
import net.minecraft.world.ChunkPosition;
import net.minecraft.world.World;
-import net.minecraft.world.WorldType;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.terraingen.PopulateChunkEvent;
+import thaumcraft.common.entities.EntityPermanentItem;
+import thaumcraft.common.entities.monster.EntityEldritchGuardian;
+import thaumcraft.common.lib.world.ThaumcraftWorldGenerator;
+import thaumcraft.common.tiles.TileCrystal;
+import thaumcraft.common.tiles.TileEldritchCrabSpawner;
+import thaumcraft.common.tiles.TileEldritchLock;
+import java.util.Iterator;
import java.util.List;
-import java.util.Random;
/**
* This class is part of the Gadomancy Mod
@@ -25,41 +34,130 @@ import java.util.Random;
*/
public class ChunkProviderTCOuter implements IChunkProvider {
- private Random rand;
+ private static final Block[] blockArr;
+ private static final byte[] metaArr;
+ private static final byte[] biomeArr;
+
private World worldObj;
- private WorldType worldType;
- private BiomeGenBase[] biomesForGeneration;
public ChunkProviderTCOuter(World p_i2006_1_, long p_i2006_2_, boolean p_i2006_4_) {
this.worldObj = p_i2006_1_;
- this.worldType = p_i2006_1_.getWorldInfo().getTerrainType();
- this.rand = new Random(p_i2006_2_);
}
- public Chunk loadChunk(int p_73158_1_, int p_73158_2_) {
- return provideChunk(p_73158_1_, p_73158_2_);
+ public Chunk loadChunk(int x, int z) {
+ return provideChunk(x, z);
}
- public Chunk provideChunk(int p_73154_1_, int p_73154_2_) {
- this.rand.setSeed(p_73154_1_ * 341873128712L + p_73154_2_ * 132897987541L);
- Block[] ablock = new Block[32768];
- byte[] meta = new byte[ablock.length];
- for (int k = 0; k < 16; k++) {
- for (int l = 0; l < 16; l++) {
- for (int j1 = 127; j1 >= 0; j1--) {
- int k1 = (l * 16 + k) * 128 + j1;
- ablock[k1] = null;
- meta[k1] = 0;
+ public Chunk provideChunk(int x, int z) {
+ Chunk chunk;
+ long key = ((long) x & 15) | ((long) z & 15) << 32;
+ if(TCMazeHandler.GEN.chunks.containsKey(key)) {
+ System.out.println("preGen Chunk found for " + x + ", " + z);
+ FakeWorldTCGeneration.ChunkBuffer buf = TCMazeHandler.GEN.chunks.get(key);
+ chunk = new Chunk(worldObj, buf.blockData, buf.metaBuffer, x, z);
+ byte[] abyte = chunk.getBiomeArray();
+ System.arraycopy(biomeArr, 0, abyte, 0, biomeArr.length);
+
+ for(Integer[] pos : buf.tiles) {
+ TileEntity te = buf.blockData[pos[3]].createTileEntity(worldObj, metaArr[pos[3]]);
+ if(te != null) {
+ System.out.println("te wasn't null");
+ worldObj.loadedTileEntityList.add(te);
+ chunk.func_150812_a(pos[0] & 15, pos[1], pos[2] & 15, te);
+ te.blockMetadata = metaArr[pos[3]];
}
}
- }
- this.biomesForGeneration = this.worldObj.getWorldChunkManager().loadBlockGeneratorData(this.biomesForGeneration, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16);
- Chunk chunk = new Chunk(this.worldObj, ablock, meta, p_73154_1_, p_73154_2_);
- byte[] abyte = chunk.getBiomeArray();
- for (int k = 0; k < abyte.length; k++) {
- abyte[k] = ((byte) this.biomesForGeneration[k].biomeID);
+ Iterator it = TCMazeHandler.GEN.gettedTE.keySet().iterator();
+ while(it.hasNext()) {
+ ChunkCoordinates cc = it.next();
+ TileEntity te = TCMazeHandler.GEN.gettedTE.get(cc);
+ if(te.xCoord >> 4 != x || te.zCoord >> 4 != z) continue;
+ ChunkPosition pos = new ChunkPosition(te.xCoord & 15, te.yCoord, te.zCoord & 15);
+ if(!chunk.chunkTileEntityMap.containsKey(pos)) {
+ System.out.println("INVALID TE at: " + te.xCoord + ", " + te.yCoord + ", " + te.zCoord + " --- Not found in its parent chunk " + chunk.xPosition + ", " + chunk.zPosition);
+ //throw new IllegalStateException("INVALID TE");
+ continue;
+ }
+ TileEntity correspondingTE = (TileEntity) chunk.chunkTileEntityMap.get(pos);
+ if(te instanceof TileEntityMobSpawner) {
+ if(!(correspondingTE instanceof TileEntityMobSpawner)) {
+ System.out.println("DATA INCONSISTENCY - TE at " + te.xCoord + ", " + te.yCoord + ", " + te.zCoord + " EXPECTED: " + te.getClass().getSimpleName() + " GIVEN " + correspondingTE.getClass().getSimpleName());
+ throw new IllegalStateException();
+ }
+
+ ((TileEntityMobSpawner) correspondingTE).func_145881_a().setEntityName(((TileEntityMobSpawner) te).func_145881_a().getEntityNameToSpawn());
+ } else if(te instanceof TileEldritchLock) {
+ if(!(correspondingTE instanceof TileEldritchLock)) {
+ System.out.println("DATA INCONSISTENCY - TE at " + te.xCoord + ", " + te.yCoord + ", " + te.zCoord + " EXPECTED: " + te.getClass().getSimpleName() + " GIVEN " + correspondingTE.getClass().getSimpleName());
+ throw new IllegalStateException();
+ }
+
+ ((TileEldritchLock) correspondingTE).setFacing(((TileEldritchLock) te).getFacing());
+ } else if(te instanceof TileCrystal) {
+ if(!(correspondingTE instanceof TileCrystal)) {
+ System.out.println("DATA INCONSISTENCY - TE at " + te.xCoord + ", " + te.yCoord + ", " + te.zCoord + " EXPECTED: " + te.getClass().getSimpleName() + " GIVEN " + correspondingTE.getClass().getSimpleName());
+ throw new IllegalStateException();
+ }
+
+ ((TileCrystal) correspondingTE).orientation = ((TileCrystal) te).orientation;
+ } else if(te instanceof TileEldritchCrabSpawner) {
+ if(!(correspondingTE instanceof TileEldritchCrabSpawner)) {
+ System.out.println("DATA INCONSISTENCY - TE at " + te.xCoord + ", " + te.yCoord + ", " + te.zCoord + " EXPECTED: " + te.getClass().getSimpleName() + " GIVEN " + correspondingTE.getClass().getSimpleName());
+ throw new IllegalStateException();
+ }
+
+ ((TileEldritchCrabSpawner) correspondingTE).setFacing(((TileEldritchCrabSpawner) te).getFacing());
+ } else {
+ throw new IllegalStateException("Unexpected TileEntity: " + te);
+ }
+ it.remove();
+ }
+
+ Iterator