From 48bfff4621a8bf5d3be5ab2d313355eeb420c578 Mon Sep 17 00:00:00 2001 From: MachineMuse Date: Sun, 3 Feb 2013 10:46:34 -0700 Subject: [PATCH] Repackaged resources --- .gitignore | 6 +++++- build.xml | 7 ++++--- mcmod.info | 2 +- .../machinemuse}/blankarmor.png | Bin .../machinemuse}/iconstodo.txt | 0 {resource => resources/machinemuse}/keybind.png | Bin .../machinemuse}/mmmpsicon.png | Bin .../machinemuse}/mmmpslogo_64.png | Bin .../machinemuse}/moreiconideas.txt | 0 .../machinemuse}/sebkarmor.png | Bin .../machinemuse}/sebkarmorpants.png | Bin .../machinemuse}/sebkicons.png | Bin .../machinemuse}/tinkertable_tx.png | Bin {resource => resources/machinemuse}/tool.png | Bin .../machinemuse}/watericons-2.png | Bin .../machinemuse}/watericons.png | Bin .../powersuits/client/render/ToolModel.java | 6 +++--- .../machinemuse/powersuits/common/Config.java | 16 ++++++++-------- 18 files changed, 21 insertions(+), 16 deletions(-) rename {resource => resources/machinemuse}/blankarmor.png (100%) rename {resource => resources/machinemuse}/iconstodo.txt (100%) rename {resource => resources/machinemuse}/keybind.png (100%) rename {resource => resources/machinemuse}/mmmpsicon.png (100%) rename {resource => resources/machinemuse}/mmmpslogo_64.png (100%) rename {resource => resources/machinemuse}/moreiconideas.txt (100%) rename {resource => resources/machinemuse}/sebkarmor.png (100%) rename {resource => resources/machinemuse}/sebkarmorpants.png (100%) rename {resource => resources/machinemuse}/sebkicons.png (100%) rename {resource => resources/machinemuse}/tinkertable_tx.png (100%) rename {resource => resources/machinemuse}/tool.png (100%) rename {resource => resources/machinemuse}/watericons-2.png (100%) rename {resource => resources/machinemuse}/watericons.png (100%) diff --git a/.gitignore b/.gitignore index 142cb96..a335998 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file +!src/minecraft/net/machinemuse + +resources/* +!resources/machinemuse \ No newline at end of file diff --git a/build.xml b/build.xml index 9ee352b..01eaf0f 100644 --- a/build.xml +++ b/build.xml @@ -24,7 +24,7 @@ - + @@ -150,8 +150,9 @@ - - + + + diff --git a/mcmod.info b/mcmod.info index c1f1e1d..0a4f6f6 100644 --- a/mcmod.info +++ b/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" ], diff --git a/resource/blankarmor.png b/resources/machinemuse/blankarmor.png similarity index 100% rename from resource/blankarmor.png rename to resources/machinemuse/blankarmor.png diff --git a/resource/iconstodo.txt b/resources/machinemuse/iconstodo.txt similarity index 100% rename from resource/iconstodo.txt rename to resources/machinemuse/iconstodo.txt diff --git a/resource/keybind.png b/resources/machinemuse/keybind.png similarity index 100% rename from resource/keybind.png rename to resources/machinemuse/keybind.png diff --git a/resource/mmmpsicon.png b/resources/machinemuse/mmmpsicon.png similarity index 100% rename from resource/mmmpsicon.png rename to resources/machinemuse/mmmpsicon.png diff --git a/resource/mmmpslogo_64.png b/resources/machinemuse/mmmpslogo_64.png similarity index 100% rename from resource/mmmpslogo_64.png rename to resources/machinemuse/mmmpslogo_64.png diff --git a/resource/moreiconideas.txt b/resources/machinemuse/moreiconideas.txt similarity index 100% rename from resource/moreiconideas.txt rename to resources/machinemuse/moreiconideas.txt diff --git a/resource/sebkarmor.png b/resources/machinemuse/sebkarmor.png similarity index 100% rename from resource/sebkarmor.png rename to resources/machinemuse/sebkarmor.png diff --git a/resource/sebkarmorpants.png b/resources/machinemuse/sebkarmorpants.png similarity index 100% rename from resource/sebkarmorpants.png rename to resources/machinemuse/sebkarmorpants.png diff --git a/resource/sebkicons.png b/resources/machinemuse/sebkicons.png similarity index 100% rename from resource/sebkicons.png rename to resources/machinemuse/sebkicons.png diff --git a/resource/tinkertable_tx.png b/resources/machinemuse/tinkertable_tx.png similarity index 100% rename from resource/tinkertable_tx.png rename to resources/machinemuse/tinkertable_tx.png diff --git a/resource/tool.png b/resources/machinemuse/tool.png similarity index 100% rename from resource/tool.png rename to resources/machinemuse/tool.png diff --git a/resource/watericons-2.png b/resources/machinemuse/watericons-2.png similarity index 100% rename from resource/watericons-2.png rename to resources/machinemuse/watericons-2.png diff --git a/resource/watericons.png b/resources/machinemuse/watericons.png similarity index 100% rename from resource/watericons.png rename to resources/machinemuse/watericons.png diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/ToolModel.java b/src/minecraft/net/machinemuse/powersuits/client/render/ToolModel.java index bc51239..43909be 100644 --- a/src/minecraft/net/machinemuse/powersuits/client/render/ToolModel.java +++ b/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; diff --git a/src/minecraft/net/machinemuse/powersuits/common/Config.java b/src/minecraft/net/machinemuse/powersuits/common/Config.java index b0fa86f..6357411 100644 --- a/src/minecraft/net/machinemuse/powersuits/common/Config.java +++ b/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];