From c433734191735b920d66f3d8d372e0358f7296b2 Mon Sep 17 00:00:00 2001 From: MachineMuse Date: Tue, 6 Aug 2013 17:27:56 -0600 Subject: [PATCH] changed mod descriptor to powersuits (All lowercase) --- .../net/machinemuse/general/gui/MuseIcon.java | 2 +- .../client/render/modelspec/DefaultModelSpec.scala | 12 ++++++------ .../net/machinemuse/powersuits/common/Config.java | 2 +- .../powersuits/common/ModularPowersuits.java | 6 +++--- .../powersuits/common/MuseCreativeTab.java | 4 ++-- .../net/machinemuse/utils/render/MuseRenderer.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/minecraft/net/machinemuse/general/gui/MuseIcon.java b/src/minecraft/net/machinemuse/general/gui/MuseIcon.java index 6af6244..de00e9a 100644 --- a/src/minecraft/net/machinemuse/general/gui/MuseIcon.java +++ b/src/minecraft/net/machinemuse/general/gui/MuseIcon.java @@ -9,7 +9,7 @@ import net.minecraft.util.Icon; * @author MachineMuse */ public class MuseIcon { - public static final String ICON_PREFIX = "mmmPowersuits:"; + public static final String ICON_PREFIX = "powersuits:"; // Placeholder icons public static final MuseIcon ORB_1_GREEN = new MuseIcon("greendrone"); diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/modelspec/DefaultModelSpec.scala b/src/minecraft/net/machinemuse/powersuits/client/render/modelspec/DefaultModelSpec.scala index 33b54df..1b994f3 100644 --- a/src/minecraft/net/machinemuse/powersuits/client/render/modelspec/DefaultModelSpec.scala +++ b/src/minecraft/net/machinemuse/powersuits/client/render/modelspec/DefaultModelSpec.scala @@ -14,32 +14,32 @@ import net.minecraft.nbt.NBTTagCompound object DefaultModelSpec { val normalcolour: Colour = Colour.WHITE val glowcolour: Colour = new Colour(17.0 / 255, 78.0 / 255, 1, 1) - val tex = "/mods/mmmPowersuits/textures/models/diffuse.png" + val tex = "/assets/powersuits/textures/models/diffuse.png" def loadDefaultModel: Option[ModelSpec] = { - loadModel("/mods/mmmPowersuits/models/mps_helm.obj", tex.split(";")).map(model => { + loadModel("/assets/powersuits/models/mps_helm.obj", tex.split(";")).map(model => { makeEntries(Head, 0, 0, false, "helm_main;helm_tube_entry1;helm_tubes;helm_tube_entry2".split(";"), model) makeEntries(Head, 0, 1, true, "visor".split(";"), model) model }) - loadModel("/mods/mmmPowersuits/models/mps_arms.obj", tex.split(";")).map(model => { + loadModel("/assets/powersuits/models/mps_arms.obj", tex.split(";")).map(model => { makeEntries(RightArm, 1, 0, false, "arms3".split(";"), model) makeEntries(RightArm, 1, 1, true, "crystal_shoulder_2".split(";"), model) makeEntries(LeftArm, 1, 0, false, "arms2".split(";"), model) makeEntries(LeftArm, 1, 1, true, "crystal_shoulder_1".split(";"), model) model }) - loadModel("/mods/mmmPowersuits/models/mps_chest.obj", tex.split(";")).map(model => { + loadModel("/assets/powersuits/models/mps_chest.obj", tex.split(";")).map(model => { makeEntries(Body, 1, 0, false, "belt;chest_main;polySurface36;backpack;chest_padding".split(";"), model) makeEntries(Body, 1, 1, true, "crystal_belt".split(";"), model) model }) - loadModel("/mods/mmmPowersuits/models/mps_pantaloons.obj", tex.split(";")).map(model => { + loadModel("/assets/powersuits/models/mps_pantaloons.obj", tex.split(";")).map(model => { makeEntries(RightLeg, 2, 0, false, "leg1".split(";"), model) makeEntries(LeftLeg, 2, 0, false, "leg2".split(";"), model) model }) - loadModel("/mods/mmmPowersuits/models/mps_boots.obj", tex.split(";")).map(model => { + loadModel("/assets/powersuits/models/mps_boots.obj", tex.split(";")).map(model => { makeEntries(RightLeg, 3, 0, false, "boots1".split(";"), model) makeEntries(LeftLeg, 3, 0, false, "boots2".split(";"), model) model diff --git a/src/minecraft/net/machinemuse/powersuits/common/Config.java b/src/minecraft/net/machinemuse/powersuits/common/Config.java index 61771cb..5617640 100644 --- a/src/minecraft/net/machinemuse/powersuits/common/Config.java +++ b/src/minecraft/net/machinemuse/powersuits/common/Config.java @@ -105,7 +105,7 @@ public class Config { * @return */ public static String getNetworkChannelName() { - return "mmmPowerSuits"; + return "powerSuits"; } /** diff --git a/src/minecraft/net/machinemuse/powersuits/common/ModularPowersuits.java b/src/minecraft/net/machinemuse/powersuits/common/ModularPowersuits.java index 6865319..209bea4 100644 --- a/src/minecraft/net/machinemuse/powersuits/common/ModularPowersuits.java +++ b/src/minecraft/net/machinemuse/powersuits/common/ModularPowersuits.java @@ -38,7 +38,7 @@ import java.io.File; // Informs forge that this is a base mod class, and gives it some info for the // FML mod list. This is also where it looks to see if your client's version // matches the server's. -@Mod(modid = "mmmPowersuits", +@Mod(modid = "powersuits", name = "MachineMuse's Modular Powersuits", /* @DEPENDENCIES@ */ version = "@MOD_VERSION@" @@ -54,8 +54,8 @@ import java.io.File; // things that add new blocks/items, false for things like Rei's Minimap or // Inventory Tweaks. @NetworkMod(clientSideRequired = true, serverSideRequired = true, - clientPacketHandlerSpec = @SidedPacketHandler(channels = {"mmmPowersuits"}, packetHandler = MusePacketHandler.class), - serverPacketHandlerSpec = @SidedPacketHandler(channels = {"mmmPowersuits"}, packetHandler = MusePacketHandler.class)) + clientPacketHandlerSpec = @SidedPacketHandler(channels = {"powersuits"}, packetHandler = MusePacketHandler.class), + serverPacketHandlerSpec = @SidedPacketHandler(channels = {"powersuits"}, packetHandler = MusePacketHandler.class)) public class ModularPowersuits { public static ItemPowerArmorHelmet powerArmorHead; diff --git a/src/minecraft/net/machinemuse/powersuits/common/MuseCreativeTab.java b/src/minecraft/net/machinemuse/powersuits/common/MuseCreativeTab.java index 8b52f09..b01da1d 100644 --- a/src/minecraft/net/machinemuse/powersuits/common/MuseCreativeTab.java +++ b/src/minecraft/net/machinemuse/powersuits/common/MuseCreativeTab.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.LanguageRegistry; public class MuseCreativeTab extends CreativeTabs { - public static final String NAME = "MMMPowerSuits"; + public static final String NAME = "PowerSuits"; public static MuseCreativeTab instance; public static ItemStack stack; @@ -18,7 +18,7 @@ public class MuseCreativeTab extends CreativeTabs { public MuseCreativeTab(int id, String name) { super(id, name); - LanguageRegistry.instance().addStringLocalization("itemGroup." + NAME, "en_US", "MMMPowersuits"); + LanguageRegistry.instance().addStringLocalization("itemGroup." + NAME, "en_US", "Powersuits"); } @Override diff --git a/src/minecraft/net/machinemuse/utils/render/MuseRenderer.java b/src/minecraft/net/machinemuse/utils/render/MuseRenderer.java index 6905162..4ef21ba 100644 --- a/src/minecraft/net/machinemuse/utils/render/MuseRenderer.java +++ b/src/minecraft/net/machinemuse/utils/render/MuseRenderer.java @@ -47,7 +47,7 @@ public abstract class MuseRenderer { public static final String ITEM_TEXTURE_QUILT = "/gui/items.png"; public static final String BLOCK_TEXTURE_QUILT = "/terrain.png"; - public static final String ICON_PREFIX = "mmmPowersuits:"; + public static final String ICON_PREFIX = "powersuits:"; /** * Does the rotating green circle around the selection, e.g. in GUI.