A lot of failing work on the missing textures

Fixed isaac rendering Fixed soul harvesting
sirolf2009 · Aug 8, 2013 · bd5c847 · bd5c847
1 parent b5108af
commit bd5c847
Show file tree

Hide file tree

Showing 55 changed files with 157 additions and 166 deletions.
diff --git a/build.xml b/build.xml
@@ -1,95 +1,98 @@
-<?xml version="1.0" ?> 
-<project name="Necromancy" default="build">
-
-	<property file="build.properties" prefix="build"/>
-	<property file="build_number.properties" prefix="build_number"/>
-
-	<target name="clean">
-		<delete file="${build.dir.development}\forge\mcp\src\minecraft\mcmod.info" />
-		<delete dir="${build.dir.development}\forge\mcp\src\minecraft\com\sirolf2009" />
-		<delete dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
-	</target>
-
-	<target name="prep">
-		<copy todir="${build.dir.development}\forge\mcp\src\minecraft">
-					<fileset dir="${build.dir.development}\source\Necromancy\common\" />
-		</copy>
-		<copy todir="${build.dir.development}\forge\mcp\src\minecraft">
-			<fileset dir="${build.dir.development}\source\NecroAPI\common\" />
-		</copy>
-	</target>
-
-	<target name="replace_tokens">
-		<replace dir="${build.dir.development}\forge\mcp\src\minecraft" token="@VERSION@" value="${release.mod.version}" />
-		<replace dir="${build.dir.development}\forge\mcp\src\minecraft" token="@FINGERPRINT@" value="${release.mod.fingerprint}" />
-	</target>
-
-	<target name="recompile">
-		<exec dir="${build.dir.development}\forge\mcp" executable="cmd" osfamily="windows">
-			<arg line="/c recompile.bat" />
-		</exec>
-		<exec dir="${build.dir.development}\forge\mcp" executable="bash" osfamily="unix">
-			<arg line="recompile.sh" />
-		</exec>
-	</target>
-
-	<target name="reobfuscate">
-		<exec dir="${build.dir.development}\forge\mcp" executable="cmd" osfamily="windows">
-			<arg line="/c reobfuscate_srg.bat" />
-		</exec>
-		<exec dir="${build.dir.development}\forge\mcp" executable="bash" osfamily="unix">
-			<arg line="reobfuscate_srg.sh" />
-		</exec>
-	</target>
-
-	<target name="sign_jar">
-		<signjar jar="${build.dir.release}\Necromancy-${release.mod.version}-${release.minecraft.version}.jar" keystore="${build.keystore.location}" alias="${build.keystore.alias}" storepass="${build.keystore.password}" />
-	</target>
-
-	<target name="build">
-		<!-- Prep for the build -->
-		<antcall target="clean" />
-		<antcall target="prep" />
-		<antcall target="recompile" />		
-		<antcall target="reobfuscate" />
-
-		<!-- Build the jar -->
-		<mkdir dir="${build.dir.release}" />
-		<jar destfile="${build.dir.release}\Necromancy-universal-${release.mod.version}.jar">
-			<fileset dir="${build.dir.development}\forge\mcp\src\minecraft\" includes="mcmod.info" />
-			<fileset dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
-			<fileset dir="${build.dir.development}\source\Necromancy\resources" excludes="**/xcf/**" />
-		</jar>
-
-		<!-- Clean up the MCP source now that we are done -->
-		<antcall target="clean" />
-	</target>
-
-	<target name="release">
-		<!-- Prep for the build -->
-       	 	<record name="log.txt" action="start"/>
-       	 	<echo>Did you set the MCMod.info version?</echo>
-		<input message="Mod version:" addproperty="release.mod.version" />
-		<input message="Minecraft version:" addproperty="release.minecraft.version" />
-		<antcall target="clean" />
-		<antcall target="prep" />
-		<antcall target="replace_tokens" />
-		<antcall target="recompile" />		
-		<antcall target="reobfuscate" />
-
-		<!-- Build the jar -->
-		<mkdir dir="${build.dir.release}" />
-		<jar destfile="${build.dir.release}\Necromancy-${release.mod.version}-${release.minecraft.version}.jar">
-			<fileset dir="${build.dir.development}\forge\mcp\src\minecraft\" includes="mcmod.info" />
-			<fileset dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
-			<fileset dir="${build.dir.development}\source\Necromancy\resources" excludes="**/xcf/**" />
-		</jar>
-
-		<!-- Sign the finished jar -->
-		<antcall target="sign_jar" />
-
-		<!-- Clean up the MCP source now that we are done -->
-		<antcall target="clean" />
-        	<record name="log.txt" action="stop"/>
-	</target>
+<?xml version="1.0" ?> 
+<project name="Necromancy" default="build">
+
+	<property file="build.properties" prefix="build"/>
+	<property file="build_number.properties" prefix="build_number"/>
+
+	<target name="clean">
+		<delete file="${build.dir.development}\forge\mcp\src\minecraft\mcmod.info" />
+		<delete dir="${build.dir.development}\forge\mcp\src\minecraft\com\sirolf2009" />
+		<delete dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
+	</target>
+
+	<target name="prep">
+		<copy todir="${build.dir.development}\forge\mcp\src\minecraft">
+					<fileset dir="${build.dir.development}\source\Necromancy\common\" />
+		</copy>
+		<copy todir="${build.dir.development}\forge\mcp\src\minecraft">
+					<fileset dir="${build.dir.development}\source\Necromancy\resources\" />
+		</copy>
+		<copy todir="${build.dir.development}\forge\mcp\src\minecraft">
+			<fileset dir="${build.dir.development}\source\NecroAPI\common\" />
+		</copy>
+	</target>
+
+	<target name="replace_tokens">
+		<replace dir="${build.dir.development}\forge\mcp\src\minecraft" token="@VERSION@" value="${release.mod.version}" />
+		<replace dir="${build.dir.development}\forge\mcp\src\minecraft" token="@FINGERPRINT@" value="${release.mod.fingerprint}" />
+	</target>
+
+	<target name="recompile">
+		<exec dir="${build.dir.development}\forge\mcp" executable="cmd" osfamily="windows">
+			<arg line="/c recompile.bat" />
+		</exec>
+		<exec dir="${build.dir.development}\forge\mcp" executable="bash" osfamily="unix">
+			<arg line="recompile.sh" />
+		</exec>
+	</target>
+
+	<target name="reobfuscate">
+		<exec dir="${build.dir.development}\forge\mcp" executable="cmd" osfamily="windows">
+			<arg line="/c reobfuscate_srg.bat" />
+		</exec>
+		<exec dir="${build.dir.development}\forge\mcp" executable="bash" osfamily="unix">
+			<arg line="reobfuscate_srg.sh" />
+		</exec>
+	</target>
+
+	<target name="sign_jar">
+		<signjar jar="${build.dir.release}\Necromancy-${release.mod.version}-${release.minecraft.version}.jar" keystore="${build.keystore.location}" alias="${build.keystore.alias}" storepass="${build.keystore.password}" />
+	</target>
+
+	<target name="build">
+		<!-- Prep for the build -->
+		<antcall target="clean" />
+		<antcall target="prep" />
+		<antcall target="recompile" />		
+		<antcall target="reobfuscate" />
+
+		<!-- Build the jar -->
+		<mkdir dir="${build.dir.release}" />
+		<jar destfile="${build.dir.release}\Necromancy-universal-${release.mod.version}.jar">
+			<fileset dir="${build.dir.development}\forge\mcp\src\minecraft\" includes="mcmod.info" />
+			<fileset dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
+			<fileset dir="${build.dir.development}\source\Necromancy\resources" excludes="**/xcf/**" />
+		</jar>
+
+		<!-- Clean up the MCP source now that we are done -->
+		<antcall target="clean" />
+	</target>
+
+	<target name="release">
+		<!-- Prep for the build -->
+       	 	<record name="log.txt" action="start"/>
+       	 	<echo>Did you set the MCMod.info version?</echo>
+		<input message="Mod version:" addproperty="release.mod.version" />
+		<input message="Minecraft version:" addproperty="release.minecraft.version" />
+		<antcall target="clean" />
+		<antcall target="prep" />
+		<antcall target="replace_tokens" />
+		<antcall target="recompile" />		
+		<antcall target="reobfuscate" />
+
+		<!-- Build the jar -->
+		<mkdir dir="${build.dir.release}" />
+		<jar destfile="${build.dir.release}\Necromancy-${release.mod.version}-${release.minecraft.version}.jar">
+			<fileset dir="${build.dir.development}\forge\mcp\src\minecraft\" includes="mcmod.info" />
+			<fileset dir="${build.dir.development}\forge\mcp\reobf\minecraft" />
+			<fileset dir="${build.dir.development}\source\Necromancy\resources" excludes="**/xcf/**" />
+		</jar>
+
+		<!-- Sign the finished jar -->
+		<antcall target="sign_jar" />
+
+		<!-- Clean up the MCP source now that we are done -->
+		<antcall target="clean" />
+        	<record name="log.txt" action="stop"/>
+	</target>
 </project>
