From 283460c3c8b8cda8bb5e168b1dd60804f0be675e Mon Sep 17 00:00:00 2001 From: Ayutac Date: Mon, 2 May 2022 19:07:57 +0200 Subject: [PATCH] Added Netherite nugget, texture thanks to Spearkiller --- src/main/java/techreborn/init/TRContent.java | 5 +-- .../assets/techreborn/lang/en_us.json | 1 + .../models/item/netherite_nugget.json | 6 ++++ .../textures/item/nugget/netherite_nugget.png | Bin 0 -> 237 bytes .../implosion_compressor/netherite_ingot.json | 32 ++++++++++++++++++ .../netherite_ingot_with_lava.json | 32 ++++++++++++++++++ .../implosion_compressor/netherite_alt.json | 25 ++++++++++++++ .../implosion_compressor/netherite_ingot.json | 25 ++++++++++++++ .../netherite_ingot_with_lava.json | 20 +++++++++++ 9 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/item/netherite_nugget.json create mode 100644 src/main/resources/assets/techreborn/textures/item/nugget/netherite_nugget.png create mode 100644 src/main/resources/data/techreborn/advancements/recipes/implosion_compressor/netherite_ingot.json create mode 100644 src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/netherite_ingot_with_lava.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/netherite_ingot_with_lava.json diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 932cf5638..d0c279496 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -1150,8 +1150,9 @@ public class TRContent { public enum Nuggets implements ItemConvertible, TagConvertible { ALUMINUM, BRASS, BRONZE, CHROME(CHROME_TAG_NAME_BASE), COPPER(Items.COPPER_INGOT, false), DIAMOND(Items.DIAMOND, true), - ELECTRUM, EMERALD(Items.EMERALD, true), HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, - PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; + ELECTRUM, EMERALD(Items.EMERALD, true), HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, + NETHERITE, /* We do NOT link to the netherite ingot here, because we want custom conversion recipes! */ + NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; private final String name; private final Item item; diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index 4b943368b..56ac66bd5 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -569,6 +569,7 @@ "item.techreborn.tungstensteel_nugget": "Tungstensteel Nugget", "item.techreborn.zinc_nugget": "Zinc Nugget", "item.techreborn.emerald_nugget": "Emerald Nugget", + "item.techreborn.netherite_nugget": "Netherite Nugget", "_comment12": "Plates", "item.techreborn.advanced_alloy_plate": "Advanced Alloy Plate", diff --git a/src/main/resources/assets/techreborn/models/item/netherite_nugget.json b/src/main/resources/assets/techreborn/models/item/netherite_nugget.json new file mode 100644 index 000000000..7e1246328 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/netherite_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/nugget/netherite_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/netherite_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/netherite_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..1114a7da08188e9887a9efbd950fdd1ec936f920 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6r`^#}EtuWC>QDo&YIkiL9)@?M9O4;`g@& z%L-3%V^lc%$f$^CRuvnMLR3J2K%Ruvfh-0N4o=R4FPF5a%xQaI!oa4oR7KKnjs@e> zM5Z}x4JL<7jQ{=N6FtgO!7TXXzkYsv|FdnYYKmiEjG4vBG(r2r(E}O` cjBIQSL98kse{OCDI*ozB)78&qol`;+0CxpQ-~a#s literal 0 HcmV?d00001 diff --git a/src/main/resources/data/techreborn/advancements/recipes/implosion_compressor/netherite_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/implosion_compressor/netherite_ingot.json new file mode 100644 index 000000000..7c145f4ab --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/recipes/implosion_compressor/netherite_ingot.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "techreborn:implosion_compressor/netherite_ingot" + ] + }, + "criteria": { + "has_netherite_nugget": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "c:netherite_nuggets" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "techreborn:implosion_compressor/netherite_ingot" + } + } + }, + "requirements": [ + [ + "has_netherite_nugget", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/netherite_ingot_with_lava.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/netherite_ingot_with_lava.json new file mode 100644 index 000000000..c0939087a --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/netherite_ingot_with_lava.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "techreborn:industrial_grinder/netherite_ingot_with_lava" + ] + }, + "criteria": { + "has_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["minecraft:netherite_ingot"] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "techreborn:industrial_grinder/netherite_ingot_with_lava" + } + } + }, + "requirements": [ + [ + "has_ingot", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_alt.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_alt.json new file mode 100644 index 000000000..1c7222d9e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_alt.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 30, + "time": 2000, + "ingredients" : [ + { + "tag": "c:netherite_nuggets", + "count": 9 + }, + { + "item": "minecraft:end_crystal", + "count": 4 + } + ], + "results" : [ + { + "item": "minecraft:netherite_ingot", + "count": 1 + }, + { + "item": "techreborn:ender_eye_small_dust", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_ingot.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_ingot.json new file mode 100644 index 000000000..58613ac38 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/netherite_ingot.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 30, + "time": 2000, + "ingredients" : [ + { + "tag": "c:netherite_nuggets", + "count": 9 + }, + { + "item": "minecraft:tnt", + "count": 16 + } + ], + "results" : [ + { + "item": "minecraft:netherite_ingot", + "count": 1 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/netherite_ingot_with_lava.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/netherite_ingot_with_lava.json new file mode 100644 index 000000000..362ebc53b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_grinder/netherite_ingot_with_lava.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:industrial_grinder", + "power": 64, + "time": 100, + "tank": { + "fluid": "minecraft:lava", + "amount": 1000 + }, + "ingredients": [ + { + "item": "minecraft:netherite_ingot" + } + ], + "results": [ + { + "item": "techreborn:netherite_nugget", + "count": 9 + } + ] +} \ No newline at end of file