From fa5fe1555cdce9d8064d1bc8f816be5ab0a8f635 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Mon, 29 Dec 2014 06:48:01 -0500
Subject: [PATCH] Removed debug stuff ;-;

---
 build.properties                              |   6 +-
 .../AlchemicalWizardry.java                   |  90 +++++++++---------
 .../BloodMagicConfiguration.java              |   2 +-
 .../common/block/BlockDemonPortal.java        |  14 ++-
 .../tileEntity/BlockDemonChest.java           |   2 +-
 .../tileEntity/TEDemonPortal.java             |  36 +++----
 .../common/items/ItemBloodLetterPack.java     |   2 +-
 .../assets/alchemicalwizardry/lang/en_US.lang |   1 +
 .../textures/blocks/DemonPortal.png           | Bin 0 -> 416 bytes
 9 files changed, 82 insertions(+), 71 deletions(-)
 create mode 100644 src/main/resources/assets/alchemicalwizardry/textures/blocks/DemonPortal.png

diff --git a/build.properties b/build.properties
index 525b38d5..d31178dd 100644
--- a/build.properties
+++ b/build.properties
@@ -1,12 +1,12 @@
 #
-#Fri Dec 12 19:27:09 EST 2014
+#Fri Dec 19 08:14:15 EST 2014
 mod_name=BloodMagic
 forge_version=10.13.2.1232
 ccc_version=1.0.4.29
 nei_version=1.0.3.64
 //=Dependency Information
 package_group=com.wayoftime.bloodmagic
-mod_version=1.3.0Beta
+mod_version=1.3.0
 minetweaker_version=Dev-1.7.10-3.0.9B
-build_number=7
 mc_version=1.7.10
+build_number=2
diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
index 16234f4c..ae2e3f18 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
@@ -271,7 +271,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.3.0Beta", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
+@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.3.0", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
 
 public class AlchemicalWizardry
 {
@@ -862,7 +862,7 @@ public class AlchemicalWizardry
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityFireElementalID), new ItemStack[]{incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityShadeElementalID), new ItemStack[]{tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityHolyElementalID), new ItemStack[]{sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
-        SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityMinorDemonGruntID), new ItemStack[]{incendiumStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
+//        SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityMinorDemonGruntID), new ItemStack[]{incendiumStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
         
         //Custom mobs
         EntityRegistry.registerModEntity(EntityFallenAngel.class, "FallenAngel", 20, this, 80, 3, true);
@@ -1158,7 +1158,7 @@ public class AlchemicalWizardry
 //	    if(parseTextFiles)
 //	    	this.parseTextFile();
 	    
-	    this.createItemTextureFiles();
+//	    this.createItemTextureFiles();
     }
 
     public static void initAlchemyPotionRecipes()
@@ -1390,48 +1390,48 @@ public class AlchemicalWizardry
     	CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.cobblestone), 64);
     }
     
