New TC jar textures

16 files changed, 263 insertions, 0 deletions

diff --git a/src/main/java/blocks/Block_IchorJar.java b/src/main/java/blocks/Block_IchorJar.java
new file mode 100644
index 0000000000..bc046ae3b4
--- /dev/null
+++ b/src/main/java/blocks/Block_IchorJar.java
@@ -0,0 +1,46 @@
+package blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import thaumcraft.common.blocks.BlockJar;
+import tileentities.TE_IchorJar;
+
+public class Block_IchorJar extends BlockJar {
+	
+	private static Block_IchorJar instance = new Block_IchorJar();
+	
+	private Block_IchorJar() {
+		super();
+	}
+	
+	public static Block_IchorJar getInstance() {
+		return instance;
+	}
+	
+	public void registerBlock() {
+		final String blockName = "kekztech_ichorjar_block";
+		super.setBlockName(blockName);
+		GameRegistry.registerBlock(getInstance(), blockName);
+	}
+	
+	@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:jar_side_void");
+		super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom");
+	}
+	
+	@Override
+	public TileEntity createTileEntity(World world, int meta) {
+		return new TE_IchorJar();
+	}
+	
+}
diff --git a/src/main/java/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/blocks/Block_ThaumiumReinforcedJar.java
new file mode 100644
index 0000000000..29736a14f9
--- /dev/null
+++ b/src/main/java/blocks/Block_ThaumiumReinforcedJar.java
@@ -0,0 +1,90 @@
+package blocks;
+
+import java.util.ArrayList;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import items.Item_ThaumiumReinforcedJarFilled;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.common.blocks.BlockJar;
+import thaumcraft.common.blocks.ItemJarFilled;
+import thaumcraft.common.tiles.TileJarFillable;
+import thaumcraft.common.tiles.TileJarFillableVoid;
+import tileentities.TE_ThaumiumReinforcedJar;
+
+public class Block_ThaumiumReinforcedJar extends BlockJar {
+	
+	private static Block_ThaumiumReinforcedJar instance = new Block_ThaumiumReinforcedJar();
+	
+	private Block_ThaumiumReinforcedJar() {
+		super();
+	}
+	
+	public static Block_ThaumiumReinforcedJar getInstance() {
+		return instance;
+	}
+	
+	public void registerBlock() {
+		final String blockName = "kekztech_thaumiumreinforcedjar_block";
+		super.setBlockName(blockName);
+		GameRegistry.registerBlock(getInstance(), blockName);
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister ir) {
+		super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
+		super.iconJarSide = ir.registerIcon("kekztech:jar_side");
+		super.iconJarTop = ir.registerIcon("kekztech:jar_top");
+		super.iconJarTopVoid = ir.registerIcon("kekztech:jar_top_void");
+		super.iconJarSideVoid = ir.registerIcon("kekztech:jar_side_void");
+		super.iconJarBottom = ir.registerIcon("kekztech:jar_bottom");
+	}
+	
+	@Override
+	public TileEntity createTileEntity(World world, int meta) {
+		return new TE_ThaumiumReinforcedJar();
+	}
+	
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
+		final ArrayList<ItemStack> drops = new ArrayList<>();
+		
+		TileEntity te;
+		ItemStack drop;
+		
+		te = world.getTileEntity(x, y, z);
+		if(te != null && te instanceof TileJarFillable) {
+			drop = new ItemStack(Item_ThaumiumReinforcedJarFilled.getInstance());
+			// Empty and no label
+			if(((TileJarFillable) te).amount <= 0 && ((TileJarFillable) te).aspectFilter == null) {
+				drop = new ItemStack(this);
+			}
+			// If is void jar, set meta
+			if(te instanceof TileJarFillableVoid) {
+				drop.setItemDamage(3);
+			}
+			// Non empty, generate filled jar item with contents
+			if(((TileJarFillable) te).amount > 0) {
+				((ItemJarFilled) drop.getItem()).setAspects(drop,
+						(new AspectList()).add(((TileJarFillable) te).aspect, ((TileJarFillable) te).amount));
+			}
+			// has label
+			if(((TileJarFillable) te).aspectFilter != null) {
+				if(!drop.hasTagCompound()) {
+					drop.setTagCompound(new NBTTagCompound());
+				}
+				drop.stackTagCompound.setString("AspectFilter", ((TileJarFillable) te).aspectFilter.getTag());
+			}
+			drops.add(drop);
+		}
+		return drops;
+	}
+	
+}
diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java
new file mode 100644
index 0000000000..19c2ace122
--- /dev/null
+++ b/src/main/java/items/Item_IchorJarFilled.java
@@ -0,0 +1,24 @@
+package items;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import thaumcraft.common.blocks.ItemJarFilled;
+
+public class Item_IchorJarFilled extends ItemJarFilled {
+	
+	private static final Item_IchorJarFilled instance = new Item_IchorJarFilled();
+	
+	private Item_IchorJarFilled() {
+		super();
+	}
+	
+	public static Item_IchorJarFilled getInstance() {
+		return instance;
+	}
+	
+	public void registerItem() {
+		super.setHasSubtypes(false);
+		final String unlocalizedName = "kekztech_ichorjarfilled_item";
+		super.setUnlocalizedName(unlocalizedName);
+		GameRegistry.registerItem(getInstance(), unlocalizedName);
+	}
+}
diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java
new file mode 100644
index 0000000000..cc4be0e247
--- /dev/null
+++ b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java
@@ -0,0 +1,62 @@
+package items;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import thaumcraft.common.blocks.ItemJarFilled;
+
+public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled {
+	
+	private static final Item_ThaumiumReinforcedJarFilled instance = new Item_ThaumiumReinforcedJarFilled();
+	
+	private Item_ThaumiumReinforcedJarFilled() {
+		super();
+	}
+	
+	public static Item_ThaumiumReinforcedJarFilled getInstance() {
+		return instance;
+	}
+	
+	public void registerItem() {
+		super.setHasSubtypes(false);
+		final String unlocalizedName = "kekztech_thaumiumreinforcedjarfilled_item";
+		super.setUnlocalizedName(unlocalizedName);
+		GameRegistry.registerItem(getInstance(), unlocalizedName);
+	}
+	/*
+	@Override
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+			float par8, float par9, float par10) {
+		
+		final Block block = world.getBlock(x, y, z);
+		if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) {
+			side = 1;
+		} else if(block != Blocks.vine && block != Blocks.tallgrass 
+				&& block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
+			// Displace target location if original target can't be replaced
+			if(side == 0) {
+				y--;
+			}
+			if(side == 1) {
+				y++;
+			}
+			if(side == 2) {
+				z--;
+			}
+			if(side == 3) {
+				z++;
+			}
+			if(side == 4) {
+				x--;
+			}
+			if(side == 5) {
+				x++;
+			}
+		}
+		
+		
+	}*/
+}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 368ea6f185..56645e9050 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -2,6 +2,7 @@ package kekztech;
 

 import blocks.Block_ControlRod;

 import blocks.Block_GDCUnit;

