Merge pull request #1 from kekzdealer/master

5/22

1 files changed, 222 insertions, 0 deletions

diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
new file mode 100644
index 0000000000..560fd0c37b
--- /dev/null
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -0,0 +1,222 @@
+package common.blocks;
+
+import common.itemBlocks.IB_IchorJar;
+import common.tileentities.TE_IchorJar;
+import common.tileentities.TE_IchorVoidJar;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.common.blocks.BlockJar;
+import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.config.ConfigItems;
+import thaumcraft.common.items.ItemEssence;
+import thaumcraft.common.tiles.TileJarFillable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Block_IchorJar extends BlockJar {
+	
+	private static final Block_IchorJar INSTANCE = new Block_IchorJar();
+	
+	private Block_IchorJar() {
+		super();
+		
+		super.setHardness(12.0F);
+		super.setResistance(3.0f);
+	}
+
+	public static Block registerBlock() {
+		final String blockName = "kekztech_ichorjar_block";
+		INSTANCE.setBlockName(blockName);
+		GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName);
+		
+		return INSTANCE;
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister ir) {
+		super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
+		super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side");
+		super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top");
+		super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void");
+		super.iconJarSideVoid = ir.registerIcon("kekztech:ichor_jar_side_void");
+		super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	@SuppressWarnings({"unchecked"})
+	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+		par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
+		par3List.add(new ItemStack(par1, 1, 3)); // Void jar
+	}
+	
+	@Override
+	public TileEntity createTileEntity(World world, int meta) {
+		if(meta == 3) {
+			return new TE_IchorVoidJar();
+		} else {
+			return new TE_IchorJar();
+		}
+	}
+
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, float f3) {
+		// Call parent method to handle jar emptying, labels stuff etc
+		super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
+		// Interact with Essentia Phials if the player holds one
+		final ItemStack heldItem = player.getHeldItem();
+		if(heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
+			final TileEntity te = world.getTileEntity(x, y, z);
+			if(te instanceof TE_IchorJar) {
+				return dealWithPhial(world, player, x, y, z);
+			} else if(te instanceof TE_IchorVoidJar) {
+				return dealWithPhial(world, player, x, y, z);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Handle compatibility with Essentia Phials
+	 * @param world
+	 * 			Pass through from onBlockActivated()
+	 * @param player
+	 * 			Pass through from onBlockActivated()
+	 * @param x
+	 * 			Pass through from onBlockActivated()
+	 * @param y
+	 * 			Pass through from onBlockActivated()
+	 * @param z
+	 * 			Pass through from onBlockActivated()
+	 * @return Not sure tbh
+	 */
+	private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
+		final TileJarFillable jarTE = (TileJarFillable) world.getTileEntity(x, y, z);
+		final ItemStack heldItem = player.getHeldItem();
+		// Check whether to fill or to drain the phial
+		if(heldItem.getItemDamage() == 0) {
+			if(jarTE.amount >= 8){
+				if (world.isRemote) {
+					player.swingItem();
+					return false;
+				}
+
+				final Aspect jarAspect = Aspect.getAspect(jarTE.aspect.getTag());
+				if(jarTE.takeFromContainer(jarAspect, 8)) {
+					// Take an empty phial from the player's inventory
+					heldItem.stackSize--;
+					// Fill a new phial
+					final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
+					final AspectList phialContent = new AspectList().add(jarAspect, 8);
+					((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
+					// Drop on ground if there's no inventory space
+					if (!player.inventory.addItemStackToInventory(filledPhial)) {
+						world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, filledPhial));
+					}
+
+					world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+					player.inventoryContainer.detectAndSendChanges();
+					return true;
+				}
+			}
+		} else {
+			final AspectList phialContent = ((ItemEssence) ConfigItems.itemEssence).getAspects(heldItem);
+			if(phialContent != null && phialContent.size() == 1) {
+				final Aspect phialAspect = phialContent.getAspects()[0];
+				if(jarTE.amount + 8 <= jarTE.maxAmount && jarTE.doesContainerAccept(phialAspect)) {
+					if (world.isRemote) {
+						player.swingItem();
+						return false;
+					}
+
+					if(jarTE.addToContainer(phialAspect, 8) == 0) {
+						world.markBlockForUpdate(x, y, z);
+						jarTE.markDirty();
+						heldItem.stackSize--;
+						// Drop on ground if there's no inventory space
+						if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
+							world.spawnEntityInWorld(new EntityItem(world, (float)x + 0.5F, (float)y + 0.5F, (float)z + 0.5F, new ItemStack(ConfigItems.itemEssence, 1, 0)));
+						}
+
+						world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
+						player.inventoryContainer.detectAndSendChanges();
+						return true;
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
+		final TileEntity te = world.getTileEntity(x, y, z);
+		if(te instanceof TE_IchorJar) {
+			final TE_IchorJar ite = (TE_IchorJar) te;
+			breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
+		} else if(te instanceof  TE_IchorVoidJar) {
+			final TE_IchorVoidJar ite = (TE_IchorVoidJar) te;
+			breakBlockWarpy(world, x, y, z, ite.amount, 200, 6.0F);
+		}
+		super.breakBlock(world, x, y, z, par5, par6);
+	}
+
+	private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength){
+		if(fillAmount > 0) {
+			// Create a decent explosion in the center of the block (TNT has strength 4.0F)
+			world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
+
+			// Place a lot of Flux in the area
+			final int limit = fillAmount / 16;
+			int created = 0;
+			for(int i = 0; i < iterations; i++) {
+				final int xf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+				final int yf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+				final int zf = x + world.rand.nextInt(7) - world.rand.nextInt(7);
+				if(world.isAirBlock(xf, yf, zf)) {
+					if(yf > y) {
+						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGas, 8, 3);
+					} else {
+						world.setBlock(xf, yf, zf, ConfigBlocks.blockFluxGoo, 8, 3);
+					}
+
+					if(created++ > limit) {
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
+		return new ArrayList<>(Collections.singleton(new ItemStack(this, 1, (meta == 3) ? 3 : 0)));
+	}
+
+	@Override
+	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
+	}
+
+	@Override
+	public boolean canDropFromExplosion(Explosion e) {
+		return false;
+	}
+}