summaryrefslogtreecommitdiff
path: root/src/main/java/gmail
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gmail')
-rw-r--r--src/main/java/gmail/Lance5057/com/HeaterShield.java18
-rw-r--r--src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java3
-rw-r--r--src/main/java/gmail/Lance5057/items/TinkerArmor.java2
3 files changed, 11 insertions, 12 deletions
diff --git a/src/main/java/gmail/Lance5057/com/HeaterShield.java b/src/main/java/gmail/Lance5057/com/HeaterShield.java
index 13875bc..063eb66 100644
--- a/src/main/java/gmail/Lance5057/com/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/com/HeaterShield.java
@@ -1,32 +1,30 @@
package gmail.Lance5057.com;
import java.util.List;
-import java.util.Random;
import mods.battlegear2.api.ISheathed;
import mods.battlegear2.api.shield.IArrowCatcher;
import mods.battlegear2.api.shield.IArrowDisplay;
import mods.battlegear2.api.shield.IShield;
-import mods.battlegear2.api.shield.ShieldType;
-import mods.battlegear2.utils.BattlegearConfig;
-import cpw.mods.fml.relauncher.*;
import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.IProjectile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.*;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.*;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import tconstruct.library.tools.*;
+import tconstruct.library.tools.AbilityHelper;
+import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+
public class HeaterShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
{
int induceDamage = 0;
diff --git a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
index 60e4ee1..014edcd 100644
--- a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
+++ b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
@@ -3,6 +3,7 @@ package gmail.Lance5057.com;
+
import static net.minecraft.util.EnumChatFormatting.DARK_RED;
import static net.minecraft.util.EnumChatFormatting.GOLD;
import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE;
@@ -247,7 +248,7 @@ public void init(FMLInitializationEvent e)
// Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style color, primary color for block use
//Dogbearium
- TConstructClientRegistry.addMaterialRenderMapping(201, "tinker", "Dogbearium", true);
+ TConstructClientRegistry.addMaterialRenderMapping(203, "tinker", "Dogbearium", true);
TConstructRegistry.addToolMaterial(203, "Dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
TinkerTools.registerPatternMaterial("DogbeariumIngot", 2, "Dogbearium");
TConstructRegistry.addDefaultToolPartMaterial(203);
diff --git a/src/main/java/gmail/Lance5057/items/TinkerArmor.java b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
index dd632d4..95d776c 100644
--- a/src/main/java/gmail/Lance5057/items/TinkerArmor.java
+++ b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
@@ -20,7 +20,7 @@ public class TinkerArmor extends ItemArmor
@Override
@SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister)
{
- String itemName = "tinkersdefense:textures/armor/TinkerArmor.png";
+ String itemName = "tinkersdefense:textures/armor/TinkerArmor";
this.itemIcon = par1IconRegister.registerIcon(itemName);
}