Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renamed power gauntlet to power fist

Browse source
This commit is contained in:
MachineMuse 2013-05-28 00:26:47 -06:00
parent 8768e4d4d9
commit 9b4df68723
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/net/machinemuse/powersuits/client/render/item/ToolRenderer.java
View file

@ -2,7 +2,7 @@ package net.machinemuse.powersuits.client.render.item;
import net.machinemuse.general.geometry.Colour; import net.machinemuse.general.geometry.Colour;
import net.machinemuse.powersuits.common.ModularPowersuits; import net.machinemuse.powersuits.common.ModularPowersuits;
import net.machinemuse.powersuits.item.ItemPowerGauntlet; import net.machinemuse.powersuits.item.ItemPowerFist;
import net.machinemuse.utils.render.MuseRenderer; import net.machinemuse.utils.render.MuseRenderer;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.entity.EntityClientPlayerMP;
@ -55,7 +55,7 @@ public class ToolRenderer extends Render implements IItemRenderer {
@Override @Override
public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) { public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) {
boolean drawIcon = false; boolean drawIcon = false;
ItemPowerGauntlet item = (ItemPowerGauntlet) itemStack.getItem(); ItemPowerFist item = (ItemPowerFist) itemStack.getItem();
Colour colour = item.getColorFromItemStack(itemStack); Colour colour = item.getColorFromItemStack(itemStack);
Colour glow = item.getColorFromItemStack(itemStack); Colour glow = item.getColorFromItemStack(itemStack);

4
src/minecraft/net/machinemuse/powersuits/common/Config.java
View file

@ -63,7 +63,7 @@ public class Config {
public static int chestID; public static int chestID;
public static int legsID; public static int legsID;
public static int bootsID; public static int bootsID;
public static int gauntletID; public static int fistID;
private static Configuration config; private static Configuration config;
@ -86,7 +86,7 @@ public class Config {
chestID = config.getItem("Power Armor Torso", 24772).getInt(); chestID = config.getItem("Power Armor Torso", 24772).getInt();
legsID = config.getItem("Power Armor Legs", 24773).getInt(); legsID = config.getItem("Power Armor Legs", 24773).getInt();
bootsID = config.getItem("Power Armor Feet", 24774).getInt(); bootsID = config.getItem("Power Armor Feet", 24774).getInt();
gauntletID = config.getItem("Power Tool", 24775).getInt(); fistID = config.getItem("Power Tool", 24775).getInt();
config.save(); config.save();
} }

4
src/minecraft/net/machinemuse/powersuits/common/ModularPowersuits.java
View file

@ -59,7 +59,7 @@ public class ModularPowersuits {
public static ItemPowerArmorChestplate powerArmorTorso; public static ItemPowerArmorChestplate powerArmorTorso;
public static ItemPowerArmorLeggings powerArmorLegs; public static ItemPowerArmorLeggings powerArmorLegs;
public static ItemPowerArmorBoots powerArmorFeet; public static ItemPowerArmorBoots powerArmorFeet;
public static ItemPowerGauntlet powerTool; public static ItemPowerFist powerTool;
public static ItemComponent components; public static ItemComponent components;
public static BlockTinkerTable tinkerTable; public static BlockTinkerTable tinkerTable;
public static BlockLuxCapacitor luxCapacitor; public static BlockLuxCapacitor luxCapacitor;
@ -118,7 +118,7 @@ public class ModularPowersuits {
powerArmorTorso = new ItemPowerArmorChestplate(Config.chestID); powerArmorTorso = new ItemPowerArmorChestplate(Config.chestID);
powerArmorLegs = new ItemPowerArmorLeggings(Config.legsID); powerArmorLegs = new ItemPowerArmorLeggings(Config.legsID);
powerArmorFeet = new ItemPowerArmorBoots(Config.bootsID); powerArmorFeet = new ItemPowerArmorBoots(Config.bootsID);
powerTool = new ItemPowerGauntlet(); powerTool = new ItemPowerFist();
tinkerTable = new BlockTinkerTable(); tinkerTable = new BlockTinkerTable();
luxCapacitor = new BlockLuxCapacitor(); luxCapacitor = new BlockLuxCapacitor();
components = new ItemComponent(); components = new ItemComponent();

4
src/minecraft/net/machinemuse/powersuits/event/HarvestEventHandler.java
View file

@ -3,7 +3,7 @@ package net.machinemuse.powersuits.event;
import net.machinemuse.api.IModularItem; import net.machinemuse.api.IModularItem;
import net.machinemuse.api.ModuleManager; import net.machinemuse.api.ModuleManager;
import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IBlockBreakingModule;
import net.machinemuse.powersuits.item.ItemPowerGauntlet; import net.machinemuse.powersuits.item.ItemPowerFist;
import net.machinemuse.utils.MuseItemUtils; import net.machinemuse.utils.MuseItemUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -17,7 +17,7 @@ public class HarvestEventHandler {
EntityPlayer player = event.entityPlayer; EntityPlayer player = event.entityPlayer;
Block block = event.block; Block block = event.block;
ItemStack stack = player.inventory.getCurrentItem(); ItemStack stack = player.inventory.getCurrentItem();
if (stack != null && stack.getItem() instanceof ItemPowerGauntlet && ((ItemPowerGauntlet) stack.getItem()).canHarvestBlock(stack, block, 0, player)) { if (stack != null && stack.getItem() instanceof ItemPowerFist && ((ItemPowerFist) stack.getItem()).canHarvestBlock(stack, block, 0, player)) {
event.success = true; event.success = true;
} }
} }

6
src/minecraft/net/machinemuse/powersuits/item/ItemPowerGauntlet.scala → src/minecraft/net/machinemuse/powersuits/item/ItemPowerFist.scala
View file

@ -30,7 +30,7 @@ import net.minecraft.world.World
* *
* @author MachineMuse * @author MachineMuse
*/ */
class ItemPowerGauntlet extends ItemElectricTool(Config.gauntletID, 0, EnumToolMaterial.EMERALD, new Array[Block](0)) class ItemPowerFist extends ItemElectricTool(Config.fistID, 0, EnumToolMaterial.EMERALD, new Array[Block](0))
with IModularItem with IModularItem
with IToolGrafter with IToolGrafter
with OmniWrench { with OmniWrench {
@ -39,8 +39,8 @@ with OmniWrench {
setMaxDamage(0) setMaxDamage(0)
this.damageVsEntity = 1 this.damageVsEntity = 1
setCreativeTab(Config.getCreativeTab) setCreativeTab(Config.getCreativeTab)
setUnlocalizedName("powerGauntlet") setUnlocalizedName("powerFist")
LanguageRegistry.addName(this, "Power Gauntlet") LanguageRegistry.addName(this, "Power Fist")
/** /**

4
src/minecraft/net/machinemuse/utils/MuseCommonStrings.java
View file

@ -4,7 +4,7 @@ import net.machinemuse.api.IPowerModule;
import net.machinemuse.api.ModuleManager; import net.machinemuse.api.ModuleManager;
import net.machinemuse.api.electricity.ElectricAdapter; import net.machinemuse.api.electricity.ElectricAdapter;
import net.machinemuse.powersuits.common.Config; import net.machinemuse.powersuits.common.Config;
import net.machinemuse.powersuits.item.ItemPowerGauntlet; import net.machinemuse.powersuits.item.ItemPowerFist;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -52,7 +52,7 @@ public abstract class MuseCommonStrings {
* their settings. * their settings.
*/ */
public static void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips) { public static void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips) {
if (stack.getItem() instanceof ItemPowerGauntlet) { if (stack.getItem() instanceof ItemPowerFist) {
String mode = MuseItemUtils.getStringOrNull(stack, "Mode"); String mode = MuseItemUtils.getStringOrNull(stack, "Mode");
if (mode != null) { if (mode != null) {
currentTipList.add("Mode:" + MuseStringUtils.wrapFormatTags(mode, MuseStringUtils.FormatCodes.Red)); currentTipList.add("Mode:" + MuseStringUtils.wrapFormatTags(mode, MuseStringUtils.FormatCodes.Red));