From 86e5c6e43a3a5b14efce16a3620ea46a76b1bb4c Mon Sep 17 00:00:00 2001 From: bconlon Date: Thu, 9 May 2024 18:13:58 -0700 Subject: [PATCH] update: 1.19.2 --- gradle.properties | 12 +- .../treasure_reforging/TreasureReforging.java | 3 +- .../block/ReforgingBlocks.java | 5 +- .../data/ReforgingData.java | 90 ++-- .../generators/ReforgingBlockStateData.java | 34 +- .../generators/ReforgingItemModelData.java | 46 +- .../generators/ReforgingLanguageData.java | 60 +-- .../generators/ReforgingLootTableData.java | 30 +- .../data/generators/ReforgingRecipeData.java | 460 +++++++++--------- .../generators/loot/ReforgingBlockLoot.java | 40 +- .../tags/ReforgingBlockTagData.java | 56 +-- .../generators/tags/ReforgingItemTagData.java | 80 +-- .../ReforgingBlockStateProvider.java | 54 +- .../providers/ReforgingLanguageProvider.java | 34 +- .../providers/ReforgingRecipeProvider.java | 56 +-- .../item/ReforgingCreativeTabs.java | 54 +- .../item/ReforgingItems.java | 9 +- .../TreasureReforgingRecipeSerializers.java | 4 +- .../recipe/recipes/PhoenixArmorRecipe.java | 8 +- src/main/resources/META-INF/mods.toml | 8 +- 20 files changed, 571 insertions(+), 572 deletions(-) diff --git a/gradle.properties b/gradle.properties index 08aba4e..b87ccf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ org.gradle.daemon=false mod_id=aether_treasure_reforging mod_name=Treasure Reforging mod_version=1.0.0 -mc_version=1.19.4 -forge_version=45.1.0 -mappings=2023.06.26-1.19.4 +mc_version=1.19.2 +forge_version=43.2.0 +mappings=2022.11.27-1.19.2 # Dependencies -aether_version=1.19.4-1.4.2-forge -nitrogen_version=1.19.4-1.0.6-forge -curios_version=1.19.4-5.1.5.3 +aether_version=1.19.2-1.4.2-forge +nitrogen_version=1.19.2-1.0.4-forge +curios_version=1.19.2-5.1.4.1 # Publishing curseforge_id=0 diff --git a/src/main/java/com/aetherteam/treasure_reforging/TreasureReforging.java b/src/main/java/com/aetherteam/treasure_reforging/TreasureReforging.java index 879fb17..802444a 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/TreasureReforging.java +++ b/src/main/java/com/aetherteam/treasure_reforging/TreasureReforging.java @@ -1,7 +1,6 @@ package com.aetherteam.treasure_reforging; import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.data.ReforgingData; import com.aetherteam.treasure_reforging.item.ReforgingItems; import com.aetherteam.treasure_reforging.recipe.TreasureReforgingRecipeSerializers; import com.mojang.logging.LogUtils; @@ -18,7 +17,7 @@ public class TreasureReforging { public TreasureReforging() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - modEventBus.addListener(ReforgingData::dataSetup); +// modEventBus.addListener(ReforgingData::dataSetup); DeferredRegister[] registers = { ReforgingBlocks.BLOCKS, diff --git a/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java b/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java index f9927eb..810bf46 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java +++ b/src/main/java/com/aetherteam/treasure_reforging/block/ReforgingBlocks.java @@ -2,6 +2,7 @@ import com.aetherteam.aether.Aether; import com.aetherteam.aether.block.miscellaneous.FacingPillarBlock; +import com.aetherteam.aether.item.AetherCreativeTabs; import com.aetherteam.treasure_reforging.item.ReforgingItems; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; @@ -38,9 +39,9 @@ private static Supplier registerBlockItem(final Reg return () -> { B block = Objects.requireNonNull(blockRegistryObject.get()); if (block == PYRAL_BLOCK.get()) { - return new BlockItem(block, new Item.Properties().fireResistant()); + return new BlockItem(block, new Item.Properties().fireResistant().tab(AetherCreativeTabs.AETHER_BLOCKS)); } else { - return new BlockItem(block, new Item.Properties()); + return new BlockItem(block, new Item.Properties().tab(AetherCreativeTabs.AETHER_BLOCKS)); } }; } diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/ReforgingData.java b/src/main/java/com/aetherteam/treasure_reforging/data/ReforgingData.java index 94ade07..51ca73f 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/ReforgingData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/ReforgingData.java @@ -1,47 +1,47 @@ package com.aetherteam.treasure_reforging.data; -import com.aetherteam.treasure_reforging.data.generators.ReforgingBlockStateData; -import com.aetherteam.treasure_reforging.data.generators.ReforgingItemModelData; -import com.aetherteam.treasure_reforging.data.generators.ReforgingLanguageData; -import com.aetherteam.treasure_reforging.data.generators.ReforgingRecipeData; -import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingBlockTagData; -import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingItemTagData; -import net.minecraft.SharedConstants; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; -import net.minecraft.data.metadata.PackMetadataGenerator; -import net.minecraft.network.chat.Component; -import net.minecraft.server.packs.PackType; -import net.minecraft.server.packs.metadata.pack.PackMetadataSection; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; - -import java.util.Map; -import java.util.concurrent.CompletableFuture; - -public class ReforgingData { - public static void dataSetup(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - ExistingFileHelper fileHelper = event.getExistingFileHelper(); - CompletableFuture lookupProvider = event.getLookupProvider(); - PackOutput packOutput = generator.getPackOutput(); - - // Client Data - generator.addProvider(event.includeClient(), new ReforgingBlockStateData(packOutput, fileHelper)); - generator.addProvider(event.includeClient(), new ReforgingItemModelData(packOutput, fileHelper)); - generator.addProvider(event.includeClient(), new ReforgingLanguageData(packOutput)); - - // Server Data - generator.addProvider(event.includeServer(), new ReforgingRecipeData(packOutput)); - ReforgingBlockTagData blockTags = new ReforgingBlockTagData(packOutput, lookupProvider, fileHelper); - generator.addProvider(event.includeServer(), blockTags); - generator.addProvider(event.includeServer(), new ReforgingItemTagData(packOutput, lookupProvider, blockTags.contentsGetter(), fileHelper)); - - // pack.mcmeta - PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput); - Map packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); - packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_treasure_reforging.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes)); - generator.addProvider(true, packMeta); - } -} +//import com.aetherteam.treasure_reforging.data.generators.ReforgingBlockStateData; +//import com.aetherteam.treasure_reforging.data.generators.ReforgingItemModelData; +//import com.aetherteam.treasure_reforging.data.generators.ReforgingLanguageData; +//import com.aetherteam.treasure_reforging.data.generators.ReforgingRecipeData; +//import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingBlockTagData; +//import com.aetherteam.treasure_reforging.data.generators.tags.ReforgingItemTagData; +//import net.minecraft.SharedConstants; +//import net.minecraft.core.HolderLookup; +//import net.minecraft.data.DataGenerator; +//import net.minecraft.data.PackOutput; +//import net.minecraft.data.metadata.PackMetadataGenerator; +//import net.minecraft.network.chat.Component; +//import net.minecraft.server.packs.PackType; +//import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +//import net.minecraftforge.common.data.ExistingFileHelper; +//import net.minecraftforge.data.event.GatherDataEvent; +// +//import java.util.Map; +//import java.util.concurrent.CompletableFuture; +// +//public class ReforgingData { +// public static void dataSetup(GatherDataEvent event) { +// DataGenerator generator = event.getGenerator(); +// ExistingFileHelper fileHelper = event.getExistingFileHelper(); +// CompletableFuture lookupProvider = event.getLookupProvider(); +// PackOutput packOutput = generator.getPackOutput(); +// +// // Client Data +// generator.addProvider(event.includeClient(), new ReforgingBlockStateData(packOutput, fileHelper)); +// generator.addProvider(event.includeClient(), new ReforgingItemModelData(packOutput, fileHelper)); +// generator.addProvider(event.includeClient(), new ReforgingLanguageData(packOutput)); +// +// // Server Data +// generator.addProvider(event.includeServer(), new ReforgingRecipeData(packOutput)); +// ReforgingBlockTagData blockTags = new ReforgingBlockTagData(packOutput, lookupProvider, fileHelper); +// generator.addProvider(event.includeServer(), blockTags); +// generator.addProvider(event.includeServer(), new ReforgingItemTagData(packOutput, lookupProvider, blockTags.contentsGetter(), fileHelper)); +// +// // pack.mcmeta +// PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput); +// Map packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); +// packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.aether_treasure_reforging.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes)); +// generator.addProvider(true, packMeta); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingBlockStateData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingBlockStateData.java index c0c3ae1..235f24e 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingBlockStateData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingBlockStateData.java @@ -1,19 +1,19 @@ package com.aetherteam.treasure_reforging.data.generators; -import com.aetherteam.treasure_reforging.TreasureReforging; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.data.providers.ReforgingBlockStateProvider; -import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; - -public class ReforgingBlockStateData extends ReforgingBlockStateProvider { - public ReforgingBlockStateData(PackOutput output, ExistingFileHelper helper) { - super(output, TreasureReforging.MODID, helper); - } - - @Override - public void registerStatesAndModels() { - this.pillarTop(ReforgingBlocks.VALKYRUM_BLOCK.get()); - this.block(ReforgingBlocks.PYRAL_BLOCK.get(), "construction/"); - } -} +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import com.aetherteam.treasure_reforging.data.providers.ReforgingBlockStateProvider; +//import net.minecraft.data.PackOutput; +//import net.minecraftforge.common.data.ExistingFileHelper; +// +//public class ReforgingBlockStateData extends ReforgingBlockStateProvider { +// public ReforgingBlockStateData(PackOutput output, ExistingFileHelper helper) { +// super(output, TreasureReforging.MODID, helper); +// } +// +// @Override +// public void registerStatesAndModels() { +// this.pillarTop(ReforgingBlocks.VALKYRUM_BLOCK.get()); +// this.block(ReforgingBlocks.PYRAL_BLOCK.get(), "construction/"); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingItemModelData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingItemModelData.java index df51efc..7bb20d3 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingItemModelData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingItemModelData.java @@ -1,25 +1,25 @@ package com.aetherteam.treasure_reforging.data.generators; -import com.aetherteam.nitrogen.data.providers.NitrogenItemModelProvider; -import com.aetherteam.treasure_reforging.TreasureReforging; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.item.ReforgingItems; -import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; - -public class ReforgingItemModelData extends NitrogenItemModelProvider { - public ReforgingItemModelData(PackOutput output, ExistingFileHelper helper) { - super(output, TreasureReforging.MODID, helper); - } - - @Override - protected void registerModels() { - this.item(ReforgingItems.NEPTUNE_MESH.get(), "materials/"); - this.item(ReforgingItems.VALKYRUM_INGOT.get(), "materials/"); - this.item(ReforgingItems.PYRAL_SHARD.get(), "materials/"); - this.item(ReforgingItems.PYRAL_INGOT.get(), "materials/"); - - this.itemBlock(ReforgingBlocks.VALKYRUM_BLOCK.get()); - this.itemBlock(ReforgingBlocks.PYRAL_BLOCK.get()); - } -} +//import com.aetherteam.nitrogen.data.providers.NitrogenItemModelProvider; +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import com.aetherteam.treasure_reforging.item.ReforgingItems; +//import net.minecraft.data.PackOutput; +//import net.minecraftforge.common.data.ExistingFileHelper; +// +//public class ReforgingItemModelData extends NitrogenItemModelProvider { +// public ReforgingItemModelData(PackOutput output, ExistingFileHelper helper) { +// super(output, TreasureReforging.MODID, helper); +// } +// +// @Override +// protected void registerModels() { +// this.item(ReforgingItems.NEPTUNE_MESH.get(), "materials/"); +// this.item(ReforgingItems.VALKYRUM_INGOT.get(), "materials/"); +// this.item(ReforgingItems.PYRAL_SHARD.get(), "materials/"); +// this.item(ReforgingItems.PYRAL_INGOT.get(), "materials/"); +// +// this.itemBlock(ReforgingBlocks.VALKYRUM_BLOCK.get()); +// this.itemBlock(ReforgingBlocks.PYRAL_BLOCK.get()); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLanguageData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLanguageData.java index c8ed28f..876a054 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLanguageData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLanguageData.java @@ -1,32 +1,32 @@ package com.aetherteam.treasure_reforging.data.generators; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.data.providers.ReforgingLanguageProvider; -import com.aetherteam.treasure_reforging.item.ReforgingItems; -import net.minecraft.data.PackOutput; - -public class ReforgingLanguageData extends ReforgingLanguageProvider { - public ReforgingLanguageData(PackOutput output) { - super(output); - } - - @Override - protected void addTranslations() { - this.addBlock(ReforgingBlocks.VALKYRUM_BLOCK, "Block of Valkyrum"); - this.addBlock(ReforgingBlocks.PYRAL_BLOCK, "Block of Pyral"); - - this.addItem(ReforgingItems.NEPTUNE_MESH, "Neptune Mesh"); - this.addItem(ReforgingItems.VALKYRUM_INGOT, "Valkyrum Ingot"); - this.addItem(ReforgingItems.PYRAL_SHARD, "Pyral Shard"); - this.addItem(ReforgingItems.PYRAL_INGOT, "Pyral Ingot"); - - this.addLore(ReforgingItems.NEPTUNE_MESH, "A mesh of interwoven blue metallic links. With the respective template, it can be used in a Smithing Table to forge Neptune armor."); - this.addLore(ReforgingItems.VALKYRUM_INGOT, "A rare metal utilized by the Valkyries. With the respective template, it can be used in a Smithing Table to forge Valkyrie equipment."); - this.addLore(ReforgingItems.PYRAL_SHARD, "When combined with obsidian, fragments of Pyral material can be used to craft Pyral Ingots. The shard can also function as a long-lasting fuel."); - this.addLore(ReforgingItems.PYRAL_INGOT, "A hardened and fire-resistant ingot. With the respective template, it can be used in a Smithing Table to forge Phoenix armor."); - this.addLore(ReforgingBlocks.VALKYRUM_BLOCK, "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting."); - this.addLore(ReforgingBlocks.PYRAL_BLOCK, "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them."); - - this.addPackDescription("mod", "The Aether: Treasure Reforging Resources"); - } -} +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import com.aetherteam.treasure_reforging.data.providers.ReforgingLanguageProvider; +//import com.aetherteam.treasure_reforging.item.ReforgingItems; +//import net.minecraft.data.PackOutput; +// +//public class ReforgingLanguageData extends ReforgingLanguageProvider { +// public ReforgingLanguageData(PackOutput output) { +// super(output); +// } +// +// @Override +// protected void addTranslations() { +// this.addBlock(ReforgingBlocks.VALKYRUM_BLOCK, "Block of Valkyrum"); +// this.addBlock(ReforgingBlocks.PYRAL_BLOCK, "Block of Pyral"); +// +// this.addItem(ReforgingItems.NEPTUNE_MESH, "Neptune Mesh"); +// this.addItem(ReforgingItems.VALKYRUM_INGOT, "Valkyrum Ingot"); +// this.addItem(ReforgingItems.PYRAL_SHARD, "Pyral Shard"); +// this.addItem(ReforgingItems.PYRAL_INGOT, "Pyral Ingot"); +// +// this.addLore(ReforgingItems.NEPTUNE_MESH, "A mesh of interwoven blue metallic links. With the respective template, it can be used in a Smithing Table to forge Neptune armor."); +// this.addLore(ReforgingItems.VALKYRUM_INGOT, "A rare metal utilized by the Valkyries. With the respective template, it can be used in a Smithing Table to forge Valkyrie equipment."); +// this.addLore(ReforgingItems.PYRAL_SHARD, "When combined with obsidian, fragments of Pyral material can be used to craft Pyral Ingots. The shard can also function as a long-lasting fuel."); +// this.addLore(ReforgingItems.PYRAL_INGOT, "A hardened and fire-resistant ingot. With the respective template, it can be used in a Smithing Table to forge Phoenix armor."); +// this.addLore(ReforgingBlocks.VALKYRUM_BLOCK, "A solid block made from Valkyrum Ingots. They can power beacons and be used as decorative accenting."); +// this.addLore(ReforgingBlocks.PYRAL_BLOCK, "A solid block made from Pyral Ingots. They can power beacons and have a fiery look to them."); +// +// this.addPackDescription("mod", "The Aether: Treasure Reforging Resources"); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLootTableData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLootTableData.java index 57afebf..611d8f6 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLootTableData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingLootTableData.java @@ -1,17 +1,17 @@ package com.aetherteam.treasure_reforging.data.generators; -import com.aetherteam.treasure_reforging.data.generators.loot.ReforgingBlockLoot; -import com.aetherteam.treasure_reforging.loot.ReforgingLoot; -import net.minecraft.data.PackOutput; -import net.minecraft.data.loot.LootTableProvider; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; - -import java.util.List; - -public class ReforgingLootTableData { - public static LootTableProvider create(PackOutput output) { - return new LootTableProvider(output, ReforgingLoot.IMMUTABLE_LOOT_TABLES, List.of( - new LootTableProvider.SubProviderEntry(ReforgingBlockLoot::new, LootContextParamSets.BLOCK) - )); - } -} +//import com.aetherteam.treasure_reforging.data.generators.loot.ReforgingBlockLoot; +//import com.aetherteam.treasure_reforging.loot.ReforgingLoot; +//import net.minecraft.data.PackOutput; +//import net.minecraft.data.loot.LootTableProvider; +//import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +// +//import java.util.List; +// +//public class ReforgingLootTableData { +// public static LootTableProvider create(PackOutput output) { +// return new LootTableProvider(output, ReforgingLoot.IMMUTABLE_LOOT_TABLES, List.of( +// new LootTableProvider.SubProviderEntry(ReforgingBlockLoot::new, LootContextParamSets.BLOCK) +// )); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingRecipeData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingRecipeData.java index 973985c..de3e7a4 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingRecipeData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/ReforgingRecipeData.java @@ -1,232 +1,232 @@ package com.aetherteam.treasure_reforging.data.generators; -import com.aetherteam.aether.block.AetherBlocks; -import com.aetherteam.aether.item.AetherItems; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.data.providers.ReforgingRecipeProvider; -import com.aetherteam.treasure_reforging.item.ReforgingItems; -import com.aetherteam.treasure_reforging.recipe.TreasureReforgingRecipeSerializers; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.*; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.block.Blocks; - -import java.util.function.Consumer; - -public class ReforgingRecipeData extends ReforgingRecipeProvider { - public ReforgingRecipeData(PackOutput output) { - super(output); - } - - @Override - protected void buildRecipes(Consumer consumer) { - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ReforgingItems.PYRAL_INGOT.get()) - .requires(ReforgingItems.PYRAL_SHARD.get(), 4) - .requires(Blocks.OBSIDIAN, 2) - .unlockedBy("has_pyral_shard", has(ReforgingItems.PYRAL_SHARD.get())) - .save(consumer); - - SpecialRecipeBuilder.special(TreasureReforgingRecipeSerializers.PHOENIX_ARMOR.get()).save(consumer, "phoenix_armor_reigniting"); - - this.oreBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.MISC, ReforgingItems.VALKYRUM_INGOT.get(), RecipeCategory.BUILDING_BLOCKS, ReforgingBlocks.VALKYRUM_BLOCK.get(), "valkyrum_ingot_from_valkyrum_block", "valkyrum_ingot"); - this.oreBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.MISC, ReforgingItems.PYRAL_INGOT.get(), RecipeCategory.BUILDING_BLOCKS, ReforgingBlocks.PYRAL_BLOCK.get(), "pyral_ingot_from_pyral_block", "pyral_ingot"); - - SimpleCookingRecipeBuilder.smelting( - Ingredient.of(AetherItems.NEPTUNE_BOOTS.get(), AetherItems.NEPTUNE_LEGGINGS.get(), AetherItems.NEPTUNE_CHESTPLATE.get(), AetherItems.NEPTUNE_HELMET.get(), AetherItems.NEPTUNE_GLOVES.get()), - RecipeCategory.MISC, - ReforgingItems.NEPTUNE_MESH.get(), - 0.1F, - 200) - .unlockedBy("has_boots", has(AetherItems.NEPTUNE_BOOTS.get())) - .unlockedBy("has_leggings", has(AetherItems.NEPTUNE_LEGGINGS.get())) - .unlockedBy("has_chestplate", has(AetherItems.NEPTUNE_CHESTPLATE.get())) - .unlockedBy("has_helmet", has(AetherItems.NEPTUNE_HELMET.get())) - .unlockedBy("has_gloves", has(AetherItems.NEPTUNE_GLOVES.get())) - .group(getSmeltingRecipeName(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.NEPTUNE_MESH.get()))); - SimpleCookingRecipeBuilder.smelting( - Ingredient.of(AetherItems.VALKYRIE_BOOTS.get(), AetherItems.VALKYRIE_LEGGINGS.get(), AetherItems.VALKYRIE_CHESTPLATE.get(), AetherItems.VALKYRIE_HELMET.get(), AetherItems.VALKYRIE_GLOVES.get(), - AetherItems.VALKYRIE_LANCE.get(), AetherItems.VALKYRIE_PICKAXE.get(), AetherItems.VALKYRIE_AXE.get(), AetherItems.VALKYRIE_SHOVEL.get(), AetherItems.VALKYRIE_HOE.get()), - RecipeCategory.MISC, - ReforgingItems.VALKYRUM_INGOT.get(), - 0.1F, - 200) - .unlockedBy("has_boots", has(AetherItems.VALKYRIE_BOOTS.get())) - .unlockedBy("has_leggings", has(AetherItems.VALKYRIE_LEGGINGS.get())) - .unlockedBy("has_chestplate", has(AetherItems.VALKYRIE_CHESTPLATE.get())) - .unlockedBy("has_helmet", has(AetherItems.VALKYRIE_HELMET.get())) - .unlockedBy("has_gloves", has(AetherItems.VALKYRIE_GLOVES.get())) - .unlockedBy("has_sword", has(AetherItems.VALKYRIE_LANCE.get())) - .unlockedBy("has_pickaxe", has(AetherItems.VALKYRIE_PICKAXE.get())) - .unlockedBy("has_axe", has(AetherItems.VALKYRIE_AXE.get())) - .unlockedBy("has_shovel", has(AetherItems.VALKYRIE_SHOVEL.get())) - .unlockedBy("has_hoe", has(AetherItems.VALKYRIE_HOE.get())) - .group(getSmeltingRecipeName(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.VALKYRUM_INGOT.get()))); - SimpleCookingRecipeBuilder.smelting( - Ingredient.of(AetherItems.PHOENIX_BOOTS.get(), AetherItems.PHOENIX_LEGGINGS.get(), AetherItems.PHOENIX_CHESTPLATE.get(), AetherItems.PHOENIX_HELMET.get(), AetherItems.PHOENIX_GLOVES.get()), - RecipeCategory.MISC, - ReforgingItems.PYRAL_INGOT.get(), - 0.1F, - 200) - .unlockedBy("has_boots", has(AetherItems.PHOENIX_BOOTS.get())) - .unlockedBy("has_leggings", has(AetherItems.PHOENIX_LEGGINGS.get())) - .unlockedBy("has_chestplate", has(AetherItems.PHOENIX_CHESTPLATE.get())) - .unlockedBy("has_helmet", has(AetherItems.PHOENIX_HELMET.get())) - .unlockedBy("has_gloves", has(AetherItems.PHOENIX_GLOVES.get())) - .group(getSmeltingRecipeName(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.PYRAL_INGOT.get()))); - SimpleCookingRecipeBuilder.smelting( - Ingredient.of(AetherBlocks.SUN_ALTAR.get()), - RecipeCategory.MISC, - ReforgingItems.PYRAL_SHARD.get(), - 0.1F, - 200) - .unlockedBy("has_sun_altar", has(AetherBlocks.SUN_ALTAR.get())) - .group(getSmeltingRecipeName(ReforgingItems.PYRAL_SHARD.get())) - .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.PYRAL_SHARD.get()))); - - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.ZANITE_BOOTS.get()), - Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), - RecipeCategory.COMBAT, - AetherItems.NEPTUNE_BOOTS.get()) - .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_BOOTS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.ZANITE_LEGGINGS.get()), - Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), - RecipeCategory.COMBAT, - AetherItems.NEPTUNE_LEGGINGS.get()) - .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_LEGGINGS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.ZANITE_CHESTPLATE.get()), - Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), - RecipeCategory.COMBAT, - AetherItems.NEPTUNE_CHESTPLATE.get()) - .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_CHESTPLATE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.ZANITE_HELMET.get()), - Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), - RecipeCategory.COMBAT, - AetherItems.NEPTUNE_HELMET.get()) - .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_HELMET.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.ZANITE_GLOVES.get()), - Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), - RecipeCategory.COMBAT, - AetherItems. NEPTUNE_GLOVES.get()) - .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) - .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_GLOVES.get()) + "_smithing")); - - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_BOOTS.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.VALKYRIE_BOOTS.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_BOOTS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_LEGGINGS.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.VALKYRIE_LEGGINGS.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_LEGGINGS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_CHESTPLATE.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.VALKYRIE_CHESTPLATE.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_CHESTPLATE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_HELMET.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.VALKYRIE_HELMET.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_HELMET.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_GLOVES.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_GLOVES.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_GLOVES.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_SWORD.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_LANCE.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_LANCE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_PICKAXE.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_PICKAXE.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_PICKAXE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_AXE.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_AXE.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_AXE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_SHOVEL.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_SHOVEL.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_SHOVEL.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_HOE.get()), - Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. VALKYRIE_HOE.get()) - .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_HOE.get()) + "_smithing")); - - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_BOOTS.get()), - Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.PHOENIX_BOOTS.get()) - .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.PHOENIX_BOOTS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_LEGGINGS.get()), - Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.PHOENIX_LEGGINGS.get()) - .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.PHOENIX_LEGGINGS.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_CHESTPLATE.get()), - Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.PHOENIX_CHESTPLATE.get()) - .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.PHOENIX_CHESTPLATE.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_HELMET.get()), - Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems.PHOENIX_HELMET.get()) - .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.PHOENIX_HELMET.get()) + "_smithing")); - LegacyUpgradeRecipeBuilder.smithing( - Ingredient.of(AetherItems.GRAVITITE_GLOVES.get()), - Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), - RecipeCategory.COMBAT, - AetherItems. PHOENIX_GLOVES.get()) - .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) - .save(consumer, this.name(getItemName(AetherItems.PHOENIX_GLOVES.get()) + "_smithing")); - } -} +//import com.aetherteam.aether.block.AetherBlocks; +//import com.aetherteam.aether.item.AetherItems; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import com.aetherteam.treasure_reforging.data.providers.ReforgingRecipeProvider; +//import com.aetherteam.treasure_reforging.item.ReforgingItems; +//import com.aetherteam.treasure_reforging.recipe.TreasureReforgingRecipeSerializers; +//import net.minecraft.data.PackOutput; +//import net.minecraft.data.recipes.*; +//import net.minecraft.world.item.crafting.Ingredient; +//import net.minecraft.world.level.block.Blocks; +// +//import java.util.function.Consumer; +// +//public class ReforgingRecipeData extends ReforgingRecipeProvider { +// public ReforgingRecipeData(PackOutput output) { +// super(output); +// } +// +// @Override +// protected void buildRecipes(Consumer consumer) { +// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ReforgingItems.PYRAL_INGOT.get()) +// .requires(ReforgingItems.PYRAL_SHARD.get(), 4) +// .requires(Blocks.OBSIDIAN, 2) +// .unlockedBy("has_pyral_shard", has(ReforgingItems.PYRAL_SHARD.get())) +// .save(consumer); +// +// SpecialRecipeBuilder.special(TreasureReforgingRecipeSerializers.PHOENIX_ARMOR.get()).save(consumer, "phoenix_armor_reigniting"); +// +// this.oreBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.MISC, ReforgingItems.VALKYRUM_INGOT.get(), RecipeCategory.BUILDING_BLOCKS, ReforgingBlocks.VALKYRUM_BLOCK.get(), "valkyrum_ingot_from_valkyrum_block", "valkyrum_ingot"); +// this.oreBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.MISC, ReforgingItems.PYRAL_INGOT.get(), RecipeCategory.BUILDING_BLOCKS, ReforgingBlocks.PYRAL_BLOCK.get(), "pyral_ingot_from_pyral_block", "pyral_ingot"); +// +// SimpleCookingRecipeBuilder.smelting( +// Ingredient.of(AetherItems.NEPTUNE_BOOTS.get(), AetherItems.NEPTUNE_LEGGINGS.get(), AetherItems.NEPTUNE_CHESTPLATE.get(), AetherItems.NEPTUNE_HELMET.get(), AetherItems.NEPTUNE_GLOVES.get()), +// RecipeCategory.MISC, +// ReforgingItems.NEPTUNE_MESH.get(), +// 0.1F, +// 200) +// .unlockedBy("has_boots", has(AetherItems.NEPTUNE_BOOTS.get())) +// .unlockedBy("has_leggings", has(AetherItems.NEPTUNE_LEGGINGS.get())) +// .unlockedBy("has_chestplate", has(AetherItems.NEPTUNE_CHESTPLATE.get())) +// .unlockedBy("has_helmet", has(AetherItems.NEPTUNE_HELMET.get())) +// .unlockedBy("has_gloves", has(AetherItems.NEPTUNE_GLOVES.get())) +// .group(getSmeltingRecipeName(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.NEPTUNE_MESH.get()))); +// SimpleCookingRecipeBuilder.smelting( +// Ingredient.of(AetherItems.VALKYRIE_BOOTS.get(), AetherItems.VALKYRIE_LEGGINGS.get(), AetherItems.VALKYRIE_CHESTPLATE.get(), AetherItems.VALKYRIE_HELMET.get(), AetherItems.VALKYRIE_GLOVES.get(), +// AetherItems.VALKYRIE_LANCE.get(), AetherItems.VALKYRIE_PICKAXE.get(), AetherItems.VALKYRIE_AXE.get(), AetherItems.VALKYRIE_SHOVEL.get(), AetherItems.VALKYRIE_HOE.get()), +// RecipeCategory.MISC, +// ReforgingItems.VALKYRUM_INGOT.get(), +// 0.1F, +// 200) +// .unlockedBy("has_boots", has(AetherItems.VALKYRIE_BOOTS.get())) +// .unlockedBy("has_leggings", has(AetherItems.VALKYRIE_LEGGINGS.get())) +// .unlockedBy("has_chestplate", has(AetherItems.VALKYRIE_CHESTPLATE.get())) +// .unlockedBy("has_helmet", has(AetherItems.VALKYRIE_HELMET.get())) +// .unlockedBy("has_gloves", has(AetherItems.VALKYRIE_GLOVES.get())) +// .unlockedBy("has_sword", has(AetherItems.VALKYRIE_LANCE.get())) +// .unlockedBy("has_pickaxe", has(AetherItems.VALKYRIE_PICKAXE.get())) +// .unlockedBy("has_axe", has(AetherItems.VALKYRIE_AXE.get())) +// .unlockedBy("has_shovel", has(AetherItems.VALKYRIE_SHOVEL.get())) +// .unlockedBy("has_hoe", has(AetherItems.VALKYRIE_HOE.get())) +// .group(getSmeltingRecipeName(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.VALKYRUM_INGOT.get()))); +// SimpleCookingRecipeBuilder.smelting( +// Ingredient.of(AetherItems.PHOENIX_BOOTS.get(), AetherItems.PHOENIX_LEGGINGS.get(), AetherItems.PHOENIX_CHESTPLATE.get(), AetherItems.PHOENIX_HELMET.get(), AetherItems.PHOENIX_GLOVES.get()), +// RecipeCategory.MISC, +// ReforgingItems.PYRAL_INGOT.get(), +// 0.1F, +// 200) +// .unlockedBy("has_boots", has(AetherItems.PHOENIX_BOOTS.get())) +// .unlockedBy("has_leggings", has(AetherItems.PHOENIX_LEGGINGS.get())) +// .unlockedBy("has_chestplate", has(AetherItems.PHOENIX_CHESTPLATE.get())) +// .unlockedBy("has_helmet", has(AetherItems.PHOENIX_HELMET.get())) +// .unlockedBy("has_gloves", has(AetherItems.PHOENIX_GLOVES.get())) +// .group(getSmeltingRecipeName(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.PYRAL_INGOT.get()))); +// SimpleCookingRecipeBuilder.smelting( +// Ingredient.of(AetherBlocks.SUN_ALTAR.get()), +// RecipeCategory.MISC, +// ReforgingItems.PYRAL_SHARD.get(), +// 0.1F, +// 200) +// .unlockedBy("has_sun_altar", has(AetherBlocks.SUN_ALTAR.get())) +// .group(getSmeltingRecipeName(ReforgingItems.PYRAL_SHARD.get())) +// .save(consumer, this.name(getSmeltingRecipeName(ReforgingItems.PYRAL_SHARD.get()))); +// +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.ZANITE_BOOTS.get()), +// Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), +// RecipeCategory.COMBAT, +// AetherItems.NEPTUNE_BOOTS.get()) +// .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_BOOTS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.ZANITE_LEGGINGS.get()), +// Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), +// RecipeCategory.COMBAT, +// AetherItems.NEPTUNE_LEGGINGS.get()) +// .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_LEGGINGS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.ZANITE_CHESTPLATE.get()), +// Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), +// RecipeCategory.COMBAT, +// AetherItems.NEPTUNE_CHESTPLATE.get()) +// .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_CHESTPLATE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.ZANITE_HELMET.get()), +// Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), +// RecipeCategory.COMBAT, +// AetherItems.NEPTUNE_HELMET.get()) +// .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_HELMET.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.ZANITE_GLOVES.get()), +// Ingredient.of(ReforgingItems.NEPTUNE_MESH.get()), +// RecipeCategory.COMBAT, +// AetherItems. NEPTUNE_GLOVES.get()) +// .unlocks("has_neptune_mesh", has(ReforgingItems.NEPTUNE_MESH.get())) +// .save(consumer, this.name(getItemName(AetherItems.NEPTUNE_GLOVES.get()) + "_smithing")); +// +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_BOOTS.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.VALKYRIE_BOOTS.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_BOOTS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_LEGGINGS.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.VALKYRIE_LEGGINGS.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_LEGGINGS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_CHESTPLATE.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.VALKYRIE_CHESTPLATE.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_CHESTPLATE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_HELMET.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.VALKYRIE_HELMET.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_HELMET.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_GLOVES.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_GLOVES.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_GLOVES.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_SWORD.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_LANCE.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_LANCE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_PICKAXE.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_PICKAXE.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_PICKAXE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_AXE.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_AXE.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_AXE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_SHOVEL.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_SHOVEL.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_SHOVEL.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_HOE.get()), +// Ingredient.of(ReforgingItems.VALKYRUM_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. VALKYRIE_HOE.get()) +// .unlocks("has_valkyrum_ingot", has(ReforgingItems.VALKYRUM_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.VALKYRIE_HOE.get()) + "_smithing")); +// +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_BOOTS.get()), +// Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.PHOENIX_BOOTS.get()) +// .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.PHOENIX_BOOTS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_LEGGINGS.get()), +// Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.PHOENIX_LEGGINGS.get()) +// .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.PHOENIX_LEGGINGS.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_CHESTPLATE.get()), +// Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.PHOENIX_CHESTPLATE.get()) +// .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.PHOENIX_CHESTPLATE.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_HELMET.get()), +// Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems.PHOENIX_HELMET.get()) +// .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.PHOENIX_HELMET.get()) + "_smithing")); +// LegacyUpgradeRecipeBuilder.smithing( +// Ingredient.of(AetherItems.GRAVITITE_GLOVES.get()), +// Ingredient.of(ReforgingItems.PYRAL_INGOT.get()), +// RecipeCategory.COMBAT, +// AetherItems. PHOENIX_GLOVES.get()) +// .unlocks("has_pyral_ingot", has(ReforgingItems.PYRAL_INGOT.get())) +// .save(consumer, this.name(getItemName(AetherItems.PHOENIX_GLOVES.get()) + "_smithing")); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/loot/ReforgingBlockLoot.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/loot/ReforgingBlockLoot.java index 7ff975d..1aa2131 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/loot/ReforgingBlockLoot.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/loot/ReforgingBlockLoot.java @@ -1,22 +1,22 @@ package com.aetherteam.treasure_reforging.data.generators.loot; -import com.aetherteam.nitrogen.data.providers.NitrogenBlockLootSubProvider; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import net.minecraft.world.flag.FeatureFlags; -import net.minecraft.world.item.Item; - -import java.util.Set; - -public class ReforgingBlockLoot extends NitrogenBlockLootSubProvider { - private static final Set EXPLOSION_RESISTANT = Set.of(); - - public ReforgingBlockLoot() { - super(EXPLOSION_RESISTANT, FeatureFlags.REGISTRY.allFlags()); - } - - @Override - public void generate() { - this.dropSelf(ReforgingBlocks.VALKYRUM_BLOCK.get()); - this.dropSelf(ReforgingBlocks.PYRAL_BLOCK.get()); - } -} +//import com.aetherteam.nitrogen.data.providers.NitrogenBlockLootSubProvider; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import net.minecraft.world.flag.FeatureFlags; +//import net.minecraft.world.item.Item; +// +//import java.util.Set; +// +//public class ReforgingBlockLoot extends NitrogenBlockLootSubProvider { +// private static final Set EXPLOSION_RESISTANT = Set.of(); +// +// public ReforgingBlockLoot() { +// super(EXPLOSION_RESISTANT, FeatureFlags.REGISTRY.allFlags()); +// } +// +// @Override +// public void generate() { +// this.dropSelf(ReforgingBlocks.VALKYRUM_BLOCK.get()); +// this.dropSelf(ReforgingBlocks.PYRAL_BLOCK.get()); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingBlockTagData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingBlockTagData.java index b2e7cf1..2b22400 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingBlockTagData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingBlockTagData.java @@ -1,30 +1,30 @@ package com.aetherteam.treasure_reforging.data.generators.tags; -import com.aetherteam.treasure_reforging.TreasureReforging; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.tags.BlockTags; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.data.BlockTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; - -import javax.annotation.Nullable; -import java.util.concurrent.CompletableFuture; - -public class ReforgingBlockTagData extends BlockTagsProvider { - public ReforgingBlockTagData(PackOutput output, CompletableFuture registries, @Nullable ExistingFileHelper helper) { - super(output, registries, TreasureReforging.MODID, helper); - } - - @Override - public void addTags(HolderLookup.Provider provider) { - this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add( - ReforgingBlocks.VALKYRUM_BLOCK.get(), - ReforgingBlocks.PYRAL_BLOCK.get()); - - this.tag(Tags.Blocks.STORAGE_BLOCKS).add( - ReforgingBlocks.VALKYRUM_BLOCK.get(), - ReforgingBlocks.PYRAL_BLOCK.get()); - } -} +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import net.minecraft.core.HolderLookup; +//import net.minecraft.data.PackOutput; +//import net.minecraft.tags.BlockTags; +//import net.minecraftforge.common.Tags; +//import net.minecraftforge.common.data.BlockTagsProvider; +//import net.minecraftforge.common.data.ExistingFileHelper; +// +//import javax.annotation.Nullable; +//import java.util.concurrent.CompletableFuture; +// +//public class ReforgingBlockTagData extends BlockTagsProvider { +// public ReforgingBlockTagData(PackOutput output, CompletableFuture registries, @Nullable ExistingFileHelper helper) { +// super(output, registries, TreasureReforging.MODID, helper); +// } +// +// @Override +// public void addTags(HolderLookup.Provider provider) { +// this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add( +// ReforgingBlocks.VALKYRUM_BLOCK.get(), +// ReforgingBlocks.PYRAL_BLOCK.get()); +// +// this.tag(Tags.Blocks.STORAGE_BLOCKS).add( +// ReforgingBlocks.VALKYRUM_BLOCK.get(), +// ReforgingBlocks.PYRAL_BLOCK.get()); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingItemTagData.java b/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingItemTagData.java index 9067646..79073cc 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingItemTagData.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/generators/tags/ReforgingItemTagData.java @@ -1,42 +1,42 @@ package com.aetherteam.treasure_reforging.data.generators.tags; -import com.aetherteam.aether.AetherTags; -import com.aetherteam.treasure_reforging.TreasureReforging; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import com.aetherteam.treasure_reforging.item.ReforgingItems; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.data.tags.ItemTagsProvider; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.data.ExistingFileHelper; - -import javax.annotation.Nullable; -import java.util.concurrent.CompletableFuture; - -public class ReforgingItemTagData extends ItemTagsProvider { - public ReforgingItemTagData(PackOutput output, CompletableFuture registries, CompletableFuture> blockTags, @Nullable ExistingFileHelper helper) { - super(output, registries, blockTags, TreasureReforging.MODID, helper); - } - - @Override - public void addTags(HolderLookup.Provider provider) { - this.tag(AetherTags.Items.NEPTUNE_REPAIRING).add(ReforgingItems.NEPTUNE_MESH.get()); - this.tag(AetherTags.Items.VALKYRIE_REPAIRING).add(ReforgingItems.VALKYRUM_INGOT.get()); - this.tag(AetherTags.Items.PHOENIX_REPAIRING).add(ReforgingItems.PYRAL_INGOT.get()); - - this.tag(Tags.Items.STORAGE_BLOCKS).add( - ReforgingBlocks.VALKYRUM_BLOCK.get().asItem(), - ReforgingBlocks.PYRAL_BLOCK.get().asItem()); - - this.tag(ItemTags.BEACON_PAYMENT_ITEMS).add( - ReforgingItems.NEPTUNE_MESH.get(), - ReforgingItems.VALKYRUM_INGOT.get(), - ReforgingItems.PYRAL_INGOT.get()); - this.tag(ItemTags.TRIM_MATERIALS).add( - ReforgingItems.NEPTUNE_MESH.get(), - ReforgingItems.VALKYRUM_INGOT.get(), - ReforgingItems.PYRAL_INGOT.get()); - } -} +//import com.aetherteam.aether.AetherTags; +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import com.aetherteam.treasure_reforging.item.ReforgingItems; +//import net.minecraft.core.HolderLookup; +//import net.minecraft.data.PackOutput; +//import net.minecraft.data.tags.ItemTagsProvider; +//import net.minecraft.tags.ItemTags; +//import net.minecraft.world.level.block.Block; +//import net.minecraftforge.common.Tags; +//import net.minecraftforge.common.data.ExistingFileHelper; +// +//import javax.annotation.Nullable; +//import java.util.concurrent.CompletableFuture; +// +//public class ReforgingItemTagData extends ItemTagsProvider { +// public ReforgingItemTagData(PackOutput output, CompletableFuture registries, CompletableFuture> blockTags, @Nullable ExistingFileHelper helper) { +// super(output, registries, blockTags, TreasureReforging.MODID, helper); +// } +// +// @Override +// public void addTags(HolderLookup.Provider provider) { +// this.tag(AetherTags.Items.NEPTUNE_REPAIRING).add(ReforgingItems.NEPTUNE_MESH.get()); +// this.tag(AetherTags.Items.VALKYRIE_REPAIRING).add(ReforgingItems.VALKYRUM_INGOT.get()); +// this.tag(AetherTags.Items.PHOENIX_REPAIRING).add(ReforgingItems.PYRAL_INGOT.get()); +// +// this.tag(Tags.Items.STORAGE_BLOCKS).add( +// ReforgingBlocks.VALKYRUM_BLOCK.get().asItem(), +// ReforgingBlocks.PYRAL_BLOCK.get().asItem()); +// +// this.tag(ItemTags.BEACON_PAYMENT_ITEMS).add( +// ReforgingItems.NEPTUNE_MESH.get(), +// ReforgingItems.VALKYRUM_INGOT.get(), +// ReforgingItems.PYRAL_INGOT.get()); +// this.tag(ItemTags.TRIM_MATERIALS).add( +// ReforgingItems.NEPTUNE_MESH.get(), +// ReforgingItems.VALKYRUM_INGOT.get(), +// ReforgingItems.PYRAL_INGOT.get()); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingBlockStateProvider.java b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingBlockStateProvider.java index 6e4f43a..d123cc7 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingBlockStateProvider.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingBlockStateProvider.java @@ -1,29 +1,29 @@ package com.aetherteam.treasure_reforging.data.providers; -import com.aetherteam.aether.block.miscellaneous.FacingPillarBlock; -import com.aetherteam.nitrogen.data.providers.NitrogenBlockStateProvider; -import net.minecraft.core.Direction; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; - -public abstract class ReforgingBlockStateProvider extends NitrogenBlockStateProvider { - public ReforgingBlockStateProvider(PackOutput output, String id, ExistingFileHelper helper) { - super(output, id, helper); - } - - public void pillarTop(FacingPillarBlock block) { - ResourceLocation side = this.texture(this.name(block), "construction/"); - ResourceLocation end = this.texture(this.name(block) + "_top", "construction/"); - ModelFile vertical = this.models().cubeColumn(this.name(block), side, end); - ModelFile horizontal = this.models().cubeColumnHorizontal(this.name(block) + "_horizontal", side, end); - this.getVariantBuilder(block) - .partialState().with(FacingPillarBlock.FACING, Direction.DOWN).modelForState().modelFile(vertical).rotationX(180).addModel() - .partialState().with(FacingPillarBlock.FACING, Direction.EAST).modelForState().modelFile(horizontal).rotationX(90).rotationY(90).addModel() - .partialState().with(FacingPillarBlock.FACING, Direction.NORTH).modelForState().modelFile(horizontal).rotationX(90).addModel() - .partialState().with(FacingPillarBlock.FACING, Direction.SOUTH).modelForState().modelFile(horizontal).rotationX(90).rotationY(180).addModel() - .partialState().with(FacingPillarBlock.FACING, Direction.UP).modelForState().modelFile(vertical).addModel() - .partialState().with(FacingPillarBlock.FACING, Direction.WEST).modelForState().modelFile(horizontal).rotationX(90).rotationY(270).addModel(); - } -} +//import com.aetherteam.aether.block.miscellaneous.FacingPillarBlock; +//import com.aetherteam.nitrogen.data.providers.NitrogenBlockStateProvider; +//import net.minecraft.core.Direction; +//import net.minecraft.data.PackOutput; +//import net.minecraft.resources.ResourceLocation; +//import net.minecraftforge.client.model.generators.ModelFile; +//import net.minecraftforge.common.data.ExistingFileHelper; +// +//public abstract class ReforgingBlockStateProvider extends NitrogenBlockStateProvider { +// public ReforgingBlockStateProvider(PackOutput output, String id, ExistingFileHelper helper) { +// super(output, id, helper); +// } +// +// public void pillarTop(FacingPillarBlock block) { +// ResourceLocation side = this.texture(this.name(block), "construction/"); +// ResourceLocation end = this.texture(this.name(block) + "_top", "construction/"); +// ModelFile vertical = this.models().cubeColumn(this.name(block), side, end); +// ModelFile horizontal = this.models().cubeColumnHorizontal(this.name(block) + "_horizontal", side, end); +// this.getVariantBuilder(block) +// .partialState().with(FacingPillarBlock.FACING, Direction.DOWN).modelForState().modelFile(vertical).rotationX(180).addModel() +// .partialState().with(FacingPillarBlock.FACING, Direction.EAST).modelForState().modelFile(horizontal).rotationX(90).rotationY(90).addModel() +// .partialState().with(FacingPillarBlock.FACING, Direction.NORTH).modelForState().modelFile(horizontal).rotationX(90).addModel() +// .partialState().with(FacingPillarBlock.FACING, Direction.SOUTH).modelForState().modelFile(horizontal).rotationX(90).rotationY(180).addModel() +// .partialState().with(FacingPillarBlock.FACING, Direction.UP).modelForState().modelFile(vertical).addModel() +// .partialState().with(FacingPillarBlock.FACING, Direction.WEST).modelForState().modelFile(horizontal).rotationX(90).rotationY(270).addModel(); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingLanguageProvider.java b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingLanguageProvider.java index c059d80..be9cfa2 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingLanguageProvider.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingLanguageProvider.java @@ -1,19 +1,19 @@ package com.aetherteam.treasure_reforging.data.providers; -import com.aetherteam.aether.data.providers.AetherLanguageProvider; -import com.aetherteam.treasure_reforging.TreasureReforging; -import net.minecraft.data.PackOutput; - -public abstract class ReforgingLanguageProvider extends AetherLanguageProvider { - public ReforgingLanguageProvider(PackOutput output) { - super(output, TreasureReforging.MODID); - } - - public void addUpgrade(String upgrade, String name) { - this.add("upgrade." + this.id + "." + upgrade, name); - } - - public void addSmithingTemplateDescription(String upgrade, String suffix, String name) { - this.add("item." + this.id + ".smithing_template." + upgrade + "." + suffix, name); - } -} +//import com.aetherteam.aether.data.providers.AetherLanguageProvider; +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import net.minecraft.data.PackOutput; +// +//public abstract class ReforgingLanguageProvider extends AetherLanguageProvider { +// public ReforgingLanguageProvider(PackOutput output) { +// super(output, TreasureReforging.MODID); +// } +// +// public void addUpgrade(String upgrade, String name) { +// this.add("upgrade." + this.id + "." + upgrade, name); +// } +// +// public void addSmithingTemplateDescription(String upgrade, String suffix, String name) { +// this.add("item." + this.id + ".smithing_template." + upgrade + "." + suffix, name); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingRecipeProvider.java b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingRecipeProvider.java index 86020f9..23aa85c 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingRecipeProvider.java +++ b/src/main/java/com/aetherteam/treasure_reforging/data/providers/ReforgingRecipeProvider.java @@ -1,30 +1,30 @@ package com.aetherteam.treasure_reforging.data.providers; -import com.aetherteam.aether.block.AetherBlocks; -import com.aetherteam.nitrogen.data.providers.NitrogenRecipeProvider; -import com.aetherteam.treasure_reforging.TreasureReforging; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.world.level.ItemLike; - -import java.util.function.Consumer; - -public abstract class ReforgingRecipeProvider extends NitrogenRecipeProvider { - public ReforgingRecipeProvider(PackOutput output) { - super(output, TreasureReforging.MODID); - } - - public void copyDungeonSmithingTemplate(Consumer finishedRecipeConsumer, ItemLike result, ItemLike baseItem) { - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, result, 2) - .define('#', AetherBlocks.ENCHANTED_GRAVITITE.get()) - .define('C', baseItem) - .define('S', result) - .pattern("#S#") - .pattern("#C#") - .pattern("###") - .unlockedBy(getHasName(result), has(result)) - .save(finishedRecipeConsumer); - } -} +//import com.aetherteam.aether.block.AetherBlocks; +//import com.aetherteam.nitrogen.data.providers.NitrogenRecipeProvider; +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import net.minecraft.data.PackOutput; +//import net.minecraft.data.recipes.FinishedRecipe; +//import net.minecraft.data.recipes.RecipeCategory; +//import net.minecraft.data.recipes.ShapedRecipeBuilder; +//import net.minecraft.world.level.ItemLike; +// +//import java.util.function.Consumer; +// +//public abstract class ReforgingRecipeProvider extends NitrogenRecipeProvider { +// public ReforgingRecipeProvider(PackOutput output) { +// super(output, TreasureReforging.MODID); +// } +// +// public void copyDungeonSmithingTemplate(Consumer finishedRecipeConsumer, ItemLike result, ItemLike baseItem) { +// ShapedRecipeBuilder.shaped(RecipeCategory.MISC, result, 2) +// .define('#', AetherBlocks.ENCHANTED_GRAVITITE.get()) +// .define('C', baseItem) +// .define('S', result) +// .pattern("#S#") +// .pattern("#C#") +// .pattern("###") +// .unlockedBy(getHasName(result), has(result)) +// .save(finishedRecipeConsumer); +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingCreativeTabs.java b/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingCreativeTabs.java index c26b070..8a67e42 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingCreativeTabs.java +++ b/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingCreativeTabs.java @@ -1,29 +1,29 @@ package com.aetherteam.treasure_reforging.item; -import com.aetherteam.aether.block.AetherBlocks; -import com.aetherteam.aether.item.AetherCreativeTabs; -import com.aetherteam.treasure_reforging.TreasureReforging; -import com.aetherteam.treasure_reforging.block.ReforgingBlocks; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.CreativeModeTabEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(modid = TreasureReforging.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class ReforgingCreativeTabs { - @SubscribeEvent - public static void buildCreativeModeTabs(CreativeModeTabEvent.BuildContents event) { - CreativeModeTab tab = event.getTab(); - if (tab == AetherCreativeTabs.AETHER_BUILDING_BLOCKS) { - event.getEntries().putAfter(new ItemStack(AetherBlocks.ENCHANTED_GRAVITITE.get()), new ItemStack(ReforgingBlocks.VALKYRUM_BLOCK.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - event.getEntries().putAfter(new ItemStack(ReforgingBlocks.VALKYRUM_BLOCK.get()), new ItemStack(ReforgingBlocks.PYRAL_BLOCK.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - } - if (tab == AetherCreativeTabs.AETHER_INGREDIENTS) { - event.getEntries().putAfter(new ItemStack(AetherBlocks.ENCHANTED_GRAVITITE.get()), new ItemStack(ReforgingItems.NEPTUNE_MESH.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - event.getEntries().putAfter(new ItemStack(ReforgingItems.NEPTUNE_MESH.get()), new ItemStack(ReforgingItems.VALKYRUM_INGOT.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - event.getEntries().putAfter(new ItemStack(ReforgingItems.VALKYRUM_INGOT.get()), new ItemStack(ReforgingItems.PYRAL_SHARD.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - event.getEntries().putAfter(new ItemStack(ReforgingItems.PYRAL_SHARD.get()), new ItemStack(ReforgingItems.PYRAL_INGOT.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - } - } -} +//import com.aetherteam.aether.block.AetherBlocks; +//import com.aetherteam.aether.item.AetherCreativeTabs; +//import com.aetherteam.treasure_reforging.TreasureReforging; +//import com.aetherteam.treasure_reforging.block.ReforgingBlocks; +//import net.minecraft.world.item.CreativeModeTab; +//import net.minecraft.world.item.ItemStack; +//import net.minecraftforge.event.CreativeModeTabEvent; +//import net.minecraftforge.eventbus.api.SubscribeEvent; +//import net.minecraftforge.fml.common.Mod; +// +//@Mod.EventBusSubscriber(modid = TreasureReforging.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +//public class ReforgingCreativeTabs { +// @SubscribeEvent +// public static void buildCreativeModeTabs(CreativeModeTabEvent.BuildContents event) { +// CreativeModeTab tab = event.getTab(); +// if (tab == AetherCreativeTabs.AETHER_BUILDING_BLOCKS) { +// event.getEntries().putAfter(new ItemStack(AetherBlocks.ENCHANTED_GRAVITITE.get()), new ItemStack(ReforgingBlocks.VALKYRUM_BLOCK.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// event.getEntries().putAfter(new ItemStack(ReforgingBlocks.VALKYRUM_BLOCK.get()), new ItemStack(ReforgingBlocks.PYRAL_BLOCK.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// } +// if (tab == AetherCreativeTabs.AETHER_INGREDIENTS) { +// event.getEntries().putAfter(new ItemStack(AetherBlocks.ENCHANTED_GRAVITITE.get()), new ItemStack(ReforgingItems.NEPTUNE_MESH.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// event.getEntries().putAfter(new ItemStack(ReforgingItems.NEPTUNE_MESH.get()), new ItemStack(ReforgingItems.VALKYRUM_INGOT.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// event.getEntries().putAfter(new ItemStack(ReforgingItems.VALKYRUM_INGOT.get()), new ItemStack(ReforgingItems.PYRAL_SHARD.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// event.getEntries().putAfter(new ItemStack(ReforgingItems.PYRAL_SHARD.get()), new ItemStack(ReforgingItems.PYRAL_INGOT.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); +// } +// } +//} diff --git a/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingItems.java b/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingItems.java index e5786f5..3f0e8c0 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingItems.java +++ b/src/main/java/com/aetherteam/treasure_reforging/item/ReforgingItems.java @@ -1,5 +1,6 @@ package com.aetherteam.treasure_reforging.item; +import com.aetherteam.aether.item.AetherCreativeTabs; import com.aetherteam.treasure_reforging.TreasureReforging; import com.aetherteam.treasure_reforging.item.materials.PyralShardItem; import net.minecraft.world.item.Item; @@ -10,8 +11,8 @@ public class ReforgingItems { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TreasureReforging.MODID); - public static final RegistryObject NEPTUNE_MESH = ITEMS.register("neptune_mesh", () -> new Item(new Item.Properties())); - public static final RegistryObject VALKYRUM_INGOT = ITEMS.register("valkyrum_ingot", () -> new Item(new Item.Properties())); - public static final RegistryObject PYRAL_SHARD = ITEMS.register("pyral_shard", () -> new PyralShardItem(new Item.Properties().fireResistant())); - public static final RegistryObject PYRAL_INGOT = ITEMS.register("pyral_ingot", () -> new Item(new Item.Properties().fireResistant())); + public static final RegistryObject NEPTUNE_MESH = ITEMS.register("neptune_mesh", () -> new Item(new Item.Properties().tab(AetherCreativeTabs.AETHER_INGREDIENTS))); + public static final RegistryObject VALKYRUM_INGOT = ITEMS.register("valkyrum_ingot", () -> new Item(new Item.Properties().tab(AetherCreativeTabs.AETHER_INGREDIENTS))); + public static final RegistryObject PYRAL_SHARD = ITEMS.register("pyral_shard", () -> new PyralShardItem(new Item.Properties().fireResistant().tab(AetherCreativeTabs.AETHER_INGREDIENTS))); + public static final RegistryObject PYRAL_INGOT = ITEMS.register("pyral_ingot", () -> new Item(new Item.Properties().fireResistant().tab(AetherCreativeTabs.AETHER_INGREDIENTS))); } diff --git a/src/main/java/com/aetherteam/treasure_reforging/recipe/TreasureReforgingRecipeSerializers.java b/src/main/java/com/aetherteam/treasure_reforging/recipe/TreasureReforgingRecipeSerializers.java index 4f6de51..dcf0add 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/recipe/TreasureReforgingRecipeSerializers.java +++ b/src/main/java/com/aetherteam/treasure_reforging/recipe/TreasureReforgingRecipeSerializers.java @@ -3,7 +3,7 @@ import com.aetherteam.treasure_reforging.TreasureReforging; import com.aetherteam.treasure_reforging.recipe.recipes.PhoenixArmorRecipe; import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer; +import net.minecraft.world.item.crafting.SimpleRecipeSerializer; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -11,5 +11,5 @@ public class TreasureReforgingRecipeSerializers { public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, TreasureReforging.MODID); - public static final RegistryObject> PHOENIX_ARMOR = RECIPE_SERIALIZERS.register("phoenix_armor", ()-> new SimpleCraftingRecipeSerializer<>(PhoenixArmorRecipe::new)); + public static final RegistryObject> PHOENIX_ARMOR = RECIPE_SERIALIZERS.register("phoenix_armor", ()-> new SimpleRecipeSerializer<>(PhoenixArmorRecipe::new)); } diff --git a/src/main/java/com/aetherteam/treasure_reforging/recipe/recipes/PhoenixArmorRecipe.java b/src/main/java/com/aetherteam/treasure_reforging/recipe/recipes/PhoenixArmorRecipe.java index 848644d..96e24b0 100644 --- a/src/main/java/com/aetherteam/treasure_reforging/recipe/recipes/PhoenixArmorRecipe.java +++ b/src/main/java/com/aetherteam/treasure_reforging/recipe/recipes/PhoenixArmorRecipe.java @@ -3,12 +3,10 @@ import com.aetherteam.aether.item.AetherItems; import com.aetherteam.treasure_reforging.item.ReforgingItems; import com.aetherteam.treasure_reforging.recipe.TreasureReforgingRecipeSerializers; -import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -28,8 +26,8 @@ public class PhoenixArmorRecipe extends CustomRecipe { )); private static final Ingredient SHARD_INGREDIENT = Ingredient.of(ReforgingItems.PYRAL_SHARD.get()); - public PhoenixArmorRecipe(ResourceLocation id, CraftingBookCategory category) { - super(id, category); + public PhoenixArmorRecipe(ResourceLocation id) { + super(id); } @Override @@ -50,7 +48,7 @@ public boolean matches(CraftingContainer container, Level level) { } @Override - public ItemStack assemble(CraftingContainer container, RegistryAccess registryAccess) { + public ItemStack assemble(CraftingContainer container) { ItemStack result = ItemStack.EMPTY; for (int i = 0; i < container.getContainerSize(); ++i) { ItemStack item = container.getItem(i); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 343fc2f..d787588 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[45,)" +loaderVersion="[43,)" license="Assets: All Rights Reserved; Code: LGPL-3.0" issueTrackerURL="https://github.com/The-Aether-Team/Treasure-Reforging/issues" @@ -17,18 +17,18 @@ description='''Allows dungeon treasure equipment to be smelted down into raw mat [[dependencies.aether_treasure_reforging]] modId="forge" mandatory=true - versionRange="[45.1.0,)" + versionRange="[43.2.0,)" ordering="NONE" side="BOTH" [[dependencies.aether_treasure_reforging]] modId = "aether" mandatory = true - versionRange = "[1.19.4-1.0.0-beta.5.1-forge,)" + versionRange = "[1.19.2-1.4.2-forge,)" ordering = "NONE" side = "BOTH" [[dependencies.aether_treasure_reforging]] modId="minecraft" mandatory=true - versionRange="[1.19.4,)" + versionRange="[1.19.2,)" ordering="NONE" side="BOTH"