From 266d88fa88d535c77bb0de0822d9323bd8aec939 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 13 May 2019 04:34:49 +0200 Subject: [PATCH] Added armor tiers (wip) --- .../java/cr0s/warpdrive/BreathingManager.java | 6 +- src/main/java/cr0s/warpdrive/WarpDrive.java | 7 ++ .../cr0s/warpdrive/config/Dictionary.java | 6 +- .../java/cr0s/warpdrive/config/Recipes.java | 74 +++++++++++++------ .../cr0s/warpdrive/item/ItemWarpArmor.java | 2 +- .../warpdrive/world/WorldGenSmallShip.java | 3 +- .../assets/warpdrive/lang/de_de.lang | 16 +++- .../assets/warpdrive/lang/en_us.lang | 16 +++- .../assets/warpdrive/lang/fr_fr.lang | 16 +++- .../assets/warpdrive/lang/nl_nl.lang | 16 +++- .../assets/warpdrive/lang/ru_ru.lang | 16 +++- .../assets/warpdrive/lang/zh_cn.lang | 20 ++++- .../assets/warpdrive/lang/zh_tw.lang | 16 +++- ...ts.json => warp_armor.advanced.boots.json} | 0 ...on => warp_armor.advanced.chestplate.json} | 0 ...t.json => warp_armor.advanced.helmet.json} | 0 ...json => warp_armor.advanced.leggings.json} | 0 .../models/item/warp_armor.basic.boots.json | 6 ++ .../item/warp_armor.basic.chestplate.json | 6 ++ .../models/item/warp_armor.basic.helmet.json | 6 ++ .../item/warp_armor.basic.leggings.json | 6 ++ .../item/warp_armor.superior.boots.json | 6 ++ .../item/warp_armor.superior.chestplate.json | 6 ++ .../item/warp_armor.superior.helmet.json | 6 ++ .../item/warp_armor.superior.leggings.json | 6 ++ 25 files changed, 206 insertions(+), 56 deletions(-) rename src/main/resources/assets/warpdrive/models/item/{warp_armor_boots.json => warp_armor.advanced.boots.json} (100%) rename src/main/resources/assets/warpdrive/models/item/{warp_armor_chestplate.json => warp_armor.advanced.chestplate.json} (100%) rename src/main/resources/assets/warpdrive/models/item/{warp_armor_helmet.json => warp_armor.advanced.helmet.json} (100%) rename src/main/resources/assets/warpdrive/models/item/{warp_armor_leggings.json => warp_armor.advanced.leggings.json} (100%) create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.basic.boots.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.basic.chestplate.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.basic.helmet.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.basic.leggings.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.superior.boots.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.superior.chestplate.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.superior.helmet.json create mode 100644 src/main/resources/assets/warpdrive/models/item/warp_armor.superior.leggings.json diff --git a/src/main/java/cr0s/warpdrive/BreathingManager.java b/src/main/java/cr0s/warpdrive/BreathingManager.java index 53b834f2..6d20d510 100644 --- a/src/main/java/cr0s/warpdrive/BreathingManager.java +++ b/src/main/java/cr0s/warpdrive/BreathingManager.java @@ -4,6 +4,7 @@ import cr0s.warpdrive.api.IAirContainerItem; import cr0s.warpdrive.api.IBreathingHelmet; import cr0s.warpdrive.config.Dictionary; import cr0s.warpdrive.config.WarpDriveConfig; +import cr0s.warpdrive.data.EnumTier; import cr0s.warpdrive.data.StateAir; import cr0s.warpdrive.data.VectorI; import cr0s.warpdrive.event.ChunkHandler; @@ -15,7 +16,6 @@ import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -264,7 +264,7 @@ public class BreathingManager { final ItemStack itemStackChestplate = entityLivingBase.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (!itemStackChestplate.isEmpty()) { final Item itemChestplate = itemStackChestplate.getItem(); - if (itemChestplate == WarpDrive.itemWarpArmor[2]) { + if (itemChestplate == WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][2]) { return electrolyseIceToAir(entityLivingBase); } } @@ -307,7 +307,7 @@ public class BreathingManager { final ItemStack itemStackChestplate = entityPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (!itemStackChestplate.isEmpty()) { final Item itemChestplate = itemStackChestplate.getItem(); - if (itemChestplate == WarpDrive.itemWarpArmor[2]) { + if (itemChestplate == WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][2]) { canElectrolyse = true; } } diff --git a/src/main/java/cr0s/warpdrive/WarpDrive.java b/src/main/java/cr0s/warpdrive/WarpDrive.java index f9d97c0b..f31a0869 100644 --- a/src/main/java/cr0s/warpdrive/WarpDrive.java +++ b/src/main/java/cr0s/warpdrive/WarpDrive.java @@ -318,6 +318,13 @@ public class WarpDrive { public static Logger logger; + public WarpDrive() { + // 20% more durability, same enchantability (except basic is slightly lower), increased toughness + armorMaterial[EnumTier.BASIC.getIndex() ] = EnumHelper.addArmorMaterial("warpBasic" , "warpdrive:warp", 6, new int[] { 1, 2, 3, 1 }, 12, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.0F); + armorMaterial[EnumTier.ADVANCED.getIndex()] = EnumHelper.addArmorMaterial("warpAdvanced", "warpdrive:warp", 18, new int[] { 2, 6, 5, 2 }, 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON , 1.0F); + armorMaterial[EnumTier.SUPERIOR.getIndex()] = EnumHelper.addArmorMaterial("warpSuperior", "warpdrive:warp", 40, new int[] { 3, 6, 8, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.5F); + } + @EventHandler public void onFMLPreInitialization(final FMLPreInitializationEvent event) { logger = event.getModLog(); diff --git a/src/main/java/cr0s/warpdrive/config/Dictionary.java b/src/main/java/cr0s/warpdrive/config/Dictionary.java index 27f90ee2..118db73a 100644 --- a/src/main/java/cr0s/warpdrive/config/Dictionary.java +++ b/src/main/java/cr0s/warpdrive/config/Dictionary.java @@ -422,8 +422,10 @@ public class Dictionary { config.get("item_tags", "ic2:rubber_boots" , "NoFallDamage").getString(); config.get("item_tags", "ic2:quantum_boots" , "NoFallDamage").getString(); - config.get("item_tags", "warpdrive:warp_armor_leggings" , "NoFallDamage").getString(); - config.get("item_tags", "warpdrive:warp_armor_boots" , "NoFallDamage").getString(); + config.get("item_tags", "warpdrive:warp_armor.advanced.leggings" , "NoFallDamage").getString(); + config.get("item_tags", "warpdrive:warp_armor.advanced.boots" , "NoFallDamage").getString(); + config.get("item_tags", "warpdrive:warp_armor.superior.leggings" , "NoFallDamage").getString(); + config.get("item_tags", "warpdrive:warp_armor.superior.boots" , "NoFallDamage").getString(); // *** read actual values final String[] taggedItemsName = categoryItemTags.getValues().keySet().toArray(new String[0]); diff --git a/src/main/java/cr0s/warpdrive/config/Recipes.java b/src/main/java/cr0s/warpdrive/config/Recipes.java index ab0d598c..19d39357 100644 --- a/src/main/java/cr0s/warpdrive/config/Recipes.java +++ b/src/main/java/cr0s/warpdrive/config/Recipes.java @@ -699,36 +699,68 @@ public class Recipes { private static void initToolsAndArmor() { // Warp helmet WarpDrive.register(new ShapedOreRecipe(groupTools, - WarpDrive.itemWarpArmor[EntityEquipmentSlot.HEAD.getIndex()], false, "ggg", "gig", "wcw", - 'i', Items.IRON_HELMET, - 'w', Blocks.WOOL, - 'g', "blockGlass", - 'c', ItemComponent.getItemStack(EnumComponentType.AIR_CANISTER))); + WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.HEAD.getIndex()], false, "mmm", "mgm", "ici", + 'm', "itemRubber", + 'g', "blockHull1_glass", + 'c', ItemComponent.getItemStack(EnumComponentType.AIR_CANISTER), + 'i', "nuggetIron" )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.HEAD.getIndex()], false, "mmm", "waw", " ", + 'a', WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.HEAD.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CERAMIC), + 'w', Blocks.WOOL )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][EntityEquipmentSlot.HEAD.getIndex()], false, "mmm", "mam", " ", + 'a', WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.HEAD.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CARBON_FIBER) )); // Warp chestplate WarpDrive.register(new ShapedOreRecipe(groupTools, - WarpDrive.itemWarpArmor[EntityEquipmentSlot.CHEST.getIndex()], false, "gcg", "wiw", "GmG", - 'i', Items.IRON_CHESTPLATE, - 'w', Blocks.WOOL, - 'g', "blockHull3_glass", - 'm', ItemComponent.getItemStack(EnumComponentType.PUMP), - 'G', "ingotGold", - 'c', ItemComponent.getItemStack(EnumComponentType.AIR_CANISTER))); + WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.CHEST.getIndex()], false, "i i", "mmm", "mmm", + 'm', "itemRubber", + 'i', "nuggetIron" )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.CHEST.getIndex()], false, "m m", "mam", "mwm", + 'a', WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.CHEST.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CERAMIC), + 'w', Blocks.WOOL )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][EntityEquipmentSlot.CHEST.getIndex()], false, "mam", "mpm", "mcm", + 'a', WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.CHEST.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CARBON_FIBER), + 'p', ItemComponent.getItemStack(EnumComponentType.PUMP), + 'c', ItemComponent.getItemStack(EnumComponentType.AIR_CANISTER) )); // Warp Leggings WarpDrive.register(new ShapedOreRecipe(groupTools, - WarpDrive.itemWarpArmor[EntityEquipmentSlot.LEGS.getIndex()], false, "gig", "m m", "w w", - 'i', Items.IRON_LEGGINGS, - 'm', itemStackMotors[1], - 'w', Blocks.WOOL, - 'g', "blockHull2_glass")); + WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], false, "imi", "m m", "m m", + 'm', "itemRubber", + 'i', "nuggetIron" )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], false, "mam", "M M", "w w", + 'a', WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], + 'm', Items.IRON_INGOT, + 'M', itemStackMotors[1], + 'w', Blocks.WOOL )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], false, "mam", "m m", "m m", + 'a', WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CARBON_FIBER) )); // Warp boots WarpDrive.register(new ShapedOreRecipe(groupTools, - WarpDrive.itemWarpArmor[EntityEquipmentSlot.FEET.getIndex()], false, "wiw", "r r", " ", - 'i', Items.IRON_BOOTS, - 'w', Blocks.WOOL, - 'r', rubber )); + WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.FEET.getIndex()], false, "i i", "m m", " ", + 'm', "itemRubber", + 'i', "nuggetIron" )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.FEET.getIndex()], false, "cac", "m m", " ", + 'a', WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], + 'm', Items.IRON_INGOT, + 'c', ItemComponent.getItemStack(EnumComponentType.CERAMIC) )); + WarpDrive.register(new ShapedOreRecipe(groupTools, + WarpDrive.itemWarpArmor[EnumTier.SUPERIOR.getIndex()][EntityEquipmentSlot.FEET.getIndex()], false, "mam", "m m", " ", + 'a', WarpDrive.itemWarpArmor[EnumTier.ADVANCED.getIndex()][EntityEquipmentSlot.LEGS.getIndex()], + 'm', ItemComponent.getItemStack(EnumComponentType.CARBON_FIBER) )); // Tuning fork variations for (final EnumDyeColor enumDyeColor : EnumDyeColor.values()) { diff --git a/src/main/java/cr0s/warpdrive/item/ItemWarpArmor.java b/src/main/java/cr0s/warpdrive/item/ItemWarpArmor.java index c99cf7fd..52056c9a 100644 --- a/src/main/java/cr0s/warpdrive/item/ItemWarpArmor.java +++ b/src/main/java/cr0s/warpdrive/item/ItemWarpArmor.java @@ -31,7 +31,7 @@ public class ItemWarpArmor extends ItemArmor implements IItemBase, IBreathingHel super(armorMaterial, renderIndex, entityEquipmentSlot); this.enumTier = enumTier; - setTranslationKey("warpdrive.armor." + suffixes[entityEquipmentSlot.getIndex()]); + setTranslationKey("warpdrive.armor." + enumTier.getName() + "." + suffixes[entityEquipmentSlot.getIndex()]); setRegistryName(registryName); setCreativeTab(WarpDrive.creativeTabMain); WarpDrive.register(this); diff --git a/src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java b/src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java index aa598a31..dea5f75f 100644 --- a/src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java +++ b/src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java @@ -3,6 +3,7 @@ package cr0s.warpdrive.world; import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.block.TileEntityAbstractEnergy; import cr0s.warpdrive.data.BlockProperties; +import cr0s.warpdrive.data.EnumTier; import javax.annotation.Nonnull; import java.util.Random; @@ -570,7 +571,7 @@ public class WorldGenSmallShip extends WorldGenerator { for (int idx = 0; idx < countMobs; idx++) { final EntityVillager entityVillager = new EntityVillager(world, 0); entityVillager.setLocationAndAngles(x + 0.5D, y, z + 0.5D, 0.0F, 0.0F); - entityVillager.setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(WarpDrive.itemWarpArmor[3], 1, 1)); + entityVillager.setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(WarpDrive.itemWarpArmor[EnumTier.BASIC.getIndex()][3], 1, 1)); world.spawnEntity(entityVillager); } } else if (world.rand.nextBoolean()) {// Zombies diff --git a/src/main/resources/assets/warpdrive/lang/de_de.lang b/src/main/resources/assets/warpdrive/lang/de_de.lang index ccd75e4b..4a3778fe 100644 --- a/src/main/resources/assets/warpdrive/lang/de_de.lang +++ b/src/main/resources/assets/warpdrive/lang/de_de.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=Warp Helm -item.warpdrive.armor.chestplate.name=Warp Brustpanzer -item.warpdrive.armor.leggings.name=Warp Beinschutz -item.warpdrive.armor.boots.name=Warp Stiefel +item.warpdrive.armor.basic.helmet.name=Emergency Helm +item.warpdrive.armor.basic.chestplate.name=Emergency Brustpanzer +item.warpdrive.armor.basic.leggings.name=Emergency Beinschutz +item.warpdrive.armor.basic.boots.name=Emergency Stiefel +item.warpdrive.armor.advanced.helmet.name=Re-entry Helm +item.warpdrive.armor.advanced.chestplate.name=Re-entry Brustpanzer +item.warpdrive.armor.advanced.leggings.name=Re-entry Beinschutz +item.warpdrive.armor.advanced.boots.name=Re-entry Stiefel +item.warpdrive.armor.superior.helmet.name=Warp Helm +item.warpdrive.armor.superior.chestplate.name=Warp Brustpanzer +item.warpdrive.armor.superior.leggings.name=Warp Beinschutz +item.warpdrive.armor.superior.boots.name=Warp Stiefel item.warpdrive.atomic.electromagnetic_cell.basic.name=Standard Elektromagnetische Zelle item.warpdrive.atomic.electromagnetic_cell.advanced.name=Weiterentwickelter Elektromagnetische Zelle diff --git a/src/main/resources/assets/warpdrive/lang/en_us.lang b/src/main/resources/assets/warpdrive/lang/en_us.lang index 31e02028..a31eeacf 100644 --- a/src/main/resources/assets/warpdrive/lang/en_us.lang +++ b/src/main/resources/assets/warpdrive/lang/en_us.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=Warp Helmet -item.warpdrive.armor.chestplate.name=Warp Chestplate -item.warpdrive.armor.leggings.name=Warp Leggings -item.warpdrive.armor.boots.name=Warp Boots +item.warpdrive.armor.basic.helmet.name=Emergency Helmet +item.warpdrive.armor.basic.chestplate.name=Emergency Chestplate +item.warpdrive.armor.basic.leggings.name=Emergency Leggings +item.warpdrive.armor.basic.boots.name=Emergency Boots +item.warpdrive.armor.advanced.helmet.name=Re-entry Helmet +item.warpdrive.armor.advanced.chestplate.name=Re-entry Chestplate +item.warpdrive.armor.advanced.leggings.name=Re-entry Leggings +item.warpdrive.armor.advanced.boots.name=Re-entry Boots +item.warpdrive.armor.superior.helmet.name=Warp Helmet +item.warpdrive.armor.superior.chestplate.name=Warp Chestplate +item.warpdrive.armor.superior.leggings.name=Warp Leggings +item.warpdrive.armor.superior.boots.name=Warp Boots item.warpdrive.atomic.electromagnetic_cell.basic.name=Basic Electromagnetic cell item.warpdrive.atomic.electromagnetic_cell.advanced.name=Advanced Electromagnetic cell diff --git a/src/main/resources/assets/warpdrive/lang/fr_fr.lang b/src/main/resources/assets/warpdrive/lang/fr_fr.lang index 2ae94f7e..fbe082f1 100644 --- a/src/main/resources/assets/warpdrive/lang/fr_fr.lang +++ b/src/main/resources/assets/warpdrive/lang/fr_fr.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Fibre de carbone brute item.warpdrive.component.raw_carbon_mesh.name=Maille de carbone brute item.warpdrive.component.carbon_fiber.name=Fibre de carbone -item.warpdrive.armor.helmet.name=Casque warp -item.warpdrive.armor.chestplate.name=Plastron warp -item.warpdrive.armor.leggings.name=Jambières warp -item.warpdrive.armor.boots.name=Bottes warp +item.warpdrive.armor.basic.helmet.name=Casque de secours +item.warpdrive.armor.basic.chestplate.name=Plastron de secours +item.warpdrive.armor.basic.leggings.name=Jambières de secours +item.warpdrive.armor.basic.boots.name=Bottes de secours +item.warpdrive.armor.advanced.helmet.name=Casque de ré-entrée +item.warpdrive.armor.advanced.chestplate.name=Plastron de ré-entrée +item.warpdrive.armor.advanced.leggings.name=Jambières de ré-entrée +item.warpdrive.armor.advanced.boots.name=Bottes de ré-entrée +item.warpdrive.armor.superior.helmet.name=Casque warp +item.warpdrive.armor.superior.chestplate.name=Plastron warp +item.warpdrive.armor.superior.leggings.name=Jambières warp +item.warpdrive.armor.superior.boots.name=Bottes warp item.warpdrive.atomic.electromagnetic_cell.basic.name=Cage électromagnétique élémentaire item.warpdrive.atomic.electromagnetic_cell.advanced.name=Cage électromagnétique avancée diff --git a/src/main/resources/assets/warpdrive/lang/nl_nl.lang b/src/main/resources/assets/warpdrive/lang/nl_nl.lang index 14581c4b..b37d7acb 100644 --- a/src/main/resources/assets/warpdrive/lang/nl_nl.lang +++ b/src/main/resources/assets/warpdrive/lang/nl_nl.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=Warp Helm -item.warpdrive.armor.chestplate.name=Warp Borstplaat -item.warpdrive.armor.leggings.name=Warp Broek -item.warpdrive.armor.boots.name=Warp Schoenen +item.warpdrive.armor.basic.helmet.name=Emergency Helm +item.warpdrive.armor.basic.chestplate.name=Emergency Borstplaat +item.warpdrive.armor.basic.leggings.name=Emergency Broek +item.warpdrive.armor.basic.boots.name=Emergency Schoenen +item.warpdrive.armor.advanced.helmet.name=Re-entry Helm +item.warpdrive.armor.advanced.chestplate.name=Re-entry Borstplaat +item.warpdrive.armor.advanced.leggings.name=Re-entry Broek +item.warpdrive.armor.advanced.boots.name=Re-entry Schoenen +item.warpdrive.armor.superior.helmet.name=Warp Helm +item.warpdrive.armor.superior.chestplate.name=Warp Borstplaat +item.warpdrive.armor.superior.leggings.name=Warp Broek +item.warpdrive.armor.superior.boots.name=Warp Schoenen item.warpdrive.atomic.electromagnetic_cell.basic.name=Electromagnetische Cell item.warpdrive.atomic.electromagnetic_cell.advanced.name=Electromagnetische Cell diff --git a/src/main/resources/assets/warpdrive/lang/ru_ru.lang b/src/main/resources/assets/warpdrive/lang/ru_ru.lang index 5a2d72e1..eeabebc7 100644 --- a/src/main/resources/assets/warpdrive/lang/ru_ru.lang +++ b/src/main/resources/assets/warpdrive/lang/ru_ru.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=Космический шлем -item.warpdrive.armor.chestplate.name=Warp Chestplate -item.warpdrive.armor.leggings.name=Warp Leggings -item.warpdrive.armor.boots.name=Warp Boots +item.warpdrive.armor.basic.helmet.name=Emergency шлем +item.warpdrive.armor.basic.chestplate.name=Emergency Chestplate +item.warpdrive.armor.basic.leggings.name=Emergency Leggings +item.warpdrive.armor.basic.boots.name=Emergency Boots +item.warpdrive.armor.advanced.helmet.name=Re-entry шлем +item.warpdrive.armor.advanced.chestplate.name=Re-entry Chestplate +item.warpdrive.armor.advanced.leggings.name=Re-entry Leggings +item.warpdrive.armor.advanced.boots.name=Re-entry Boots +item.warpdrive.armor.superior.helmet.name=Warp шлем +item.warpdrive.armor.superior.chestplate.name=Warp Chestplate +item.warpdrive.armor.superior.leggings.name=Warp Leggings +item.warpdrive.armor.superior.boots.name=Warp Boots item.warpdrive.atomic.electromagnetic_cell.basic.name=Basic Electromagnetic cell item.warpdrive.atomic.electromagnetic_cell.advanced.name=Advanced Electromagnetic cell diff --git a/src/main/resources/assets/warpdrive/lang/zh_cn.lang b/src/main/resources/assets/warpdrive/lang/zh_cn.lang index 6278dc0e..fe978c44 100644 --- a/src/main/resources/assets/warpdrive/lang/zh_cn.lang +++ b/src/main/resources/assets/warpdrive/lang/zh_cn.lang @@ -68,10 +68,22 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=曲率头盔 -item.warpdrive.armor.chestplate.name=曲率胸甲 -item.warpdrive.armor.leggings.name=曲率护腿 -item.warpdrive.armor.boots.name=曲率战靴 +item.warpdrive.armor.helmet.legacy_name=曲率头盔 +item.warpdrive.armor.chestplate.legacy_name=曲率胸甲 +item.warpdrive.armor.leggings.legacy_name=曲率护腿 +item.warpdrive.armor.boots.legacy_name=曲率战靴 +item.warpdrive.armor.basic.helmet.name=Emergency Helmet +item.warpdrive.armor.basic.chestplate.name=Emergency Chestplate +item.warpdrive.armor.basic.leggings.name=Emergency Leggings +item.warpdrive.armor.basic.boots.name=Emergency Boots +item.warpdrive.armor.advanced.helmet.name=Re-entry Helmet +item.warpdrive.armor.advanced.chestplate.name=Re-entry Chestplate +item.warpdrive.armor.advanced.leggings.name=Re-entry Leggings +item.warpdrive.armor.advanced.boots.name=Re-entry Boots +item.warpdrive.armor.superior.helmet.name=Warp Helmet +item.warpdrive.armor.superior.chestplate.name=Warp Chestplate +item.warpdrive.armor.superior.leggings.name=Warp Leggings +item.warpdrive.armor.superior.boots.name=Warp Boots legacyname.item.warpdrive.atomic.electromagnetic_cell.name=电磁电池 item.warpdrive.atomic.electromagnetic_cell.basic.name=Basic Electromagnetic cell diff --git a/src/main/resources/assets/warpdrive/lang/zh_tw.lang b/src/main/resources/assets/warpdrive/lang/zh_tw.lang index 0b18b5b9..af1b24be 100644 --- a/src/main/resources/assets/warpdrive/lang/zh_tw.lang +++ b/src/main/resources/assets/warpdrive/lang/zh_tw.lang @@ -68,10 +68,18 @@ item.warpdrive.component.raw_carbon_fiber.name=Raw Carbon fiber item.warpdrive.component.raw_carbon_mesh.name=Raw Carbon Mesh item.warpdrive.component.carbon_fiber.name=Carbon Fiber -item.warpdrive.armor.helmet.name=躍遷保護盔 -item.warpdrive.armor.chestplate.name=Warp Chestplate -item.warpdrive.armor.leggings.name=Warp Leggings -item.warpdrive.armor.boots.name=Warp Boots +item.warpdrive.armor.basic.helmet.name=Emergency Helmet +item.warpdrive.armor.basic.chestplate.name=Emergency Chestplate +item.warpdrive.armor.basic.leggings.name=Emergency Leggings +item.warpdrive.armor.basic.boots.name=Emergency Boots +item.warpdrive.armor.advanced.helmet.name=Re-entry Helmet +item.warpdrive.armor.advanced.chestplate.name=Re-entry Chestplate +item.warpdrive.armor.advanced.leggings.name=Re-entry Leggings +item.warpdrive.armor.advanced.boots.name=Re-entry Boots +item.warpdrive.armor.superior.helmet.name=Warp Helmet +item.warpdrive.armor.superior.chestplate.name=Warp Chestplate +item.warpdrive.armor.superior.leggings.name=Warp Leggings +item.warpdrive.armor.superior.boots.name=Warp Boots item.warpdrive.atomic.electromagnetic_cell.basic.name=Basic Electromagnetic cell item.warpdrive.atomic.electromagnetic_cell.advanced.name=Advanced Electromagnetic cell diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor_boots.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.boots.json similarity index 100% rename from src/main/resources/assets/warpdrive/models/item/warp_armor_boots.json rename to src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.boots.json diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor_chestplate.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.chestplate.json similarity index 100% rename from src/main/resources/assets/warpdrive/models/item/warp_armor_chestplate.json rename to src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.chestplate.json diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor_helmet.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.helmet.json similarity index 100% rename from src/main/resources/assets/warpdrive/models/item/warp_armor_helmet.json rename to src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.helmet.json diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor_leggings.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.leggings.json similarity index 100% rename from src/main/resources/assets/warpdrive/models/item/warp_armor_leggings.json rename to src/main/resources/assets/warpdrive/models/item/warp_armor.advanced.leggings.json diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.boots.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.boots.json new file mode 100644 index 00000000..02e68e10 --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_boots" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.chestplate.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.chestplate.json new file mode 100644 index 00000000..46b0401f --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_chestplate" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.helmet.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.helmet.json new file mode 100644 index 00000000..5f85e55c --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_helmet" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.leggings.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.leggings.json new file mode 100644 index 00000000..908516ba --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.basic.leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_leggings" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.boots.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.boots.json new file mode 100644 index 00000000..02e68e10 --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_boots" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.chestplate.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.chestplate.json new file mode 100644 index 00000000..46b0401f --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_chestplate" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.helmet.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.helmet.json new file mode 100644 index 00000000..5f85e55c --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_helmet" + } +} diff --git a/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.leggings.json b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.leggings.json new file mode 100644 index 00000000..908516ba --- /dev/null +++ b/src/main/resources/assets/warpdrive/models/item/warp_armor.superior.leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "warpdrive:items/warp_armor_leggings" + } +}