Start work on porting tool and armor materials, values still need porting over

This commit is contained in:
modmuss50 2019-02-21 17:53:30 +00:00
parent 0b0435a1a2
commit 02d2d9cf1c
9 changed files with 373 additions and 279 deletions

View file

@ -25,11 +25,7 @@
package techreborn.items.armor;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.*;
import reborncore.common.util.ItemUtils;
import techreborn.events.TRRecipeHandler;
@ -40,12 +36,12 @@ public class ItemTRArmour extends ItemArmor {
String repairOreDict = "";
public ItemTRArmour(ArmorMaterial material, EntityEquipmentSlot slot) {
public ItemTRArmour(IArmorMaterial material, EntityEquipmentSlot slot) {
this(material, slot, "");
}
public ItemTRArmour(ArmorMaterial material, EntityEquipmentSlot slot, String repairOreDict) {
super(material, slot, (new Item.Builder()).group(ItemGroup.COMBAT));
public ItemTRArmour(IArmorMaterial material, EntityEquipmentSlot slot, String repairOreDict) {
super(material, slot, (new Item.Properties()).group(ItemGroup.COMBAT));
this.repairOreDict = repairOreDict;
if (slot == EntityEquipmentSlot.HEAD)
//setTranslationKey(material.name().toLowerCase() + "Helmet");

View file

@ -24,6 +24,7 @@
package techreborn.items.tool.vanilla;
import net.minecraft.item.IItemTier;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
@ -32,11 +33,11 @@ public class ItemTRAxe extends ItemAxe {
String repairOreDict = "";
public ItemTRAxe(ToolMaterial material) {
public ItemTRAxe(IItemTier material) {
this(material, "");
}
public ItemTRAxe(ToolMaterial material, String repairOreDict) {
public ItemTRAxe(IItemTier material, String repairOreDict) {
super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F);
this.repairOreDict = repairOreDict;
}

View file

@ -24,6 +24,7 @@
package techreborn.items.tool.vanilla;
import net.minecraft.item.IItemTier;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
@ -34,11 +35,11 @@ public class ItemTRHoe extends ItemHoe {
String repairOreDict = "";
public ItemTRHoe(ToolMaterial material) {
public ItemTRHoe(IItemTier material) {
this(material, "");
}
public ItemTRHoe(ToolMaterial material, String repairOreDict) {
public ItemTRHoe(IItemTier material, String repairOreDict) {
super(material);
this.repairOreDict = repairOreDict;
}

View file

@ -24,6 +24,7 @@
package techreborn.items.tool.vanilla;
import net.minecraft.item.IItemTier;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
@ -32,11 +33,11 @@ public class ItemTRSpade extends ItemSpade {
String repairOreDict = "";
public ItemTRSpade(ToolMaterial material) {
public ItemTRSpade(IItemTier material) {
this(material, "");
}
public ItemTRSpade(ToolMaterial material, String repairOreDict) {
public ItemTRSpade(IItemTier material, String repairOreDict) {
super(material);
this.repairOreDict = repairOreDict;
}

View file

@ -24,6 +24,7 @@
package techreborn.items.tool.vanilla;
import net.minecraft.item.IItemTier;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import reborncore.common.util.ItemUtils;
@ -32,11 +33,11 @@ public class ItemTRSword extends ItemSword {
String repairOreDict = "";
public ItemTRSword(ToolMaterial material) {
public ItemTRSword(IItemTier material) {
this(material, "");
}
public ItemTRSword(ToolMaterial material, String repairOreDict) {
public ItemTRSword(IItemTier material, String repairOreDict) {
super(material);
this.repairOreDict = repairOreDict;
}