Repackaged resources

.gitignore

@@ -1,5 +1,6 @@
 /*
 !/resource
+!/resources
 !/src
 !/mcmod.info
 !/build.xml
@@ -8,4 +9,7 @@ src/minecraft/*
 !src/minecraft/net
 
 src/minecraft/net/*
-!src/minecraft/net/machinemuse
+!src/minecraft/net/machinemuse
+
+resources/*
+!resources/machinemuse

build.xml

@@ -24,7 +24,7 @@
 	<property name="dist.dir" value="${build.dir}/dist" />
 	<property name="mcp.dir" value="${forge.dir}/mcp" />
 	<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
-	<property name="resources.dir" value="resource" />
+	<property name="resources.dir" value="resources/machinemuse" />
 
 	<!-- URLs -->
 	<property name="forge.url" value="http://files.minecraftforge.net/minecraftforge/minecraftforge-src-${forge.version}.zip" />
@@ -150,8 +150,9 @@
 		<copy todir="${classes.dir}">
 			<fileset dir="${mcp.dir}/reobf/minecraft" />
 		</copy>
-		<mkdir dir="${classes.dir}/resource" />
-		<copy todir="${classes.dir}/resource">
+		<mkdir dir="${classes.dir}/resources" />
+        <mkdir dir="${classes.dir}/resources/machinemuse" />
+		<copy todir="${classes.dir}/resources/machinemuse">
 			<fileset dir="${resources.dir}" />
 		</copy>
 		<copy todir="${classes.dir}" file="mcmod.info">

mcmod.info

@@ -8,7 +8,7 @@
     "updateUrl": "",
     "authors": [ "MachineMuse" ],
     "credits": "Code by MachineMuse, Icons by WaterCandle, Modeling by SebK",
-    "logoFile": "/resource/mmmpslogo_64.png",
+    "logoFile": "/resources/machinemuse/mmmpslogo_64.png",
     "screenshots": [ ],
     "parent": "",
     "requiredMods": [ "Forge" ],

src/minecraft/net/machinemuse/powersuits/client/render/ToolModel.java

@@ -319,7 +319,7 @@ public class ToolModel extends ModelBase
 		child.rotateAngleZ -= parent.rotateAngleZ;
 	}
 
-	public void render(Entity entity, float scale, boolean isFirstPerson)
+	public void render(Entity entity, float scale, boolean renderTypeIsFirstPerson)
 	{
 		// super.render(entity, f, f1, f2, f3, f4, f5);
 		int numsegments = 16;
@@ -378,10 +378,10 @@ public class ToolModel extends ModelBase
 
 		double scale1 = 1.0 / 16.0;
 		boolean isThisEntity = entity == Minecraft.getMinecraft().renderViewEntity;
-		isFirstPerson = (Minecraft.getMinecraft().gameSettings.thirdPersonView == 0);
+		boolean gameIsFirstPerson = (Minecraft.getMinecraft().gameSettings.thirdPersonView == 0);
 		boolean isInInventoryGui = Minecraft.getMinecraft().currentScreen instanceof GuiInventory
 				|| Minecraft.getMinecraft().currentScreen instanceof GuiContainerCreative;
-		boolean doFirstPersonRender = isThisEntity && isFirstPerson && !isInInventoryGui;
+		boolean doFirstPersonRender = isThisEntity && gameIsFirstPerson && (renderTypeIsFirstPerson || !isInInventoryGui);
 		if (doFirstPersonRender) {
 			// if (entity instanceof EntityPlayer) {
 			// EntityPlayer player = (EntityPlayer) entity;

src/minecraft/net/machinemuse/powersuits/common/Config.java

@@ -30,14 +30,14 @@ import cpw.mods.fml.relauncher.Side;
  * 
  */
 public class Config {
-	public static final String SEBK_ICON_PATH = "/resource/sebkicons.png";
-	public static final String SEBK_ARMOR_PATH = "/resource/sebkarmor.png";
-	public static final String SEBK_ARMORPANTS_PATH = "/resource/sebkarmorpants.png";
-	public static final String WC_ICON_PATH = "/resource/watericons.png";
-	public static final String TINKERTABLE_TEXTURE_PATH = "/resource/tinkertable_tx.png";
-	public static final String BLANK_ARMOR_MODEL_PATH = "/resource/blankarmor.png";
-	public static final String MUSE_ICON_PATH = "/resource/museicons.png";
-	public static final String SEBK_TOOL_TEXTURE = "/resource/tool.png";
+	public static final String SEBK_ICON_PATH = "/resources/machinemuse/sebkicons.png";
+	public static final String SEBK_ARMOR_PATH = "/resources/machinemuse/sebkarmor.png";
+	public static final String SEBK_ARMORPANTS_PATH = "/resources/machinemuse/sebkarmorpants.png";
+	public static final String WC_ICON_PATH = "/resourcs/machinemusee/watericons.png";
+	public static final String TINKERTABLE_TEXTURE_PATH = "/resources/machinemuse/tinkertable_tx.png";
+	public static final String BLANK_ARMOR_MODEL_PATH = "/resources/machinemuse/blankarmor.png";
+	public static final String MUSE_ICON_PATH = "/resources/machinemuse/museicons.png";
+	public static final String SEBK_TOOL_TEXTURE = "/resources/machinemuse/tool.png";
 
 	private static final int[] assignedItemIDs = new int[Items.values().length];
 	private static final int[] assignedBlockIDs = new int[Blocks.values().length];