+import blocks.Block_IchorJar;

 import blocks.Block_ItemProxyCable;

 import blocks.Block_ItemProxyEndpoint;

 import blocks.Block_ItemProxySource;

@@ -17,6 +18,7 @@ import blocks.Block_TFFTStorageFieldBlockT2;
 import blocks.Block_TFFTStorageFieldBlockT3;

 import blocks.Block_TFFTStorageFieldBlockT4;

 import blocks.Block_TFFTStorageFieldBlockT5;

+import blocks.Block_ThaumiumReinforcedJar;

 import blocks.Block_YSZUnit;

 import cpw.mods.fml.common.Loader;

 import cpw.mods.fml.common.Mod;

@@ -34,6 +36,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;

 import items.ErrorItem;

 import items.Item_Configurator;

+import items.Item_ThaumiumReinforcedJarFilled;

 import items.MetaItem_CraftingComponent;

 import items.MetaItem_ReactorComponent;

 import net.minecraft.item.ItemStack;

@@ -44,11 +47,13 @@ import tileentities.GTMTE_ItemServer;
 import tileentities.GTMTE_ModularNuclearReactor;

 import tileentities.GTMTE_SOFuelCellMK1;

 import tileentities.GTMTE_SOFuelCellMK2;

+import tileentities.TE_IchorJar;

 import tileentities.TE_ItemProxyCable;

 import tileentities.TE_ItemProxyEndpoint;

 import tileentities.TE_ItemProxySource;

 import tileentities.TE_ItemServerIOPort;

 import tileentities.TE_TFFTMultiHatch;

