diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index ad7f5178..c09752ab 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -125,10 +125,10 @@ import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; import crazypants.enderio.material.MachinePartRenderer; import crazypants.enderio.material.Material; -import crazypants.enderio.teleport.BlockTravelAnchor; -import crazypants.enderio.teleport.TileTravelAnchor; import crazypants.enderio.teleport.TravelController; -import crazypants.enderio.teleport.TravelEntitySpecialRenderer; +import crazypants.enderio.teleport.anchor.BlockTravelAnchor; +import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; import crazypants.render.IconUtil; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 01880e55..d4ca1f34 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -149,10 +149,11 @@ import crazypants.enderio.material.OreDictionaryPreferences; import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.rail.BlockEnderRail; -import crazypants.enderio.teleport.BlockTravelAnchor; import crazypants.enderio.teleport.ItemTravelStaff; import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.teleport.TravelController; +import crazypants.enderio.teleport.anchor.BlockTravelAnchor; +import crazypants.enderio.teleport.telepad.BlockTelePad; import crazypants.util.EntityUtil; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") @@ -189,6 +190,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; + public static BlockTelePad blockTelePad; public static ItemTravelStaff itemTravelStaff; // Painter @@ -335,11 +337,12 @@ public class EnderIO { blockVacuumChest = BlockVacuumChest.create(); blockTransceiver = BlockTransceiver.create(); - + blockBuffer = BlockBuffer.create(); blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); + blockTelePad = BlockTelePad.create(); blockSliceAndSplice = BlockSliceAndSplice.create(); blockSoulFuser = BlockSoulBinder.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 68585715..9d5157b9 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -95,6 +95,7 @@ public enum ModObject { itemXpTransfer, blockTravelAnchor, + blockTelePad, itemTravelStaff, itemMagnet, itemGliderWing, diff --git a/src/main/java/crazypants/enderio/teleport/IItemOfTravel.java b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java similarity index 72% rename from src/main/java/crazypants/enderio/teleport/IItemOfTravel.java rename to src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java index 17ec779b..b2440b18 100644 --- a/src/main/java/crazypants/enderio/teleport/IItemOfTravel.java +++ b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java @@ -1,4 +1,4 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.api.teleport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,6 +8,6 @@ public interface IItemOfTravel extends IEnergyContainerItem { boolean isActive(EntityPlayer ep, ItemStack equipped); - void extractInternal(ItemStack equipped, int powerUse2); + void extractInternal(ItemStack equipped, int power); } diff --git a/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java similarity index 87% rename from src/main/java/crazypants/enderio/teleport/ITravelAccessable.java rename to src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java index 8812c8d0..1e53d207 100644 --- a/src/main/java/crazypants/enderio/teleport/ITravelAccessable.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java @@ -1,14 +1,17 @@ -package crazypants.enderio.teleport; - -import java.util.UUID; +package crazypants.enderio.api.teleport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; import crazypants.util.BlockCoord; public interface ITravelAccessable { + public enum AccessMode { + PUBLIC, + PRIVATE, + PROTECTED + } + boolean canBlockBeAccessed(EntityPlayer playerName); boolean canSeeBlock(EntityPlayer playerName); diff --git a/src/main/java/crazypants/enderio/teleport/TravelSource.java b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java similarity index 95% rename from src/main/java/crazypants/enderio/teleport/TravelSource.java rename to src/main/java/crazypants/enderio/api/teleport/TravelSource.java index b9e03699..465751dc 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelSource.java +++ b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java @@ -1,4 +1,4 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.api.teleport; import crazypants.enderio.config.Config; diff --git a/src/main/java/crazypants/enderio/api/teleport/package-info.java b/src/main/java/crazypants/enderio/api/teleport/package-info.java new file mode 100644 index 00000000..054afef1 --- /dev/null +++ b/src/main/java/crazypants/enderio/api/teleport/package-info.java @@ -0,0 +1,6 @@ +@API(apiVersion = EnderIOAPIProps.VERSION, owner = "EnderIO", provides = "EnderIOAPI|Teleport") +package crazypants.enderio.api.teleport; + +import cpw.mods.fml.common.API; +import crazypants.enderio.api.EnderIOAPIProps; + diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 6efb8968..a4be8028 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -18,10 +18,10 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; import crazypants.enderio.ModObject; +import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.enderface.te.MeProxy; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.ITravelAccessable; import crazypants.util.Lang; public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java index df578425..f3f93998 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java @@ -13,7 +13,7 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import crazypants.enderio.EnderIO; -import crazypants.enderio.teleport.TravelEntitySpecialRenderer; +import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java index 299bb21a..a59d10b9 100644 --- a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java @@ -3,8 +3,8 @@ package crazypants.enderio.enderface; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.teleport.TileTravelAnchor; import crazypants.enderio.teleport.TravelController; +import crazypants.enderio.teleport.anchor.TileTravelAnchor; public class TileEnderIO extends TileTravelAnchor { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 77a65304..021115dd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -26,12 +26,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.teleport.IItemOfTravel; import crazypants.enderio.teleport.TravelController; -import crazypants.enderio.teleport.TravelSource; import crazypants.util.ItemUtil; import crazypants.util.Lang; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 63d2df03..fdabc9b5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -31,11 +31,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.teleport.IItemOfTravel; import crazypants.enderio.teleport.TravelController; -import crazypants.enderio.teleport.TravelSource; import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index 6bd49f18..59f2ca6c 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -57,7 +57,6 @@ public class PowerDistributor { appliedCount++; } return transmitted; - } private void checkReceptors(World worldObj) { diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java index fe0ffe12..ef9f9ebc 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java @@ -7,6 +7,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.gui.TemplateSlot; import crazypants.util.ArrayInventory; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 588ae4e6..c4058836 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -11,10 +11,11 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; import crazypants.enderio.gui.CheckBoxEIO; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.gui.GuiContainerBase; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index d5b3f32d..6c7eed25 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index adf09472..ad766d4f 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -16,6 +16,8 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index cd1625fe..5056f66b 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -29,6 +29,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.enderface.TileEnderIO; import crazypants.enderio.network.PacketHandler; diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java similarity index 96% rename from src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java rename to src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 95bc2559..79f4e389 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -1,4 +1,4 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.anchor; import java.util.Random; @@ -23,6 +23,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; @@ -30,6 +31,11 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.ConnectionHandler; +import crazypants.enderio.teleport.ContainerTravelAccessable; +import crazypants.enderio.teleport.ContainerTravelAuth; +import crazypants.enderio.teleport.GuiTravelAccessable; +import crazypants.enderio.teleport.GuiTravelAuth; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketConfigSync; import crazypants.enderio.teleport.packet.PacketDrainStaff; diff --git a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java similarity index 96% rename from src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java rename to src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index f6dba88e..99641834 100644 --- a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -1,8 +1,7 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.anchor; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -11,22 +10,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.machine.painter.IPaintableTileEntity; -import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import crazypants.util.BlockCoord; public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable, IPaintableTileEntity { - - public enum AccessMode { - PUBLIC, - PRIVATE, - PROTECTED - } private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock"; private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; diff --git a/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java similarity index 97% rename from src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java rename to src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index af83821c..cff4454e 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.anchor; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -17,6 +17,9 @@ import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; import crazypants.enderio.EnderIO; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.teleport.TravelController; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java index b34fba53..4e965bd9 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java @@ -6,8 +6,8 @@ import net.minecraft.tileentity.TileEntity; 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 crazypants.enderio.teleport.ITravelAccessable; -import crazypants.enderio.teleport.TileTravelAnchor; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.teleport.anchor.TileTravelAnchor; /** * Created by CrazyPants on 27/02/14. diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java index f9893a39..48303999 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java @@ -7,7 +7,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 crazypants.enderio.Log; -import crazypants.enderio.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.IItemOfTravel; public class PacketDrainStaff implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java b/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java index 8ebd149f..35571acb 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java @@ -7,8 +7,7 @@ import cpw.mods.fml.common.network.ByteBufUtils; 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 crazypants.enderio.teleport.ITravelAccessable; -import crazypants.enderio.teleport.TileTravelAnchor; +import crazypants.enderio.api.teleport.ITravelAccessable; public class PacketLabel implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index f194e431..2e21b11e 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -8,7 +8,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 crazypants.enderio.EnderIO; -import crazypants.enderio.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.util.Util; import crazypants.vecmath.Vector3d; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java new file mode 100644 index 00000000..0803efa6 --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java @@ -0,0 +1,26 @@ +package crazypants.enderio.teleport.telepad; + +import net.minecraft.block.Block; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; + +public class BlockTelePad extends BlockEio { + + public static BlockTelePad create() { + BlockTelePad ret = new BlockTelePad(); + ret.init(); + return ret; + } + + protected BlockTelePad() { + super(ModObject.blockTelePad.unlocalisedName, TileTelePad.class); + } + + @Override + public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + super.onNeighborChange(world, x, y, z, tileX, tileY, tileZ); + ((TileTelePad) world.getTileEntity(x, y, z)).updateConnectedState(true); + } +} diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java new file mode 100644 index 00000000..d6ec58eb --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -0,0 +1,207 @@ +package crazypants.enderio.teleport.telepad; + +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.EnergyStorage; + +import com.google.common.collect.Lists; + +import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import crazypants.util.BlockCoord; +import crazypants.util.Util; + +public class TileTelePad extends TileTravelAnchor implements IInternalPowerReceiver { + + private boolean inNetwork; + + private EnumSet connections = EnumSet.noneOf(ForgeDirection.class); + + private EnergyStorage energy = new EnergyStorage(100000, 1000, 1000); + + private TileTelePad master = null; + + private boolean autoUpdate = false; + + @Override + public void updateEntity() { + super.updateEntity(); + // my master is gone! + if(master != null && master.isInvalid()) { + master.breakNetwork(); + } + if(autoUpdate && worldObj != null) { + updateConnectedState(true); + autoUpdate = false; + } + } + + public void updateConnectedState(boolean fromBlock) { + + for (BlockCoord bc : getSurroundingCoords()) { + TileEntity te = bc.getTileEntity(worldObj); + ForgeDirection con = Util.getDirFromOffset(xCoord - bc.x, 0, zCoord - bc.z); + if(te instanceof TileTelePad) { + if(fromBlock) { + ((TileTelePad) te).updateConnectedState(false); + } + if(con != ForgeDirection.UNKNOWN) { + connections.add(con); + } + } else { + connections.remove(con); + if(master == this) { + breakNetwork(); + updateBlock(); + } else if(con != ForgeDirection.UNKNOWN) { + if(inNetwork && master != null && fromBlock) { + master.updateConnectedState(false); + } + } + if(te != null) { + // manually call this to avoid infinite recursion + worldObj.getBlock(te.xCoord, te.yCoord, te.zCoord).onNeighborChange(worldObj, te.xCoord, te.yCoord, te.zCoord, xCoord, yCoord, zCoord); + } + } + } + if(isMaster() && !inNetwork) { + inNetwork = formNetwork(); + updateBlock(); + if(inNetwork) { + master = this; + } + } + } + + public boolean isMaster() { + return connections.size() == 4; + } + + private boolean formNetwork() { + List temp = Lists.newArrayList(); + if(isMaster()) { + for (BlockCoord c : getSurroundingCoords()) { + TileEntity te = c.getTileEntity(worldObj); + if(!(te instanceof TileTelePad)) { + return false; + } + temp.add((TileTelePad) te); + } + for (TileTelePad te : temp) { + te.master = this; + te.inNetwork = true; + te.updateBlock(); + } + return true; + } + return false; + } + + private void breakNetwork() { + master = null; + inNetwork = false; + for (BlockCoord c : getSurroundingCoords()) { + TileEntity te = c.getTileEntity(worldObj); + if(te instanceof TileTelePad) { + ((TileTelePad) te).master = null; + ((TileTelePad) te).inNetwork = false; + ((TileTelePad) te).updateBlock(); + } + } + } + + private List getSurroundingCoords() { + List ret = Lists.newArrayList(); + for (int x = -1; x <= 1; x++) { + for (int z = -1; z <= 1; z++) { + if(x != 0 || z != 0) { + ret.add(new BlockCoord(xCoord + x, yCoord, zCoord + z)); + } + } + } + return ret; + } + + @Override + public boolean canUpdate() { + return true; + } + + @Override + protected void writeCustomNBT(NBTTagCompound root) { + super.writeCustomNBT(root); + energy.writeToNBT(root); + } + + @Override + protected void readCustomNBT(NBTTagCompound root) { + super.readCustomNBT(root); + energy.readFromNBT(root); + autoUpdate = true; + } + + /* ITravelAccessable overrides */ + + @Override + public boolean canSeeBlock(EntityPlayer playerName) { + return isMaster() && inNetwork && getEnergyStored() > 0; + } + + /* IInternalPowerReceiver */ + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return inNetwork && master != null ? master == this ? energy.getMaxReceive() : master.getMaxEnergyRecieved(dir) : 0; + } + + @Override + public int getMaxEnergyStored() { + return inNetwork && master != null ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() : 0; + } + + @Override + public boolean displayPower() { + return inNetwork && master != null; + } + + @Override + public int getEnergyStored() { + return inNetwork && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; + } + + @Override + public void setEnergyStored(int storedEnergy) { + if(inNetwork && master != null) { + if(master == this) { + energy.setEnergyStored(storedEnergy); + } else { + master.setEnergyStored(storedEnergy); + } + } + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return inNetwork && master != null; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return inNetwork && master != null ? master == this ? energy.receiveEnergy(maxReceive, simulate) : master.receiveEnergy(from, maxReceive, simulate) : 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return inNetwork && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return inNetwork && master != null ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() : 0; + } +} diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java index 7b471107..893b25a9 100644 --- a/src/main/java/crazypants/util/Util.java +++ b/src/main/java/crazypants/util/Util.java @@ -21,6 +21,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import com.google.common.base.Charsets; @@ -498,6 +499,19 @@ public class Util { } return result; } + + public static ForgeDirection getDirFromOffset(int xOff, int yOff, int zOff) { + if(xOff != 0 && yOff == 0 && zOff == 0) { + return xOff < 0 ? ForgeDirection.WEST : ForgeDirection.EAST; + } + if(zOff != 0 && yOff == 0 && xOff == 0) { + return zOff < 0 ? ForgeDirection.NORTH : ForgeDirection.SOUTH; + } + if(yOff != 0 && xOff == 0 && zOff == 0) { + return yOff < 0 ? ForgeDirection.DOWN : ForgeDirection.UP; + } + return ForgeDirection.UNKNOWN; + } // copied from WAILA source to avoid API dependency public static String WailaStyle = "\u00A4";