diff --git a/common/com/sirolf2009/necromancy/client/model/ModelScytheSpecial.java b/common/com/sirolf2009/necromancy/client/model/ModelScytheSpecial.java
@@ -20,9 +20,9 @@ public class ModelScytheSpecial extends ModelBase {
     ModelRenderer BladeBaseRight;
     ModelRenderer BladeBaseLeft;
 
-    private ResourceLocation metal = new ResourceLocation("necromancy:"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/SwordMetal.jpg");
-    private ResourceLocation cloth = new ResourceLocation("necromancy:"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/cloth.jpg");
-    private ResourceLocation gun = new ResourceLocation("necromancy:"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/GunTex.jpg");
+    private ResourceLocation metal = new ResourceLocation(ReferenceNecromancy.MOD_ID+":"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/SwordMetal.jpg");
+    private ResourceLocation cloth = new ResourceLocation(ReferenceNecromancy.MOD_ID+":"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/cloth.jpg");
+    private ResourceLocation gun = new ResourceLocation(ReferenceNecromancy.MOD_ID+":"+ReferenceNecromancy.LOC_RESOURCES_TEXTURES_MODELS + "/GunTex.jpg");
 
     public ItemScytheRenderer renderer;
     private IModelCustom scytheSpecial;

diff --git a/common/com/sirolf2009/necromancy/client/renderer/RenderIsaac.java b/common/com/sirolf2009/necromancy/client/renderer/RenderIsaac.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
 
 import com.sirolf2009.necromancy.entity.EntityIsaacBody;
@@ -16,15 +17,15 @@ public RenderIsaac(ModelBase par1ModelBase, float par2) {
 
     @Override
     public void doRenderLiving(EntityLiving el, double d1, double d2, double d3, float f1, float f2) {
-        renderIsaacNormal((EntityIsaacBody) el, d1, d2, d3, f1, f2);
+        renderIsaacNormal(el, d1, d2, d3, f1, f2);
     }
 
     @Override
     public void doRender(Entity el, double d1, double d2, double d3, float f1, float f2) {
-        renderIsaacNormal((EntityIsaacBody) el, d1, d2, d3, f1, f2);
+        renderIsaacNormal((EntityLiving)el, d1, d2, d3, f1, f2);
     }
 
-    public void renderIsaacNormal(EntityIsaacBody em, double d1, double d2, double d3, float f1, float f2) {
+    public void renderIsaacNormal(EntityLiving em, double d1, double d2, double d3, float f1, float f2) {
         super.doRenderLiving(em, d1, d2, d3, f1, f2);
     }
 

diff --git a/common/com/sirolf2009/necromancy/client/renderer/RenderIsaacBlood.java b/common/com/sirolf2009/necromancy/client/renderer/RenderIsaacBlood.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
 
 import com.sirolf2009.necromancy.entity.EntityIsaacBody;
@@ -16,15 +17,15 @@ public RenderIsaacBlood(ModelBase par1ModelBase, float par2) {
 
     @Override
     public void doRenderLiving(EntityLiving el, double d1, double d2, double d3, float f1, float f2) {
-        renderIsaacNormal((EntityIsaacBody) el, d1, d2, d3, f1, f2);
+        renderIsaacNormal(el, d1, d2, d3, f1, f2);
     }
 
     @Override
     public void doRender(Entity el, double d1, double d2, double d3, float f1, float f2) {
-        renderIsaacNormal((EntityIsaacBody) el, d1, d2, d3, f1, f2);
+        renderIsaacNormal((EntityLiving)el, d1, d2, d3, f1, f2);
     }
 
-    public void renderIsaacNormal(EntityIsaacBody em, double d1, double d2, double d3, float f1, float f2) {
+    public void renderIsaacNormal(EntityLiving em, double d1, double d2, double d3, float f1, float f2) {
         super.doRenderLiving(em, d1, d2, d3, f1, f2);
     }
 

diff --git a/common/com/sirolf2009/necromancy/core/proxy/ClientProxy.java b/common/com/sirolf2009/necromancy/core/proxy/ClientProxy.java
@@ -5,6 +5,7 @@
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fluids.FluidRegistry;
 
+import com.sirolf2009.necromancy.Necromancy;
 import com.sirolf2009.necromancy.block.BlockNecromancy;
 import com.sirolf2009.necromancy.client.model.ModelIsaacHead;
 import com.sirolf2009.necromancy.client.model.ModelIsaacNormal;
@@ -35,13 +36,16 @@
 import com.sirolf2009.necromancy.entity.EntityTearBlood;
 import com.sirolf2009.necromancy.entity.EntityTeddy;
 import com.sirolf2009.necromancy.item.ItemNecromancy;
+import com.sirolf2009.necromancy.lib.ConfigurationNecromancy;
+import com.sirolf2009.necromancy.lib.ReferenceNecromancy;
 import com.sirolf2009.necromancy.tileentity.TileEntityAltar;
 import com.sirolf2009.necromancy.tileentity.TileEntitySewing;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.registry.VillagerRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -53,6 +57,7 @@ public class ClientProxy extends CommonProxy {
     public void init() {
         super.init();
         mc = FMLClientHandler.instance().getClient();
+
         RenderingRegistry.registerEntityRenderingHandler(EntityMinion.class, new RenderMinion());
         RenderingRegistry.registerEntityRenderingHandler(EntityTeddy.class, new RenderTeddy(new ModelTeddy(), 0.3F));
         RenderingRegistry.registerEntityRenderingHandler(EntityNightCrawler.class, new RenderNightCrawler(new ModelNightCrawler(), 0.3F));
@@ -62,14 +67,21 @@ public void init() {
         RenderingRegistry.registerEntityRenderingHandler(EntityIsaacHead.class, new RenderIsaacBlood(new ModelIsaacHead(), 0.3F));
         RenderingRegistry.registerEntityRenderingHandler(EntityTear.class, new RenderTear());
         RenderingRegistry.registerEntityRenderingHandler(EntityTearBlood.class, new RenderTearBlood());
+
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAltar.class, new TileEntityAltarRenderer());
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySewing.class, new TileEntitySewingRenderer());
+
         MinecraftForgeClient.registerItemRenderer(BlockNecromancy.altar.blockID, new TileEntityAltarRenderer());
         MinecraftForgeClient.registerItemRenderer(BlockNecromancy.sewing.blockID, new TileEntitySewingRenderer());
-        FluidRegistry.registerFluid(BlockNecromancy.fluidBlood);
         MinecraftForgeClient.registerItemRenderer(ItemNecromancy.scythe.itemID, new ItemScytheRenderer());
         MinecraftForgeClient.registerItemRenderer(ItemNecromancy.scytheBone.itemID, new ItemScytheBoneRenderer());
         MinecraftForgeClient.registerItemRenderer(ItemNecromancy.necronomicon.itemID, new ItemNecronomiconRenderer());
+
+        VillagerRegistry.instance().registerVillagerSkin(ConfigurationNecromancy.NecroVillagerID, ReferenceNecromancy.TEXTURES_ENTITIES_NECROMANCER);
+        VillagerRegistry.instance().registerVillageTradeHandler(ConfigurationNecromancy.NecroVillagerID, Necromancy.PacketHandler);
+
+        FluidRegistry.registerFluid(BlockNecromancy.fluidBlood);
+
         KeyBindingRegistry.registerKeyBinding(new KeyHandlerNecro());
     }
 

diff --git a/common/com/sirolf2009/necromancy/entity/EntityNecromancy.java b/common/com/sirolf2009/necromancy/entity/EntityNecromancy.java
@@ -29,6 +29,8 @@
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.common.registry.VillagerRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class EntityNecromancy {
 
@@ -63,9 +65,6 @@ public static void initEntities() {
         EntityRegistry.registerModEntity(EntityTear.class, "TearNormal", 6, Necromancy.Instance, 144, 2, true);
         EntityRegistry.registerModEntity(EntityTearBlood.class, "TearBlood", 7, Necromancy.Instance, 144, 2, true);
 
-        VillagerRegistry.instance().registerVillagerSkin(ConfigurationNecromancy.NecroVillagerID, ReferenceNecromancy.TEXTURES_ENTITIES_NECROMANCER);
-        VillagerRegistry.instance().registerVillageTradeHandler(ConfigurationNecromancy.NecroVillagerID, Necromancy.PacketHandler);
-
         NecroEntityRegistry.RegisterEntity(new NecroEntitySkeleton());
         NecroEntityRegistry.RegisterEntity(new NecroEntityZombie());
         NecroEntityRegistry.RegisterEntity(new NecroEntityPig());

diff --git a/common/com/sirolf2009/necromancy/item/ItemGeneric.java b/common/com/sirolf2009/necromancy/item/ItemGeneric.java
@@ -94,8 +94,8 @@ public static ItemStack getItemStackFromName(String name, int amount) {
     @Override
     public void registerIcons(IconRegister iconRegister) {
         for (int index = 0; index < names.length; index++) {
-            String path = names[index].replace(" ", "");
-            icons[index] = iconRegister.registerIcon("necromancy:" + path);
+            String path = names[index].replace(" ", "").toLowerCase();
+            icons[index] = iconRegister.registerIcon("necromancy:"+path.toLowerCase());
         }
         tearBlood = iconRegister.registerIcon("necromancy:BloodTear");
         tearNormal = iconRegister.registerIcon("necromancy:Tear");

diff --git a/common/com/sirolf2009/necromancy/item/ItemScythe.java b/common/com/sirolf2009/necromancy/item/ItemScythe.java
@@ -28,7 +28,8 @@ public ItemScythe(int par1, EnumToolMaterial material) {
     @Override
     public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
         par1ItemStack.damageItem(1, par3EntityLivingBase);
-        if (par2EntityLivingBase.func_110138_aP() <= 0)
+        System.out.println("hit entity, life = "+par2EntityLivingBase.func_110143_aJ());
+        if (par2EntityLivingBase.func_110143_aJ() <= 0)
             if (((EntityPlayer) par3EntityLivingBase).inventory.consumeInventoryItem(Item.glassBottle.itemID)) {
                 ((EntityPlayer) par3EntityLivingBase).inventory.addItemStackToInventory(ItemGeneric.getItemStackFromName("Soul in a Jar"));
                 if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
@@ -39,6 +40,6 @@ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiv
                 }
                 par2EntityLivingBase.motionY = 10000;
             }
-        return true;
+        return false;
     }
 }