From 47fe351ecb9e393e1b72aedd323627319a614bc0 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Sun, 19 Dec 2021 14:38:05 +0100 Subject: [PATCH] Added Silver Armor. Textures by Xanthian. (#2659). Thanks to Ayutac Silver is 2 times as durable as gold (still less than iron), -5 of gold's enchantability (still more than diamond and netherite) and cannot pacify/distract piglins. Also, it looks very fancy. --- .../java/techreborn/events/ModRegistry.java | 5 +++++ .../java/techreborn/init/TRArmorMaterials.java | 3 +++ src/main/java/techreborn/init/TRContent.java | 8 ++++++++ .../textures/models/armor/silver_layer_1.png | Bin 0 -> 1314 bytes .../textures/models/armor/silver_layer_2.png | Bin 0 -> 352 bytes .../resources/assets/techreborn/lang/en_us.json | 5 +++++ .../techreborn/models/item/silver_boots.json | 6 ++++++ .../models/item/silver_chestplate.json | 6 ++++++ .../techreborn/models/item/silver_helmet.json | 6 ++++++ .../techreborn/models/item/silver_leggings.json | 6 ++++++ .../textures/item/armor/silver_boots.png | Bin 0 -> 313 bytes .../textures/item/armor/silver_chestplate.png | Bin 0 -> 312 bytes .../textures/item/armor/silver_helmet.png | Bin 0 -> 280 bytes .../textures/item/armor/silver_leggings.png | Bin 0 -> 439 bytes .../gem_armor_tools/silver_boots.json | 15 +++++++++++++++ .../gem_armor_tools/silver_chestplate.json | 16 ++++++++++++++++ .../gem_armor_tools/silver_helmet.json | 15 +++++++++++++++ .../gem_armor_tools/silver_leggings.json | 16 ++++++++++++++++ 18 files changed, 107 insertions(+) create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/silver_layer_2.png create mode 100644 src/main/resources/assets/techreborn/models/item/silver_boots.json create mode 100644 src/main/resources/assets/techreborn/models/item/silver_chestplate.json create mode 100644 src/main/resources/assets/techreborn/models/item/silver_helmet.json create mode 100644 src/main/resources/assets/techreborn/models/item/silver_leggings.json create mode 100644 src/main/resources/assets/techreborn/textures/item/armor/silver_boots.png create mode 100644 src/main/resources/assets/techreborn/textures/item/armor/silver_chestplate.png create mode 100644 src/main/resources/assets/techreborn/textures/item/armor/silver_helmet.png create mode 100644 src/main/resources/assets/techreborn/textures/item/armor/silver_leggings.png create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_boots.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_chestplate.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_helmet.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/silver_leggings.json 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 0000000000000000000000000000000000000000..d567ae3df7e66d835488779f7028b6f00741821d GIT binary patch literal 1314 zcmV+-1>O3IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1h+{O`8gL9YI`e>(ggH$xbL*CynVE58V`E_+7-V#$fU~o+p!W;ubUKn02Nj75Fd?yc zCX>;Anz3f{pYVW=wn3hetx$vqm2ck$ej7|h1Qfx{;s_TC8^k||@CD>8VoyEt<~J=>8Yzo{I4!AxxFtZk<8DIP!k@6nV6W+ z5HXM+vLnOp#m=tMtPl7Nwo&C31ss0<>>e)6U#bFzu!w!w!NGwx1f80iQsDuD?Ce&9<_%!;<0ljB1mRl+0mF8WZz(VKz{9K6*3F30nD0dhtgo+MlgFYo zetdgvZLPt0C-{{E0&73IzufkNp1s{t-j)1fTOL!2DTH-Z!E$)wFlCm=+Z5^_@MWO@6hPOW5TU2-E%qNSHY#oDijLt!NR=Gu?DqDZf>qsz{xp-Io9k1 zT`Pc(Bqps;;v=%xMp{C>e5Jx5fFaHgD4Y-qCDG_pJ0LKPD>>>2*2c0NtF_h$Xsa^} z(BufMNE6Vt0|D0?@6eMFV3(ko@Md8eA8OXNd7q!=^V1N>-*rg76i$}(p#6kglXpT|gg-qw z2@A0#be#loajPb&B+)wYeG%AAnD_aCpC5d{-|zc^6md!icLU}&W-aJ=KR$-QSPm=r zv=1z93W)Qg5QDk1mDByM8HNyCv#6IfHR}d6g4)T;VDqL3bz5>h+K|DvINn{1`MFV_7Tvr}AIB)B=XMg`4xPD{D`3q+rKLN@dYWQFYq}WS>{DS|30fUq` zvl~!|v%n*=n1O-sFbFdq&tH)O6g=qZ;uzxL{dV#}z7_=@m+0uf|NZZox9(`?<$RQT zSYu(rFAe5fUxTDKFkWK&!++q+bVuHTmg^agtRFs1X9!u$Dp@q0b8R(`lKS0Evm*5v z?s)bX@b`4o)JUzFC2~=VVG~0_su#Nm>+8>#FNw`rdYY^8*Pks~p5Gg|IEo&MJhA(k zx@^yd1*W!NuJRuIwdT9uNS%G|;0G|+7O*1o1Q!^cX{h$B;UwZjUOhNI|iEg>zfWnwBRDXF8UCnhfsG~ir<%nl$WQWE4B{2voA`1?N>1j=(3ctjR6Fz_7) zVaDV6D^h@hX`U{QAsWHGXCLx4C~&YOY~e80>Hc1Sy)S0#ui))3KkVi`8TXS@WKkqf z?lI2T^UrG;zOwTaHTOH_O?WavPeRpvhE&g_D~_&;Eox7V9^Yn4JTU3wy0odA7b!%W kyS-0zd+06ylWDW;l}~){-)JzU0c~XPboFyt=akR{02KsxQvd(} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1be55a947218960892178ced0c07fbdc3b0671cf GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}x0G|+79esUGGc!$7v!DO}UwZlK!1WuN78Vnhub8lGxu&_rfos=OtEw-( zcqu6^N#Qgd&iD5zSKgoD~##YYd9Y56iq^B31=G+j+m$sQxDD4kd!x5If8$L0u{o7!a n8eyJua_@nXs-pagq%!7J&fMmPI~z9vEobm_^>bP0l+XkKOHq2K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..59b3306a9f7364916dc819d1c87d98d5931fa45d GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|m0G|+7XMcZ>@Q4G~Z@mBa@5BH9Q`f9Dw6k~e^Z)nn-~a#rbPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Zd6mK~y+T#gfZT z!cY)~{}#C@1lC=;A;yHH!cyJnv&h^KfZR2q|i`s+?@Ve zVm084a1z7%vVB3)#`WF3@l!Y-rG!Iv#~;oO0ojJORCrV*hh3-Jav0wXFCIN9B0Q|>tIiyM+n1Ev_Vf01cB9< zu^PO;^$~PBlBAM__5#U#jt=?x^#$3htZWT