diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index db6af8b00..19bcd5bed 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -172,6 +172,11 @@ public class ModRegistry { RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.PERIDOT, EquipmentSlot.LEGS), "peridot_leggings")); RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.PERIDOT, EquipmentSlot.FEET), "peridot_boots")); + RebornRegistry.registerItem(TRContent.SILVER_HELMET = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.HEAD), "silver_helmet")); + RebornRegistry.registerItem(TRContent.SILVER_CHESTPLATE = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.CHEST), "silver_chestplate")); + RebornRegistry.registerItem(TRContent.SILVER_LEGGINGS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.LEGS), "silver_leggings")); + RebornRegistry.registerItem(TRContent.SILVER_BOOTS = InitUtils.setup(new TRArmourItem(TRArmorMaterials.SILVER, EquipmentSlot.FEET), "silver_boots")); + // Battery RebornRegistry.registerItem(TRContent.RED_CELL_BATTERY = InitUtils.setup(new BatteryItem(TechRebornConfig.redCellBatteryMaxCharge, RcEnergyTier.LOW), "red_cell_battery")); RebornRegistry.registerItem(TRContent.LITHIUM_ION_BATTERY = InitUtils.setup(new BatteryItem(TechRebornConfig.lithiumIonBatteryMaxCharge, RcEnergyTier.MEDIUM), "lithium_ion_battery")); diff --git a/src/main/java/techreborn/init/TRArmorMaterials.java b/src/main/java/techreborn/init/TRArmorMaterials.java index 674fef470..9b9f8bef6 100644 --- a/src/main/java/techreborn/init/TRArmorMaterials.java +++ b/src/main/java/techreborn/init/TRArmorMaterials.java @@ -49,6 +49,9 @@ public enum TRArmorMaterials implements ArmorMaterial { PERIDOT(17, new int[]{3, 8, 3, 2}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> { return Ingredient.ofItems(TRContent.Gems.PERIDOT.asItem()); }), + SILVER(14, new int[]{1, 3, 5, 2}, 20, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, () -> { + return Ingredient.ofItems(TRContent.Ingots.SILVER.asItem()); + }), QUANTUM(75, new int[]{3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, () -> Ingredient.EMPTY), CLOAKING_DEVICE(5, new int[]{0, 2, 0, 0}, 0, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, () -> Ingredient.EMPTY), LITHIUM_BATPACK(25, new int[]{0, 5, 0, 0}, 10, SoundEvents.ITEM_ARMOR_EQUIP_TURTLE, 0.0F, () -> Ingredient.EMPTY), diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index dcb4e8b4e..136089849 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -231,6 +231,14 @@ public class TRContent { public static Item PERIDOT_LEGGINGS; @Nullable public static Item PERIDOT_BOOTS; + @Nullable + public static Item SILVER_HELMET; + @Nullable + public static Item SILVER_CHESTPLATE; + @Nullable + public static Item SILVER_LEGGINGS; + @Nullable + public static Item SILVER_BOOTS; public enum SolarPanels implements ItemConvertible { BASIC(RcEnergyTier.MICRO, TechRebornConfig.basicGenerationRateD, TechRebornConfig.basicGenerationRateN), diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png new file mode 100644 index 000000000..d567ae3df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png new file mode 100644 index 000000000..dfd57943a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png differ diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index a367fd453..b04260c3f 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -728,6 +728,11 @@ "item.techreborn.peridot_leggings": "Peridot Leggings", "item.techreborn.peridot_boots": "Peridot Boots", + "item.techreborn.silver_helmet": "Silver Helmet", + "item.techreborn.silver_chestplate": "Silver Chestplate", + "item.techreborn.silver_leggings": "Silver Leggings", + "item.techreborn.silver_boots": "Silver Boots", + "_comment18": "Message", "techreborn.message.missingmultiblock": "Incomplete Multiblock", "techreborn.message.setTo": "Set to", diff --git a/src/main/resources/assets/techreborn/models/item/silver_boots.json b/src/main/resources/assets/techreborn/models/item/silver_boots.json new file mode 100644 index 000000000..34c002170 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_chestplate.json b/src/main/resources/assets/techreborn/models/item/silver_chestplate.json new file mode 100644 index 000000000..8c413da91 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_helmet.json b/src/main/resources/assets/techreborn/models/item/silver_helmet.json new file mode 100644 index 000000000..57db54a63 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_leggings.json b/src/main/resources/assets/techreborn/models/item/silver_leggings.json new file mode 100644 index 000000000..caaa5048f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/silver_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png new file mode 100644 index 000000000..f14bd04d8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png new file mode 100644 index 000000000..1be55a947 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png new file mode 100644 index 000000000..59b3306a9 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png differ diff --git a/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png b/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png new file mode 100644 index 000000000..233595f43 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png differ diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json new file mode 100644 index 000000000..6316ff034 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json new file mode 100644 index 000000000..f8b68c4a3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json new file mode 100644 index 000000000..89ba0b229 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_helmet" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json new file mode 100644 index 000000000..a713f2882 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "item": "techreborn:silver_ingot" + } + }, + "result": { + "item": "techreborn:silver_leggings" + } +} \ No newline at end of file