+import tileentities.TE_ThaumiumReinforcedJar;

 import util.Util;

 

 /**

@@ -87,6 +92,9 @@ public class KekzCore {
 		MetaItem_CraftingComponent.getInstance().registerItem();

 		Item_Configurator.getInstance().registerItem();

 		Items.registerOreDictNames();

+		

+		Item_ThaumiumReinforcedJarFilled.getInstance().registerItem();

+		

 		// Blocks

 		Block_YSZUnit.getInstance().registerBlock();

 		Block_GDCUnit.getInstance().registerBlock();

@@ -106,6 +114,10 @@ public class KekzCore {
 		Block_ItemProxyCable.getInstance().registerBlock();

 		Block_ItemProxySource.getInstance().registerBlock();

 		Block_ItemProxyEndpoint.getInstance().registerBlock();

+		

+		Block_ThaumiumReinforcedJar.getInstance().registerBlock();

+		Block_IchorJar.getInstance().registerBlock();

+		

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

 		GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

@@ -113,6 +125,9 @@ public class KekzCore {
 		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

 		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

 		

+		GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");

+		GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");

+		

 		// Register guis

 		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());

 	}

diff --git a/src/main/java/tileentities/TE_IchorJar.java b/src/main/java/tileentities/TE_IchorJar.java
new file mode 100644
index 0000000000..cc3063dc5d
--- /dev/null
+++ b/src/main/java/tileentities/TE_IchorJar.java
@@ -0,0 +1,10 @@
+package tileentities;
+
+import thaumcraft.common.tiles.TileJarFillable;
+
+public class TE_IchorJar extends TileJarFillable {
+	
+	public TE_IchorJar() {
+		super.maxAmount = 4096;
+	}
+}
diff --git a/src/main/java/tileentities/TE_ThaumiumReinforcedJar.java b/src/main/java/tileentities/TE_ThaumiumReinforcedJar.java
new file mode 100644
index 0000000000..946f861f91
--- /dev/null
+++ b/src/main/java/tileentities/TE_ThaumiumReinforcedJar.java
@@ -0,0 +1,10 @@
+package tileentities;
+
+import thaumcraft.common.tiles.TileJarFillable;
+
+public class TE_ThaumiumReinforcedJar extends TileJarFillable {
+	
+	public TE_ThaumiumReinforcedJar() {
+		super.maxAmount = 256;
+	}
+}
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 1fffdf2b4e..c0992809c9 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -74,6 +74,9 @@ item.kekztech_crafting_item.14.name=YSZ Ceramic Plate
 item.kekztech_crafting_item.15.name=GDC Ceramic Plate

 item.kekztech_crafting_item.16.name=Item Server Blade

 

+item.kekztech_thaumiumreinforcedjarfilled_item.name=Thaumium Reinforced Jar

+item.kekztech_ichorjarfilled_item.name=Ichor Jar

+

 tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit

 tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit

 

@@ -96,3 +99,6 @@ tile.kekztech_itemserverdrive_block.name=Item Server Drive
 tile.kekztech_itemserverrackcasing_block.name=Item Server Rack Casing

 tile.kekztech_itemserverioport_block.name=Item Server I/O Port

 

+tile.kekztech_thaumiumreinforcedjar_block.name=Thaumium Reinforced Jar

+tile.kekztech_ichorjar_block.name=Ichor Jar

+

diff --git a/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.png b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.png
new file mode 100644
index 0000000000..075e490985
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_bottom.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.png b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.png
new file mode 100644
index 0000000000..002df614b8
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_side.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.png b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.png
new file mode 100644
index 0000000000..794995c9de
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/ichor_jar_top.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/jar_bottom.png b/src/main/resources/assets/kekztech/textures/blocks/jar_bottom.png
new file mode 100644
index 0000000000..08c88b06c8
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/jar_bottom.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/jar_side.png b/src/main/resources/assets/kekztech/textures/blocks/jar_side.png
new file mode 100644
index 0000000000..16f5ae1946
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/jar_side.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/jar_side_void.png b/src/main/resources/assets/kekztech/textures/blocks/jar_side_void.png
new file mode 100644
index 0000000000..331e06c126
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/jar_side_void.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/jar_top.png b/src/main/resources/assets/kekztech/textures/blocks/jar_top.png
new file mode 100644
index 0000000000..f7afb2e4b3
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/jar_top.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/jar_top_void.png b/src/main/resources/assets/kekztech/textures/blocks/jar_top_void.png
new file mode 100644
index 0000000000..7ba9f054e7
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/jar_top_void.png