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 itEntity = TCMazeHandler.GEN.bufferedEntities.iterator(); + while(itEntity.hasNext()) { + Object bufE = itEntity.next(); + + if(bufE instanceof FakeWorldTCGeneration.EntityPermItem) { + FakeWorldTCGeneration.EntityPermItem i = (FakeWorldTCGeneration.EntityPermItem) bufE; + if(((int) i.x >> 4) != x || ((int) i.z >> 4) != z) continue; + EntityPermanentItem item = new EntityPermanentItem(worldObj, i.x, i.y, i.z, i.buffItemStack); + item.motionX = 0; + item.motionY = 0; + item.motionZ = 0; + chunk.addEntity(item); + worldObj.loadedEntityList.add(item); + worldObj.onEntityAdded(item); + itEntity.remove(); + } else if(bufE instanceof FakeWorldTCGeneration.EntityGuardianBuf) { + FakeWorldTCGeneration.EntityGuardianBuf b = (FakeWorldTCGeneration.EntityGuardianBuf) bufE; + if(((int) b.x >> 4) != x || ((int) b.z >> 4) != z) continue; + EntityEldritchGuardian guardian = new EntityEldritchGuardian(worldObj); + guardian.setPosition(b.x, b.y, b.z); + guardian.setHomeArea(b.coordinates.posX, b.coordinates.posY, b.coordinates.posZ, (int) b.dst); + chunk.addEntity(guardian); + worldObj.loadedEntityList.add(guardian); + worldObj.onEntityAdded(guardian); + itEntity.remove(); + } else { + throw new IllegalStateException("Unexpected Entity: " + bufE); + } + } + + TCMazeHandler.GEN.chunks.remove(key); + } else { + System.out.println("Creating NEW Chunk"); + + Block[] ablock = new Block[blockArr.length]; + System.arraycopy(blockArr, 0, ablock, 0, blockArr.length); + byte[] meta = new byte[metaArr.length]; + System.arraycopy(metaArr, 0, meta, 0, metaArr.length); + + chunk = new Chunk(this.worldObj, ablock, meta, x, z); + byte[] abyte = chunk.getBiomeArray(); + System.arraycopy(biomeArr, 0, abyte, 0, biomeArr.length); } + chunk.generateSkylightMap(); return chunk; } @@ -92,11 +190,6 @@ public class ChunkProviderTCOuter implements IChunkProvider { } public boolean canSave() { - System.out.println("canSave?"); - StackTraceElement[] currentStack = Thread.currentThread().getStackTrace(); - for(StackTraceElement element : currentStack) { - System.out.println(element.toString()); - } return false; } @@ -117,6 +210,27 @@ public class ChunkProviderTCOuter implements IChunkProvider { return 0; } - public void recreateStructures(int p_82695_1_, int p_82695_2_) { + public void recreateStructures(int p_82695_1_, int p_82695_2_) {} + + public static int getKey(int x, int y, int z) { + return (x << 4 | z) << 7 | y; + } + + static { + blockArr = new Block[32768]; + metaArr = new byte[blockArr.length]; + biomeArr = new byte[16 * 16]; + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + for (int y = 127; y >= 0; y--) { + int index = (x << 4 | z) << 7 | y; + blockArr[index] = null; + metaArr[index] = 0; + } + } + } + for(int i = 0; i < biomeArr.length; i++) { + biomeArr[i] = (byte) ThaumcraftWorldGenerator.biomeEldritchLands.biomeID; + } } } 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 4836c24..8306833 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -1,6 +1,8 @@ package makeo.gadomancy.common.utils.world; +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; import makeo.gadomancy.common.data.ModConfig; +import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; @@ -8,23 +10,19 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.LongHashMap; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.storage.AnvilChunkLoader; import net.minecraft.world.gen.ChunkProviderServer; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.world.WorldEvent; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.lib.world.dim.Cell; import thaumcraft.common.lib.world.dim.CellLoc; import thaumcraft.common.lib.world.dim.MazeHandler; import thaumcraft.common.lib.world.dim.MazeThread; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; @@ -35,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; * Gadomancy is Open Source and distributed under the * GNU LESSER GENERAL PUBLIC LICENSE * for more read the LICENSE file - * + *

