Skip to content

Commit

Permalink
Fixed textures and paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Mrthomas20121 committed Sep 27, 2020
1 parent ff18edd commit 744dd0b
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minecraftforge.common.util.EnumHelper;

public class ArmorMaterialsTFCompat {
public static final IArmorMaterialTFC thaumium = new ArmorMaterialTFC(EnumHelper.addArmorMaterial("thaumium", TFCompat.MODID + ":thaumium", 33, new int[] {1, 4, 5, 2}, 30, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), 20, 20, 13.2f);
public static final IArmorMaterialTFC thaumium = new ArmorMaterialTFC(EnumHelper.addArmorMaterial("thaumium", TFCompat.MODID + ":thaumium", 33, new int[] {1, 4, 5, 2}, 60, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), 20, 20, 13.2f);
public static final IArmorMaterialTFC signalum = new ArmorMaterialTFC(EnumHelper.addArmorMaterial("signalum", TFCompat.MODID + ":signalum", 40, new int[] {2, 5, 6, 2}, 12, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), 25, 30, 16.5f);
public static final IArmorMaterialTFC lumium = new ArmorMaterialTFC(EnumHelper.addArmorMaterial("enderium", TFCompat.MODID + ":enderium", 40, new int[] {2, 5, 6, 2}, 12, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), 25, 30, 16.5f);
public static final IArmorMaterialTFC enderium = new ArmorMaterialTFC(EnumHelper.addArmorMaterial("enderium", TFCompat.MODID + ":enderium", 40, new int[] {2, 5, 6, 2}, 12, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F), 40, 20, 17.5f);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import net.minecraftforge.common.util.EnumHelper;

public class ToolMaterialsTFCompat {
public static final Item.ToolMaterial thaumium = EnumHelper.addToolMaterial("tfcompat_thaumium", 2, 2200, 12, 4.9f, 30);
public static final Item.ToolMaterial thaumium = EnumHelper.addToolMaterial("tfcompat_thaumium", 2, 2200, 12, 4.9f, 60);
public static final Item.ToolMaterial signalum = EnumHelper.addToolMaterial("tfcompat_signalum", 2, 3400, 15, 5.75f, 10);
public static final Item.ToolMaterial lumium = EnumHelper.addToolMaterial("tfcompat_lumium", 2, 3400, 15, 5.75f, 11);
public static final Item.ToolMaterial enderium = EnumHelper.addToolMaterial("tfcompat_enderium", 2, 5400, 15, 5.75f, 22);
Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/assets/tfc/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ item.tfc.metal.unfinished_greaves.thaumium.name=Unfinished Thaumium Greaves
item.tfc.metal.boots.thaumium.name=Thaumium Boots
item.tfc.metal.unfinished_boots.thaumium.name=Unfinished Thaumium Boots
# molds
item.tfc.ceramics.mold.ingot.thaumium.name=Unshaped Thaumium
item.tfc.ceramics.fired.mold.ingot.thaumium.name=Unshaped Thaumium

# metals
tfc.types.metal.lumium=Lumium
Expand Down Expand Up @@ -110,7 +110,7 @@ item.tfc.metal.unfinished_greaves.lumium.name=Unfinished Lumium Greaves
item.tfc.metal.boots.lumium.name=Lumium Boots
item.tfc.metal.unfinished_boots.lumium.name=Unfinished Lumium Boots
# molds
item.tfc.ceramics.mold.ingot.lumium.name=Unshaped Lumium
item.tfc.ceramics.fired.mold.ingot.lumium.name=Unshaped Lumium

# metals
tfc.types.metal.signalum=Signalum
Expand Down Expand Up @@ -167,7 +167,7 @@ item.tfc.metal.unfinished_greaves.signalum.name=Unfinished Signalum Greaves
item.tfc.metal.boots.signalum.name=Signalum Boots
item.tfc.metal.unfinished_boots.signalum.name=Unfinished Signalum Boots
# molds
item.tfc.ceramics.mold.ingot.signalum.name=Unshaped Signalum
item.tfc.ceramics.fired.mold.ingot.signalum.name=Unshaped Signalum

# metals
tfc.types.metal.enderium=Enderium
Expand Down Expand Up @@ -224,7 +224,7 @@ item.tfc.metal.unfinished_greaves.enderium.name=Unfinished Enderium Greaves
item.tfc.metal.boots.enderium.name=Enderium Boots
item.tfc.metal.unfinished_boots.enderium.name=Unfinished Enderium Boots
# molds
item.tfc.ceramics.mold.ingot.enderium.name=Unshaped Enderium
item.tfc.ceramics.fired.mold.ingot.enderium.name=Unshaped Enderium

# metals
tfc.types.metal.void_metal=Void Metal
Expand All @@ -241,7 +241,7 @@ item.tfc.metal.dust.void_metal.name= Void Metal dust
item.tfc.metal.nugget.void_metal.name= Void Metal nugget
item.tfc.metal.lamp.void_metal.name= Void Metal lamp
# molds
item.tfc.ceramics.mold.ingot.void_metal.name=Unshaped Void Metal
item.tfc.ceramics.fired.mold.ingot.void_metal.name=Unshaped Void Metal

# metals
tfc.types.metal.refined_glowstone=Refined Glowstone
Expand All @@ -258,7 +258,7 @@ item.tfc.metal.dust.refined_glowstone.name= Refined Glowstone dust
item.tfc.metal.nugget.refined_glowstone.name= Refined Glowstone nugget
item.tfc.metal.lamp.refined_glowstone.name= Refined Glowstone lamp
# molds
item.tfc.ceramics.mold.ingot.refined_glowstone.name=Unshaped Refined Glowstone
item.tfc.ceramics.fired.mold.ingot.refined_glowstone.name=Unshaped Refined Glowstone

# metals
tfc.types.metal.refined_obsidian= Refined Obsidian
Expand All @@ -275,7 +275,7 @@ item.tfc.metal.dust.refined_obsidian.name= Refined Obsidian dust
item.tfc.metal.nugget.refined_obsidian.name= Refined Obsidian nugget
item.tfc.metal.lamp.refined_obsidian.name= Refined Obsidian lamp
# molds
item.tfc.ceramics.mold.ingot.refined_obsidian.name=Unshaped Refined Obsidian
item.tfc.ceramics.fired.mold.ingot.refined_obsidian.name=Unshaped Refined Obsidian

# metals
tfc.types.metal.soulforged_steel=Soulforged Steel
Expand All @@ -292,4 +292,4 @@ item.tfc.metal.dust.soulforged_steel.name=Soulforged Steel dust
item.tfc.metal.nugget.soulforged_steel.name=Soulforged Steel nugget
item.tfc.metal.lamp.soulforged_steel.name=Soulforged Steel lamp
# molds
item.tfc.ceramics.mold.ingot.soulforged_steel.name=Unshaped Soulforged Steel
item.tfc.ceramics.fired.mold.ingot.soulforged_steel.name=Unshaped Soulforged Steel

0 comments on commit 744dd0b

Please sign in to comment.