From 17aa18201b615199e2fc8defad05fd059d7b25fa Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sat, 27 Apr 2024 23:33:12 -0400 Subject: [PATCH 1/7] 1.20.5 update, pending kff fixes --- build.gradle.kts | 16 ++-- gradle.properties | 6 +- .../kotlin/net/benjimadness/triad/TriadMod.kt | 25 ++---- .../triad/api/block/AbstractMachineBlock.kt | 22 +++-- .../block/entity/AbstractBoilerBlockEntity.kt | 17 ++-- .../entity/AbstractCapacitorBlockEntity.kt | 14 +-- .../AbstractElectricFurnaceBlockEntity.kt | 13 +-- .../AbstractElectricGrinderBlockEntity.kt | 13 +-- .../AbstractElectricProcessorBlockEntity.kt | 13 +-- .../AbstractEnergyGeneratorBlockEntity.kt | 13 +-- .../entity/AbstractGeneratorBlockEntity.kt | 9 +- .../entity/AbstractGrinderBlockEntity.kt | 20 +++-- .../entity/AbstractItemBoilerBlockEntity.kt | 13 +-- .../entity/AbstractMachineBlockEntity.kt | 20 ++--- .../entity/AbstractTurbineBlockEntity.kt | 13 +-- .../triad/api/item/ReusableItem.kt | 9 +- .../benjimadness/triad/block/BoilerBlock.kt | 24 ++---- .../triad/block/ElectricFurnaceBlock.kt | 6 -- .../benjimadness/triad/block/GrinderBlock.kt | 1 - .../benjimadness/triad/block/TurbineBlock.kt | 2 - .../benjimadness/triad/config/TriadConfig.kt | 4 +- .../triad/event/TriadEventHandler.kt | 4 +- .../net/benjimadness/triad/gui/BoilerMenu.kt | 1 - .../net/benjimadness/triad/gui/GrinderMenu.kt | 8 +- .../triad/item/armor/TriadArmorItem.kt | 20 ++++- .../triad/item/armor/TriadArmorMaterials.kt | 86 ------------------- .../triad/item/tool/TriadToolTiers.kt | 69 --------------- .../triad/recipe/GrinderRecipe.kt | 31 +++---- .../benjimadness/triad/registry/TriadItems.kt | 78 +++++++++++++---- .../{mods.toml => neoforge.mods.toml} | 0 .../tags/blocks/ore_rates/dense.json | 0 .../tags/items => c/tags/blocks}/ores.json | 2 +- .../{forge => c}/tags/blocks/ores/tin.json | 0 .../tags/blocks/ores_in_ground/deepslate.json | 0 .../tags/blocks/ores_in_ground/stone.json | 0 .../data/c/tags/blocks/storage_blocks.json | 9 ++ .../tags/blocks/storage_blocks/bronze.json | 0 .../tags/blocks/storage_blocks/raw_tin.json | 0 .../tags/blocks/storage_blocks/steel.json | 0 .../tags/blocks/storage_blocks/tin.json | 0 .../{forge => c}/tags/items/armors/boots.json | 0 .../tags/items/armors/chestplates.json | 0 .../tags/items/armors/helmets.json | 0 .../tags/items/armors/leggings.json | 0 .../resources/data/c/tags/items/dusts.json | 11 +++ .../{forge => c}/tags/items/dusts/bronze.json | 0 .../{forge => c}/tags/items/dusts/copper.json | 0 .../{forge => c}/tags/items/dusts/gold.json | 0 .../{forge => c}/tags/items/dusts/iron.json | 0 .../{forge => c}/tags/items/dusts/steel.json | 0 .../{forge => c}/tags/items/dusts/tin.json | 0 .../resources/data/c/tags/items/ingots.json | 8 ++ .../tags/items/ingots/bronze.json | 0 .../{forge => c}/tags/items/ingots/steel.json | 0 .../{forge => c}/tags/items/ingots/tin.json | 0 .../tags/items/ore_rates/dense.json | 0 .../tags/blocks => c/tags/items}/ores.json | 2 +- .../{forge => c}/tags/items/ores/tin.json | 0 .../tags/items/ores_in_ground/deepslate.json | 0 .../tags/items/ores_in_ground/stone.json | 0 .../tags/items/raw_materials.json | 2 +- .../tags/items/raw_materials/tin.json | 0 .../data/c/tags/items/storage_blocks.json | 9 ++ .../tags/items/storage_blocks/bronze.json | 0 .../tags/items/storage_blocks/raw_tin.json | 0 .../tags/items/storage_blocks/steel.json | 0 .../tags/items/storage_blocks/tin.json | 0 .../forge/tags/blocks/storage_blocks.json | 9 -- .../data/forge/tags/items/dusts.json | 11 --- .../data/forge/tags/items/ingots.json | 8 -- .../data/forge/tags/items/storage_blocks.json | 9 -- ...ronze_ingot_from_blasting_bronze_dust.json | 2 +- ...opper_ingot_from_blasting_copper_dust.json | 2 +- .../gold_ingot_from_blasting_gold_dust.json | 2 +- .../iron_ingot_from_blasting_iron_dust.json | 2 +- .../steel_ingot_from_blasting_steel_dust.json | 2 +- .../tin_ingot_from_blasting_raw_tin.json | 2 +- .../tin_ingot_from_blasting_tin_dust.json | 2 +- .../tin_ingot_from_blasting_tin_ore.json | 2 +- .../crafting/shaped/blast_furnace.json | 2 +- .../recipes/crafting/shaped/bronze_axe.json | 2 +- .../recipes/crafting/shaped/bronze_blade.json | 2 +- .../recipes/crafting/shaped/bronze_block.json | 2 +- .../recipes/crafting/shaped/bronze_boots.json | 2 +- .../crafting/shaped/bronze_chestplate.json | 2 +- .../crafting/shaped/bronze_furnace.json | 2 +- .../crafting/shaped/bronze_grinder.json | 4 +- .../crafting/shaped/bronze_helmet.json | 2 +- .../recipes/crafting/shaped/bronze_hoe.json | 2 +- .../crafting/shaped/bronze_item_boiler.json | 4 +- .../crafting/shaped/bronze_leggings.json | 2 +- .../crafting/shaped/bronze_pickaxe.json | 2 +- .../crafting/shaped/bronze_shovel.json | 2 +- .../recipes/crafting/shaped/bronze_sword.json | 2 +- .../crafting/shaped/bronze_turbine.json | 4 +- .../crafting/shaped/raw_tin_block.json | 2 +- .../crafting/shaped/redstone_grinder.json | 2 +- .../recipes/crafting/shaped/steel_axe.json | 2 +- .../recipes/crafting/shaped/steel_block.json | 2 +- .../recipes/crafting/shaped/steel_boots.json | 2 +- .../crafting/shaped/steel_capacitor.json | 2 +- .../crafting/shaped/steel_chestplate.json | 2 +- .../recipes/crafting/shaped/steel_helmet.json | 2 +- .../recipes/crafting/shaped/steel_hoe.json | 2 +- .../crafting/shaped/steel_leggings.json | 2 +- .../crafting/shaped/steel_pickaxe.json | 2 +- .../recipes/crafting/shaped/steel_shovel.json | 2 +- .../recipes/crafting/shaped/steel_sword.json | 2 +- .../recipes/crafting/shaped/tin_block.json | 2 +- .../crafting/shapeless/bronze_dust.json | 8 +- .../crafting/shapeless/bronze_ingot.json | 2 +- .../crafting/shapeless/copper_dust.json | 2 +- .../recipes/crafting/shapeless/gold_dust.json | 2 +- .../recipes/crafting/shapeless/iron_dust.json | 2 +- .../recipes/crafting/shapeless/raw_tin.json | 2 +- .../crafting/shapeless/steel_dust.json | 6 +- .../crafting/shapeless/steel_ingot.json | 2 +- .../recipes/crafting/shapeless/tin_dust.json | 2 +- .../recipes/crafting/shapeless/tin_ingot.json | 2 +- ...ronze_dust_from_grinding_bronze_block.json | 2 +- ...ronze_dust_from_grinding_bronze_ingot.json | 2 +- ...opper_dust_from_grinding_copper_block.json | 2 +- ...opper_dust_from_grinding_copper_ingot.json | 2 +- .../copper_dust_from_grinding_copper_ore.json | 2 +- .../copper_dust_from_grinding_raw_copper.json | 2 +- ...r_dust_from_grinding_raw_copper_block.json | 2 +- .../gold_dust_from_grinding_gold_block.json | 2 +- .../gold_dust_from_grinding_gold_ingot.json | 2 +- .../gold_dust_from_grinding_gold_ore.json | 2 +- .../gold_dust_from_grinding_raw_gold.json | 2 +- ...old_dust_from_grinding_raw_gold_block.json | 2 +- .../iron_dust_from_grinding_iron_block.json | 2 +- .../iron_dust_from_grinding_iron_ingot.json | 2 +- .../iron_dust_from_grinding_iron_ore.json | 2 +- .../iron_dust_from_grinding_raw_iron.json | 2 +- ...ron_dust_from_grinding_raw_iron_block.json | 2 +- .../steel_dust_from_grinding_steel_block.json | 2 +- .../steel_dust_from_grinding_steel_ingot.json | 2 +- .../tin_dust_from_grinding_raw_tin.json | 2 +- .../tin_dust_from_grinding_raw_tin_block.json | 2 +- .../tin_dust_from_grinding_tin_block.json | 2 +- .../tin_dust_from_grinding_tin_ingot.json | 2 +- .../tin_dust_from_grinding_tin_ore.json | 2 +- ...ronze_ingot_from_smelting_bronze_dust.json | 2 +- ...opper_ingot_from_smelting_copper_dust.json | 2 +- .../gold_ingot_from_smelting_gold_dust.json | 2 +- .../iron_ingot_from_smelting_iron_dust.json | 2 +- .../tin_ingot_from_smelting_raw_tin.json | 2 +- .../tin_ingot_from_smelting_tin_dust.json | 2 +- .../tin_ingot_from_smelting_tin_ore.json | 2 +- update.json | 2 +- 151 files changed, 360 insertions(+), 466 deletions(-) delete mode 100644 src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorMaterials.kt delete mode 100644 src/main/kotlin/net/benjimadness/triad/item/tool/TriadToolTiers.kt rename src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) rename src/main/resources/data/{forge => c}/tags/blocks/ore_rates/dense.json (100%) rename src/main/resources/data/{forge/tags/items => c/tags/blocks}/ores.json (65%) rename src/main/resources/data/{forge => c}/tags/blocks/ores/tin.json (100%) rename src/main/resources/data/{forge => c}/tags/blocks/ores_in_ground/deepslate.json (100%) rename src/main/resources/data/{forge => c}/tags/blocks/ores_in_ground/stone.json (100%) create mode 100644 src/main/resources/data/c/tags/blocks/storage_blocks.json rename src/main/resources/data/{forge => c}/tags/blocks/storage_blocks/bronze.json (100%) rename src/main/resources/data/{forge => c}/tags/blocks/storage_blocks/raw_tin.json (100%) rename src/main/resources/data/{forge => c}/tags/blocks/storage_blocks/steel.json (100%) rename src/main/resources/data/{forge => c}/tags/blocks/storage_blocks/tin.json (100%) rename src/main/resources/data/{forge => c}/tags/items/armors/boots.json (100%) rename src/main/resources/data/{forge => c}/tags/items/armors/chestplates.json (100%) rename src/main/resources/data/{forge => c}/tags/items/armors/helmets.json (100%) rename src/main/resources/data/{forge => c}/tags/items/armors/leggings.json (100%) create mode 100644 src/main/resources/data/c/tags/items/dusts.json rename src/main/resources/data/{forge => c}/tags/items/dusts/bronze.json (100%) rename src/main/resources/data/{forge => c}/tags/items/dusts/copper.json (100%) rename src/main/resources/data/{forge => c}/tags/items/dusts/gold.json (100%) rename src/main/resources/data/{forge => c}/tags/items/dusts/iron.json (100%) rename src/main/resources/data/{forge => c}/tags/items/dusts/steel.json (100%) rename src/main/resources/data/{forge => c}/tags/items/dusts/tin.json (100%) create mode 100644 src/main/resources/data/c/tags/items/ingots.json rename src/main/resources/data/{forge => c}/tags/items/ingots/bronze.json (100%) rename src/main/resources/data/{forge => c}/tags/items/ingots/steel.json (100%) rename src/main/resources/data/{forge => c}/tags/items/ingots/tin.json (100%) rename src/main/resources/data/{forge => c}/tags/items/ore_rates/dense.json (100%) rename src/main/resources/data/{forge/tags/blocks => c/tags/items}/ores.json (65%) rename src/main/resources/data/{forge => c}/tags/items/ores/tin.json (100%) rename src/main/resources/data/{forge => c}/tags/items/ores_in_ground/deepslate.json (100%) rename src/main/resources/data/{forge => c}/tags/items/ores_in_ground/stone.json (100%) rename src/main/resources/data/{forge => c}/tags/items/raw_materials.json (56%) rename src/main/resources/data/{forge => c}/tags/items/raw_materials/tin.json (100%) create mode 100644 src/main/resources/data/c/tags/items/storage_blocks.json rename src/main/resources/data/{forge => c}/tags/items/storage_blocks/bronze.json (100%) rename src/main/resources/data/{forge => c}/tags/items/storage_blocks/raw_tin.json (100%) rename src/main/resources/data/{forge => c}/tags/items/storage_blocks/steel.json (100%) rename src/main/resources/data/{forge => c}/tags/items/storage_blocks/tin.json (100%) delete mode 100644 src/main/resources/data/forge/tags/blocks/storage_blocks.json delete mode 100644 src/main/resources/data/forge/tags/items/dusts.json delete mode 100644 src/main/resources/data/forge/tags/items/ingots.json delete mode 100644 src/main/resources/data/forge/tags/items/storage_blocks.json diff --git a/build.gradle.kts b/build.gradle.kts index eba428c..180a868 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,13 +70,13 @@ minecraft { subsystems { parchment { - minecraftVersion(minecraft_version) + minecraftVersion("1.20.4") mappingsVersion(mappings_version) } } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) withSourcesJar() } @@ -111,11 +111,11 @@ dependencies { implementation("thedarkcolour:kotlinforforge-neoforge:${kotlinforforge_version}") - compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}") - compileOnly("mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}") - runtimeOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}") + compileOnly("mezz.jei:jei-1.20.4-common-api:${jei_version}") + compileOnly("mezz.jei:jei-1.20.4-neoforge-api:${jei_version}") + runtimeOnly("mezz.jei:jei-1.20.4-neoforge:${jei_version}") - implementation ("mcjty.theoneprobe:theoneprobe:${minecraft_version}_neo-${top_version}") + implementation ("mcjty.theoneprobe:theoneprobe:1.20.4_neo-${top_version}") } tasks { @@ -137,13 +137,13 @@ tasks { ) inputs.properties(replaceProperties) - filesMatching(mutableListOf("META-INF/mods.toml", "pack.mcmeta")) { + filesMatching(mutableListOf("META-INF/neoforge.mods.toml", "pack.mcmeta")) { expand(replaceProperties) } } withType().configureEach { - kotlinOptions.jvmTarget = "17" + kotlinOptions.jvmTarget = "21" kotlinOptions.verbose = true } diff --git a/gradle.properties b/gradle.properties index 8041b64..8abfefb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,10 +19,10 @@ org.gradle.jvmargs=-Xmx4G -Xms4G org.gradle.daemon=false org.gradle.debug=false -mappings_version=2024.02.25 -minecraft_version=1.20.4 +mappings_version=2024.04.14 +minecraft_version=1.20.5 minecraft_version_range=[1.20.4,1.21) -neo_version=20.4.226 +neo_version=20.5.16-beta neo_version_range=[20.4,) loader_version_range=[4.7 ,) kotlinforforge_version=4.10.0 diff --git a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt index 40ba1ed..4abbf0e 100644 --- a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt +++ b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt @@ -25,12 +25,9 @@ import net.benjimadness.triad.gui.BoilerScreen import net.benjimadness.triad.gui.ElectricFurnaceScreen import net.benjimadness.triad.gui.TurbineScreen import net.benjimadness.triad.gui.GrinderScreen -import net.benjimadness.triad.item.tool.TriadToolTiers import net.benjimadness.triad.registry.* -import net.minecraft.resources.ResourceLocation -import net.minecraft.world.item.Tiers import net.neoforged.bus.api.SubscribeEvent -import net.neoforged.fml.ModLoadingContext +import net.neoforged.fml.common.EventBusSubscriber import net.neoforged.fml.common.Mod import net.neoforged.fml.config.ModConfig import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent @@ -39,35 +36,25 @@ import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent -import net.neoforged.neoforge.common.TierSortingRegistry import org.slf4j.Logger import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS +import thedarkcolour.kotlinforforge.neoforge.forge.registerConfig import thedarkcolour.kotlinforforge.neoforge.forge.runForDist @Mod(TriadMod.MODID) -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) object TriadMod { const val MODID = "triad" val LOGGER: Logger = LogUtils.getLogger() init { - TierSortingRegistry.registerTier( - TriadToolTiers.BRONZE, - ResourceLocation(MODID, "bronze"), - listOf(Tiers.IRON), - listOf(Tiers.DIAMOND) - ) - TierSortingRegistry.registerTier( - TriadToolTiers.STEEL, - ResourceLocation(MODID, "steel"), - listOf(Tiers.DIAMOND), - listOf(Tiers.NETHERITE) - ) + runForDist( clientTarget = { MOD_BUS.addListener(::onClientSetup) }, serverTarget = { MOD_BUS.addListener(::onServerSetup) }) - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, TriadConfig.SPEC) + registerConfig(ModConfig.Type.COMMON, TriadConfig.SPEC) TriadBlocks.REGISTRY.register(MOD_BUS) TriadItems.REGISTRY.register(MOD_BUS) + TriadItems.ARMOR_MATERIAL_REGISTRY.register(MOD_BUS) TriadFluids.REGISTRY.register(MOD_BUS) TriadBlockEntities.REGISTRY.register(MOD_BUS) MOD_BUS.addListener(::registerCapabilities) diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/AbstractMachineBlock.kt b/src/main/kotlin/net/benjimadness/triad/api/block/AbstractMachineBlock.kt index 519ac69..0c0cf11 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/AbstractMachineBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/AbstractMachineBlock.kt @@ -6,8 +6,10 @@ import net.minecraft.core.Direction import net.minecraft.server.level.ServerPlayer import net.minecraft.world.InteractionHand import net.minecraft.world.InteractionResult +import net.minecraft.world.ItemInteractionResult import net.minecraft.world.entity.item.ItemEntity import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.ItemStack import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -45,15 +47,11 @@ abstract class AbstractMachineBlock(properties: Properties, blockEntity: KClass< builder.add(FACING, LEVER, RUNNING) } - @Deprecated("Deprecated in Java", ReplaceWith( - "super.use(pState, pLevel, pPos, pPlayer, pHand, pHit)", - "net.minecraft.world.level.block.Block")) - override fun use( + override fun useWithoutItem( state: BlockState, level: Level, pos: BlockPos, player: Player, - hand: InteractionHand, hit: BlockHitResult ): InteractionResult { if (!level.isClientSide && player is ServerPlayer) @@ -61,6 +59,20 @@ abstract class AbstractMachineBlock(properties: Properties, blockEntity: KClass< return InteractionResult.sidedSuccess(level.isClientSide()) } + override fun useItemOn( + stack: ItemStack, + state: BlockState, + level: Level, + pos: BlockPos, + player: Player, + hand: InteractionHand, + result: BlockHitResult + ): ItemInteractionResult { + if (!level.isClientSide && player is ServerPlayer) + state.getMenuProvider(level, pos)?.let { player.openMenu(it) { buf -> buf.writeBlockPos(pos) } } + return ItemInteractionResult.sidedSuccess(level.isClientSide()) + } + @Deprecated("Deprecated in Java", ReplaceWith( "super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston)", "net.minecraft.world.level.block.Block")) diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractBoilerBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractBoilerBlockEntity.kt index 2e50ff5..22be95d 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractBoilerBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractBoilerBlockEntity.kt @@ -4,6 +4,7 @@ import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.registry.TriadFluids import net.minecraft.core.BlockPos import net.minecraft.core.Direction +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -53,16 +54,16 @@ abstract class AbstractBoilerBlockEntity(capacity: Int, private val transfer: In water.drain(gen, IFluidHandler.FluidAction.EXECUTE) } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Steam", steam.writeToNBT(CompoundTag())) - tag.put("Water", water.writeToNBT(CompoundTag())) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Steam", steam.writeToNBT(registry, CompoundTag())) + tag.put("Water", water.writeToNBT(registry, CompoundTag())) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Steam")) steam.readFromNBT(tag.getCompound("Steam")) - if (tag.contains("Water")) water.readFromNBT(tag.getCompound("Water")) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Steam")) steam.readFromNBT(registry, tag.getCompound("Steam")) + if (tag.contains("Water")) water.readFromNBT(registry, tag.getCompound("Water")) } private fun hasWater() = !water.isEmpty diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractCapacitorBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractCapacitorBlockEntity.kt index 1442238..7ae662a 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractCapacitorBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractCapacitorBlockEntity.kt @@ -4,6 +4,8 @@ import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.util.MiscUtil.getLeverOrientation import net.minecraft.core.BlockPos import net.minecraft.core.Direction +import net.minecraft.core.HolderLookup +import net.minecraft.core.HolderLookup.Provider import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -45,13 +47,13 @@ AbstractTriadBlockEntity(type, pos, state) { setChanged() } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Energy", energy.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: Provider) { + super.saveAdditional(tag, registry) + tag.put("Energy", energy.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(it) } + override fun loadAdditional(tag: CompoundTag, registry: Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(registry, it) } } } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricFurnaceBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricFurnaceBlockEntity.kt index 1ed4d2f..acbcfd6 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricFurnaceBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricFurnaceBlockEntity.kt @@ -1,6 +1,7 @@ package net.benjimadness.triad.api.block.entity import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.Container import net.minecraft.world.item.ItemStack @@ -31,14 +32,14 @@ abstract class AbstractElectricFurnaceBlockEntity(capacity: Int, type: BlockEnti val itemHandler: IItemHandler by lazy { items } override val check: RecipeManager.CachedCheck = RecipeManager.createCheck(RecipeType.SMELTING) - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Items", items.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Items", items.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Items")) items.deserializeNBT(tag.getCompound("Items")) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Items")) items.deserializeNBT(registry, tag.getCompound("Items")) } override fun execute() { diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt index 97ed8be..b0807ff 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt @@ -7,6 +7,7 @@ import net.benjimadness.triad.api.item.ReusableItem import net.benjimadness.triad.recipe.GrinderRecipe import net.benjimadness.triad.registry.TriadRecipes import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.resources.ResourceLocation import net.minecraft.tags.ItemTags @@ -28,14 +29,14 @@ abstract class AbstractElectricGrinderBlockEntity(capacity: Int, type: BlockEnti private val energy = EnergyStorage(capacity) val energyStorage: IEnergyStorage by lazy { energy } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Energy", energy.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Energy", energy.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(it) } + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(registry, it) } } override fun shouldRun(): Boolean = super.shouldRun() && level?.hasNeighborSignal(blockPos) == false diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricProcessorBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricProcessorBlockEntity.kt index 318c904..6cf4bbd 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricProcessorBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricProcessorBlockEntity.kt @@ -1,6 +1,7 @@ package net.benjimadness.triad.api.block.entity import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState @@ -12,14 +13,14 @@ abstract class AbstractElectricProcessorBlockEntity(capacity: Int, type: BlockEn private val energy = EnergyStorage(capacity) val energyStorage: IEnergyStorage by lazy { energy } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Energy", energy.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Energy", energy.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(it) } + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(registry, it) } } override fun shouldRun(): Boolean = super.shouldRun() && level?.hasNeighborSignal(blockPos) == false diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractEnergyGeneratorBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractEnergyGeneratorBlockEntity.kt index 07f8eae..1fbd1a6 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractEnergyGeneratorBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractEnergyGeneratorBlockEntity.kt @@ -2,6 +2,7 @@ package net.benjimadness.triad.api.block.entity import net.minecraft.core.BlockPos import net.minecraft.core.Direction +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState @@ -32,14 +33,14 @@ abstract class AbstractEnergyGeneratorBlockEntity(capacity: Int, private val tra } } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Energy", energy.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Energy", energy.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(it) } + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Energy")) tag.get("Energy")?.let { energy.deserializeNBT(registry, it) } } override fun fill() { diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGeneratorBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGeneratorBlockEntity.kt index 2fd6887..02ef2ce 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGeneratorBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGeneratorBlockEntity.kt @@ -1,6 +1,7 @@ package net.benjimadness.triad.api.block.entity import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState @@ -29,13 +30,13 @@ abstract class AbstractGeneratorBlockEntity(capacity: Int, private val transfer: abstract fun fill() abstract fun distribute() - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) tag.putInt("Progress", progress) } - override fun load(tag: CompoundTag) { - super.load(tag) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) if (tag.contains("Progress")) progress = tag.getInt("Progress") } diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt index b726948..8d24823 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt @@ -7,6 +7,7 @@ import net.benjimadness.triad.api.item.ReusableItem import net.benjimadness.triad.recipe.GrinderRecipe import net.benjimadness.triad.registry.TriadRecipes import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.resources.ResourceLocation import net.minecraft.tags.ItemTags @@ -60,8 +61,9 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo items.setStackInSlot(OUTPUT_SLOT, recipe.output.copyWithCount(recipe.output.count)) else result.grow(recipe.output.count) input.shrink(1) - if (bladeStack.hurt(BLADE_SLOT, random, null)) + bladeStack.hurtAndBreak(1, random, null) { bladeStack.shrink(1) + } progress = 0 } else progress++ } @@ -70,10 +72,10 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo else outputMatch = false } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) tag.putInt("Progress", progress) - tag.put("Items", items.serializeNBT()) + tag.put("Items", items.serializeNBT(registry)) saveClientData(tag) } @@ -83,10 +85,10 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo tag.putString("Blade", blade.serializedName) } - override fun load(tag: CompoundTag) { - super.load(tag) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) if (tag.contains("Progress")) progress = tag.getInt("Progress") - if (tag.contains("Items")) items.deserializeNBT(tag.getCompound("Items")) + if (tag.contains("Items")) items.deserializeNBT(registry, tag.getCompound("Items")) loadClientData(tag) } @@ -123,8 +125,8 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo } private fun getTimeMultiplier(): Int { val stack = items.getStackInSlot(INPUT_SLOT) - return if (stack.`is`(ItemTags.create(ResourceLocation("forge", "storage_blocks"))) || - stack.`is`(ItemTags.create(ResourceLocation("forge", "storage_blocks")))) 9 + return if (stack.`is`(ItemTags.create(ResourceLocation("c", "storage_blocks"))) || + stack.`is`(ItemTags.create(ResourceLocation("c", "storage_blocks")))) 9 else 1 } override fun isFueled(): Boolean { diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractItemBoilerBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractItemBoilerBlockEntity.kt index 0a03f5b..88794d8 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractItemBoilerBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractItemBoilerBlockEntity.kt @@ -1,6 +1,7 @@ package net.benjimadness.triad.api.block.entity import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.RecipeType @@ -31,14 +32,14 @@ abstract class AbstractItemBoilerBlockEntity(capacity: Int, transfer: Int, gen: } val itemHandler: IItemHandler by lazy { items } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Items", items.serializeNBT()) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Items", items.serializeNBT(registry)) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Items")) items.deserializeNBT(tag.getCompound("Items")) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Items")) items.deserializeNBT(registry, tag.getCompound("Items")) } override fun useFuel() { diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractMachineBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractMachineBlockEntity.kt index a549f65..91282af 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractMachineBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractMachineBlockEntity.kt @@ -3,6 +3,7 @@ package net.benjimadness.triad.api.block.entity import net.benjimadness.triad.api.util.MiscUtil.getLeverOrientation import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup.Provider import net.minecraft.nbt.CompoundTag import net.minecraft.network.Connection import net.minecraft.network.protocol.Packet @@ -33,8 +34,8 @@ abstract class AbstractMachineBlockEntity (type: BlockEntityType<*>, pos: BlockP abstract fun execute() - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) + override fun saveAdditional(tag: CompoundTag, registry: Provider) { + super.saveAdditional(tag, registry) saveClientData(tag) } @@ -42,8 +43,8 @@ abstract class AbstractMachineBlockEntity (type: BlockEntityType<*>, pos: BlockP tag.putBoolean("IsRunning", isRunning) } - override fun load(tag: CompoundTag) { - super.load(tag) + override fun loadAdditional(tag: CompoundTag, registry: Provider) { + super.loadAdditional(tag, registry) loadClientData(tag) } @@ -51,22 +52,21 @@ abstract class AbstractMachineBlockEntity (type: BlockEntityType<*>, pos: BlockP if (tag.contains("IsRunning")) isRunning = tag.getBoolean("IsRunning") } - override fun getUpdateTag(): CompoundTag { - val tag = super.getUpdateTag() + override fun getUpdateTag(registry: Provider): CompoundTag { + val tag = super.getUpdateTag(registry) saveClientData(tag) return tag } - override fun handleUpdateTag(tag: CompoundTag) { + override fun handleUpdateTag(tag: CompoundTag, registry: Provider) { loadClientData(tag) } override fun getUpdatePacket(): Packet? = ClientboundBlockEntityDataPacket.create(this) - override fun onDataPacket(network: Connection, packet: ClientboundBlockEntityDataPacket) { - if (packet.tag != null) - handleUpdateTag(packet.tag!!) + override fun onDataPacket(network: Connection, packet: ClientboundBlockEntityDataPacket, registry: Provider) { + handleUpdateTag(packet.tag, registry) } open fun shouldRun(): Boolean = isFueled() diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractTurbineBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractTurbineBlockEntity.kt index f737593..72b3f70 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractTurbineBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractTurbineBlockEntity.kt @@ -3,6 +3,7 @@ package net.benjimadness.triad.api.block.entity import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.registry.TriadFluids import net.minecraft.core.BlockPos +import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -26,14 +27,14 @@ abstract class AbstractTurbineBlockEntity(capacity: Int, transfer: Int, private super.serverTick(level, pos, blockEntity) } - override fun saveAdditional(tag: CompoundTag) { - super.saveAdditional(tag) - tag.put("Steam", steam.writeToNBT(CompoundTag())) + override fun saveAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.saveAdditional(tag, registry) + tag.put("Steam", steam.writeToNBT(registry, CompoundTag())) } - override fun load(tag: CompoundTag) { - super.load(tag) - if (tag.contains("Steam")) steam.readFromNBT(tag.getCompound("Steam")) + override fun loadAdditional(tag: CompoundTag, registry: HolderLookup.Provider) { + super.loadAdditional(tag, registry) + if (tag.contains("Steam")) steam.readFromNBT(registry, tag.getCompound("Steam")) } override fun useFuel() { diff --git a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt index 7e27300..f8d6c5b 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt @@ -25,6 +25,11 @@ import net.minecraft.world.item.ItemStack class ReusableItem(properties: Properties, val materialName: String = "none") : Item(properties) { private val rand: RandomSource = RandomSource.create() override fun hasCraftingRemainingItem(stack: ItemStack): Boolean = true - override fun getCraftingRemainingItem(stack: ItemStack): ItemStack = - stack.copy().let { if (it.hurt(1, rand, null)) ItemStack.EMPTY else it } + override fun getCraftingRemainingItem(stack: ItemStack): ItemStack { + var ret = stack.copy() + ret.hurtAndBreak(1, rand, null) { + ret = ItemStack.EMPTY + } + return stack + } } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt index 186dbc0..09140f3 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt @@ -11,13 +11,11 @@ import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.core.particles.ParticleTypes import net.minecraft.network.chat.Component +import net.minecraft.server.level.ServerPlayer import net.minecraft.sounds.SoundEvents import net.minecraft.sounds.SoundSource import net.minecraft.util.RandomSource -import net.minecraft.world.InteractionHand -import net.minecraft.world.InteractionResult -import net.minecraft.world.MenuProvider -import net.minecraft.world.SimpleMenuProvider +import net.minecraft.world.* import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items @@ -59,26 +57,22 @@ class BoilerBlock(properties: Properties, blockEntity: KClass) : AbstractMachineBlock(properties, blockEntity), EntityBlock { diff --git a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt index 6866a50..13c6e68 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt @@ -27,7 +27,6 @@ import net.benjimadness.triad.gui.GrinderMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.network.chat.Component -import net.minecraft.util.RandomSource import net.minecraft.util.StringRepresentable import net.minecraft.world.MenuProvider import net.minecraft.world.SimpleMenuProvider diff --git a/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt index 4264fe3..fac5aa4 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt @@ -10,8 +10,6 @@ import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.core.particles.ParticleTypes import net.minecraft.network.chat.Component -import net.minecraft.sounds.SoundEvents -import net.minecraft.sounds.SoundSource import net.minecraft.util.RandomSource import net.minecraft.world.MenuProvider import net.minecraft.world.SimpleMenuProvider diff --git a/src/main/kotlin/net/benjimadness/triad/config/TriadConfig.kt b/src/main/kotlin/net/benjimadness/triad/config/TriadConfig.kt index bff2899..a6b14b7 100644 --- a/src/main/kotlin/net/benjimadness/triad/config/TriadConfig.kt +++ b/src/main/kotlin/net/benjimadness/triad/config/TriadConfig.kt @@ -20,11 +20,11 @@ package net.benjimadness.triad.config import net.benjimadness.triad.TriadMod import net.neoforged.bus.api.SubscribeEvent -import net.neoforged.fml.common.Mod +import net.neoforged.fml.common.EventBusSubscriber import net.neoforged.fml.event.config.ModConfigEvent import net.neoforged.neoforge.common.ModConfigSpec -@Mod.EventBusSubscriber(modid = TriadMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = TriadMod.MODID, bus = EventBusSubscriber.Bus.MOD) object TriadConfig { private val BUILDER = ModConfigSpec.Builder() private val DISABLE_VANIlLA_BEES: ModConfigSpec.BooleanValue = BUILDER diff --git a/src/main/kotlin/net/benjimadness/triad/event/TriadEventHandler.kt b/src/main/kotlin/net/benjimadness/triad/event/TriadEventHandler.kt index 6fae3ea..49c6d65 100644 --- a/src/main/kotlin/net/benjimadness/triad/event/TriadEventHandler.kt +++ b/src/main/kotlin/net/benjimadness/triad/event/TriadEventHandler.kt @@ -25,11 +25,11 @@ import net.minecraft.world.entity.animal.Bee import net.minecraft.world.level.block.Blocks import net.neoforged.bus.api.EventPriority import net.neoforged.bus.api.SubscribeEvent -import net.neoforged.fml.common.Mod +import net.neoforged.fml.common.EventBusSubscriber import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent import net.neoforged.neoforge.event.level.ChunkEvent -@Mod.EventBusSubscriber(modid = TriadMod.MODID) +@EventBusSubscriber(modid = TriadMod.MODID) object TriadEventHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) fun onEntityJoinLevel(event: EntityJoinLevelEvent) { diff --git a/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt index 7530666..423a670 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt @@ -18,7 +18,6 @@ package net.benjimadness.triad.gui -import net.benjimadness.triad.api.block.entity.AbstractGeneratorBlockEntity import net.benjimadness.triad.api.block.entity.AbstractItemBoilerBlockEntity import net.benjimadness.triad.registry.TriadMenus import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt index 5eb7071..e85146a 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt @@ -87,10 +87,10 @@ class GrinderMenu( if (!moveItemStackTo(slotStack, 1, 2, false)) return ItemStack.EMPTY } else if ( - slot.item.`is`(ItemTags.create(ResourceLocation("forge", "ingots"))) || - slot.item.`is`(ItemTags.create(ResourceLocation("forge", "ores"))) || - slot.item.`is`(ItemTags.create(ResourceLocation("forge", "raw_materials"))) || - slot.item.`is`(ItemTags.create(ResourceLocation("forge", "storage_blocks"))) + slot.item.`is`(ItemTags.create(ResourceLocation("c", "ingots"))) || + slot.item.`is`(ItemTags.create(ResourceLocation("c", "ores"))) || + slot.item.`is`(ItemTags.create(ResourceLocation("c", "raw_materials"))) || + slot.item.`is`(ItemTags.create(ResourceLocation("c", "storage_blocks"))) ) { if (!moveItemStackTo(slotStack, 0, 1, false)) return ItemStack.EMPTY diff --git a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt b/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt index b722a61..0068f05 100644 --- a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt +++ b/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt @@ -19,15 +19,27 @@ package net.benjimadness.triad.item.armor import net.benjimadness.triad.TriadMod +import net.minecraft.core.Holder +import net.minecraft.resources.ResourceLocation import net.minecraft.world.entity.Entity import net.minecraft.world.entity.EquipmentSlot import net.minecraft.world.item.ArmorItem import net.minecraft.world.item.ArmorMaterial import net.minecraft.world.item.ItemStack -class TriadArmorItem(material: ArmorMaterial, type: Type) : ArmorItem(material, type, Properties()) { - override fun getArmorTexture(stack: ItemStack, entity: Entity, slot: EquipmentSlot, type: String): String? = +class TriadArmorItem(private val materialName: String, material: Holder, type: Type) : + ArmorItem(material, type, Properties()) { + override fun getArmorTexture( + stack: ItemStack, + entity: Entity, + slot: EquipmentSlot, + layer: ArmorMaterial.Layer, + innerModel: Boolean + ): ResourceLocation? = if (stack.item !is ArmorItem) null - else if ((stack.item as ArmorItem).type == Type.LEGGINGS) TriadMod.MODID + ":" + "textures/models/armor/" + material.name + "_layer_2.png" - else TriadMod.MODID + ":" + "textures/models/armor/" + material.name + "_layer_1.png" + else ResourceLocation(TriadMod.MODID, + "textures/models/armors/${materialName}_layer_${ + if ((stack.item as ArmorItem).type == Type.LEGGINGS) "2" + else "1" + }.png") } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorMaterials.kt b/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorMaterials.kt deleted file mode 100644 index e6b2eb0..0000000 --- a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorMaterials.kt +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Triad, a tech mod for Minecraft - * Copyright (C) 2024 Ben M. Sutter - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.benjimadness.triad.item.armor - -import net.benjimadness.triad.registry.TriadItems -import net.minecraft.sounds.SoundEvent -import net.minecraft.sounds.SoundEvents -import net.minecraft.util.StringRepresentable -import net.minecraft.world.item.ArmorItem -import net.minecraft.world.item.ArmorMaterial -import net.minecraft.world.item.crafting.Ingredient -import java.util.function.Supplier - -enum class TriadArmorMaterials( - private val durabilityMultiplier: Int, - private val protectionFunctionForType: HashMap, - private val enchantmentValue: Int, - private val sound: SoundEvent, - private val toughness: Float, - private val knockbackResistance: Float, - private val repairIngredient: Supplier -) : StringRepresentable, ArmorMaterial { - BRONZE(10, - hashMapOf - ( - ArmorItem.Type.HELMET to 2, - ArmorItem.Type.LEGGINGS to 5, - ArmorItem.Type.CHESTPLATE to 6, - ArmorItem.Type.BOOTS to 2 - ), - 15, - SoundEvents.ARMOR_EQUIP_IRON, - 0F, - 0.25F, - { Ingredient.of(TriadItems.BRONZE_INGOT) }), - STEEL(33, - hashMapOf - ( - ArmorItem.Type.HELMET to 3, - ArmorItem.Type.LEGGINGS to 6, - ArmorItem.Type.CHESTPLATE to 8, - ArmorItem.Type.BOOTS to 3 - ), - 12, - SoundEvents.ARMOR_EQUIP_IRON, - 1F, - 0.4F, - { Ingredient.of(TriadItems.STEEL_INGOT) }); - - - private val healthFunctionForType = - hashMapOf( - ArmorItem.Type.BOOTS to 13, - ArmorItem.Type.LEGGINGS to 15, - ArmorItem.Type.CHESTPLATE to 16, - ArmorItem.Type.HELMET to 11 - ) - - override fun getEnchantmentValue(): Int = enchantmentValue - override fun getEquipSound(): SoundEvent = sound - override fun getKnockbackResistance(): Float = knockbackResistance - override fun getName(): String = name.lowercase() - override fun getRepairIngredient(): Ingredient = repairIngredient.get() - override fun getToughness(): Float = toughness - override fun getDefenseForType(type: ArmorItem.Type): Int = protectionFunctionForType[type] ?: 2 - override fun getDurabilityForType(type: ArmorItem.Type): Int = - (healthFunctionForType[type] ?: 11) * durabilityMultiplier - - override fun getSerializedName(): String = getName() -} \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/item/tool/TriadToolTiers.kt b/src/main/kotlin/net/benjimadness/triad/item/tool/TriadToolTiers.kt deleted file mode 100644 index 4de7df4..0000000 --- a/src/main/kotlin/net/benjimadness/triad/item/tool/TriadToolTiers.kt +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Triad, a tech mod for Minecraft - * Copyright (C) 2024 Ben M. Sutter - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.benjimadness.triad.item.tool - -import net.benjimadness.triad.registry.TriadItems -import net.minecraft.tags.BlockTags -import net.minecraft.tags.TagKey -import net.minecraft.world.item.Tier -import net.minecraft.world.item.crafting.Ingredient -import net.minecraft.world.level.block.Block -import java.util.function.Supplier - -enum class TriadToolTiers( - private val uses: Int, - private val speed: Float, - private val damageBonus: Float, - private val level: Int, - private val enchantmentValue: Int, - private val tag: TagKey, - private val repairIngredient: Supplier -) : Tier { - BRONZE( - 200, - 6F, - 2F, - 2, - 22, - BlockTags.NEEDS_IRON_TOOL, - { Ingredient.of(TriadItems.BRONZE_INGOT) }), - STEEL( - 1700, - 8F, - 3F, - 3, - 17, - BlockTags.NEEDS_DIAMOND_TOOL, - { Ingredient.of(TriadItems.STEEL_INGOT) }); - - override fun getUses(): Int = uses - - override fun getSpeed(): Float = speed - - override fun getAttackDamageBonus(): Float = damageBonus - - @Deprecated("Deprecated in Java") - override fun getLevel(): Int = level - - override fun getEnchantmentValue(): Int = enchantmentValue - - override fun getRepairIngredient(): Ingredient = repairIngredient.get() - - override fun getTag(): TagKey? = tag -} \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt b/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt index 29a5700..ecf0f6d 100644 --- a/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt +++ b/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt @@ -18,13 +18,14 @@ package net.benjimadness.triad.recipe -import com.mojang.serialization.Codec +import com.mojang.serialization.MapCodec import com.mojang.serialization.codecs.RecordCodecBuilder import net.benjimadness.triad.TriadMod import net.benjimadness.triad.registry.TriadRecipes +import net.minecraft.core.HolderLookup import net.minecraft.core.NonNullList -import net.minecraft.core.RegistryAccess -import net.minecraft.network.FriendlyByteBuf +import net.minecraft.network.RegistryFriendlyByteBuf +import net.minecraft.network.codec.StreamCodec import net.minecraft.resources.ResourceLocation import net.minecraft.tags.ItemTags import net.minecraft.world.Container @@ -49,34 +50,30 @@ class GrinderRecipe( return list } - override fun assemble(container: Container, regAccess: RegistryAccess): ItemStack = getResultItem(regAccess).copy() + override fun assemble(container: Container, registry: HolderLookup.Provider): ItemStack = getResultItem(registry).copy() override fun canCraftInDimensions(x: Int, y: Int): Boolean = false - override fun getResultItem(regAccess: RegistryAccess): ItemStack = output + override fun getResultItem(registry: HolderLookup.Provider): ItemStack = output override fun getSerializer(): RecipeSerializer<*> = TriadRecipes.GRINDER_RECIPE_SERIALIZER override fun getType(): RecipeType<*> = TriadRecipes.GRINDER_RECIPE_TYPE class Serializer : RecipeSerializer { - override fun codec(): Codec = RecordCodecBuilder.create { + override fun codec(): MapCodec = RecordCodecBuilder.mapCodec { it.group( Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(GrinderRecipe::input), - ItemStack.ITEM_WITH_COUNT_CODEC.fieldOf("result").forGetter(GrinderRecipe::output) + ItemStack.SIMPLE_ITEM_CODEC.fieldOf("result").forGetter(GrinderRecipe::output) ).apply(it, ::GrinderRecipe) } - override fun fromNetwork(buffer: FriendlyByteBuf): GrinderRecipe { - val out = buffer.readItem() - val input = Ingredient.fromNetwork(buffer) - return GrinderRecipe(input, out) - } - - override fun toNetwork(buffer: FriendlyByteBuf, recipe: GrinderRecipe) { - buffer.writeItem(recipe.output) - recipe.input.toNetwork(buffer) - } + override fun streamCodec(): StreamCodec = + StreamCodec.composite( + Ingredient.CONTENTS_STREAM_CODEC, GrinderRecipe::input, + ItemStack.STREAM_CODEC, GrinderRecipe::output, + ::GrinderRecipe + ) } } diff --git a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt index fdd28ca..6d334c8 100644 --- a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt +++ b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt @@ -21,14 +21,53 @@ package net.benjimadness.triad.registry import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.item.ReusableItem import net.benjimadness.triad.item.armor.TriadArmorItem -import net.benjimadness.triad.item.armor.TriadArmorMaterials +import net.minecraft.core.registries.Registries +import net.minecraft.sounds.SoundEvents import net.minecraft.world.item.* +import net.minecraft.world.item.crafting.Ingredient +import net.neoforged.neoforge.registries.DeferredHolder import net.neoforged.neoforge.registries.DeferredRegister import thedarkcolour.kotlinforforge.neoforge.forge.getValue import java.util.function.Supplier object TriadItems { val REGISTRY: DeferredRegister.Items = DeferredRegister.createItems(TriadMod.MODID) + val ARMOR_MATERIAL_REGISTRY: DeferredRegister = DeferredRegister.create(Registries.ARMOR_MATERIAL, TriadMod.MODID) + + val BRONZE_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("bronze") { + ArmorMaterial( + hashMapOf + ( + ArmorItem.Type.HELMET to 2, + ArmorItem.Type.LEGGINGS to 5, + ArmorItem.Type.CHESTPLATE to 6, + ArmorItem.Type.BOOTS to 2 + ), + 15, + SoundEvents.ARMOR_EQUIP_IRON, + { Ingredient.of(BRONZE_INGOT) }, + null, + 0F, + 0.25F + ) + } + val STEEL_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("steel") { + ArmorMaterial( + hashMapOf + ( + ArmorItem.Type.HELMET to 3, + ArmorItem.Type.LEGGINGS to 6, + ArmorItem.Type.CHESTPLATE to 8, + ArmorItem.Type.BOOTS to 3 + ), + 12, + SoundEvents.ARMOR_EQUIP_IRON, + { Ingredient.of(STEEL_INGOT) }, + null, + 1F, + 0.4F + ) + } val TIN_DUST: Item by registerItem("tin_dust") val TIN_INGOT: Item by registerItem("tin_ingot") @@ -50,60 +89,61 @@ object TriadItems { ReusableItem(Item.Properties().durability(10).setNoRepair(), "bronze") } val BRONZE_PICKAXE: Item by registerItem("bronze_pickaxe") { - PickaxeItem(Tiers.IRON, 2, -3F, Item.Properties()) + PickaxeItem(Tiers.IRON, Item.Properties()) } val BRONZE_AXE: Item by registerItem("bronze_axe") { - AxeItem(Tiers.IRON, 6F, -3.5F, Item.Properties()) + AxeItem(Tiers.IRON, Item.Properties()) } val BRONZE_SHOVEL: Item by registerItem("bronze_shovel") { - ShovelItem(Tiers.IRON, 2F, -3.2F, Item.Properties()) + ShovelItem(Tiers.IRON, Item.Properties()) } val BRONZE_SWORD: Item by registerItem("bronze_sword") { - SwordItem(Tiers.IRON, 4, -2.8F, Item.Properties()) + SwordItem(Tiers.IRON, Item.Properties()) } val BRONZE_HOE: Item by registerItem("bronze_hoe") { - HoeItem(Tiers.IRON, -1, -1.2F, Item.Properties()) + HoeItem(Tiers.IRON, Item.Properties()) } val BRONZE_CHESTPLATE: Item by registerItem("bronze_chestplate") { - TriadArmorItem(TriadArmorMaterials.BRONZE, ArmorItem.Type.CHESTPLATE) + TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE) } val BRONZE_HELMET: Item by registerItem("bronze_helmet") { - TriadArmorItem(TriadArmorMaterials.BRONZE, ArmorItem.Type.HELMET) + TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.HELMET) } val BRONZE_LEGGINGS: Item by registerItem("bronze_leggings") { - TriadArmorItem(TriadArmorMaterials.BRONZE, ArmorItem.Type.LEGGINGS) + TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS) } val BRONZE_BOOTS: Item by registerItem("bronze_boots") { - TriadArmorItem(TriadArmorMaterials.BRONZE, ArmorItem.Type.BOOTS) + TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.BOOTS) } val STEEL_PICKAXE: Item by registerItem("steel_pickaxe") { - PickaxeItem(Tiers.DIAMOND, 1, -2.8F, Item.Properties()) + PickaxeItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_AXE: Item by registerItem("steel_axe") { - AxeItem(Tiers.DIAMOND, 5F, -3F, Item.Properties()) + AxeItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_SHOVEL: Item by registerItem("steel_shovel") { - ShovelItem(Tiers.DIAMOND, 1.5F, -3F, Item.Properties()) + ShovelItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_SWORD: Item by registerItem("steel_sword") { - SwordItem(Tiers.DIAMOND, 3, -2.4F, Item.Properties()) + SwordItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_HOE: Item by registerItem("steel_hoe") { - HoeItem(Tiers.DIAMOND, -3, 0F, Item.Properties()) + HoeItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_CHESTPLATE: Item by registerItem("steel_chestplate") { - TriadArmorItem(TriadArmorMaterials.STEEL, ArmorItem.Type.CHESTPLATE) + TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE) } val STEEL_HELMET: Item by registerItem("steel_helmet") { - TriadArmorItem(TriadArmorMaterials.STEEL, ArmorItem.Type.HELMET) + TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.HELMET) } val STEEL_LEGGINGS: Item by registerItem("steel_leggings") { - TriadArmorItem(TriadArmorMaterials.STEEL, ArmorItem.Type.LEGGINGS) + TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS) } val STEEL_BOOTS: Item by registerItem("steel_boots") { - TriadArmorItem(TriadArmorMaterials.STEEL, ArmorItem.Type.BOOTS) + TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS) } + private fun registerArmorMaterial(name: String, material: Supplier) = ARMOR_MATERIAL_REGISTRY.register(name, material) private fun registerItem(name: String, item: Supplier) = REGISTRY.register(name, item) private fun registerItem(name: String) = registerItem(name) { Item(Item.Properties()) } } \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml diff --git a/src/main/resources/data/forge/tags/blocks/ore_rates/dense.json b/src/main/resources/data/c/tags/blocks/ore_rates/dense.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ore_rates/dense.json rename to src/main/resources/data/c/tags/blocks/ore_rates/dense.json diff --git a/src/main/resources/data/forge/tags/items/ores.json b/src/main/resources/data/c/tags/blocks/ores.json similarity index 65% rename from src/main/resources/data/forge/tags/items/ores.json rename to src/main/resources/data/c/tags/blocks/ores.json index 71bddfb..b82e201 100644 --- a/src/main/resources/data/forge/tags/items/ores.json +++ b/src/main/resources/data/c/tags/blocks/ores.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ores/tin" + "#c:ores/tin" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/tin.json b/src/main/resources/data/c/tags/blocks/ores/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/tin.json rename to src/main/resources/data/c/tags/blocks/ores/tin.json diff --git a/src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json b/src/main/resources/data/c/tags/blocks/ores_in_ground/deepslate.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json rename to src/main/resources/data/c/tags/blocks/ores_in_ground/deepslate.json diff --git a/src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json b/src/main/resources/data/c/tags/blocks/ores_in_ground/stone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json rename to src/main/resources/data/c/tags/blocks/ores_in_ground/stone.json diff --git a/src/main/resources/data/c/tags/blocks/storage_blocks.json b/src/main/resources/data/c/tags/blocks/storage_blocks.json new file mode 100644 index 0000000..6f8e6ad --- /dev/null +++ b/src/main/resources/data/c/tags/blocks/storage_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/tin", + "#c:storage_blocks/raw_tin", + "#c:storage_blocks/bronze", + "#c:storage_blocks/steel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/bronze.json b/src/main/resources/data/c/tags/blocks/storage_blocks/bronze.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/bronze.json rename to src/main/resources/data/c/tags/blocks/storage_blocks/bronze.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_tin.json b/src/main/resources/data/c/tags/blocks/storage_blocks/raw_tin.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/raw_tin.json rename to src/main/resources/data/c/tags/blocks/storage_blocks/raw_tin.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/steel.json b/src/main/resources/data/c/tags/blocks/storage_blocks/steel.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/steel.json rename to src/main/resources/data/c/tags/blocks/storage_blocks/steel.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/tin.json b/src/main/resources/data/c/tags/blocks/storage_blocks/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/tin.json rename to src/main/resources/data/c/tags/blocks/storage_blocks/tin.json diff --git a/src/main/resources/data/forge/tags/items/armors/boots.json b/src/main/resources/data/c/tags/items/armors/boots.json similarity index 100% rename from src/main/resources/data/forge/tags/items/armors/boots.json rename to src/main/resources/data/c/tags/items/armors/boots.json diff --git a/src/main/resources/data/forge/tags/items/armors/chestplates.json b/src/main/resources/data/c/tags/items/armors/chestplates.json similarity index 100% rename from src/main/resources/data/forge/tags/items/armors/chestplates.json rename to src/main/resources/data/c/tags/items/armors/chestplates.json diff --git a/src/main/resources/data/forge/tags/items/armors/helmets.json b/src/main/resources/data/c/tags/items/armors/helmets.json similarity index 100% rename from src/main/resources/data/forge/tags/items/armors/helmets.json rename to src/main/resources/data/c/tags/items/armors/helmets.json diff --git a/src/main/resources/data/forge/tags/items/armors/leggings.json b/src/main/resources/data/c/tags/items/armors/leggings.json similarity index 100% rename from src/main/resources/data/forge/tags/items/armors/leggings.json rename to src/main/resources/data/c/tags/items/armors/leggings.json diff --git a/src/main/resources/data/c/tags/items/dusts.json b/src/main/resources/data/c/tags/items/dusts.json new file mode 100644 index 0000000..ce0d15c --- /dev/null +++ b/src/main/resources/data/c/tags/items/dusts.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#c:dusts/bronze", + "#c:dusts/tin", + "#c:dusts/iron", + "#c:dusts/gold", + "#c:dusts/copper", + "#c:dusts/steel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/bronze.json b/src/main/resources/data/c/tags/items/dusts/bronze.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/bronze.json rename to src/main/resources/data/c/tags/items/dusts/bronze.json diff --git a/src/main/resources/data/forge/tags/items/dusts/copper.json b/src/main/resources/data/c/tags/items/dusts/copper.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/copper.json rename to src/main/resources/data/c/tags/items/dusts/copper.json diff --git a/src/main/resources/data/forge/tags/items/dusts/gold.json b/src/main/resources/data/c/tags/items/dusts/gold.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/gold.json rename to src/main/resources/data/c/tags/items/dusts/gold.json diff --git a/src/main/resources/data/forge/tags/items/dusts/iron.json b/src/main/resources/data/c/tags/items/dusts/iron.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/iron.json rename to src/main/resources/data/c/tags/items/dusts/iron.json diff --git a/src/main/resources/data/forge/tags/items/dusts/steel.json b/src/main/resources/data/c/tags/items/dusts/steel.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/steel.json rename to src/main/resources/data/c/tags/items/dusts/steel.json diff --git a/src/main/resources/data/forge/tags/items/dusts/tin.json b/src/main/resources/data/c/tags/items/dusts/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/tin.json rename to src/main/resources/data/c/tags/items/dusts/tin.json diff --git a/src/main/resources/data/c/tags/items/ingots.json b/src/main/resources/data/c/tags/items/ingots.json new file mode 100644 index 0000000..13e489f --- /dev/null +++ b/src/main/resources/data/c/tags/items/ingots.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#c:ingots/tin", + "#c:ingots/bronze", + "#c:ingots/steel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/bronze.json b/src/main/resources/data/c/tags/items/ingots/bronze.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ingots/bronze.json rename to src/main/resources/data/c/tags/items/ingots/bronze.json diff --git a/src/main/resources/data/forge/tags/items/ingots/steel.json b/src/main/resources/data/c/tags/items/ingots/steel.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ingots/steel.json rename to src/main/resources/data/c/tags/items/ingots/steel.json diff --git a/src/main/resources/data/forge/tags/items/ingots/tin.json b/src/main/resources/data/c/tags/items/ingots/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ingots/tin.json rename to src/main/resources/data/c/tags/items/ingots/tin.json diff --git a/src/main/resources/data/forge/tags/items/ore_rates/dense.json b/src/main/resources/data/c/tags/items/ore_rates/dense.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ore_rates/dense.json rename to src/main/resources/data/c/tags/items/ore_rates/dense.json diff --git a/src/main/resources/data/forge/tags/blocks/ores.json b/src/main/resources/data/c/tags/items/ores.json similarity index 65% rename from src/main/resources/data/forge/tags/blocks/ores.json rename to src/main/resources/data/c/tags/items/ores.json index 71bddfb..b82e201 100644 --- a/src/main/resources/data/forge/tags/blocks/ores.json +++ b/src/main/resources/data/c/tags/items/ores.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:ores/tin" + "#c:ores/tin" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/tin.json b/src/main/resources/data/c/tags/items/ores/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/tin.json rename to src/main/resources/data/c/tags/items/ores/tin.json diff --git a/src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/main/resources/data/c/tags/items/ores_in_ground/deepslate.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json rename to src/main/resources/data/c/tags/items/ores_in_ground/deepslate.json diff --git a/src/main/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/main/resources/data/c/tags/items/ores_in_ground/stone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores_in_ground/stone.json rename to src/main/resources/data/c/tags/items/ores_in_ground/stone.json diff --git a/src/main/resources/data/forge/tags/items/raw_materials.json b/src/main/resources/data/c/tags/items/raw_materials.json similarity index 56% rename from src/main/resources/data/forge/tags/items/raw_materials.json rename to src/main/resources/data/c/tags/items/raw_materials.json index 521ab3c..64695fd 100644 --- a/src/main/resources/data/forge/tags/items/raw_materials.json +++ b/src/main/resources/data/c/tags/items/raw_materials.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#forge:raw_materials/tin" + "#c:raw_materials/tin" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials/tin.json b/src/main/resources/data/c/tags/items/raw_materials/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/raw_materials/tin.json rename to src/main/resources/data/c/tags/items/raw_materials/tin.json diff --git a/src/main/resources/data/c/tags/items/storage_blocks.json b/src/main/resources/data/c/tags/items/storage_blocks.json new file mode 100644 index 0000000..6f8e6ad --- /dev/null +++ b/src/main/resources/data/c/tags/items/storage_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#c:storage_blocks/tin", + "#c:storage_blocks/raw_tin", + "#c:storage_blocks/bronze", + "#c:storage_blocks/steel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/bronze.json b/src/main/resources/data/c/tags/items/storage_blocks/bronze.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/bronze.json rename to src/main/resources/data/c/tags/items/storage_blocks/bronze.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/raw_tin.json b/src/main/resources/data/c/tags/items/storage_blocks/raw_tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/raw_tin.json rename to src/main/resources/data/c/tags/items/storage_blocks/raw_tin.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/steel.json b/src/main/resources/data/c/tags/items/storage_blocks/steel.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/steel.json rename to src/main/resources/data/c/tags/items/storage_blocks/steel.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/tin.json b/src/main/resources/data/c/tags/items/storage_blocks/tin.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/tin.json rename to src/main/resources/data/c/tags/items/storage_blocks/tin.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index 92b8036..0000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/tin", - "#forge:storage_blocks/raw_tin", - "#forge:storage_blocks/bronze", - "#forge:storage_blocks/steel" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts.json b/src/main/resources/data/forge/tags/items/dusts.json deleted file mode 100644 index d38dce9..0000000 --- a/src/main/resources/data/forge/tags/items/dusts.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:dusts/bronze", - "#forge:dusts/tin", - "#forge:dusts/iron", - "#forge:dusts/gold", - "#forge:dusts/copper", - "#forge:dusts/steel" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots.json b/src/main/resources/data/forge/tags/items/ingots.json deleted file mode 100644 index 6ada70b..0000000 --- a/src/main/resources/data/forge/tags/items/ingots.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ingots/tin", - "#forge:ingots/bronze", - "#forge:ingots/steel" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/main/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index 92b8036..0000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/tin", - "#forge:storage_blocks/raw_tin", - "#forge:storage_blocks/bronze", - "#forge:storage_blocks/steel" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json b/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json index 88d9dd7..6efe69d 100644 --- a/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "bronze_ingot", "ingredient": { - "tag": "forge:dusts/bronze" + "tag": "c:dusts/bronze" }, "result": "triad:bronze_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json b/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json index 0269caf..c7bf011 100644 --- a/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "copper_ingot", "ingredient": { - "tag": "forge:dusts/copper" + "tag": "c:dusts/copper" }, "result": "minecraft:copper_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json b/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json index 4414234..e9c4793 100644 --- a/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "gold_ingot", "ingredient": { - "tag": "forge:dusts/gold" + "tag": "c:dusts/gold" }, "result": "minecraft:gold_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json b/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json index bee57ef..87fa557 100644 --- a/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "iron_ingot", "ingredient": { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, "result": "minecraft:iron_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json b/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json index 2c101ab..7f32a0d 100644 --- a/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "steel_ingot", "ingredient": { - "tag": "forge:dusts/steel" + "tag": "c:dusts/steel" }, "result": "triad:steel_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json index 10e6a90..9aa2540 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:raw_materials/tin" + "tag": "c:raw_materials/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json index 39efe30..77a9da1 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:dusts/tin" + "tag": "c:dusts/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json index 212e94d..6fdb0f7 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:ores/tin" + "tag": "c:ores/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json b/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json index a38667a..b2f8633 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json @@ -12,7 +12,7 @@ "item": "minecraft:furnace" }, "$": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json index b398057..4d16b09 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json index ee188ec..8693755 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json index 2b66c75..e88e60a 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json index 273c6f3..779aa32 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json index ecd7ec2..4c00c51 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json index 321925b..081ccac 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" }, "@": { "item": "minecraft:lightning_rod" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json index 160f3d2..c6ba267 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" }, "@": { "item": "minecraft:lightning_rod" @@ -12,7 +12,7 @@ "item": "minecraft:piston" }, "$": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json index 9e0a640..95aaaf3 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json index 66dae66..b2f2b01 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json index 59132da..cc0031b 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" }, "@": { "item": "minecraft:cauldron" @@ -12,7 +12,7 @@ "item": "minecraft:furnace" }, "$": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json index bbf3690..292091b 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json index fe82f62..aba5b59 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json index fbb817f..ff0eedc 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json index 11cd25b..2faa960 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json index 8f3e834..274a916 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json @@ -3,13 +3,13 @@ "category": "misc", "key": { "#": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" }, "$": { "item": "minecraft:redstone_block" }, "@": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" }, "&": { "tag": "triad:blades" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json index 03ce128..b6b0c12 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "tag": "forge:raw_materials/tin" + "tag": "c:raw_materials/tin" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json b/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json index febe92a..731f19b 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json @@ -12,7 +12,7 @@ "item": "minecraft:piston" }, "$": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json index fabffcc..57e5701 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json index 36ad7c1..f07c152 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json index 7c014b7..f4b1410 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json index dd77d60..18f8c65 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json @@ -9,7 +9,7 @@ "item": "minecraft:redstone_torch" }, "$": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json index e279986..41220b3 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json index 8209a92..fe1bb4a 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json index ad3b468..4aa747d 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json index 9bb6189..84fdeb2 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json index fd5d6b1..96b7c0f 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json index 6e965e7..5844379 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json index 88b03f6..c41337a 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "@": { "item": "minecraft:stick" diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json index 85197e8..df72bf9 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "tag": "forge:ingots/tin" + "tag": "c:ingots/tin" } }, "pattern": [ diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json index ce78256..d3f19d0 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json @@ -3,16 +3,16 @@ "category": "misc", "ingredients": [ { - "tag": "forge:dusts/copper" + "tag": "c:dusts/copper" }, { - "tag": "forge:dusts/copper" + "tag": "c:dusts/copper" }, { - "tag": "forge:dusts/copper" + "tag": "c:dusts/copper" }, { - "tag": "forge:dusts/tin" + "tag": "c:dusts/tin" } ], "result": { diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json index 1ab2930..05de8a0 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json @@ -4,7 +4,7 @@ "group": "bronze_ingot", "ingredients": [ { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" } ], "result": { diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json index 06b0051..15efbaa 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:raw_materials/copper" + "tag": "c:raw_materials/copper" }, { "item": "triad:stone_mortar" diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json index 46a033e..c922b60 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:raw_materials/gold" + "tag": "c:raw_materials/gold" }, { "item": "triad:stone_mortar" diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json index 11f0da2..1571581 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:raw_materials/iron" + "tag": "c:raw_materials/iron" }, { "item": "triad:stone_mortar" diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json b/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json index f3d5b9b..b8e86bb 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:storage_blocks/raw_tin" + "tag": "c:storage_blocks/raw_tin" } ], "result": { diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json index 6f8be49..2a7c3b5 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json @@ -3,13 +3,13 @@ "category": "misc", "ingredients": [ { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, { "tag": "minecraft:coals" diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json index 49fe0b6..a6e4740 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json @@ -4,7 +4,7 @@ "group": "steel_ingot", "ingredients": [ { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" } ], "result": { diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json index 603059c..48e5d3f 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:raw_materials/tin" + "tag": "c:raw_materials/tin" }, { "item": "triad:stone_mortar" diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json index 7c19a67..3d067bb 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json @@ -4,7 +4,7 @@ "group": "tin_ingot", "ingredients": [ { - "tag": "forge:storage_blocks/tin" + "tag": "c:storage_blocks/tin" } ], "result": { diff --git a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json index 87c83c7..504870a 100644 --- a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json +++ b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/bronze" + "tag": "c:storage_blocks/bronze" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json index 402e3fd..3b9bad0 100644 --- a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/bronze" + "tag": "c:ingots/bronze" }, "result": { "item": "triad:bronze_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json index a5e821e..aa2b6ad 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/copper" + "tag": "c:storage_blocks/copper" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json index 404a500..5c033a8 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "result": { "item": "triad:copper_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json index b7d3b8b..490570a 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ores/copper" + "tag": "c:ores/copper" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json index 005c3e3..a624d6f 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:raw_materials/copper" + "tag": "c:raw_materials/copper" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json index 3bb395a..7499d36 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/copper" + "tag": "c:storage_blocks/copper" }, "result": { "count": 18, diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json index b87384e..1cb6828 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/gold" + "tag": "c:storage_blocks/gold" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json index 65afc5c..b6b4563 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, "result": { "item": "triad:gold_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json index 2430b2d..b7de407 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ores/gold" + "tag": "c:ores/gold" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json index 84c0c5b..2e50ede 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:raw_materials/gold" + "tag": "c:raw_materials/gold" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json index 64f6d88..308a9bf 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/raw_gold" + "tag": "c:storage_blocks/raw_gold" }, "result": { "count": 18, diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json index b22e9fe..07c8ea1 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/iron" + "tag": "c:storage_blocks/iron" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json index 8538a88..4fb9df9 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "result": { "item": "triad:iron_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json index 9e3711e..7a0e476 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ores/iron" + "tag": "c:ores/iron" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json index fbe8b58..8d7ed37 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:raw_materials/iron" + "tag": "c:raw_materials/iron" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json index 0418f3a..7f9dfbe 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/raw_iron" + "tag": "c:storage_blocks/raw_iron" }, "result": { "count": 18, diff --git a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json index a6bd236..f9a5c5d 100644 --- a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json +++ b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/steel" + "tag": "c:storage_blocks/steel" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json index d453089..e8c4a66 100644 --- a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "result": { "item": "triad:steel_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json index 65c0fe1..267008a 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:raw_materials/tin" + "tag": "c:raw_materials/tin" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json index 7a5b5e1..65d1398 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/tin" + "tag": "c:storage_blocks/tin" }, "result": { "count": 18, diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json index da3f22f..78723d4 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:storage_blocks/tin" + "tag": "c:storage_blocks/tin" }, "result": { "count": 9, diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json index 3bb8d3a..c1e8bdc 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ingots/tin" + "tag": "c:ingots/tin" }, "result": { "item": "triad:tin_dust" diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json index 67791e3..2871894 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json @@ -2,7 +2,7 @@ "type": "triad:grinding", "ingredient": { - "tag": "forge:ores/tin" + "tag": "c:ores/tin" }, "result": { "count": 2, diff --git a/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json b/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json index 894728a..f608079 100644 --- a/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "bronze_ingot", "ingredient": { - "tag": "forge:dusts/bronze" + "tag": "c:dusts/bronze" }, "result": "triad:bronze_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json b/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json index 1f39a6b..fe302ce 100644 --- a/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "copper_ingot", "ingredient": { - "tag": "forge:dusts/copper" + "tag": "c:dusts/copper" }, "result": "minecraft:copper_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json b/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json index aae1138..148fae4 100644 --- a/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "gold_ingot", "ingredient": { - "tag": "forge:dusts/gold" + "tag": "c:dusts/gold" }, "result": "minecraft:gold_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json b/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json index 8d34cb3..cd58b58 100644 --- a/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "iron_ingot", "ingredient": { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, "result": "minecraft:iron_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json index e22d85c..4c2bc0e 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:raw_materials/tin" + "tag": "c:raw_materials/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json index bcbefff..003f03d 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:dusts/tin" + "tag": "c:dusts/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json index d7bda72..75d3781 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json @@ -5,7 +5,7 @@ "experience": 0.7, "group": "tin_ingot", "ingredient": { - "tag": "forge:ores/tin" + "tag": "c:ores/tin" }, "result": "triad:tin_ingot" } \ No newline at end of file diff --git a/update.json b/update.json index 95cdfa9..ce9e378 100644 --- a/update.json +++ b/update.json @@ -1,6 +1,6 @@ { "homepage": "https://github.com/bms-1984/triad", "promos": { - "1.20.4-latest": "0.0.1.0" + "1.20.5-latest": "0.0.1.0" } } \ No newline at end of file From dd13d657ff2cebb9debceaebb980af3e36648763 Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sat, 27 Apr 2024 23:56:39 -0400 Subject: [PATCH 2/7] steel capacitor animation --- .../textures/block/steel_capacitor_powered.png | Bin 400 -> 676 bytes .../block/steel_capacitor_powered.png.mcmeta | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png.mcmeta diff --git a/src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png b/src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png index de35e4dc6c37e88bf794033f58ab606b80b35d9a..cf0fb0521eacb7b85a039b81ddd46ce628caa9ca 100644 GIT binary patch delta 645 zcmV;00($+B1Ed9z7YaZK1^@s66MgrVks%j<0#->xK~z{r?UzeW!axv!2PjlaQA#kx z#2Af<9!!krL4SbJ-|NMH;EfZ;g9n2NJ`xisMoNShw6pE#?zY?33kPwUru&$E%y#G7 z+1$nX`KRl7fKt>n_Eib#Q9bHwSXixABW-50nNWs#UD6s3hrovP!WkqEA5%GOT)*sRw;(+c0}IK!O(JoaqZYSdZzrFG1{tbmuH^wfB)KrL0Tu8% zW6(}@C>D#Xv`{FBCgAAs;DH05vDTFRnaB$%n6R4bR0PdO_ zZ^FCn2#stbFwGi`g>v46Jl5b}$oeOLXd$Ub!35cGd1R`0U4;oS`sspfj$2LTUm#^% zZIzhDvQQKMA5EhjO?fWI^OrfA|9r^=+qdhm72ZOh$ zEAuWb^B_-G9t`8~zCePm%)eC5c;E-y_(rZg@_m6W9dh73KOU$;{!Bbb3i(sxgCv-w f@}Rl9a6I?|f30R9BZ1)u00000NkvXXu0mjf)%ZGF delta 367 zcmV-#0g(Qr1&{-f7YYyv1^@s6AM^iVks%j<0YXVcK~y+TjZ-~O!!QtiAx$j1 z1n(}CS&$L4sUtq1YsCL%1(1H3beF%2W5%@)LRL0FA)R*dwt(GDNuF1D-_sT z*~Gg}`WI*KIWoRTBl@;5|)hFun+D_psD~v-~w5K-Ql!m`c;e;ae3jcix zeUUn&L7`8)Us=cN+Cc%E-xQj&?KYiSub{zn+b&6>QzK+h_*iF%?j({ZV$dLokrxG$ zIA)u45+{Y{>jwrHb8yzNlYR01H?n*rXWvHxJWMoIHqkReUsmgV+&9Qam~rHy^L_vT N002ovPDHLkV1ii>qS^oe diff --git a/src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png.mcmeta b/src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png.mcmeta new file mode 100644 index 0000000..a3371d4 --- /dev/null +++ b/src/main/resources/assets/triad/textures/block/steel_capacitor_powered.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": false, + "frametime": 5 + } +} \ No newline at end of file From 37ffe6d9b597cf250933a6728c3c7866710d5a14 Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sun, 28 Apr 2024 00:25:30 -0400 Subject: [PATCH 3/7] minor refactors and cleanups --- .../api/block/TriadBlockStateProperties.kt | 12 +++++- .../AbstractElectricGrinderBlockEntity.kt | 15 ------- .../entity/AbstractGrinderBlockEntity.kt | 10 ++--- .../triad/api/util/ComponentUtil.kt | 5 ++- .../benjimadness/triad/block/GrinderBlock.kt | 11 +---- .../benjimadness/triad/compat/TheOneProbe.kt | 40 +++++++++---------- 6 files changed, 39 insertions(+), 54 deletions(-) diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/TriadBlockStateProperties.kt b/src/main/kotlin/net/benjimadness/triad/api/block/TriadBlockStateProperties.kt index 1f037df..ba6622c 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/TriadBlockStateProperties.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/TriadBlockStateProperties.kt @@ -1,6 +1,7 @@ package net.benjimadness.triad.api.block -import net.benjimadness.triad.block.GrinderBlock.Blades +import net.benjimadness.triad.TriadMod +import net.minecraft.network.chat.Component import net.minecraft.util.StringRepresentable import net.minecraft.world.level.block.state.properties.BooleanProperty import net.minecraft.world.level.block.state.properties.EnumProperty @@ -18,4 +19,13 @@ enum class LeverPositions : StringRepresentable { NONE, SOUTH, EAST, WEST, BOTTOM, TOP, BOTTOM_ROT, TOP_ROT; override fun getSerializedName(): String = name.lowercase() override fun toString(): String = serializedName +} + +enum class Blades : StringRepresentable { + NONE, BRONZE, STEEL; + override fun getSerializedName(): String = name.lowercase() + override fun toString(): String = serializedName + private fun getCapitalizedName(): String = serializedName.replaceFirstChar { it.uppercase() } + fun getComponent(): Component = Component.translatableWithFallback( + "${TriadMod.MODID}.message.blade.${serializedName}", getCapitalizedName()) } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt index b0807ff..87b45b3 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractElectricGrinderBlockEntity.kt @@ -1,27 +1,12 @@ package net.benjimadness.triad.api.block.entity -import net.benjimadness.triad.TriadMod -import net.benjimadness.triad.block.GrinderBlock -import net.benjimadness.triad.api.block.TriadBlockStateProperties -import net.benjimadness.triad.api.item.ReusableItem -import net.benjimadness.triad.recipe.GrinderRecipe -import net.benjimadness.triad.registry.TriadRecipes import net.minecraft.core.BlockPos import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag -import net.minecraft.resources.ResourceLocation -import net.minecraft.tags.ItemTags -import net.minecraft.util.RandomSource -import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.crafting.RecipeManager -import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.energy.EnergyStorage import net.neoforged.neoforge.energy.IEnergyStorage -import net.neoforged.neoforge.items.IItemHandler -import net.neoforged.neoforge.items.ItemStackHandler -import net.neoforged.neoforge.items.wrapper.RecipeWrapper abstract class AbstractElectricGrinderBlockEntity(capacity: Int, type: BlockEntityType<*>, pos: BlockPos, state: BlockState) : AbstractGrinderBlockEntity(type, pos, state) { diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt index 8d24823..c5c462b 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt @@ -1,7 +1,7 @@ package net.benjimadness.triad.api.block.entity import net.benjimadness.triad.TriadMod -import net.benjimadness.triad.block.GrinderBlock +import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.item.ReusableItem import net.benjimadness.triad.recipe.GrinderRecipe @@ -14,9 +14,7 @@ import net.minecraft.tags.ItemTags import net.minecraft.util.RandomSource import net.minecraft.world.Container import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.crafting.Recipe import net.minecraft.world.item.crafting.RecipeManager -import net.minecraft.world.item.crafting.SmeltingRecipe import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState @@ -42,7 +40,7 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo } val itemHandler: IItemHandler by lazy { items } private var isOn = false - private var blade = GrinderBlock.Blades.NONE + private var blade = Blades.NONE private val random = RandomSource.create() override val check: RecipeManager.CachedCheck = RecipeManager.createCheck(TriadRecipes.GRINDER_RECIPE_TYPE) @@ -95,7 +93,7 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo override fun loadClientData(tag: CompoundTag) { super.loadClientData(tag) if (tag.contains("IsOn")) isOn = tag.getBoolean("IsOn") - if (tag.contains("Blade")) blade = GrinderBlock.Blades.valueOf(tag.getString("Blade").uppercase()) + if (tag.contains("Blade")) blade = Blades.valueOf(tag.getString("Blade").uppercase()) } private fun hasBlade(): Boolean { if (!hasLevel()) return false @@ -109,7 +107,7 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo return true } else { - blade = GrinderBlock.Blades.NONE + blade = Blades.NONE level!!.setBlock(blockPos, level!!.getBlockState(blockPos).setValue(TriadBlockStateProperties.BLADE, blade), Block.UPDATE_CLIENTS ) diff --git a/src/main/kotlin/net/benjimadness/triad/api/util/ComponentUtil.kt b/src/main/kotlin/net/benjimadness/triad/api/util/ComponentUtil.kt index c2fbf82..bd7efcc 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/util/ComponentUtil.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/util/ComponentUtil.kt @@ -4,9 +4,12 @@ import net.minecraft.network.chat.Component import net.minecraft.network.chat.MutableComponent object ComponentUtil { - fun Component.add(vararg components: Component): Component { + private fun Component.add(vararg components: Component): Component { val mutableComponents = components.map { MutableComponent.create(it.contents) } mutableComponents.drop(1).forEach { mutableComponents.first().append(it) } return MutableComponent.create(this.contents).append(mutableComponents.first()) } + + fun combine(vararg components: Component): Component = components.first().add(*components.drop(1).toTypedArray()) + } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt index 13c6e68..2276581 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt @@ -20,6 +20,7 @@ package net.benjimadness.triad.block import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.AbstractMachineBlock +import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.block.LeverPositions import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.block.entity.AbstractMachineBlockEntity @@ -27,7 +28,6 @@ import net.benjimadness.triad.gui.GrinderMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.network.chat.Component -import net.minecraft.util.StringRepresentable import net.minecraft.world.MenuProvider import net.minecraft.world.SimpleMenuProvider import net.minecraft.world.level.Level @@ -63,13 +63,4 @@ class GrinderBlock(properties: Properties, blockEntity: KClass GrinderMenu(id, inv, pos) }, Component.translatableWithFallback("menu.title.${TriadMod.MODID}.grinder_menu", "Grinder") ) - - enum class Blades : StringRepresentable { - NONE, BRONZE, STEEL; - override fun getSerializedName(): String = name.lowercase() - override fun toString(): String = serializedName - fun getComponent(): Component = Component.translatableWithFallback( - "${TriadMod.MODID}.message.blade.${serializedName}", - serializedName.replaceFirstChar { it.uppercase() }) - } } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/compat/TheOneProbe.kt b/src/main/kotlin/net/benjimadness/triad/compat/TheOneProbe.kt index 0472181..b4129ba 100644 --- a/src/main/kotlin/net/benjimadness/triad/compat/TheOneProbe.kt +++ b/src/main/kotlin/net/benjimadness/triad/compat/TheOneProbe.kt @@ -24,8 +24,7 @@ import net.benjimadness.triad.block.GrinderBlock import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.block.entity.AbstractBoilerBlockEntity import net.benjimadness.triad.api.block.entity.AbstractTurbineBlockEntity -import net.benjimadness.triad.api.util.ComponentUtil -import net.benjimadness.triad.api.util.ComponentUtil.add +import net.benjimadness.triad.api.util.ComponentUtil.combine import net.benjimadness.triad.block.BoilerBlock import net.benjimadness.triad.block.TurbineBlock import net.minecraft.network.chat.Component @@ -42,7 +41,6 @@ object TheOneProbe { if (!ModList.get().isLoaded("theoneprobe")) return InterModComms.sendTo("theoneprobe", "getTheOneProbe", ::GetTheOneProbe) - } class GetTheOneProbe : Function { @@ -56,7 +54,9 @@ object TheOneProbe { ) { if (state != null && state.block is GrinderBlock && info != null) { info.horizontal().text( - Component.translatable("${TriadMod.MODID}.message.blade").add( + combine( + Component.translatableWithFallback( + "${TriadMod.MODID}.message.blade", "Blade"), Component.literal(": "), state.getValue(TriadBlockStateProperties.BLADE).getComponent() ) @@ -64,39 +64,37 @@ object TheOneProbe { } if (level != null && hitData != null && state != null && state.block is BoilerBlock && info != null) { info.horizontal().text( - Component.translatable("${TriadMod.MODID}.message.steam").add( + combine( + Component.translatableWithFallback( + "${TriadMod.MODID}.message.steam", "Steam"), Component.literal(": "), Component.literal( - "${ - (level.getBlockEntity(hitData.pos) as AbstractBoilerBlockEntity).steamTank.getFluidInTank( - 0 - ).amount - } L" + "${(level.getBlockEntity(hitData.pos) as AbstractBoilerBlockEntity) + .steamTank.getFluidInTank(0).amount} L" ) ) ) info.horizontal().text( - Component.translatable("${TriadMod.MODID}.message.water").add( + combine( + Component.translatableWithFallback( + "${TriadMod.MODID}.message.water", "Water"), Component.literal(": "), Component.literal( - "${ - (level.getBlockEntity(hitData.pos) as AbstractBoilerBlockEntity).waterTank.getFluidInTank( - 0 - ).amount - } L" + "${(level.getBlockEntity(hitData.pos) as AbstractBoilerBlockEntity) + .waterTank.getFluidInTank(0).amount} L" ) ) ) } if (level != null && hitData != null && state != null && state.block is TurbineBlock && info != null) { info.horizontal().text( - Component.translatable("${TriadMod.MODID}.message.steam").add( + combine( + Component.translatableWithFallback( + "${TriadMod.MODID}.message.steam", "Steam"), Component.literal(": "), Component.literal( - "${ - (level.getBlockEntity(hitData.pos) as - AbstractTurbineBlockEntity).steamTank.getFluidInTank(0).amount - } L" + "${(level.getBlockEntity(hitData.pos) as AbstractTurbineBlockEntity) + .steamTank.getFluidInTank(0).amount} L" ) ) ) From 04b9819067af3d9eb7fc6f305468a7086d02fadc Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sun, 28 Apr 2024 00:30:20 -0400 Subject: [PATCH 4/7] cleanup reusable item --- .../net/benjimadness/triad/api/item/ReusableItem.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt index f8d6c5b..416ff0c 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt @@ -24,12 +24,18 @@ import net.minecraft.world.item.ItemStack class ReusableItem(properties: Properties, val materialName: String = "none") : Item(properties) { private val rand: RandomSource = RandomSource.create() - override fun hasCraftingRemainingItem(stack: ItemStack): Boolean = true + override fun hasCraftingRemainingItem(stack: ItemStack): Boolean { + var ret = true + stack.copy().hurtAndBreak(1, rand, null) { + ret = true + } + return ret + } override fun getCraftingRemainingItem(stack: ItemStack): ItemStack { var ret = stack.copy() ret.hurtAndBreak(1, rand, null) { ret = ItemStack.EMPTY } - return stack + return ret } } \ No newline at end of file From 9fdfc60347010bf8d2e2dbf5b6ee5590b1c5077c Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sun, 28 Apr 2024 00:47:47 -0400 Subject: [PATCH 5/7] random refactors --- src/main/kotlin/net/benjimadness/triad/TriadMod.kt | 8 ++++---- .../triad/api/block/entity/AbstractGrinderBlockEntity.kt | 4 ++-- .../net/benjimadness/triad/api/item/ReusableItem.kt | 2 +- .../kotlin/net/benjimadness/triad/block/BoilerBlock.kt | 4 +--- .../net/benjimadness/triad/block/ElectricFurnaceBlock.kt | 2 +- .../kotlin/net/benjimadness/triad/block/GrinderBlock.kt | 2 +- .../kotlin/net/benjimadness/triad/block/TurbineBlock.kt | 2 +- .../net/benjimadness/triad/gui/{ => menu}/BoilerMenu.kt | 2 +- .../triad/gui/{ => menu}/ElectricFurnaceMenu.kt | 7 +------ .../net/benjimadness/triad/gui/{ => menu}/GrinderMenu.kt | 2 +- .../net/benjimadness/triad/gui/{ => menu}/TurbineMenu.kt | 9 +-------- .../benjimadness/triad/gui/{ => screen}/BoilerScreen.kt | 3 ++- .../triad/gui/{ => screen}/ElectricFurnaceScreen.kt | 4 ++-- .../benjimadness/triad/gui/{ => screen}/GrinderScreen.kt | 4 ++-- .../benjimadness/triad/gui/{ => screen}/TurbineScreen.kt | 3 ++- src/main/kotlin/net/benjimadness/triad/item/BladeItem.kt | 7 +++++++ .../kotlin/net/benjimadness/triad/registry/TriadItems.kt | 6 ++++-- .../kotlin/net/benjimadness/triad/registry/TriadMenus.kt | 8 ++++---- 18 files changed, 38 insertions(+), 41 deletions(-) rename src/main/kotlin/net/benjimadness/triad/gui/{ => menu}/BoilerMenu.kt (99%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => menu}/ElectricFurnaceMenu.kt (93%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => menu}/GrinderMenu.kt (99%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => menu}/TurbineMenu.kt (93%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => screen}/BoilerScreen.kt (97%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => screen}/ElectricFurnaceScreen.kt (95%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => screen}/GrinderScreen.kt (95%) rename src/main/kotlin/net/benjimadness/triad/gui/{ => screen}/TurbineScreen.kt (97%) create mode 100644 src/main/kotlin/net/benjimadness/triad/item/BladeItem.kt diff --git a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt index 4abbf0e..55e9d5b 100644 --- a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt +++ b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt @@ -21,10 +21,10 @@ package net.benjimadness.triad import com.mojang.logging.LogUtils import net.benjimadness.triad.compat.TheOneProbe import net.benjimadness.triad.config.TriadConfig -import net.benjimadness.triad.gui.BoilerScreen -import net.benjimadness.triad.gui.ElectricFurnaceScreen -import net.benjimadness.triad.gui.TurbineScreen -import net.benjimadness.triad.gui.GrinderScreen +import net.benjimadness.triad.gui.screen.BoilerScreen +import net.benjimadness.triad.gui.screen.ElectricFurnaceScreen +import net.benjimadness.triad.gui.screen.TurbineScreen +import net.benjimadness.triad.gui.screen.GrinderScreen import net.benjimadness.triad.registry.* import net.neoforged.bus.api.SubscribeEvent import net.neoforged.fml.common.EventBusSubscriber diff --git a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt index c5c462b..724d726 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/block/entity/AbstractGrinderBlockEntity.kt @@ -3,7 +3,7 @@ package net.benjimadness.triad.api.block.entity import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.block.TriadBlockStateProperties -import net.benjimadness.triad.api.item.ReusableItem +import net.benjimadness.triad.item.BladeItem import net.benjimadness.triad.recipe.GrinderRecipe import net.benjimadness.triad.registry.TriadRecipes import net.minecraft.core.BlockPos @@ -100,7 +100,7 @@ abstract class AbstractGrinderBlockEntity(type: BlockEntityType<*>, pos: BlockPo val bladeStack = items.getStackInSlot(BLADE_SLOT) if (bladeStack.isEmpty) return false if (bladeStack.`is`(ItemTags.create(ResourceLocation(TriadMod.MODID, "blades")))) { - blade = TriadBlockStateProperties.BLADE.getValue((bladeStack.item as ReusableItem).materialName).get() + blade = TriadBlockStateProperties.BLADE.getValue((bladeStack.item as BladeItem).bladeType.toString()).get() level!!.setBlock(blockPos, level!!.getBlockState(blockPos).setValue(TriadBlockStateProperties.BLADE, blade), Block.UPDATE_CLIENTS ) diff --git a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt index 416ff0c..b464244 100644 --- a/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt +++ b/src/main/kotlin/net/benjimadness/triad/api/item/ReusableItem.kt @@ -22,7 +22,7 @@ import net.minecraft.util.RandomSource import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -class ReusableItem(properties: Properties, val materialName: String = "none") : Item(properties) { +open class ReusableItem(properties: Properties) : Item(properties) { private val rand: RandomSource = RandomSource.create() override fun hasCraftingRemainingItem(stack: ItemStack): Boolean { var ret = true diff --git a/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt index 09140f3..a4fe7e4 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/BoilerBlock.kt @@ -6,12 +6,11 @@ import net.benjimadness.triad.api.block.LeverPositions import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.block.entity.AbstractBoilerBlockEntity import net.benjimadness.triad.api.block.entity.AbstractGeneratorBlockEntity -import net.benjimadness.triad.gui.BoilerMenu +import net.benjimadness.triad.gui.menu.BoilerMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.core.particles.ParticleTypes import net.minecraft.network.chat.Component -import net.minecraft.server.level.ServerPlayer import net.minecraft.sounds.SoundEvents import net.minecraft.sounds.SoundSource import net.minecraft.util.RandomSource @@ -20,7 +19,6 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraft.world.level.Level -import net.minecraft.world.level.block.AbstractFurnaceBlock import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.state.BlockState diff --git a/src/main/kotlin/net/benjimadness/triad/block/ElectricFurnaceBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/ElectricFurnaceBlock.kt index da64135..169ee44 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/ElectricFurnaceBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/ElectricFurnaceBlock.kt @@ -21,7 +21,7 @@ package net.benjimadness.triad.block import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.AbstractMachineBlock import net.benjimadness.triad.api.block.entity.AbstractMachineBlockEntity -import net.benjimadness.triad.gui.ElectricFurnaceMenu +import net.benjimadness.triad.gui.menu.ElectricFurnaceMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.core.particles.ParticleTypes diff --git a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt index 2276581..312a79e 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/GrinderBlock.kt @@ -24,7 +24,7 @@ import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.block.LeverPositions import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.block.entity.AbstractMachineBlockEntity -import net.benjimadness.triad.gui.GrinderMenu +import net.benjimadness.triad.gui.menu.GrinderMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.network.chat.Component diff --git a/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt b/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt index fac5aa4..a3b5c28 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/TurbineBlock.kt @@ -5,7 +5,7 @@ import net.benjimadness.triad.api.block.AbstractMachineBlock import net.benjimadness.triad.api.block.LeverPositions import net.benjimadness.triad.api.block.TriadBlockStateProperties import net.benjimadness.triad.api.block.entity.AbstractGeneratorBlockEntity -import net.benjimadness.triad.gui.TurbineMenu +import net.benjimadness.triad.gui.menu.TurbineMenu import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.core.particles.ParticleTypes diff --git a/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/menu/BoilerMenu.kt similarity index 99% rename from src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt rename to src/main/kotlin/net/benjimadness/triad/gui/menu/BoilerMenu.kt index 423a670..a7d261d 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/BoilerMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/menu/BoilerMenu.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.menu import net.benjimadness.triad.api.block.entity.AbstractItemBoilerBlockEntity import net.benjimadness.triad.registry.TriadMenus diff --git a/src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/menu/ElectricFurnaceMenu.kt similarity index 93% rename from src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceMenu.kt rename to src/main/kotlin/net/benjimadness/triad/gui/menu/ElectricFurnaceMenu.kt index a15c8e7..fa322e0 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/menu/ElectricFurnaceMenu.kt @@ -16,20 +16,15 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.menu -import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.entity.AbstractElectricFurnaceBlockEntity -import net.benjimadness.triad.api.block.entity.AbstractGrinderBlockEntity import net.benjimadness.triad.registry.TriadMenus import net.minecraft.core.BlockPos -import net.minecraft.resources.ResourceLocation -import net.minecraft.tags.ItemTags import net.minecraft.util.Mth.clamp import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.inventory.AbstractFurnaceMenu import net.minecraft.world.inventory.ContainerLevelAccess import net.minecraft.world.inventory.DataSlot import net.minecraft.world.inventory.Slot diff --git a/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/menu/GrinderMenu.kt similarity index 99% rename from src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt rename to src/main/kotlin/net/benjimadness/triad/gui/menu/GrinderMenu.kt index e85146a..8b7588c 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/GrinderMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/menu/GrinderMenu.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.menu import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.entity.AbstractGrinderBlockEntity diff --git a/src/main/kotlin/net/benjimadness/triad/gui/TurbineMenu.kt b/src/main/kotlin/net/benjimadness/triad/gui/menu/TurbineMenu.kt similarity index 93% rename from src/main/kotlin/net/benjimadness/triad/gui/TurbineMenu.kt rename to src/main/kotlin/net/benjimadness/triad/gui/menu/TurbineMenu.kt index 0534b29..094045d 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/TurbineMenu.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/menu/TurbineMenu.kt @@ -16,9 +16,8 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.menu -import net.benjimadness.triad.api.block.entity.AbstractGeneratorBlockEntity import net.benjimadness.triad.api.block.entity.AbstractTurbineBlockEntity import net.benjimadness.triad.registry.TriadMenus import net.minecraft.core.BlockPos @@ -30,7 +29,6 @@ import net.minecraft.world.inventory.ContainerLevelAccess import net.minecraft.world.inventory.DataSlot import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack -import net.neoforged.neoforge.items.SlotItemHandler class TurbineMenu( id: Int, playerInventory: Inventory, @@ -124,10 +122,6 @@ class TurbineMenu( override fun stillValid(player: Player): Boolean = stillValid(ContainerLevelAccess.create(player.level(), pos), player, player.level().getBlockState(pos).block) - fun getProgress(): Float = - if (progress == 0 || totalTime == 0) 0F - else clamp(progress.toFloat() / totalTime.toFloat(), 0F, 1F) - fun getPower(): Float = if (power == 0 || totalPower == 0) 0F else clamp(power.toFloat() / totalPower.toFloat(), 0F, 1F) @@ -138,5 +132,4 @@ class TurbineMenu( fun getAbsolutePower() = power fun getAbsoluteSteam() = steam - fun isPowered(): Boolean = progress > 0 } \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/gui/BoilerScreen.kt b/src/main/kotlin/net/benjimadness/triad/gui/screen/BoilerScreen.kt similarity index 97% rename from src/main/kotlin/net/benjimadness/triad/gui/BoilerScreen.kt rename to src/main/kotlin/net/benjimadness/triad/gui/screen/BoilerScreen.kt index 87175ac..2e5eebc 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/BoilerScreen.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/screen/BoilerScreen.kt @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.screen import net.benjimadness.triad.TriadMod +import net.benjimadness.triad.gui.menu.BoilerMenu import net.minecraft.client.gui.GuiGraphics import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen import net.minecraft.network.chat.Component diff --git a/src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceScreen.kt b/src/main/kotlin/net/benjimadness/triad/gui/screen/ElectricFurnaceScreen.kt similarity index 95% rename from src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceScreen.kt rename to src/main/kotlin/net/benjimadness/triad/gui/screen/ElectricFurnaceScreen.kt index 1110d26..69a6e1f 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/ElectricFurnaceScreen.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/screen/ElectricFurnaceScreen.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.screen import net.benjimadness.triad.TriadMod +import net.benjimadness.triad.gui.menu.ElectricFurnaceMenu import net.minecraft.client.gui.GuiGraphics import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen import net.minecraft.network.chat.Component import net.minecraft.resources.ResourceLocation -import net.minecraft.util.Mth import net.minecraft.world.entity.player.Inventory import kotlin.math.ceil diff --git a/src/main/kotlin/net/benjimadness/triad/gui/GrinderScreen.kt b/src/main/kotlin/net/benjimadness/triad/gui/screen/GrinderScreen.kt similarity index 95% rename from src/main/kotlin/net/benjimadness/triad/gui/GrinderScreen.kt rename to src/main/kotlin/net/benjimadness/triad/gui/screen/GrinderScreen.kt index 119fb52..a10e211 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/GrinderScreen.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/screen/GrinderScreen.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.screen import net.benjimadness.triad.TriadMod +import net.benjimadness.triad.gui.menu.GrinderMenu import net.minecraft.client.gui.GuiGraphics import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen import net.minecraft.network.chat.Component import net.minecraft.resources.ResourceLocation -import net.minecraft.util.Mth import net.minecraft.world.entity.player.Inventory import kotlin.math.ceil diff --git a/src/main/kotlin/net/benjimadness/triad/gui/TurbineScreen.kt b/src/main/kotlin/net/benjimadness/triad/gui/screen/TurbineScreen.kt similarity index 97% rename from src/main/kotlin/net/benjimadness/triad/gui/TurbineScreen.kt rename to src/main/kotlin/net/benjimadness/triad/gui/screen/TurbineScreen.kt index 0735556..669bb8e 100644 --- a/src/main/kotlin/net/benjimadness/triad/gui/TurbineScreen.kt +++ b/src/main/kotlin/net/benjimadness/triad/gui/screen/TurbineScreen.kt @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package net.benjimadness.triad.gui +package net.benjimadness.triad.gui.screen import net.benjimadness.triad.TriadMod +import net.benjimadness.triad.gui.menu.TurbineMenu import net.minecraft.client.gui.GuiGraphics import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen import net.minecraft.network.chat.Component diff --git a/src/main/kotlin/net/benjimadness/triad/item/BladeItem.kt b/src/main/kotlin/net/benjimadness/triad/item/BladeItem.kt new file mode 100644 index 0000000..3c299cd --- /dev/null +++ b/src/main/kotlin/net/benjimadness/triad/item/BladeItem.kt @@ -0,0 +1,7 @@ +package net.benjimadness.triad.item + +import net.benjimadness.triad.api.block.Blades +import net.benjimadness.triad.api.item.ReusableItem + +class BladeItem(properties: Properties, val bladeType: Blades) : + ReusableItem(properties) \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt index 6d334c8..8948fc2 100644 --- a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt +++ b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt @@ -19,7 +19,9 @@ package net.benjimadness.triad.registry import net.benjimadness.triad.TriadMod +import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.item.ReusableItem +import net.benjimadness.triad.item.BladeItem import net.benjimadness.triad.item.armor.TriadArmorItem import net.minecraft.core.registries.Registries import net.minecraft.sounds.SoundEvents @@ -83,10 +85,10 @@ object TriadItems { ReusableItem(Item.Properties().durability(100).setNoRepair()) } val STEEL_BLADE: Item by registerItem("steel_blade") { - ReusableItem(Item.Properties().durability(100).setNoRepair(), "steel") + BladeItem(Item.Properties().durability(100).setNoRepair(), Blades.STEEL) } val BRONZE_BLADE: Item by registerItem("bronze_blade") { - ReusableItem(Item.Properties().durability(10).setNoRepair(), "bronze") + BladeItem(Item.Properties().durability(10).setNoRepair(), Blades.BRONZE) } val BRONZE_PICKAXE: Item by registerItem("bronze_pickaxe") { PickaxeItem(Tiers.IRON, Item.Properties()) diff --git a/src/main/kotlin/net/benjimadness/triad/registry/TriadMenus.kt b/src/main/kotlin/net/benjimadness/triad/registry/TriadMenus.kt index 834edba..5e607b4 100644 --- a/src/main/kotlin/net/benjimadness/triad/registry/TriadMenus.kt +++ b/src/main/kotlin/net/benjimadness/triad/registry/TriadMenus.kt @@ -19,10 +19,10 @@ package net.benjimadness.triad.registry import net.benjimadness.triad.TriadMod -import net.benjimadness.triad.gui.BoilerMenu -import net.benjimadness.triad.gui.ElectricFurnaceMenu -import net.benjimadness.triad.gui.GrinderMenu -import net.benjimadness.triad.gui.TurbineMenu +import net.benjimadness.triad.gui.menu.BoilerMenu +import net.benjimadness.triad.gui.menu.ElectricFurnaceMenu +import net.benjimadness.triad.gui.menu.GrinderMenu +import net.benjimadness.triad.gui.menu.TurbineMenu import net.minecraft.core.registries.Registries import net.minecraft.world.flag.FeatureFlags import net.minecraft.world.inventory.MenuType From a79a9314ffe2ca3a016f3f6e145a6dc8eaba6679 Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sun, 28 Apr 2024 00:49:26 -0400 Subject: [PATCH 6/7] github action updated to java 21 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf864e1..9918a08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,10 @@ jobs: fetch-depth: 1000 fetch-tags: true - - name: Setup JDK 17 + - name: Setup JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Build with Gradle From 9c24c3533d994ab84c38809b95570ecd00db3e35 Mon Sep 17 00:00:00 2001 From: Ben Sutter Date: Sun, 28 Apr 2024 20:56:29 -0400 Subject: [PATCH 7/7] full update to 1.20.5 --- gradle.properties | 12 ++--- .../kotlin/net/benjimadness/triad/TriadMod.kt | 16 ++----- .../block/entity/SteelCapacitorBlockEntity.kt | 2 +- .../triad/item/armor/TriadArmorItem.kt | 45 ------------------- .../triad/recipe/GrinderRecipe.kt | 2 +- .../benjimadness/triad/registry/TriadItems.kt | 26 +++++------ ...ronze_ingot_from_blasting_bronze_dust.json | 4 +- ...opper_ingot_from_blasting_copper_dust.json | 4 +- .../gold_ingot_from_blasting_gold_dust.json | 4 +- .../iron_ingot_from_blasting_iron_dust.json | 4 +- .../steel_ingot_from_blasting_steel_dust.json | 4 +- .../tin_ingot_from_blasting_raw_tin.json | 4 +- .../tin_ingot_from_blasting_tin_dust.json | 4 +- .../tin_ingot_from_blasting_tin_ore.json | 4 +- .../crafting/shaped/blast_furnace.json | 2 +- .../recipes/crafting/shaped/bronze_axe.json | 2 +- .../recipes/crafting/shaped/bronze_blade.json | 2 +- .../recipes/crafting/shaped/bronze_block.json | 2 +- .../recipes/crafting/shaped/bronze_boots.json | 2 +- .../crafting/shaped/bronze_chestplate.json | 2 +- .../crafting/shaped/bronze_furnace.json | 2 +- .../crafting/shaped/bronze_grinder.json | 2 +- .../crafting/shaped/bronze_helmet.json | 2 +- .../recipes/crafting/shaped/bronze_hoe.json | 2 +- .../crafting/shaped/bronze_item_boiler.json | 2 +- .../crafting/shaped/bronze_leggings.json | 2 +- .../crafting/shaped/bronze_pickaxe.json | 2 +- .../crafting/shaped/bronze_shovel.json | 2 +- .../recipes/crafting/shaped/bronze_sword.json | 2 +- .../crafting/shaped/bronze_turbine.json | 2 +- .../crafting/shaped/raw_tin_block.json | 2 +- .../crafting/shaped/redstone_grinder.json | 2 +- .../recipes/crafting/shaped/steel_axe.json | 2 +- .../recipes/crafting/shaped/steel_block.json | 2 +- .../recipes/crafting/shaped/steel_boots.json | 2 +- .../crafting/shaped/steel_capacitor.json | 2 +- .../crafting/shaped/steel_chestplate.json | 2 +- .../recipes/crafting/shaped/steel_helmet.json | 2 +- .../recipes/crafting/shaped/steel_hoe.json | 2 +- .../crafting/shaped/steel_leggings.json | 2 +- .../crafting/shaped/steel_pickaxe.json | 2 +- .../recipes/crafting/shaped/steel_shovel.json | 2 +- .../recipes/crafting/shaped/steel_sword.json | 2 +- .../recipes/crafting/shaped/stone_mortar.json | 2 +- .../recipes/crafting/shaped/tin_block.json | 2 +- .../crafting/shapeless/bronze_dust.json | 2 +- .../crafting/shapeless/bronze_ingot.json | 2 +- .../crafting/shapeless/copper_dust.json | 2 +- .../recipes/crafting/shapeless/gold_dust.json | 2 +- .../recipes/crafting/shapeless/iron_dust.json | 2 +- .../recipes/crafting/shapeless/raw_tin.json | 2 +- .../crafting/shapeless/steel_dust.json | 3 +- .../crafting/shapeless/steel_ingot.json | 2 +- .../recipes/crafting/shapeless/tin_dust.json | 2 +- .../recipes/crafting/shapeless/tin_ingot.json | 2 +- ...ronze_dust_from_grinding_bronze_block.json | 2 +- ...ronze_dust_from_grinding_bronze_ingot.json | 2 +- ...opper_dust_from_grinding_copper_block.json | 2 +- ...opper_dust_from_grinding_copper_ingot.json | 2 +- .../copper_dust_from_grinding_copper_ore.json | 2 +- .../copper_dust_from_grinding_raw_copper.json | 2 +- ...r_dust_from_grinding_raw_copper_block.json | 2 +- .../gold_dust_from_grinding_gold_block.json | 2 +- .../gold_dust_from_grinding_gold_ingot.json | 2 +- .../gold_dust_from_grinding_gold_ore.json | 2 +- .../gold_dust_from_grinding_raw_gold.json | 2 +- ...old_dust_from_grinding_raw_gold_block.json | 2 +- .../iron_dust_from_grinding_iron_block.json | 2 +- .../iron_dust_from_grinding_iron_ingot.json | 2 +- .../iron_dust_from_grinding_iron_ore.json | 2 +- .../iron_dust_from_grinding_raw_iron.json | 2 +- ...ron_dust_from_grinding_raw_iron_block.json | 2 +- .../steel_dust_from_grinding_steel_block.json | 2 +- .../steel_dust_from_grinding_steel_ingot.json | 2 +- .../tin_dust_from_grinding_raw_tin.json | 2 +- .../tin_dust_from_grinding_raw_tin_block.json | 2 +- .../tin_dust_from_grinding_tin_block.json | 2 +- .../tin_dust_from_grinding_tin_ingot.json | 2 +- .../tin_dust_from_grinding_tin_ore.json | 2 +- ...ronze_ingot_from_smelting_bronze_dust.json | 4 +- ...opper_ingot_from_smelting_copper_dust.json | 4 +- .../gold_ingot_from_smelting_gold_dust.json | 4 +- .../iron_ingot_from_smelting_iron_dust.json | 4 +- .../tin_ingot_from_smelting_raw_tin.json | 4 +- .../tin_ingot_from_smelting_tin_dust.json | 4 +- .../tin_ingot_from_smelting_tin_ore.json | 4 +- 86 files changed, 134 insertions(+), 160 deletions(-) delete mode 100644 src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt diff --git a/gradle.properties b/gradle.properties index 8abfefb..fb32d5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,12 +21,12 @@ org.gradle.debug=false mappings_version=2024.04.14 minecraft_version=1.20.5 -minecraft_version_range=[1.20.4,1.21) +minecraft_version_range=[1.20.5,1.21) neo_version=20.5.16-beta -neo_version_range=[20.4,) -loader_version_range=[4.7 ,) -kotlinforforge_version=4.10.0 -kotlinforforge_version_range=[4.10.0,) +neo_version_range=[20.5,) +loader_version_range=[5.0.1,) +kotlinforforge_version=5.0.1 +kotlinforforge_version_range=[5.0.1,) top_version=11.0.2-3 jei_version=17.3.0.49 @@ -37,4 +37,4 @@ mod_version=0.0.1.0 mod_group_id=net.benjimadness.triad mod_authors=BenjiMadness mod_description=Tech Mod -pack_format_id=26 \ No newline at end of file +pack_format_id=32 \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt index 55e9d5b..c95e351 100644 --- a/src/main/kotlin/net/benjimadness/triad/TriadMod.kt +++ b/src/main/kotlin/net/benjimadness/triad/TriadMod.kt @@ -30,16 +30,13 @@ import net.neoforged.bus.api.SubscribeEvent import net.neoforged.fml.common.EventBusSubscriber import net.neoforged.fml.common.Mod import net.neoforged.fml.config.ModConfig -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent -import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent import org.slf4j.Logger +import thedarkcolour.kotlinforforge.neoforge.forge.LOADING_CONTEXT import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS -import thedarkcolour.kotlinforforge.neoforge.forge.registerConfig -import thedarkcolour.kotlinforforge.neoforge.forge.runForDist @Mod(TriadMod.MODID) @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) @@ -47,11 +44,7 @@ object TriadMod { const val MODID = "triad" val LOGGER: Logger = LogUtils.getLogger() init { - - runForDist( - clientTarget = { MOD_BUS.addListener(::onClientSetup) }, - serverTarget = { MOD_BUS.addListener(::onServerSetup) }) - registerConfig(ModConfig.Type.COMMON, TriadConfig.SPEC) + LOADING_CONTEXT.activeContainer.registerConfig(ModConfig.Type.COMMON, TriadConfig.SPEC) TriadBlocks.REGISTRY.register(MOD_BUS) TriadItems.REGISTRY.register(MOD_BUS) TriadItems.ARMOR_MATERIAL_REGISTRY.register(MOD_BUS) @@ -64,6 +57,7 @@ object TriadMod { TriadMenus.REGISTRY.register(MOD_BUS) } + @Suppress("UNUSED_PARAMETER") @SubscribeEvent private fun onCommonSetup(event: FMLCommonSetupEvent) { LOGGER.info("Trying Triad, David, Stephen, Neil, Graham, Joni, YESSIREE!") @@ -120,8 +114,6 @@ object TriadMod { ) { o, _ -> o.energyStorage } } - private fun onClientSetup(event: FMLClientSetupEvent) {} - @SubscribeEvent private fun onRegisterMenuScreens(event: RegisterMenuScreensEvent) { event.register(TriadMenus.GRINDER_MENU_TYPE.get(), ::GrinderScreen) @@ -129,6 +121,4 @@ object TriadMod { event.register(TriadMenus.TURBINE_MENU_TYPE.get(), ::TurbineScreen) event.register(TriadMenus.ITEM_BOILER_MENU_TYPE.get(), ::BoilerScreen) } - - private fun onServerSetup(event: FMLDedicatedServerSetupEvent) {} } diff --git a/src/main/kotlin/net/benjimadness/triad/block/entity/SteelCapacitorBlockEntity.kt b/src/main/kotlin/net/benjimadness/triad/block/entity/SteelCapacitorBlockEntity.kt index fa66c0a..ebb6a79 100644 --- a/src/main/kotlin/net/benjimadness/triad/block/entity/SteelCapacitorBlockEntity.kt +++ b/src/main/kotlin/net/benjimadness/triad/block/entity/SteelCapacitorBlockEntity.kt @@ -6,4 +6,4 @@ import net.minecraft.core.BlockPos import net.minecraft.world.level.block.state.BlockState class SteelCapacitorBlockEntity(pos: BlockPos, state: BlockState) : -AbstractCapacitorBlockEntity(25000, 5, TriadBlockEntities.STEEL_CAPACITOR_BLOCK_ENTITY_TYPE, pos, state) \ No newline at end of file +AbstractCapacitorBlockEntity(50000, 5, TriadBlockEntities.STEEL_CAPACITOR_BLOCK_ENTITY_TYPE, pos, state) \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt b/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt deleted file mode 100644 index 0068f05..0000000 --- a/src/main/kotlin/net/benjimadness/triad/item/armor/TriadArmorItem.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Triad, a tech mod for Minecraft - * Copyright (C) 2024 Ben M. Sutter - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.benjimadness.triad.item.armor - -import net.benjimadness.triad.TriadMod -import net.minecraft.core.Holder -import net.minecraft.resources.ResourceLocation -import net.minecraft.world.entity.Entity -import net.minecraft.world.entity.EquipmentSlot -import net.minecraft.world.item.ArmorItem -import net.minecraft.world.item.ArmorMaterial -import net.minecraft.world.item.ItemStack - -class TriadArmorItem(private val materialName: String, material: Holder, type: Type) : - ArmorItem(material, type, Properties()) { - override fun getArmorTexture( - stack: ItemStack, - entity: Entity, - slot: EquipmentSlot, - layer: ArmorMaterial.Layer, - innerModel: Boolean - ): ResourceLocation? = - if (stack.item !is ArmorItem) null - else ResourceLocation(TriadMod.MODID, - "textures/models/armors/${materialName}_layer_${ - if ((stack.item as ArmorItem).type == Type.LEGGINGS) "2" - else "1" - }.png") -} \ No newline at end of file diff --git a/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt b/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt index ecf0f6d..4e18cf2 100644 --- a/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt +++ b/src/main/kotlin/net/benjimadness/triad/recipe/GrinderRecipe.kt @@ -64,7 +64,7 @@ class GrinderRecipe( override fun codec(): MapCodec = RecordCodecBuilder.mapCodec { it.group( Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(GrinderRecipe::input), - ItemStack.SIMPLE_ITEM_CODEC.fieldOf("result").forGetter(GrinderRecipe::output) + ItemStack.CODEC.fieldOf("result").forGetter(GrinderRecipe::output) ).apply(it, ::GrinderRecipe) } diff --git a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt index 8948fc2..97deb54 100644 --- a/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt +++ b/src/main/kotlin/net/benjimadness/triad/registry/TriadItems.kt @@ -22,8 +22,8 @@ import net.benjimadness.triad.TriadMod import net.benjimadness.triad.api.block.Blades import net.benjimadness.triad.api.item.ReusableItem import net.benjimadness.triad.item.BladeItem -import net.benjimadness.triad.item.armor.TriadArmorItem import net.minecraft.core.registries.Registries +import net.minecraft.resources.ResourceLocation import net.minecraft.sounds.SoundEvents import net.minecraft.world.item.* import net.minecraft.world.item.crafting.Ingredient @@ -36,7 +36,7 @@ object TriadItems { val REGISTRY: DeferredRegister.Items = DeferredRegister.createItems(TriadMod.MODID) val ARMOR_MATERIAL_REGISTRY: DeferredRegister = DeferredRegister.create(Registries.ARMOR_MATERIAL, TriadMod.MODID) - val BRONZE_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("bronze") { + private val BRONZE_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("bronze") { ArmorMaterial( hashMapOf ( @@ -48,12 +48,12 @@ object TriadItems { 15, SoundEvents.ARMOR_EQUIP_IRON, { Ingredient.of(BRONZE_INGOT) }, - null, + listOf(ArmorMaterial.Layer(ResourceLocation(TriadMod.MODID, "bronze"))), 0F, 0.25F ) } - val STEEL_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("steel") { + private val STEEL_ARMOR_MATERIAL: DeferredHolder = registerArmorMaterial("steel") { ArmorMaterial( hashMapOf ( @@ -65,7 +65,7 @@ object TriadItems { 12, SoundEvents.ARMOR_EQUIP_IRON, { Ingredient.of(STEEL_INGOT) }, - null, + listOf(ArmorMaterial.Layer(ResourceLocation(TriadMod.MODID, "steel"))), 1F, 0.4F ) @@ -106,16 +106,16 @@ object TriadItems { HoeItem(Tiers.IRON, Item.Properties()) } val BRONZE_CHESTPLATE: Item by registerItem("bronze_chestplate") { - TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE) + ArmorItem(BRONZE_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE, Item.Properties()) } val BRONZE_HELMET: Item by registerItem("bronze_helmet") { - TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.HELMET) + ArmorItem(BRONZE_ARMOR_MATERIAL, ArmorItem.Type.HELMET, Item.Properties()) } val BRONZE_LEGGINGS: Item by registerItem("bronze_leggings") { - TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS) + ArmorItem(BRONZE_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, Item.Properties()) } val BRONZE_BOOTS: Item by registerItem("bronze_boots") { - TriadArmorItem("bronze", BRONZE_ARMOR_MATERIAL, ArmorItem.Type.BOOTS) + ArmorItem(BRONZE_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, Item.Properties()) } val STEEL_PICKAXE: Item by registerItem("steel_pickaxe") { PickaxeItem(Tiers.DIAMOND, Item.Properties()) @@ -133,16 +133,16 @@ object TriadItems { HoeItem(Tiers.DIAMOND, Item.Properties()) } val STEEL_CHESTPLATE: Item by registerItem("steel_chestplate") { - TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE) + ArmorItem(STEEL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE, Item.Properties()) } val STEEL_HELMET: Item by registerItem("steel_helmet") { - TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.HELMET) + ArmorItem(STEEL_ARMOR_MATERIAL, ArmorItem.Type.HELMET, Item.Properties()) } val STEEL_LEGGINGS: Item by registerItem("steel_leggings") { - TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS) + ArmorItem(STEEL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, Item.Properties()) } val STEEL_BOOTS: Item by registerItem("steel_boots") { - TriadArmorItem("steel", STEEL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS) + ArmorItem(STEEL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, Item.Properties()) } private fun registerArmorMaterial(name: String, material: Supplier) = ARMOR_MATERIAL_REGISTRY.register(name, material) diff --git a/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json b/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json index 6efe69d..1ebef58 100644 --- a/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/bronze_ingot_from_blasting_bronze_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/bronze" }, - "result": "triad:bronze_ingot" + "result": { + "id": "triad:bronze_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json b/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json index c7bf011..5758c4e 100644 --- a/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/copper_ingot_from_blasting_copper_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/copper" }, - "result": "minecraft:copper_ingot" + "result": { + "id": "minecraft:copper_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json b/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json index e9c4793..e3a173f 100644 --- a/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/gold_ingot_from_blasting_gold_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/gold" }, - "result": "minecraft:gold_ingot" + "result": { + "id": "minecraft:gold_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json b/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json index 87fa557..560336a 100644 --- a/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/iron_ingot_from_blasting_iron_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/iron" }, - "result": "minecraft:iron_ingot" + "result": { + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json b/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json index 7f32a0d..1d5a550 100644 --- a/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/steel_ingot_from_blasting_steel_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/steel" }, - "result": "triad:steel_ingot" + "result": { + "id": "triad:steel_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json index 9aa2540..7589b68 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_raw_tin.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:raw_materials/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json index 77a9da1..074e178 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json index 6fdb0f7..751abd4 100644 --- a/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json +++ b/src/main/resources/data/triad/recipes/blasting/tin_ingot_from_blasting_tin_ore.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:ores/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json b/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json index b2f8633..90f0843 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/blast_furnace.json @@ -21,6 +21,6 @@ "#$#" ], "result": { - "item": "minecraft:blast_furnace" + "id": "minecraft:blast_furnace" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json index 4d16b09..3a5cd75 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_axe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:bronze_axe" + "id": "triad:bronze_axe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json index 8693755..a3ae5a2 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_blade.json @@ -12,6 +12,6 @@ " " ], "result": { - "item": "triad:bronze_blade" + "id": "triad:bronze_blade" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json index e88e60a..3813b1b 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_block.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:bronze_block" + "id": "triad:bronze_block" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json index 779aa32..04479bb 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_boots.json @@ -12,6 +12,6 @@ "# #" ], "result": { - "item": "triad:bronze_boots" + "id": "triad:bronze_boots" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json index 4c00c51..17e78e6 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_chestplate.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:bronze_chestplate" + "id": "triad:bronze_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json index 081ccac..7656591 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_furnace.json @@ -15,6 +15,6 @@ "###" ], "result": { - "item": "triad:bronze_furnace" + "id": "triad:bronze_furnace" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json index c6ba267..d7972df 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_grinder.json @@ -21,6 +21,6 @@ "#$#" ], "result": { - "item": "triad:bronze_grinder" + "id": "triad:bronze_grinder" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json index 95aaaf3..0d5d695 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_helmet.json @@ -12,6 +12,6 @@ " " ], "result": { - "item": "triad:bronze_helmet" + "id": "triad:bronze_helmet" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json index b2f2b01..ccc9980 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_hoe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:bronze_hoe" + "id": "triad:bronze_hoe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json index cc0031b..b17c70a 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_item_boiler.json @@ -21,6 +21,6 @@ "#$#" ], "result": { - "item": "triad:bronze_item_boiler" + "id": "triad:bronze_item_boiler" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json index 292091b..856953e 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_leggings.json @@ -12,6 +12,6 @@ "# #" ], "result": { - "item": "triad:bronze_leggings" + "id": "triad:bronze_leggings" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json index aba5b59..b1c54c8 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_pickaxe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:bronze_pickaxe" + "id": "triad:bronze_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json index ff0eedc..46a757a 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_shovel.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:bronze_shovel" + "id": "triad:bronze_shovel" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json index 2faa960..35ac509 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_sword.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:bronze_sword" + "id": "triad:bronze_sword" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json index 274a916..cc7fdb5 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/bronze_turbine.json @@ -21,6 +21,6 @@ "#@#" ], "result": { - "item": "triad:bronze_turbine" + "id": "triad:bronze_turbine" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json index b6b0c12..0e79608 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/raw_tin_block.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:raw_tin_block" + "id": "triad:raw_tin_block" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json b/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json index 731f19b..24d3d7c 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/redstone_grinder.json @@ -21,6 +21,6 @@ "#$#" ], "result": { - "item": "triad:redstone_grinder" + "id": "triad:redstone_grinder" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json index 57e5701..3a1d0ea 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_axe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:steel_axe" + "id": "triad:steel_axe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json index f07c152..c16a614 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_block.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:steel_block" + "id": "triad:steel_block" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json index f4b1410..7559ee8 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_boots.json @@ -12,6 +12,6 @@ "# #" ], "result": { - "item": "triad:steel_boots" + "id": "triad:steel_boots" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json index 18f8c65..0fe87b6 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_capacitor.json @@ -18,6 +18,6 @@ "$$$" ], "result": { - "item": "triad:steel_capacitor" + "id": "triad:steel_capacitor" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json index 41220b3..022b5d0 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_chestplate.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:steel_chestplate" + "id": "triad:steel_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json index fe1bb4a..40d6920 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_helmet.json @@ -12,6 +12,6 @@ " " ], "result": { - "item": "triad:steel_helmet" + "id": "triad:steel_helmet" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json index 4aa747d..bf08413 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_hoe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:steel_hoe" + "id": "triad:steel_hoe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json index 84fdeb2..371bbab 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_leggings.json @@ -12,6 +12,6 @@ "# #" ], "result": { - "item": "triad:steel_leggings" + "id": "triad:steel_leggings" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json index 96b7c0f..18746ec 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_pickaxe.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:steel_pickaxe" + "id": "triad:steel_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json index 5844379..68e7d7f 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_shovel.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:steel_shovel" + "id": "triad:steel_shovel" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json b/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json index c41337a..2d467b4 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/steel_sword.json @@ -15,6 +15,6 @@ " @ " ], "result": { - "item": "triad:steel_sword" + "id": "triad:steel_sword" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/stone_mortar.json b/src/main/resources/data/triad/recipes/crafting/shaped/stone_mortar.json index c0843d6..8905997 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/stone_mortar.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/stone_mortar.json @@ -15,6 +15,6 @@ "###" ], "result": { - "item": "triad:stone_mortar" + "id": "triad:stone_mortar" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json b/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json index df72bf9..a095132 100644 --- a/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json +++ b/src/main/resources/data/triad/recipes/crafting/shaped/tin_block.json @@ -12,6 +12,6 @@ "###" ], "result": { - "item": "triad:tin_block" + "id": "triad:tin_block" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json index d3f19d0..8f5e570 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_dust.json @@ -17,6 +17,6 @@ ], "result": { "count": 2, - "item": "triad:bronze_dust" + "id": "triad:bronze_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json index 05de8a0..5f63e1c 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/bronze_ingot.json @@ -9,6 +9,6 @@ ], "result": { "count": 9, - "item": "triad:bronze_ingot" + "id": "triad:bronze_ingot" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json index 15efbaa..839c93e 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/copper_dust.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json index c922b60..dc0b537 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/gold_dust.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json index 1571581..d1c54fe 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/iron_dust.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json b/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json index b8e86bb..fde9ffc 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/raw_tin.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "triad:raw_tin" + "id": "triad:raw_tin" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json index 2a7c3b5..e084cdd 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_dust.json @@ -16,7 +16,6 @@ } ], "result": { - "count": 1, - "item": "triad:steel_dust" + "id": "triad:steel_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json index a6e4740..cec9f40 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/steel_ingot.json @@ -9,6 +9,6 @@ ], "result": { "count": 9, - "item": "triad:steel_ingot" + "id": "triad:steel_ingot" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json index 48e5d3f..82edfcb 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_dust.json @@ -10,6 +10,6 @@ } ], "result": { - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json index 3d067bb..a65e472 100644 --- a/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json +++ b/src/main/resources/data/triad/recipes/crafting/shapeless/tin_ingot.json @@ -9,6 +9,6 @@ ], "result": { "count": 9, - "item": "triad:tin_ingot" + "id": "triad:tin_ingot" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json index 504870a..ae8a991 100644 --- a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json +++ b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:bronze_dust" + "id": "triad:bronze_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json index 3b9bad0..820c9a2 100644 --- a/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/bronze_dust_from_grinding_bronze_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/bronze" }, "result": { - "item": "triad:bronze_dust" + "id": "triad:bronze_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json index aa2b6ad..f89515e 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json index 5c033a8..b901538 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/copper" }, "result": { - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json index 490570a..55a62be 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_copper_ore.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json index a624d6f..490d618 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json index 7499d36..62c8111 100644 --- a/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json +++ b/src/main/resources/data/triad/recipes/grinding/copper_dust_from_grinding_raw_copper_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 18, - "item": "triad:copper_dust" + "id": "triad:copper_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json index 1cb6828..4180766 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json index b6b4563..3a54455 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/gold" }, "result": { - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json index b7de407..435a4f5 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_gold_ore.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json index 2e50ede..f315c40 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json index 308a9bf..75c9947 100644 --- a/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json +++ b/src/main/resources/data/triad/recipes/grinding/gold_dust_from_grinding_raw_gold_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 18, - "item": "triad:gold_dust" + "id": "triad:gold_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json index 07c8ea1..3222ea5 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json index 4fb9df9..e07a5ee 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/iron" }, "result": { - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json index 7a0e476..2cd76c2 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_iron_ore.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json index 8d7ed37..3b12819 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json index 7f9dfbe..fe8f32f 100644 --- a/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json +++ b/src/main/resources/data/triad/recipes/grinding/iron_dust_from_grinding_raw_iron_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 18, - "item": "triad:iron_dust" + "id": "triad:iron_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json index f9a5c5d..68dd48e 100644 --- a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json +++ b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:steel_dust" + "id": "triad:steel_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json index e8c4a66..f52a5e0 100644 --- a/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/steel_dust_from_grinding_steel_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/steel" }, "result": { - "item": "triad:steel_dust" + "id": "triad:steel_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json index 267008a..eb8cef2 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json index 65d1398..50ce0d8 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_raw_tin_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 18, - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json index 78723d4..211fa7e 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_block.json @@ -6,6 +6,6 @@ }, "result": { "count": 9, - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json index c1e8bdc..052f339 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ingot.json @@ -5,6 +5,6 @@ "tag": "c:ingots/tin" }, "result": { - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json index 2871894..b67db58 100644 --- a/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json +++ b/src/main/resources/data/triad/recipes/grinding/tin_dust_from_grinding_tin_ore.json @@ -6,6 +6,6 @@ }, "result": { "count": 2, - "item": "triad:tin_dust" + "id": "triad:tin_dust" } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json b/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json index f608079..1694c27 100644 --- a/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/bronze_ingot_from_smelting_bronze_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/bronze" }, - "result": "triad:bronze_ingot" + "result": { + "id": "triad:bronze_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json b/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json index fe302ce..a206b9a 100644 --- a/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/copper_ingot_from_smelting_copper_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/copper" }, - "result": "minecraft:copper_ingot" + "result": { + "id": "minecraft:copper_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json b/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json index 148fae4..51bb0fd 100644 --- a/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/gold_ingot_from_smelting_gold_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/gold" }, - "result": "minecraft:gold_ingot" + "result": { + "id": "minecraft:gold_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json b/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json index cd58b58..9923aa4 100644 --- a/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/iron_ingot_from_smelting_iron_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/iron" }, - "result": "minecraft:iron_ingot" + "result": { + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json index 4c2bc0e..65e33da 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_raw_tin.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:raw_materials/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json index 003f03d..b51b04a 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_dust.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:dusts/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json index 75d3781..3dd3713 100644 --- a/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json +++ b/src/main/resources/data/triad/recipes/smelting/tin_ingot_from_smelting_tin_ore.json @@ -7,5 +7,7 @@ "ingredient": { "tag": "c:ores/tin" }, - "result": "triad:tin_ingot" + "result": { + "id": "triad:tin_ingot" + } } \ No newline at end of file