Fixed Shields, Did Armor things

2 files changed, 0 insertions, 156 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java b/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
deleted file mode 100644
index ab27838..0000000
--- a/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package lance5057.tDefense.armor.materials;
-
-import java.util.List;
-
-import net.minecraft.util.text.TextFormatting;
-
-import com.google.common.collect.Lists;
-
-import slimeknights.tconstruct.library.TinkerRegistry;
-import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.client.CustomFontColor;
-import slimeknights.tconstruct.library.materials.AbstractMaterialStats;
-import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.utils.HarvestLevels;
-
-public class MaterialArmor extends AbstractMaterialStats {
-
-	public final static String TYPE = "armor";
-
-	public final static String LOC_Durability = "stat.armor.durability.name";
-	public final static String LOC_DMGReduction = "stat.armor.dmgreduction.name"; //in half shirts
-
-	public final static String LOC_DurabilityDesc = "stat.armor.durability.desc";
-	public final static String LOC_DMGReductionDesc = "stat.armor.dmgreduction.desc";
-
-	public final static String COLOR_Durability = CustomFontColor.valueToColorCode(1f);
-	public final static String COLOR_DMGReduction = CustomFontColor.encodeColor(215, 100, 100);
-
-	public final int durability; // usually between 1 and 1000
-	public final float DMGReduction;
-	// Full 	Full 	Helmet 	Chest 	Legs 	Boots
-	// Leather 	7 		1 		3 		2 		1
-	// Golden 	11	 	2 		5 		3 		1
-	// Chain 	12 		2 		5 		4 		1
-	// Iron 	15 		2 		6 		5 		2
-	// Diamond 	20 		3 		8 		6 		3
-	//in half shirts
-
-	public MaterialArmor(int durability, float DMGReduction/*in half shirts*/) {
-		super(TYPE);
-		this.durability = durability;
-		this.DMGReduction = DMGReduction;
-
-	}
-
-	@Override
-	public List<String> getLocalizedInfo() {
-		List<String> info = Lists.newArrayList();
-
-		info.add(formatDurability(durability));
-		info.add(formatPercentBlocked(DMGReduction));
-
-		return info;
-	}
-
-	public static String formatDurability(int durability) {
-		return formatNumber(LOC_Durability, COLOR_Durability, durability);
-	}
-
-	public static String formatDurability(int durability, int ref) {
-		return String.format("%s: %s%s%s/%s%s", Util.translate(LOC_Durability),
-				CustomFontColor.valueToColorCode((float) durability / (float) ref), Util.df.format(durability),
-				TextFormatting.GRAY.toString(), COLOR_Durability, Util.df.format(ref)) + TextFormatting.RESET;
-	}
-
-	public static String formatPercentBlocked(float percent) {
-		return formatNumber(LOC_DMGReduction, COLOR_DMGReduction, percent*100) + "%";
-	}
-
-	@Override
-	public List<String> getLocalizedDesc() {
-		List<String> info = Lists.newArrayList();
-
-		info.add(Util.translate(LOC_DurabilityDesc));
-		info.add(Util.translate(LOC_DMGReductionDesc));
-
-		return info;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java b/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java
deleted file mode 100644
index 7918b0d..0000000
--- a/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package lance5057.tDefense.armor.materials;
-
-import java.util.List;
-
-import net.minecraft.util.text.TextFormatting;
-
-import com.google.common.collect.Lists;
-
-import slimeknights.tconstruct.library.TinkerRegistry;
-import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.client.CustomFontColor;
-import slimeknights.tconstruct.library.materials.AbstractMaterialStats;
-import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.utils.HarvestLevels;
-
-public class MaterialCloth extends AbstractMaterialStats  {
-
-	public final static String TYPE = "cloth";
-
-	  public final static String LOC_Durability   = "stat.cloth.durability.name";
-	  //public final static String LOC_DMGReduction  = "stat.cloth.percentblocked.name";
-
-	  public final static String LOC_DurabilityDesc    = "stat.cloth.durability.desc";
-	  //public final static String LOC_DMGReductionDesc   = "stat.cloth.percentblocked.desc";
-
-	  public final static String COLOR_Durability = CustomFontColor.valueToColorCode(1f);
-	  //public final static String COLOR_DMGReduction    = CustomFontColor.encodeColor(215, 100, 100);
-	  
-	  public final int durability; // usually between 1 and 1000
-	 // public final int DMGReduction; // vanilla is 33%
-
-	  public MaterialCloth(int durability) {
-	    super(TYPE);
-	    this.durability = durability;
-	    //this.DMGReduction = percentBlocked;
-	    
-	  }
-
-	  @Override
-	  public List<String> getLocalizedInfo() {
-	    List<String> info = Lists.newArrayList();
-
-	    info.add(formatDurability(durability));
-	    //info.add(formatPercentBlocked(DMGReduction));
-
-	    return info;
-	  }
-
-	  public static String formatDurability(int durability) {
-	    return formatNumber(LOC_Durability, COLOR_Durability, durability);
-	  }
-
-	  public static String formatDurability(int durability, int ref) {
-	    return String.format("%s: %s%s%s/%s%s",
-	                         Util.translate(LOC_Durability),
-	                         CustomFontColor.valueToColorCode((float) durability / (float) ref),
-	                         Util.df.format(durability),
-	                         TextFormatting.GRAY.toString(),
-	                         COLOR_Durability,
-	                         Util.df.format(ref))
-	           + TextFormatting.RESET;
-	  }
-
-//	  public static String formatPercentBlocked(int percent) {
-//	    return formatNumber(LOC_DMGReduction, COLOR_DMGReduction, percent) + "%";
-//	  }
-//	  
-	  @Override
-	  public List<String> getLocalizedDesc() {
-	    List<String> info = Lists.newArrayList();
-
-	    info.add(Util.translate(LOC_DurabilityDesc));
-	    //info.add(Util.translate(LOC_DMGReductionDesc));
-
-	    return info;
-	  }
-}