diff --git a/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenLanguageProvider.java b/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenLanguageProvider.java index 3545566..9076a13 100644 --- a/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenLanguageProvider.java +++ b/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenLanguageProvider.java @@ -32,7 +32,7 @@ public void addTrim(String key, String name) { } public void addEffectDesc(Supplier key, String name) { - this.add("effect." + this.id + "." + key.get().getDescriptionId() + ".description", name); + this.add(key.get().getDescriptionId() + ".description", name); } public void addDimension(ResourceKey dimension, String name) { diff --git a/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenRecipeProvider.java b/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenRecipeProvider.java index dd8e901..ecbd684 100644 --- a/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenRecipeProvider.java +++ b/src/main/java/com/aetherteam/nitrogen/data/providers/NitrogenRecipeProvider.java @@ -249,6 +249,47 @@ protected ShapedRecipeBuilder makeGlovesWithBlock(Supplier glove .unlockedBy(getHasName(material.get()), has(material.get())); } + protected ShapedRecipeBuilder makeHelmetWithTag(Supplier helmet, TagKey materialTag, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, helmet.get()) + .define('#', materialTag) + .pattern("###") + .pattern("# #") + .unlockedBy("has_" + unlockName, has(materialTag)); + } + + protected ShapedRecipeBuilder makeChestplateWithTag(Supplier chestplate, TagKey materialTag, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, chestplate.get()) + .define('#', materialTag) + .pattern("# #") + .pattern("###") + .pattern("###") + .unlockedBy("has_" + unlockName, has(materialTag)); + } + + protected ShapedRecipeBuilder makeLeggingsWithTag(Supplier leggings, TagKey materialTag, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, leggings.get()) + .define('#', materialTag) + .pattern("###") + .pattern("# #") + .pattern("# #") + .unlockedBy("has_" + unlockName, has(materialTag)); + } + + protected ShapedRecipeBuilder makeBootsWithTag(Supplier boots, TagKey materialTag, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, boots.get()) + .define('#', materialTag) + .pattern("# #") + .pattern("# #") + .unlockedBy("has_" + unlockName, has(materialTag)); + } + + protected ShapedRecipeBuilder makeGlovesWithTag(Supplier gloves, TagKey materialTag, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, gloves.get()) + .define('#', materialTag) + .pattern("# #") + .unlockedBy("has_" + unlockName, has(materialTag)); + } + protected ShapedRecipeBuilder makeHelmet(Supplier helmet, Supplier material) { return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, helmet.get()) .define('#', material.get()) @@ -290,13 +331,6 @@ protected ShapedRecipeBuilder makeGloves(Supplier gloves, Suppli .unlockedBy(getHasName(material.get()), has(material.get())); } - protected ShapedRecipeBuilder makeGlovesWithTag(Supplier gloves, TagKey materialTag, String unlockName) { - return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, gloves.get()) - .define('#', materialTag) - .pattern("# #") - .unlockedBy("has_" + unlockName, has(materialTag)); - } - protected ShapedRecipeBuilder makeRing(Supplier ring, Item material) { return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ring.get()) .define('#', material) @@ -316,6 +350,25 @@ protected ShapedRecipeBuilder makePendant(Supplier pendant, Item .unlockedBy(getHasName(material), has(material)); } + protected ShapedRecipeBuilder makeRingWithTag(Supplier ring, Item material, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ring.get()) + .define('#', material) + .pattern(" # ") + .pattern("# #") + .pattern(" # ") + .unlockedBy("has_" + unlockName, has(material)); + } + + protected ShapedRecipeBuilder makePendantWithTag(Supplier pendant, TagKey material, Ingredient string, String unlockName) { + return ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, pendant.get()) + .define('S', string) + .define('#', material) + .pattern("SSS") + .pattern("S S") + .pattern(" # ") + .unlockedBy("has_" + unlockName, has(material)); + } + protected SimpleCookingRecipeBuilder smeltingOreRecipe(ItemLike result, ItemLike ingredient, float experience) { return SimpleCookingRecipeBuilder.smelting(Ingredient.of(ingredient), RecipeCategory.MISC, result, experience, 200) .unlockedBy(getHasName(ingredient), has(ingredient));