diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 70777e0..1977d05 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -24,15 +24,7 @@ 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.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.blocks.tiles.*; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; @@ -50,6 +42,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.client.gui.GuiGolem; import thaumcraft.client.renderers.entity.RenderGolemBase; +import thaumcraft.client.renderers.tile.TileEldritchPortalRenderer; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.entities.golems.EntityGolemBase; @@ -99,6 +92,8 @@ public class ClientProxy extends CommonProxy { RenderTileManipulationFocus renderTileManipulationFocus = new RenderTileManipulationFocus(); ClientRegistry.bindTileEntitySpecialRenderer(TileManipulationFocus.class, renderTileManipulationFocus); + ClientRegistry.bindTileEntitySpecialRenderer(TileAdditionalEldritchPortal.class, new TileEldritchPortalRenderer()); + //Items TileArcaneDropper fakeTile = new TileArcaneDropper(); fakeTile.blockMetadata = 8 | ForgeDirection.SOUTH.ordinal(); diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java new file mode 100644 index 0000000..9ee10ab --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java @@ -0,0 +1,38 @@ +package makeo.gadomancy.common.blocks; + +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; +import makeo.gadomancy.common.registration.RegisteredItems; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import thaumcraft.common.blocks.BlockEldritchPortal; +import thaumcraft.common.config.ConfigBlocks; + +/** + * 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:23 + */ +public class BlockAdditionalEldritchPortal extends BlockEldritchPortal { + public BlockAdditionalEldritchPortal() { + setCreativeTab(RegisteredItems.creativeTab); + } + + @Override + public String getUnlocalizedName() { + return ConfigBlocks.blockEldritchPortal.getUnlocalizedName(); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileAdditionalEldritchPortal(); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + + } +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java new file mode 100644 index 0000000..a6e3a2c --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java @@ -0,0 +1,63 @@ +package makeo.gadomancy.common.blocks.tiles; + +import cpw.mods.fml.common.FMLCommonHandler; +import makeo.gadomancy.common.data.ModConfig; +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 thaumcraft.common.tiles.TileEldritchPortal; + +import java.util.List; + +/** + * 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 int count = 0; + + @Override + public void updateEntity() { + this.count += 1; + if ((this.worldObj.isRemote) && ((this.count % 250 == 0) || (this.count == 0))) { + this.worldObj.playSound(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, "thaumcraft:evilportal", 1.0F, 1.0F, false); + } + if ((this.worldObj.isRemote) && (this.opencount < 30)) { + this.opencount += 1; + } + + if ((!this.worldObj.isRemote) && (this.count % 5 == 0)) { + 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; + + //TODO: Teleport to dim + //player.mcServer.getConfigurationManager().transferPlayerToDimension(player, Config.dimensionOuterId, new TeleporterThaumcraft(mServer.worldServerForDimension(Config.dimensionOuterId))); + + if (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), "ENTEROUTER")) { + PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("ENTEROUTER"), player); + Thaumcraft.proxy.getResearchManager().completeResearch(player, "ENTEROUTER"); + } + } else { + player.timeUntilPortal = 100; + + //TODO: Teleport out + //player.mcServer.getConfigurationManager().transferPlayerToDimension(player, 0, new TeleporterThaumcraft(mServer.worldServerForDimension(0))); + } + } + } + } + } +} diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java new file mode 100644 index 0000000..fdde8e3 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java @@ -0,0 +1,34 @@ +package makeo.gadomancy.common.items; + +import makeo.gadomancy.common.Gadomancy; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.IIcon; + +/** + * 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 @ 07.11.2015 00:35 + */ +public class ItemBlockAdditionalEldritchPortal extends ItemBlock { + public ItemBlockAdditionalEldritchPortal(Block block) { + super(block); + } + + private IIcon portalIcon; + + @Override + public void registerIcons(IIconRegister ir) { + super.registerIcons(ir); + portalIcon = ir.registerIcon(Gadomancy.MODID + ":eldritch_portal"); + } + + @Override + public IIcon getIconFromDamage(int damage) { + return portalIcon; + } +} diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index 9f22f3f..5a37d73 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -2,23 +2,9 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; -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.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.blocks.*; +import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.items.ItemBlockAdditionalEldritchPortal; import makeo.gadomancy.common.items.ItemBlockRemoteJar; import makeo.gadomancy.common.items.ItemBlockStoneMachine; import makeo.gadomancy.common.items.ItemNodeManipulator; @@ -56,6 +42,7 @@ public class RegisteredBlocks { public static BlockExtendedNodeJar blockExtendedNodeJar; public static BlockNodeManipulator blockNodeManipulator; public static BlockStoneMachine blockStoneMachine; + public static BlockAdditionalEldritchPortal blockAdditionalEldrichPortal; public static void init() { registerBlocks(); @@ -76,6 +63,7 @@ public class RegisteredBlocks { blockExtendedNodeJar = registerBlock(new BlockExtendedNodeJar()); blockNodeManipulator = registerBlock(new BlockNodeManipulator(), ItemNodeManipulator.class); blockStoneMachine = registerBlock(new BlockStoneMachine(), ItemBlockStoneMachine.class); + blockAdditionalEldrichPortal = registerBlock(new BlockAdditionalEldritchPortal(), ItemBlockAdditionalEldritchPortal.class); } private static T registerBlock(String name, T block) { @@ -111,6 +99,7 @@ public class RegisteredBlocks { registerTile(TileNodeManipulator.class); registerTile(TileManipulatorPillar.class); registerTile(TileManipulationFocus.class); + registerTile(TileAdditionalEldritchPortal.class); } private static void registerTile(Class tile, String name) { diff --git a/src/main/resources/assets/gadomancy/textures/blocks/eldritch_portal.png b/src/main/resources/assets/gadomancy/textures/blocks/eldritch_portal.png new file mode 100644 index 0000000..2beb280 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/blocks/eldritch_portal.png differ