-    public void createItemTextureFiles()
-    {
-    	File textFiles = new File("config/BloodMagic/itemJsonFiles");
-    	
-    	File bmDirectory = new File("src/main/resources/assets/alchemicalwizardryJsonFiles");
-        if(!bmDirectory.exists())
-        {
-        	bmDirectory.mkdirs();
-        }
-
-        String[] itemStrings = new String[]{"apple", "apple"};
-        
-        String prefix = "alchemicalwizardry:items/";
-        
-        try
-        {
-        	for(int i=0; i<itemStrings.length; i+=2)
-        	{
-        		if(i+1 < itemStrings.length)
-        		{
-        			File file = new File(bmDirectory, itemStrings[i] + ".json");
-                    {
-                    	String[] strings = getGeneratedStrings(prefix + itemStrings[i + 1]);
-                    	PrintWriter writer = new PrintWriter(file);
-            			for(String stri : strings)
-            			{
-            				writer.println(stri);
-            			}
-            			writer.close();
-                    }
-        		}
-        		
-        	}
-        	
-        } catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        
-        
-    	
-    }
+//    public void createItemTextureFiles()
+//    {
+//    	File textFiles = new File("config/BloodMagic/itemJsonFiles");
+//    	
+//    	File bmDirectory = new File("src/main/resources/assets/alchemicalwizardryJsonFiles");
+//        if(!bmDirectory.exists())
+//        {
+//        	bmDirectory.mkdirs();
+//        }
+//
+//        String[] itemStrings = new String[]{"apple", "apple"};
+//        
+//        String prefix = "alchemicalwizardry:items/";
+//        
+//        try
+//        {
+//        	for(int i=0; i<itemStrings.length; i+=2)
+//        	{
+//        		if(i+1 < itemStrings.length)
+//        		{
+//        			File file = new File(bmDirectory, itemStrings[i] + ".json");
+//                    {
+//                    	String[] strings = getGeneratedStrings(prefix + itemStrings[i + 1]);
+//                    	PrintWriter writer = new PrintWriter(file);
+//            			for(String stri : strings)
+//            			{
+//            				writer.println(stri);
+//            			}
+//            			writer.close();
+//                    }
+//        		}
+//        		
+//        	}
+//        	
+//        } catch (FileNotFoundException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//        
+//        
+//    	
+//    }
     
     public String[] getGeneratedStrings(String itemName)
     {
diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
index 901f681d..31445c7e 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
@@ -136,7 +136,7 @@ public class BloodMagicConfiguration
 		AlchemicalWizardry.ritualDisabledVeilOfEvil = config.get("Ritual Blacklist", "Veil of Evil", false).getBoolean(false);
 		AlchemicalWizardry.ritualDisabledFullStomach = config.get("Ritual Blacklist", "Requiem of the Satiated Stomach", false).getBoolean(false);
 		
-		String tempDemonConfigs = "Temp Demon Configs [2]";
+		String tempDemonConfigs = "Demon Configs";
 		TEDemonPortal.buildingGridDelay = config.get(tempDemonConfigs, "Building Grid Delay", 25).getInt();
 		TEDemonPortal.roadGridDelay = config.get(tempDemonConfigs, "Road Grid Delay", 10).getInt();
 		TEDemonPortal.demonHoardDelay = config.get(tempDemonConfigs, "Demon Hoard Delay", 40).getInt();
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java
index 30e58512..eb3ab934 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java
@@ -1,7 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -13,12 +16,19 @@ public class BlockDemonPortal extends BlockContainer
     public BlockDemonPortal()
     {
         super(Material.rock);
-        setHardness(2.0F);
-        setResistance(5.0F);
+        setHardness(1000);
+        setResistance(10000);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("demonPortal");
     }
     
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister iconRegister)
+    {
+        this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonPortal");
+    }
+    
     @Override
     public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player)
     {
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java
index 13508052..e03030c5 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/BlockDemonChest.java
@@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 
-public class BlockDemonChest extends BlockChest implements IBlockPortalNode, IRoadWard
+public class BlockDemonChest extends BlockChest implements IBlockPortalNode
 {
 	public BlockDemonChest() 
 	{
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
index fd150940..022b2e6f 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java
@@ -46,7 +46,7 @@ public class TEDemonPortal extends TileEntity
 {
 	public DemonType type = DemonType.FIRE;
 	
-	public static boolean printDebug = true;
+	public static boolean printDebug = false;
 	
 	public static int limit = 100;
 	
@@ -1158,23 +1158,23 @@ public class TEDemonPortal extends TileEntity
 
     public void rightClickBlock(EntityPlayer player, int side)
     {
-        if (worldObj.isRemote)
-        {
-            return;
-        }
-
-        this.initialize();
-
-        if (ForgeDirection.getOrientation(side) == ForgeDirection.UP)
-        {
-            this.createRandomBuilding(DemonBuilding.BUILDING_HOUSE, 0);
-        } else if (ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
-        {
-            this.createRandomBuilding(DemonBuilding.BUILDING_PORTAL, 0);
-        } else
-        {
-            this.createRandomRoad();
-        }
+//        if (worldObj.isRemote)
+//        {
+//            return;
+//        }
+//
+//        this.initialize();
+//
+//        if (ForgeDirection.getOrientation(side) == ForgeDirection.UP)
+//        {
+//            this.createRandomBuilding(DemonBuilding.BUILDING_HOUSE, 0);
+//        } else if (ForgeDirection.getOrientation(side) == ForgeDirection.DOWN)
+//        {
+//            this.createRandomBuilding(DemonBuilding.BUILDING_PORTAL, 0);
+//        } else
+//        {
+//            this.createRandomRoad();
+//        }
     }
 
     public int createRandomBuilding(int type, int tier)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java
index b94982ce..183b59a5 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java
@@ -143,7 +143,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
     public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
     {
     	//This is where I need to do the updating
-    	if(world.isRemote)
+    	if(!world.isRemote)
     	{
     		return;
     	}
diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
index 077a71fd..11e8d0d2 100644
--- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
+++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
@@ -57,6 +57,7 @@ tile.blockReagentConduit.name=Alchemy Relay
 tile.lifeEssenceFluidBlock.name=Life Essence
 tile.crystalBlock.fullCrystal.name=Crystal Cluster
 tile.crystalBlock.crystalBrick.name=Crystal Cluster Brick
+tile.demonPortal.name=Demon Portal
 
 #Item Localization
 item.weakBloodOrb.name=Weak Blood Orb
diff --git a/src/main/resources/assets/alchemicalwizardry/textures/blocks/DemonPortal.png b/src/main/resources/assets/alchemicalwizardry/textures/blocks/DemonPortal.png
new file mode 100644
index 0000000000000000000000000000000000000000..0183e979ee6733ee6125c8839be2dd27e51d8115
GIT binary patch
literal 416
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#9*;0Dql#Zmiw{spHZvrm#5q4VH#M&W$Yo$~E=o--Nlj5G&n(GMaQE~LNYP7W
zXJB9y^K@|x(Kw$vDLaV8kfX((W3k*J=ZgQcEroaeop^HBYE7-FiyG=C{E(W@!1CX(
z;eRTZQpXKhM+y6Pq2K?kb5yZZIB9FjwBvTzF@Zx5xE6IZ7Y1<NxvF2&!`rL2sv&7l
zuzZN&wkfWh_aAoZ-P)0t*3)d&aqz?BD_@2Dq9iolYc@6u-e%rEV{x}Zo=4*X$Ci0K
zeX`t+D<%do^|rS3w*If!Kgqjrv60!VFGqcp>SMc>I!1qVIkYvXS1;s?io&E5dym|^
zYJO-@$)bd3XOnmisqFaZx&B3O!oej6kM-WaaL_|4Y0>0LBmG?y7fxHlrd((`t4C>a
z#DmHI?lD#9<UL%oJMdjw>Wd>zubV~I%d?d@Dt!CZQ_k>*;pejZ{h=j~%Rxcs>FVdQ
I&MBb@01`Z<iU0rr

literal 0
HcmV?d00001