* Created by HellFirePvP @ 05.11.2015 10:40 */ public class TCMazeHandler { @@ -49,6 +47,11 @@ public class TCMazeHandler { public static ConcurrentHashMap labyrinthCopy = new ConcurrentHashMap(); public static final int TELEPORT_LAYER_Y = 55; + public static final FakeWorldTCGeneration GEN = new FakeWorldTCGeneration(); + + private static List scheduledWorldUnloads = new ArrayList(); + private static List flaggedSessions = new ArrayList(); + private static Map runningSessions = new HashMap(); public static void closeAllSessionsAndCleanup() { @@ -60,22 +63,22 @@ public class TCMazeHandler { public static void tick() { WorldServer w = DimensionManager.getWorld(ModConfig.dimOuterId); - if(w != null) { - if(!w.levelSaving) w.levelSaving = true; - //Chunks still get saved... + if (w != null) { + if (!w.levelSaving) w.levelSaving = true; WorldServer out = MinecraftServer.getServer().worldServerForDimension(0); List playerObjects = w.playerEntities; for (int i = 0; i < playerObjects.size(); i++) { EntityPlayer player = (EntityPlayer) playerObjects.get(i); - if(!hasOpenSession(player)) { + if (!hasOpenSession(player)) { WorldUtil.tryTeleportBack((EntityPlayerMP) player, 0); ChunkCoordinates cc = out.getSpawnPoint(); - player.setPosition(cc.posX + 0.5, cc.posY + 0.5, cc.posZ + 0.5); + int y = w.getTopSolidOrLiquidBlock(cc.posX, cc.posZ); + player.setPosition(cc.posX + 0.5, y, cc.posZ + 0.5); } } - for(EntityPlayer player : runningSessions.keySet()) { - if(player.worldObj.provider.dimensionId != ModConfig.dimOuterId) { //If the player left our dim, but he should still be in the session, ... + for (EntityPlayer player : runningSessions.keySet()) { + if (player.worldObj.provider.dimensionId != ModConfig.dimOuterId) { //If the player left our dim, but he should still be in the session, ... closeSession(player, false); } } @@ -85,24 +88,32 @@ public class TCMazeHandler { /* * Coordinates wanted here are the absolute Portal coordinates. */ - public static boolean createSessionAndTeleport(EntityPlayer player, int pX, int pY, int pZ) { - if(hasOpenSession(player) || !hasFreeSessionSpace()) return false; + public static boolean createSessionWaitForTeleport(EntityPlayer player, double pX, double pY, double pZ) { + if (hasOpenSession(player) || !hasFreeSessionSpace()) return false; WorldServer w = MinecraftServer.getServer().worldServerForDimension(ModConfig.dimOuterId); - Map chunksAffected = setupChunks(w, pX, pZ); - Vec3 currentPos = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); - int originDim = player.worldObj.provider.dimensionId; - TCMazeSession session = new TCMazeSession(player, chunksAffected, originDim, currentPos); - session.startSession(); - runningSessions.put(player, session); + reserveSessionSpace(player); + setupSession(player, w, pX, pY, pZ); return true; } - private static Map setupChunks(World world, int pX, int pZ) { + private static void reserveSessionSpace(EntityPlayer player) { + runningSessions.put(player, TCMazeSession.placeholder()); + } + + private static void setupSession(EntityPlayer player, WorldServer world, double pX, double pY, double pZ) { + Vec3 currentPos = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); + int originDim = player.worldObj.provider.dimensionId; + Map locs = calculateCellLocs(world, pX, pZ); + MazeBuilderThread t = new MazeBuilderThread((EntityPlayerMP) player, locs, originDim, currentPos); + t.start(); + } + + private static Map calculateCellLocs(WorldServer world, double pX, double pZ) { ConcurrentHashMap oldDat = MazeHandler.labyrinth; ConcurrentHashMap bufferOld = new ConcurrentHashMap(labyrinthCopy); MazeHandler.labyrinth = labyrinthCopy; - int chX = pX >> 4; - int chZ = pZ >> 4; + int chX = ((int) pX) >> 4; + int chZ = ((int) pZ) >> 4; int w = randWH(world.rand); int h = randWH(world.rand); while (MazeHandler.mazesInRange(chX, chZ, w, h)) { @@ -111,27 +122,6 @@ public class TCMazeHandler { MazeThread mt = new MazeThread(chX, chZ, w, h, world.rand.nextLong()); mt.run(); Map locs = calculateDifferences(bufferOld); - for(CellLoc l : locs.keySet()) { - Cell c = new Cell(locs.get(l)); - boolean oldFlag = false; - if(c.feature == 1) { - oldFlag = world.captureBlockSnapshots; - world.captureBlockSnapshots = true; - } - MazeHandler.generateEldritch(world, world.rand, l.x, l.z); - if(c.feature == 1) { - world.captureBlockSnapshots = oldFlag; - ArrayList snapshots = world.capturedBlockSnapshots; - for(BlockSnapshot sn : snapshots) { - if(sn.getCurrentBlock() == ConfigBlocks.blockEldritch && (sn.world.getBlockMetadata(sn.x, sn.y, sn.z) == 1 || sn.world.getBlockMetadata(sn.x, sn.y, sn.z) == 2 || sn.world.getBlockMetadata(sn.x, sn.y, sn.z) == 3)) { - sn.world.setBlockToAir(sn.x, sn.y, sn.z); - } - if(sn.getCurrentBlock() == ConfigBlocks.blockEldritchPortal) { - sn.world.setBlockToAir(sn.x, sn.y, sn.z); - } - } - } - } labyrinthCopy = MazeHandler.labyrinth; MazeHandler.labyrinth = oldDat; return locs; @@ -140,8 +130,8 @@ public class TCMazeHandler { private static Map calculateDifferences(ConcurrentHashMap bufferOld) { ConcurrentHashMap newDat = MazeHandler.labyrinth; //Only the new data has data, the old one doesn't have. Map newlyEvaluatedMaze = new HashMap(); - for(CellLoc loc : newDat.keySet()) { - if(!bufferOld.containsKey(loc)) { + for (CellLoc loc : newDat.keySet()) { + if (!bufferOld.containsKey(loc)) { newlyEvaluatedMaze.put(loc, newDat.get(loc)); } } @@ -165,46 +155,104 @@ public class TCMazeHandler { } public static void closeSession(EntityPlayer player, boolean teleport) { - if(player.worldObj.isRemote) return; + if (player.worldObj.isRemote) return; - if(runningSessions.containsKey(player)) { + if (runningSessions.containsKey(player)) { runningSessions.get(player).closeSession(teleport); runningSessions.remove(player); } - if(runningSessions.size() == 0) { - forceWorldUnloading(ModConfig.dimOuterId); + if (runningSessions.size() == 0) { + //addToWorldUnloadQueue(ModConfig.dimOuterId); } } public static void free(Map locations) { + if (locations == null) return; WorldServer ws = DimensionManager.getWorld(ModConfig.dimOuterId); - for(CellLoc loc : locations.keySet()) { + for (CellLoc loc : locations.keySet()) { labyrinthCopy.remove(loc); forceChunkUnloading(ws, loc.x, loc.z); } } private static void forceChunkUnloading(WorldServer ws, int chX, int chZ) { - if(ws == null) return; + 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) serverChProvider.loadedChunks.remove(c); - - if(serverChProvider.loadedChunks.size() == 0) { - forceWorldUnloading(ws.provider.dimensionId); + if (c != null) { + c.onChunkUnload(); + serverChProvider.loadedChunks.remove(c); } } - private static void forceWorldUnloading(int dimId) { - WorldServer ws = DimensionManager.getWorld(dimId); - if(ws != null) { - MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(ws)); - ws.flush(); - DimensionManager.setWorld(dimId, null); + private static void addToWorldUnloadQueue(int dimId) { + if(!scheduledWorldUnloads.contains(dimId)) { + scheduledWorldUnloads.add(dimId); } } + + public static void scheduleTick() { + for(Integer i : scheduledWorldUnloads) { + WorldServer ws = DimensionManager.getWorld(i); + if (ws != null) { + MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(ws)); + ws.flush(); + DimensionManager.setWorld(i, null); + } + } + scheduledWorldUnloads.clear(); + + Iterator it = flaggedSessions.iterator(); + while(it.hasNext()) { + TCMazeSession s = it.next(); + it.remove(); + s.startSession(); + runningSessions.put(s.player, s); + } + } + + public static void flagSessionForStart(TCMazeSession session) { + flaggedSessions.add(session); + } + + public static class MazeBuilderThread extends Thread { + + private final EntityPlayerMP player; + private final Map chunksAffected; + private final int originDimId; + private final Vec3 originLocation; + + public MazeBuilderThread(EntityPlayerMP player, Map chunksAffected, int originDimId, Vec3 originLocation) { + this.player = player; + this.chunksAffected = chunksAffected; + this.originDimId = originDimId; + this.originLocation = originLocation; + setName("GadomancyEldritchGen (SERVER/ThreadID=" + getId() + ")"); + } + + @Override + public void run() { + long startMs = System.currentTimeMillis(); + for (CellLoc l : chunksAffected.keySet()) { + ConcurrentHashMap old = MazeHandler.labyrinth; + MazeHandler.labyrinth = labyrinthCopy; + MazeHandler.generateEldritch(GEN, GEN.rand, l.x, l.z); + MazeHandler.labyrinth = old; + } + System.out.println("BuildTime: " + (System.currentTimeMillis() - startMs) + " (ms)"); + + finishBuild(); + } + + private void finishBuild() { + TileAdditionalEldritchPortal.informSessionStart(player); + TCMazeSession session = new TCMazeSession(player, chunksAffected, originDimId, originLocation); + flagSessionForStart(session); + } + + } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java index 12e61ca..fb6d35c 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java @@ -36,6 +36,14 @@ class TCMazeSession { this.portalCell = findPortal(); } + TCMazeSession() { + player = null; + chunksAffected = null; + portalCell = null; + originDimId = 0; + originLocation = null; + } + private CellLoc findPortal() { for(CellLoc loc : chunksAffected.keySet()) { Short s = chunksAffected.get(loc); @@ -64,8 +72,11 @@ class TCMazeSession { WorldUtil.teleportToFakeOuter(player); int x = portalCell.x * 16 + 8; int z = portalCell.z * 16 + 8; - player.setPositionAndUpdate(x, TCMazeHandler.TELEPORT_LAYER_Y, z); + player.setPositionAndUpdate(x + 0.5, TCMazeHandler.TELEPORT_LAYER_Y, z + 0.5); } } + public static TCMazeSession placeholder() { + return new TCMazeSession(); + } } diff --git a/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java b/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java index 29a0529..5b1d431 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java @@ -1,8 +1,6 @@ package makeo.gadomancy.common.utils.world; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.common.data.ModConfig; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/makeo/gadomancy/common/utils/FakeWorld.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java similarity index 89% rename from src/main/java/makeo/gadomancy/common/utils/FakeWorld.java rename to src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java index a0dcbe2..12574f3 100644 --- a/src/main/java/makeo/gadomancy/common/utils/FakeWorld.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java @@ -1,9 +1,10 @@ -package makeo.gadomancy.common.utils; +package makeo.gadomancy.common.utils.world.fake; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.EnumDifficulty; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.MinecraftException; import net.minecraft.world.World; @@ -25,8 +26,15 @@ import java.io.File; * Created by makeo @ 16.10.2015 22:15 */ public class FakeWorld extends World { + + public FakeWorld(WorldProvider provider) { + super(FakeSaveHandler.instance, "", null, provider, null); + difficultySetting = EnumDifficulty.NORMAL; + } + public FakeWorld() { super(FakeSaveHandler.instance, "", null, FakeWorldProvider.instance, null); + difficultySetting = EnumDifficulty.NORMAL; } @Override @@ -103,8 +111,7 @@ public class FakeWorld extends World { } @Override - public void flush() { - } + public void flush() {} @Override public File getWorldDirectory() { diff --git a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java new file mode 100644 index 0000000..f486e57 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java @@ -0,0 +1,209 @@ +package makeo.gadomancy.common.utils.world.fake; + +import makeo.gadomancy.common.data.ModConfig; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.common.util.ForgeDirection; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.entities.EntityPermanentItem; +import thaumcraft.common.entities.monster.EntityEldritchGuardian; + +import java.util.ArrayList; +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 HellFirePvP @ 08.11.2015 21:57 + */ +public class FakeWorldTCGeneration extends FakeWorld { + + public FakeWorldTCGeneration() { + super(TCFakeWorldProvider.instance); + } + + public ChunkMap chunks = new ChunkMap(); + public List bufferedEntities = new ArrayList(); + public Map gettedTE = new HashMap(); + + @Override + public boolean setBlock(int x, int y, int z, Block block, int meta, int flags) { + if(block == ConfigBlocks.blockEldritchPortal) return true; + if(block == ConfigBlocks.blockEldritch && (meta == 1 || meta == 2 || meta == 3)) return true; + + ChunkBuffer buf = chunks.get(((long) x & 15) | ((long) z & 15) << 32); + int key = ((x & 15) << 4 | (z & 15)) << 7 | y; + + buf.blockData[key] = block; + buf.metaBuffer[key] = (byte) meta; + if(block.hasTileEntity(meta)) buf.tiles.add(new Integer[] {x, y, z, key}); + return true; + } + + @Override + public Block getBlock(int x, int y, int z) { + ChunkBuffer buf = chunks.get(((long) x & 15) | ((long) z & 15) << 32); + int key = ((x & 15) << 4 | (z & 15)) << 7 | y; + + Block b = buf.blockData[key]; + return b == null ? Blocks.air : b; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + ChunkBuffer buf = chunks.get(((long) x & 15) | ((long) z & 15) << 32); + int key = ((x & 15) << 4 | (z & 15)) << 7 | y; + + return buf.metaBuffer[key]; + } + + @Override + public boolean isAirBlock(int x, int y, int z) { + return getBlock(x, y, z) == Blocks.air; + } + + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side) { + return getBlock(x, y, z).isSideSolid(this, x, y, z, side); + } + + @Override + public Chunk getChunkFromBlockCoords(int p_72938_1_, int p_72938_2_) { + return new Chunk(this, 0, 0); + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + TileEntity te = getBlock(x, y, z).createTileEntity(null, getBlockMetadata(x, y, z)); + if(te == null) return null; + ChunkCoordinates cc = new ChunkCoordinates(x, y, z); + if(!gettedTE.containsKey(cc)) gettedTE.put(cc, te); + te.setWorldObj(this); + te.xCoord = x; + te.yCoord = y; + te.zCoord = z; + return te; + } + + @Override + public void markTileEntityChunkModified(int p_147476_1_, int p_147476_2_, int p_147476_3_, TileEntity p_147476_4_) {} + + @Override + public void func_147453_f(int p_147453_1_, int p_147453_2_, int p_147453_3_, Block p_147453_4_) {} + + @Override + public boolean spawnEntityInWorld(Entity entity) { + if(entity instanceof EntityPermanentItem) { + bufferedEntities.add(new EntityPermItem(entity.posX, entity.posY, entity.posZ, ((EntityPermanentItem) entity).getEntityItem())); + } else if(entity instanceof EntityEldritchGuardian) { + bufferedEntities.add(new EntityGuardianBuf(((EntityEldritchGuardian) entity).getHomePosition(), entity.posX, entity.posY, entity.posZ, ((EntityEldritchGuardian) entity).func_110174_bM())); + } + return true; + } + + //TC eldrich guardian on spawn egg + @Override + public float func_147462_b(double p_147462_1_, double p_147462_3_, double p_147462_5_) { + return 0; + } + + @Override + public int getHeightValue(int p_72976_1_, int p_72976_2_) { + return 0; + } + + @Override + public void notifyBlockChange(int p_147444_1_, int p_147444_2_, int p_147444_3_, Block p_147444_4_) {} + + public static class EntityGuardianBuf { + + public ChunkCoordinates coordinates; + public double x, y, z, dst; + + public EntityGuardianBuf(ChunkCoordinates coordinates, double x, double y, double z, double dst) { + this.coordinates = coordinates; + this.x = x; + this.y = y; + this.z = z; + this.dst = dst; + } + } + + public static class EntityPermItem { + + public double x, y, z; + public ItemStack buffItemStack; + + public EntityPermItem(double x, double y, double z, ItemStack buffItemStack) { + this.x = x; + this.y = y; + this.z = z; + this.buffItemStack = buffItemStack; + } + } + + public static class ChunkBuffer { + private long key; + public Block[] blockData = new Block[32768]; + public byte[] metaBuffer = new byte[32768]; + public List tiles = new ArrayList(); + static int cnt = 0; + + public ChunkBuffer(long key) { + this.key = key; + cnt++; + if(cnt % 50 == 0) { + System.out.println("ChunkBuffers created: " + cnt); + } + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ChunkBuffer that = (ChunkBuffer) o; + return key == that.key; + } + + @Override + public int hashCode() { + return (int) (key ^ (key >>> 32)); + } + } + + public static class ChunkMap extends HashMap { + @Override + public ChunkBuffer get(Object key) { + if(!containsKey(key)) { + put((Long) key, new ChunkBuffer((Long) key)); + } + return super.get(key); + } + } + + public static class TCFakeWorldProvider extends WorldProvider { + private static TCFakeWorldProvider instance; + + static { + instance = new TCFakeWorldProvider(); + instance.dimensionId = ModConfig.dimOuterId; + } + + @Override + public String getDimensionName() { + return "FAKEWORLD-TC"; + } + } + +}