diff --git a/.gitignore b/.gitignore index 09cd281f..a425769e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ bin/ # fabric run/ +src/main/generated/.cache diff --git a/README.md b/README.md index 572bd736..12dfc759 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![icon](https://i.imgur.com/BiDGRe9.png) +![icon.png](https://i.imgur.com/BiDGRe9.png) ## license This project is licensed under [ARR](LICENSE). If you would like clarification or explicit permission, contact me on Discord. diff --git a/build.gradle b/build.gradle index 7bedeaa0..6c442202 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,16 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } +base { + archivesName = project.archives_base_name +} + version = project.mod_version group = project.maven_group repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. } loom { @@ -49,11 +48,8 @@ dependencies { // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. - // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" -} -base { - archivesName = project.archives_base_name + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" } processResources { @@ -65,14 +61,10 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. withSourcesJar() sourceCompatibility = JavaVersion.VERSION_17 diff --git a/gradle.properties b/gradle.properties index f70b5e40..9d57cae0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.5 - loader_version=0.14.21 + minecraft_version=1.21.1 + yarn_mappings=1.21.1+build.3 + loader_version=0.16.7 # Mod Properties - mod_version = 3.1.0 + mod_version = 4.0.0 maven_group = com.ninni archives_base_name = twigs # Dependencies - fabric_version=0.84.0+1.20.1 + fabric_version=0.106.0+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..1e2fbf0d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index b02216ba..682bbc60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,5 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = 'twigs' diff --git a/src/main/generated/.cache/992030af1166d80cd522100e1ae5b945fa70818d b/src/main/generated/.cache/992030af1166d80cd522100e1ae5b945fa70818d deleted file mode 100644 index b8da7a94..00000000 --- a/src/main/generated/.cache/992030af1166d80cd522100e1ae5b945fa70818d +++ /dev/null @@ -1,11 +0,0 @@ -// 1.19.4 2023-05-09T22:28:07.0037359 Twigs/worldgen/placed_feature -7966b3b727cfa0de202323e424e20c9cd8177810 data\twigs\worldgen\placed_feature\silt_strip.json -416b1da2ee6958bc96532b55e72eded59acd9079 data\twigs\worldgen\placed_feature\ore_schist_upper.json -0528cbb063be769c4a382a43388d1aa40da7b75d data\twigs\worldgen\placed_feature\ore_rhyolite.json -48328031204dd7f49f0a29988150b73975e1b6c1 data\twigs\worldgen\placed_feature\azalea_flowers.json -ff4b07b0a6d9862b29b8a10d3b497b3dff57ea21 data\twigs\worldgen\placed_feature\patch_twig.json -05e85ad54f2150a55d812b76bd44c7556dc0f008 data\twigs\worldgen\placed_feature\patch_seashell_land.json -14430c00f5817666f24c04059517e9f722121399 data\twigs\worldgen\placed_feature\ore_schist_lower.json -17fc2122046e18844cbf437cafe1638aa51e55a2 data\twigs\worldgen\placed_feature\ore_bloodstone.json -221d679bce3faa8159775ef7b679a6e32649751c data\twigs\worldgen\placed_feature\patch_seashell_water.json -89578c7b44ecbe5c4154939e6fae4eee7ad37f89 data\twigs\worldgen\placed_feature\patch_pebble.json diff --git a/src/main/generated/.cache/f418228a60fef977eb19c4adca647c6a9fa60d17 b/src/main/generated/.cache/f418228a60fef977eb19c4adca647c6a9fa60d17 deleted file mode 100644 index e27ec4ae..00000000 --- a/src/main/generated/.cache/f418228a60fef977eb19c4adca647c6a9fa60d17 +++ /dev/null @@ -1,9 +0,0 @@ -// 1.19.4 2023-05-09T22:28:07.0067363 Twigs/worldgen/configured_feature -9f80fd766a043eb5ae59dc2d7012ee883054ce7d data\twigs\worldgen\configured_feature\silt_strip.json -534ea1ec9b2782a5850075ceeefd6b5c1f16a07d data\twigs\worldgen\configured_feature\ore_rhyolite.json -e308fd61a81759900fdb310b07ec8f0c2e02803b data\twigs\worldgen\configured_feature\ore_bloodstone.json -09e0201edab89fd7fba389b7cca09abd471581ce data\twigs\worldgen\configured_feature\azalea_flowers.json -71bf58def1df05fc6c46740c38d31c223de651aa data\twigs\worldgen\configured_feature\patch_twig.json -7e91cfef041f4cfc6bcf3bae42bb90be031ebda3 data\twigs\worldgen\configured_feature\patch_pebble.json -81c6417bd09b9276f7887820a725f23c730c9b52 data\twigs\worldgen\configured_feature\ore_schist.json -d90ee40d61f84ef43e150f35251693ba2ca6418b data\twigs\worldgen\configured_feature\patch_seashell.json diff --git a/src/main/generated/data/twigs/worldgen/configured_feature/azalea_flowers.json b/src/main/generated/data/twigs/worldgen/configured_feature/azalea_flowers.json index 6625f70e..8e19529b 100644 --- a/src/main/generated/data/twigs/worldgen/configured_feature/azalea_flowers.json +++ b/src/main/generated/data/twigs/worldgen/configured_feature/azalea_flowers.json @@ -4,10 +4,8 @@ "vertical_range": 3, "xz_radius": { "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 2 - } + "max_inclusive": 4, + "min_inclusive": 2 } } } \ No newline at end of file diff --git a/src/main/java/com/ninni/twigs/Twigs.java b/src/main/java/com/ninni/twigs/Twigs.java index 99ccfd20..ab38893b 100644 --- a/src/main/java/com/ninni/twigs/Twigs.java +++ b/src/main/java/com/ninni/twigs/Twigs.java @@ -1,7 +1,6 @@ package com.ninni.twigs; import com.google.common.reflect.Reflection; -import com.ninni.twigs.entity.Pebble; import com.ninni.twigs.registry.TwigsBiomeModifier; import com.ninni.twigs.registry.TwigsBlockEntityType; import com.ninni.twigs.registry.TwigsBlocks; @@ -18,11 +17,6 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.registry.OxidizableBlocksRegistry; import net.minecraft.Util; -import net.minecraft.core.Position; -import net.minecraft.core.dispenser.AbstractProjectileDispenseBehavior; -import net.minecraft.world.entity.projectile.Projectile; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DispenserBlock; @@ -50,12 +44,7 @@ public void onInitialize() { TwigsStructurePieceTypes.class ); - DispenserBlock.registerBehavior(TwigsItems.PEBBLE, new AbstractProjectileDispenseBehavior() { - @Override - protected Projectile getProjectile(Level world, Position position, ItemStack stack) { - return Util.make(new Pebble(world, position.x(), position.y(), position.z()), entity -> entity.setItem(stack)); - } - }); + DispenserBlock.registerProjectileBehavior(TwigsItems.PEBBLE); Util.make(new LinkedHashMap(), pairs -> { pairs.put(TwigsBlocks.COPPER_PILLAR, TwigsBlocks.WAXED_COPPER_PILLAR); diff --git a/src/main/java/com/ninni/twigs/TwigsClient.java b/src/main/java/com/ninni/twigs/TwigsClient.java index 907ca29e..57ba8f6d 100644 --- a/src/main/java/com/ninni/twigs/TwigsClient.java +++ b/src/main/java/com/ninni/twigs/TwigsClient.java @@ -11,12 +11,11 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; -import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.ThrownItemRenderer; +import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.resources.ResourceLocation; -@SuppressWarnings("deprecation") @Environment(EnvType.CLIENT) public class TwigsClient implements ClientModInitializer { @@ -42,7 +41,7 @@ public void onInitializeClient() { TwigsBlocks.BAMBOO_THATCH_SLAB ); - FabricModelPredicateProviderRegistry.register(TwigsItems.BRONZED_SEASHELL, new ResourceLocation("playing"), (itemStack, clientWorld, livingEntity, var) -> { + ItemProperties.register(TwigsItems.BRONZED_SEASHELL, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, "playing"), (itemStack, clientWorld, livingEntity, var) -> { if (livingEntity == null) return 0.0F; return livingEntity.isUsingItem() && livingEntity.getUseItem() == itemStack ? 1.0F : 0.0F; diff --git a/src/main/java/com/ninni/twigs/TwigsTags.java b/src/main/java/com/ninni/twigs/TwigsTags.java index 1b2b7c3c..9a278882 100644 --- a/src/main/java/com/ninni/twigs/TwigsTags.java +++ b/src/main/java/com/ninni/twigs/TwigsTags.java @@ -14,32 +14,32 @@ public interface TwigsTags { //item tags - TagKey SCHIST_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "schist")); - TagKey RHYOLITE_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "rhyolite")); - TagKey BLOODSTONE_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "bloodstone")); - TagKey PACKED_SILT_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "packed_silt")); - TagKey PACKED_SILT_FULL_BLOCKS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "packed_silt_full_blocks")); - TagKey SILT_POTS_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "silt_pots")); - TagKey SEASHELLS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "seashells")); - TagKey TABLES_ITEM = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "tables")); + TagKey SCHIST_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "schist")); + TagKey RHYOLITE_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "rhyolite")); + TagKey BLOODSTONE_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "bloodstone")); + TagKey PACKED_SILT_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "packed_silt")); + TagKey PACKED_SILT_FULL_BLOCKS = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "packed_silt_full_blocks")); + TagKey SILT_POTS_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "silt_pots")); + TagKey SEASHELLS = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "seashells")); + TagKey TABLES_ITEM = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "tables")); //block tags - TagKey SCHIST_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "schist")); - TagKey RHYOLITE_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "rhyolite")); - TagKey BLOODSTONE_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "bloodstone")); - TagKey PACKED_SILT_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "packed_silt")); - TagKey SILT_POTS_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "silt_pots")); - TagKey OFFSET_REMOVER = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "offset_remover")); - TagKey TABLES_BLOCK = TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, "tables")); + TagKey SCHIST_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "schist")); + TagKey RHYOLITE_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "rhyolite")); + TagKey BLOODSTONE_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "bloodstone")); + TagKey PACKED_SILT_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "packed_silt")); + TagKey SILT_POTS_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "silt_pots")); + TagKey OFFSET_REMOVER = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "offset_remover")); + TagKey TABLES_BLOCK = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "tables")); //biome tags - TagKey BLOODSTONE_GENERATES = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "bloodstone_generates")); - TagKey SCHIST_GENERATES = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "schist_generates")); - TagKey SILT_GENERATES = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "silt_generates")); - TagKey AZALEA_FLOWERS_GENERATE = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "azalea_flowers_generate")); - TagKey SPAWNS_TWIG = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "spawns_twig")); - TagKey SPAWNS_PEBBLE = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "spawns_pebble")); - TagKey SPAWNS_SEA_SHELL = TagKey.create(Registries.BIOME, new ResourceLocation(MOD_ID, "spawns_sea_shell")); + TagKey BLOODSTONE_GENERATES = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "bloodstone_generates")); + TagKey SCHIST_GENERATES = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "schist_generates")); + TagKey SILT_GENERATES = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "silt_generates")); + TagKey AZALEA_FLOWERS_GENERATE = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "azalea_flowers_generate")); + TagKey SPAWNS_TWIG = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "spawns_twig")); + TagKey SPAWNS_PEBBLE = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "spawns_pebble")); + TagKey SPAWNS_SEA_SHELL = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(MOD_ID, "spawns_sea_shell")); - TagKey> BAMBOO_LEAVES_SLOW_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation(MOD_ID, "bamboo_leaves_slow_immune")); + TagKey> BAMBOO_LEAVES_SLOW_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath(MOD_ID, "bamboo_leaves_slow_immune")); } diff --git a/src/main/java/com/ninni/twigs/block/AzaleaFlowersBlock.java b/src/main/java/com/ninni/twigs/block/AzaleaFlowersBlock.java index 9666cd61..c8f06846 100644 --- a/src/main/java/com/ninni/twigs/block/AzaleaFlowersBlock.java +++ b/src/main/java/com/ninni/twigs/block/AzaleaFlowersBlock.java @@ -1,5 +1,6 @@ package com.ninni.twigs.block; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; @@ -20,12 +21,18 @@ public class AzaleaFlowersBlock extends MultifaceBlock implements SimpleWaterloggedBlock { private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; private final MultifaceSpreader spreader = new MultifaceSpreader(this); + private static final MapCodec CODEC = simpleCodec(AzaleaFlowersBlock::new); public AzaleaFlowersBlock(BlockBehaviour.Properties properties) { super(properties); this.registerDefaultState(this.defaultBlockState().setValue(WATERLOGGED, false)); } + @Override + protected MapCodec codec() { + return CODEC; + } + protected void createBlockStateDefinition(StateDefinition.Builder builder) { super.createBlockStateDefinition(builder); builder.add(WATERLOGGED); @@ -42,7 +49,6 @@ public boolean canBeReplaced(BlockState blockState, BlockPlaceContext blockPlace return !blockPlaceContext.getItemInHand().is(this.asItem()) || super.canBeReplaced(blockState, blockPlaceContext); } - @SuppressWarnings("deprecation") public FluidState getFluidState(BlockState blockState) { return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState); } diff --git a/src/main/java/com/ninni/twigs/block/BambooLeavesBlock.java b/src/main/java/com/ninni/twigs/block/BambooLeavesBlock.java index 15478abe..bd858ad8 100644 --- a/src/main/java/com/ninni/twigs/block/BambooLeavesBlock.java +++ b/src/main/java/com/ninni/twigs/block/BambooLeavesBlock.java @@ -1,5 +1,6 @@ package com.ninni.twigs.block; +import com.mojang.serialization.MapCodec; import com.ninni.twigs.TwigsProperties; import com.ninni.twigs.TwigsTags; import net.minecraft.core.BlockPos; @@ -27,7 +28,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class BambooLeavesBlock extends BushBlock implements SimpleWaterloggedBlock { private static final IntegerProperty LAYERS = TwigsProperties.LAYERS_1_4; private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; @@ -36,18 +36,25 @@ public class BambooLeavesBlock extends BushBlock implements SimpleWaterloggedBlo public static final VoxelShape SHAPE_THREE = box(0, 0, 0, 16, 3, 16); public static final VoxelShape SHAPE_FOUR = box(0, 0, 0, 16, 5, 16); + private static final MapCodec CODEC = simpleCodec(BambooLeavesBlock::new); + public BambooLeavesBlock(Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(LAYERS, 1).setValue(WATERLOGGED, false)); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Override public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { return switch (blockState.getValue(LAYERS)) { - default -> SHAPE_ONE; case 2 -> SHAPE_TWO; case 3 -> SHAPE_THREE; case 4 -> SHAPE_FOUR; + default -> SHAPE_ONE; }; } diff --git a/src/main/java/com/ninni/twigs/block/BambooMatBlock.java b/src/main/java/com/ninni/twigs/block/BambooMatBlock.java index e07d6f41..c6d33b0c 100644 --- a/src/main/java/com/ninni/twigs/block/BambooMatBlock.java +++ b/src/main/java/com/ninni/twigs/block/BambooMatBlock.java @@ -20,7 +20,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class BambooMatBlock extends Block implements SimpleWaterloggedBlock { protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 2.0D, 16.0D); private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; @@ -57,8 +56,7 @@ public FluidState getFluidState(BlockState blockState) { } @Override - public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, PathComputationType pathComputationType) { + protected boolean isPathfindable(BlockState blockState, PathComputationType pathComputationType) { return true; } - -} \ No newline at end of file +} diff --git a/src/main/java/com/ninni/twigs/block/BrickTrailBlock.java b/src/main/java/com/ninni/twigs/block/BrickTrailBlock.java index 729a80e0..072c45eb 100644 --- a/src/main/java/com/ninni/twigs/block/BrickTrailBlock.java +++ b/src/main/java/com/ninni/twigs/block/BrickTrailBlock.java @@ -1,8 +1,8 @@ package com.ninni.twigs.block; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.tags.BlockTags; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelAccessor; @@ -22,17 +22,22 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class BrickTrailBlock extends HorizontalDirectionalBlock implements SimpleWaterloggedBlock { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; private static final VoxelShape SHAPE = box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D); + private static final MapCodec CODEC = simpleCodec(BrickTrailBlock::new); public BrickTrailBlock(Properties properties) { super(properties); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Override public boolean canSurvive(BlockState blockState, LevelReader levelReader, BlockPos blockPos) { BlockPos belowPos = blockPos.below(); diff --git a/src/main/java/com/ninni/twigs/block/ColumnBlock.java b/src/main/java/com/ninni/twigs/block/ColumnBlock.java index 4b031bf4..0d3130ef 100644 --- a/src/main/java/com/ninni/twigs/block/ColumnBlock.java +++ b/src/main/java/com/ninni/twigs/block/ColumnBlock.java @@ -24,7 +24,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class ColumnBlock extends Block { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final EnumProperty SHAPE = TwigsProperties.SHAPE; @@ -62,7 +61,7 @@ public VoxelShape getShape(BlockState state, BlockGetter blockGetter, BlockPos b } @Override - public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, PathComputationType pathComputationType) { + public boolean isPathfindable(BlockState blockState, PathComputationType pathComputationType) { return false; } diff --git a/src/main/java/com/ninni/twigs/block/CompactedDripstoneBlock.java b/src/main/java/com/ninni/twigs/block/CompactedDripstoneBlock.java index 06f7e0c2..da1fd6aa 100644 --- a/src/main/java/com/ninni/twigs/block/CompactedDripstoneBlock.java +++ b/src/main/java/com/ninni/twigs/block/CompactedDripstoneBlock.java @@ -19,7 +19,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class CompactedDripstoneBlock extends FacingBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final DirectionProperty FACING = BlockStateProperties.FACING; @@ -48,7 +47,7 @@ public BlockState updateShape(BlockState state, Direction direction, BlockState } @Override - public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, PathComputationType pathComputationType) { + public boolean isPathfindable(BlockState blockState, PathComputationType pathComputationType) { return false; } diff --git a/src/main/java/com/ninni/twigs/block/CutAmethystBlock.java b/src/main/java/com/ninni/twigs/block/CutAmethystBlock.java index 83e5f2d8..c242839b 100644 --- a/src/main/java/com/ninni/twigs/block/CutAmethystBlock.java +++ b/src/main/java/com/ninni/twigs/block/CutAmethystBlock.java @@ -10,9 +10,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.material.PushReaction; -@SuppressWarnings("deprecation") public class CutAmethystBlock extends AmethystBlock { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; @@ -34,10 +32,6 @@ public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { return this.defaultBlockState().setValue(FACING, blockPlaceContext.getHorizontalDirection().getOpposite()); } - public PushReaction getPistonPushReaction(BlockState blockState) { - return PushReaction.PUSH_ONLY; - } - protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } diff --git a/src/main/java/com/ninni/twigs/block/FacingBlock.java b/src/main/java/com/ninni/twigs/block/FacingBlock.java index e99a60a3..47cc6078 100644 --- a/src/main/java/com/ninni/twigs/block/FacingBlock.java +++ b/src/main/java/com/ninni/twigs/block/FacingBlock.java @@ -1,5 +1,6 @@ package com.ninni.twigs.block; +import com.mojang.serialization.MapCodec; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; @@ -12,12 +13,18 @@ public class FacingBlock extends DirectionalBlock { public static final DirectionProperty FACING = BlockStateProperties.FACING; + public static final MapCodec CODEC = simpleCodec(FacingBlock::new); public FacingBlock(Properties properties) { super(properties); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Nullable @Override public BlockState getStateForPlacement(BlockPlaceContext ctx) { diff --git a/src/main/java/com/ninni/twigs/block/FallingBlockWithEntity.java b/src/main/java/com/ninni/twigs/block/FallingBlockWithEntity.java index b05f9130..438329cd 100644 --- a/src/main/java/com/ninni/twigs/block/FallingBlockWithEntity.java +++ b/src/main/java/com/ninni/twigs/block/FallingBlockWithEntity.java @@ -1,5 +1,6 @@ package com.ninni.twigs.block; +import com.mojang.serialization.MapCodec; import com.ninni.twigs.mixin.FallingBlockEntityInvoker; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -17,14 +18,18 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import org.jetbrains.annotations.Nullable; - -@SuppressWarnings("deprecation") public class FallingBlockWithEntity extends BaseEntityBlock implements Fallable { + public static final MapCodec CODEC = simpleCodec(FallingBlockWithEntity::new); public FallingBlockWithEntity(Properties settings) { super(settings); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Override public void onPlace(BlockState blockState, Level level, BlockPos blockPos, BlockState blockState2, boolean bl) { level.scheduleTick(blockPos, this, this.getFallDelay()); @@ -44,7 +49,7 @@ public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource } BlockEntity blockEntity = world.getBlockEntity(pos); FallingBlockEntity fallingBlockEntity = spawnFromBlock(world, pos, state); - if (blockEntity != null) fallingBlockEntity.blockData = blockEntity.saveWithoutMetadata(); + if (blockEntity != null) fallingBlockEntity.blockData = blockEntity.saveWithoutMetadata(world.registryAccess()); this.configureFallingBlockEntity(fallingBlockEntity); } @@ -67,4 +72,4 @@ protected int getFallDelay() { public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/com/ninni/twigs/block/FloorItemBlock.java b/src/main/java/com/ninni/twigs/block/FloorItemBlock.java index 821f5da4..febe135b 100644 --- a/src/main/java/com/ninni/twigs/block/FloorItemBlock.java +++ b/src/main/java/com/ninni/twigs/block/FloorItemBlock.java @@ -2,7 +2,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.tags.BlockTags; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelAccessor; @@ -21,7 +20,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("deprecation") public class FloorItemBlock extends Block implements SimpleWaterloggedBlock { private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; private static final VoxelShape SHAPE = box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D); @@ -69,7 +67,7 @@ public boolean canSurvive(BlockState blockState, LevelReader levelReader, BlockP } @Override - public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, PathComputationType pathComputationType) { - return (pathComputationType == PathComputationType.AIR && !this.hasCollision) || super.isPathfindable(blockState, blockGetter, blockPos, pathComputationType); + public boolean isPathfindable(BlockState blockState, PathComputationType pathComputationType) { + return (pathComputationType == PathComputationType.AIR && !this.hasCollision) || super.isPathfindable(blockState, pathComputationType); } } diff --git a/src/main/java/com/ninni/twigs/block/LampBlock.java b/src/main/java/com/ninni/twigs/block/LampBlock.java index 109e9a73..1aefa8bb 100644 --- a/src/main/java/com/ninni/twigs/block/LampBlock.java +++ b/src/main/java/com/ninni/twigs/block/LampBlock.java @@ -3,7 +3,6 @@ import com.ninni.twigs.registry.TwigsSoundEvents; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; -import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; @@ -22,9 +21,8 @@ public LampBlock(Properties properties) { this.registerDefaultState(this.defaultBlockState().setValue(LIT, true)); } - @SuppressWarnings("deprecation") @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult) { + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult blockHitResult) { if (!player.isShiftKeyDown()) { final boolean wasLit = state.getValue(LIT); level.setBlockAndUpdate(pos, state.setValue(LIT, !wasLit)); diff --git a/src/main/java/com/ninni/twigs/block/PaperLanternBlock.java b/src/main/java/com/ninni/twigs/block/PaperLanternBlock.java index a99425f4..74dda9c5 100644 --- a/src/main/java/com/ninni/twigs/block/PaperLanternBlock.java +++ b/src/main/java/com/ninni/twigs/block/PaperLanternBlock.java @@ -4,6 +4,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -20,7 +21,6 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; @@ -29,7 +29,6 @@ import java.util.List; -@SuppressWarnings("deprecation") public class PaperLanternBlock extends Block implements SimpleWaterloggedBlock { public static final BooleanProperty HANGING = BlockStateProperties.HANGING; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; @@ -95,7 +94,7 @@ public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { } @Override - public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, PathComputationType pathComputationType) { + public boolean isPathfindable(BlockState blockState, PathComputationType pathComputationType) { return false; } @@ -105,7 +104,7 @@ public FluidState getFluidState(BlockState state) { } @Override - public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter blockGetter, List list, TooltipFlag tooltipFlag) { + public void appendHoverText(ItemStack itemStack, Item.TooltipContext tooltipContext, List list, TooltipFlag tooltipFlag) { if (this.content != Blocks.AIR) { list.add(this.createContentTooltip()); } diff --git a/src/main/java/com/ninni/twigs/block/PillarOxidizableBlock.java b/src/main/java/com/ninni/twigs/block/PillarOxidizableBlock.java index 2f9bd103..05e18488 100644 --- a/src/main/java/com/ninni/twigs/block/PillarOxidizableBlock.java +++ b/src/main/java/com/ninni/twigs/block/PillarOxidizableBlock.java @@ -20,10 +20,9 @@ public boolean isRandomlyTicking(BlockState blockState) { return WeatheringCopper.getPrevious(blockState.getBlock()).isPresent(); } - @SuppressWarnings("deprecation") @Override public void randomTick(BlockState blockState, ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) { - this.applyChangeOverTime(blockState, serverLevel, blockPos, randomSource); + this.changeOverTime(blockState, serverLevel, blockPos, randomSource); } @Override diff --git a/src/main/java/com/ninni/twigs/block/SiltPotBlock.java b/src/main/java/com/ninni/twigs/block/SiltPotBlock.java index 6af5c93c..cd37e4b6 100644 --- a/src/main/java/com/ninni/twigs/block/SiltPotBlock.java +++ b/src/main/java/com/ninni/twigs/block/SiltPotBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.Container; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.FallingBlockEntity; import net.minecraft.world.entity.monster.piglin.PiglinAi; @@ -25,7 +25,12 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.FlowerBlock; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.SimpleWaterloggedBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -42,7 +47,6 @@ import java.util.stream.Stream; -@SuppressWarnings("deprecation") public class SiltPotBlock extends FallingBlockWithEntity implements SimpleWaterloggedBlock { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty FILLED = TwigsProperties.FILLED; @@ -65,34 +69,33 @@ public SoundType getSoundType(BlockState state) { } @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { BlockEntity blockEntity = level.getBlockEntity(pos); - ItemStack stack = player.getItemInHand(hand); if (hit.getDirection() == Direction.UP && stack.getItem() instanceof BlockItem blockItem && blockItem.getBlock() instanceof FlowerBlock && state.getValue(FILLED)) { blockItem.place(new BlockPlaceContext(player, hand, stack, hit)); - return InteractionResult.sidedSuccess(level.isClientSide); + return ItemInteractionResult.sidedSuccess(level.isClientSide); } if (state.getValue(FILLED) && stack.getItem() instanceof ShovelItem) { level.setBlock(pos, state.setValue(FILLED, false), Block.UPDATE_NONE); - if (!player.getAbilities().instabuild) stack.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(player.getUsedItemHand())); + if (!player.getAbilities().instabuild) stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand)); if (level.isClientSide) { level.playSound(player, pos, SoundEvents.ROOTED_DIRT_BREAK, SoundSource.BLOCKS, 1, 1); - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } } else if (!state.getValue(FILLED) && stack.is(Blocks.ROOTED_DIRT.asItem())) { level.setBlock(pos, state.setValue(FILLED, true), Block.UPDATE_NONE); if (level.isClientSide) { level.playSound(player, pos, SoundEvents.ROOTED_DIRT_PLACE, SoundSource.BLOCKS, 1, 1); - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } if (!player.getAbilities().instabuild) stack.shrink(1); } else if (blockEntity instanceof SiltPotBlockEntity && !state.getValue(FILLED)) { - if (level.isClientSide) return InteractionResult.SUCCESS; + if (level.isClientSide) return ItemInteractionResult.SUCCESS; player.openMenu((SiltPotBlockEntity)blockEntity); player.awardStat(TwigsStats.OPEN_SILT_POT); PiglinAi.angerNearbyPiglins(player, true); } - return InteractionResult.CONSUME; + return ItemInteractionResult.CONSUME; } @@ -100,7 +103,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player public void onBrokenAfterFall(Level level, BlockPos pos, FallingBlockEntity fallingBlockEntity) { SiltPotBlockEntity blockEntity = TwigsBlockEntityType.SILT_POT.create(pos, fallingBlockEntity.getBlockState()); assert blockEntity != null; - blockEntity.load(fallingBlockEntity.blockData); + blockEntity.loadCustomOnly(fallingBlockEntity.blockData, level.registryAccess()); Containers.dropContents(level, pos, blockEntity); } @@ -117,14 +120,6 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new super.onRemove(state, level, pos, newState, moved); } - @Override - public void setPlacedBy(Level level, BlockPos pos, BlockState blockState, @Nullable LivingEntity livingEntity, ItemStack itemStack) { - BlockEntity blockEntity; - if (itemStack.hasCustomHoverName() && (blockEntity = level.getBlockEntity(pos)) instanceof SiltPotBlockEntity) { - ((SiltPotBlockEntity)blockEntity).setCustomName(itemStack.getHoverName()); - } - } - public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { return new SiltPotBlockEntity(blockPos, blockState); } diff --git a/src/main/java/com/ninni/twigs/block/TableBlock.java b/src/main/java/com/ninni/twigs/block/TableBlock.java index aa18eb6d..b0c20f35 100644 --- a/src/main/java/com/ninni/twigs/block/TableBlock.java +++ b/src/main/java/com/ninni/twigs/block/TableBlock.java @@ -27,7 +27,6 @@ go check it out it's a very awesome mod */ -@SuppressWarnings("deprecation") public class TableBlock extends Block implements SimpleWaterloggedBlock { private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; private static final BooleanProperty LEG1 = TwigsProperties.TABLE_LEG1; @@ -142,7 +141,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder use(Level level, Player player, Intera } @Override - public int getUseDuration(ItemStack itemStack) { + public int getUseDuration(ItemStack itemStack, LivingEntity livingEntity) { return 1200; } @@ -51,4 +51,3 @@ private static void play(Level level, Player player) { level.gameEvent(GameEvent.INSTRUMENT_PLAY, player.position(), GameEvent.Context.of(player)); } } - diff --git a/src/main/java/com/ninni/twigs/item/PebbleItem.java b/src/main/java/com/ninni/twigs/item/PebbleItem.java index 2a0ce136..7e2e2239 100644 --- a/src/main/java/com/ninni/twigs/item/PebbleItem.java +++ b/src/main/java/com/ninni/twigs/item/PebbleItem.java @@ -2,22 +2,31 @@ import com.ninni.twigs.entity.Pebble; import com.ninni.twigs.registry.TwigsSoundEvents; +import net.minecraft.core.Direction; +import net.minecraft.core.Position; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ProjectileItem; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import org.jetbrains.annotations.NotNull; -public class PebbleItem extends BlockItem { - +public class PebbleItem extends BlockItem implements ProjectileItem { public PebbleItem(Block block, Properties properties) { super(block, properties); } + @Override + public @NotNull Projectile asProjectile(Level level, Position position, ItemStack itemStack, Direction direction) { + return new Pebble(level, position.x(), position.y(), position.z(), itemStack); + } + @Override public InteractionResultHolder use(Level level, Player player, InteractionHand interactionHand) { ItemStack stack = player.getItemInHand(interactionHand); diff --git a/src/main/java/com/ninni/twigs/mixin/FlowerBlockMixin.java b/src/main/java/com/ninni/twigs/mixin/FlowerBlockMixin.java index d3558116..06ebf09a 100644 --- a/src/main/java/com/ninni/twigs/mixin/FlowerBlockMixin.java +++ b/src/main/java/com/ninni/twigs/mixin/FlowerBlockMixin.java @@ -11,8 +11,7 @@ @Mixin(FlowerBlock.class) public abstract class FlowerBlockMixin extends BushBlock { - - public FlowerBlockMixin(Properties properties) { + private FlowerBlockMixin(Properties properties) { super(properties); } diff --git a/src/main/java/com/ninni/twigs/mixin/LootItemAccessor.java b/src/main/java/com/ninni/twigs/mixin/LootItemAccessor.java index 35371850..ea178411 100644 --- a/src/main/java/com/ninni/twigs/mixin/LootItemAccessor.java +++ b/src/main/java/com/ninni/twigs/mixin/LootItemAccessor.java @@ -1,5 +1,6 @@ package com.ninni.twigs.mixin; +import net.minecraft.core.Holder; import net.minecraft.world.item.Item; import net.minecraft.world.level.storage.loot.entries.LootItem; import org.spongepowered.asm.mixin.Mixin; @@ -9,9 +10,9 @@ @Mixin(LootItem.class) public interface LootItemAccessor { @Accessor - Item getItem(); + Holder getItem(); @Mutable @Accessor - void setItem(Item item); + void setItem(Holder item); } diff --git a/src/main/java/com/ninni/twigs/mixin/MultifaceGrowthFeatureMixin.java b/src/main/java/com/ninni/twigs/mixin/MultifaceGrowthFeatureMixin.java index 32c4fb44..31347465 100644 --- a/src/main/java/com/ninni/twigs/mixin/MultifaceGrowthFeatureMixin.java +++ b/src/main/java/com/ninni/twigs/mixin/MultifaceGrowthFeatureMixin.java @@ -16,7 +16,6 @@ import java.util.function.Supplier; -@SuppressWarnings("deprecation") @Mixin(MultifaceGrowthFeature.class) public class MultifaceGrowthFeatureMixin { @Unique diff --git a/src/main/java/com/ninni/twigs/registry/TwigsBiomeModifier.java b/src/main/java/com/ninni/twigs/registry/TwigsBiomeModifier.java index a44362e7..70591f29 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsBiomeModifier.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsBiomeModifier.java @@ -10,7 +10,6 @@ import net.minecraft.Util; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BiomeTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.GenerationStep; @@ -37,11 +36,11 @@ public static void init() { } public static void addFeature(String id, GenerationStep.Decoration decoration, ResourceKey resourceKey, TagKey biome) { - BiomeModifications.create(new ResourceLocation(Twigs.MOD_ID, id)).add(ModificationPhase.ADDITIONS, BiomeSelectors.tag(biome), biomeModificationContext -> biomeModificationContext.getGenerationSettings().addFeature(decoration, resourceKey)); + BiomeModifications.create(ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id)).add(ModificationPhase.ADDITIONS, BiomeSelectors.tag(biome), biomeModificationContext -> biomeModificationContext.getGenerationSettings().addFeature(decoration, resourceKey)); } private static void addOre(String id, ResourceKey resourceKey, Predicate biome) { - BiomeModifications.create(new ResourceLocation(Twigs.MOD_ID, id)).add(ModificationPhase.ADDITIONS, biome, context -> context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, resourceKey)); + BiomeModifications.create(ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id)).add(ModificationPhase.ADDITIONS, biome, context -> context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, resourceKey)); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsBlockEntityType.java b/src/main/java/com/ninni/twigs/registry/TwigsBlockEntityType.java index 9c1202a1..333b42bd 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsBlockEntityType.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsBlockEntityType.java @@ -2,7 +2,6 @@ import com.ninni.twigs.Twigs; import com.ninni.twigs.block.entity.SiltPotBlockEntity; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; @@ -11,8 +10,8 @@ public class TwigsBlockEntityType { public static final BlockEntityType SILT_POT = Registry.register( - BuiltInRegistries.BLOCK_ENTITY_TYPE, new ResourceLocation(Twigs.MOD_ID, "silt_pot"), - FabricBlockEntityTypeBuilder.create(SiltPotBlockEntity::new, + BuiltInRegistries.BLOCK_ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, "silt_pot"), + BlockEntityType.Builder.of(SiltPotBlockEntity::new, TwigsBlocks.SILT_POT, TwigsBlocks.BLACK_SILT_POT, TwigsBlocks.BLUE_SILT_POT, diff --git a/src/main/java/com/ninni/twigs/registry/TwigsBlocks.java b/src/main/java/com/ninni/twigs/registry/TwigsBlocks.java index 35be091b..af68042c 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsBlocks.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsBlocks.java @@ -1,14 +1,35 @@ package com.ninni.twigs.registry; import com.ninni.twigs.Twigs; -import com.ninni.twigs.block.*; +import com.ninni.twigs.block.AzaleaFlowersBlock; +import com.ninni.twigs.block.BambooLeavesBlock; +import com.ninni.twigs.block.BambooMatBlock; +import com.ninni.twigs.block.BrickTrailBlock; +import com.ninni.twigs.block.ColumnBlock; +import com.ninni.twigs.block.CompactedDripstoneBlock; +import com.ninni.twigs.block.CutAmethystBlock; +import com.ninni.twigs.block.FacingBlock; +import com.ninni.twigs.block.FloorItemBlock; +import com.ninni.twigs.block.LampBlock; +import com.ninni.twigs.block.PaperLanternBlock; +import com.ninni.twigs.block.PillarOxidizableBlock; +import com.ninni.twigs.block.SeashellBlock; import com.ninni.twigs.block.SiltPotBlock; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import com.ninni.twigs.block.TableBlock; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.AmethystBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.FlowerPotBlock; +import net.minecraft.world.level.block.GlowLichenBlock; +import net.minecraft.world.level.block.RotatedPillarBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.block.WeatheringCopper; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -17,15 +38,13 @@ import java.util.function.ToIntFunction; -import static net.minecraft.world.level.block.Blocks.BRICKS; - public class TwigsBlocks { //collectibles - public static final Block AZALEA_FLOWERS = register("azalea_flowers", new AzaleaFlowersBlock(FabricBlockSettings.of().mapColor(MapColor.PLANT).instabreak().noCollission().noOcclusion().sound(SoundType.MOSS_CARPET))); - @SuppressWarnings("unused") public static final Block POTTED_AZALEA_FLOWERS = register("potted_azalea_flowers", new FlowerPotBlock(AZALEA_FLOWERS, FabricBlockSettings.copyOf(Blocks.POTTED_FLOWERING_AZALEA))); - public static final Block TWIG = register("twig", new FloorItemBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instabreak().noOcclusion().sound(SoundType.WOOD).noCollission())); - public static final Block PEBBLE = register("pebble", new FloorItemBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instabreak().noOcclusion().noCollission().sound(SoundType.STONE))); + public static final Block AZALEA_FLOWERS = register("azalea_flowers", new AzaleaFlowersBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instabreak().noCollission().noOcclusion().sound(SoundType.MOSS_CARPET))); + @SuppressWarnings("unused") public static final Block POTTED_AZALEA_FLOWERS = register("potted_azalea_flowers", new FlowerPotBlock(AZALEA_FLOWERS, BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_FLOWERING_AZALEA))); + public static final Block TWIG = register("twig", new FloorItemBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instabreak().noOcclusion().sound(SoundType.WOOD).noCollission())); + public static final Block PEBBLE = register("pebble", new FloorItemBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instabreak().noOcclusion().sound(SoundType.STONE).noCollission())); public static final Block OPALINE_SEASHELL = register("opaline_seashell", new SeashellBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_WHITE).instabreak().noOcclusion().sound(TwigsSoundEvents.SEASHELL))); public static final Block BRONZED_SEASHELL = register("bronzed_seashell", new SeashellBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instabreak().noOcclusion().sound(TwigsSoundEvents.SEASHELL))); public static final Block ROSEATE_SEASHELL = register("roseate_seashell", new SeashellBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_PINK).instabreak().noOcclusion().sound(TwigsSoundEvents.SEASHELL))); @@ -34,304 +53,304 @@ public class TwigsBlocks { //bamboo public static final Block BAMBOO_LEAVES = register("bamboo_leaves", new BambooLeavesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).strength(0.2F).noOcclusion().instabreak().noCollission().sound(SoundType.MOSS_CARPET))); public static final Block BAMBOO_THATCH = register("bamboo_thatch", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.2F).sound(SoundType.MOSS))); - public static final Block BAMBOO_THATCH_SLAB = register("bamboo_thatch_slab", new SlabBlock(BlockBehaviour.Properties.copy(BAMBOO_THATCH))); - public static final Block BAMBOO_MAT = register("bamboo_mat", new BambooMatBlock(FabricBlockSettings.copyOf(Blocks.BAMBOO_PLANKS))); + public static final Block BAMBOO_THATCH_SLAB = register("bamboo_thatch_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BAMBOO_THATCH))); + public static final Block BAMBOO_MAT = register("bamboo_mat", new BambooMatBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BAMBOO_PLANKS))); //paper lanterns public static final Block PAPER_LANTERN = register("paper_lantern", new PaperLanternBlock(Blocks.AIR, BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_WHITE).strength(1.5f).pushReaction(PushReaction.DESTROY).sound(TwigsSoundEvents.PAPER_LANTERN).lightLevel(blockState -> 15).noOcclusion())); - public static final Block ALLIUM_PAPER_LANTERN = register("allium_paper_lantern", new PaperLanternBlock(Blocks.ALLIUM, BlockBehaviour.Properties.copy(PAPER_LANTERN))); - public static final Block BLUE_ORCHID_PAPER_LANTERN = register("blue_orchid_paper_lantern", new PaperLanternBlock(Blocks.BLUE_ORCHID, BlockBehaviour.Properties.copy(PAPER_LANTERN))); - public static final Block CRIMSON_ROOTS_PAPER_LANTERN = register("crimson_roots_paper_lantern", new PaperLanternBlock(Blocks.CRIMSON_ROOTS, BlockBehaviour.Properties.copy(PAPER_LANTERN))); - public static final Block DANDELION_PAPER_LANTERN = register("dandelion_paper_lantern", new PaperLanternBlock(Blocks.DANDELION, BlockBehaviour.Properties.copy(PAPER_LANTERN))); - public static final Block TORCHFLOWER_PAPER_LANTERN = register("torchflower_paper_lantern", new PaperLanternBlock(Blocks.TORCHFLOWER, BlockBehaviour.Properties.copy(PAPER_LANTERN))); + public static final Block ALLIUM_PAPER_LANTERN = register("allium_paper_lantern", new PaperLanternBlock(Blocks.ALLIUM, BlockBehaviour.Properties.ofFullCopy(PAPER_LANTERN))); + public static final Block BLUE_ORCHID_PAPER_LANTERN = register("blue_orchid_paper_lantern", new PaperLanternBlock(Blocks.BLUE_ORCHID, BlockBehaviour.Properties.ofFullCopy(PAPER_LANTERN))); + public static final Block CRIMSON_ROOTS_PAPER_LANTERN = register("crimson_roots_paper_lantern", new PaperLanternBlock(Blocks.CRIMSON_ROOTS, BlockBehaviour.Properties.ofFullCopy(PAPER_LANTERN))); + public static final Block DANDELION_PAPER_LANTERN = register("dandelion_paper_lantern", new PaperLanternBlock(Blocks.DANDELION, BlockBehaviour.Properties.ofFullCopy(PAPER_LANTERN))); + public static final Block TORCHFLOWER_PAPER_LANTERN = register("torchflower_paper_lantern", new PaperLanternBlock(Blocks.TORCHFLOWER, BlockBehaviour.Properties.ofFullCopy(PAPER_LANTERN))); //lamps - public static final Block LAMP = register("lamp", new LampBlock(FabricBlockSettings.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(4.5F).sound(TwigsSoundEvents.LAMP).lightLevel(createLampLightLevel()))); - public static final Block SOUL_LAMP = register("soul_lamp", new LampBlock(FabricBlockSettings.copyOf(TwigsBlocks.LAMP))); - public static final Block CRIMSON_SHROOMLAMP = register("crimson_shroomlamp", new Block(FabricBlockSettings.of().mapColor(Blocks.CRIMSON_PLANKS.defaultMapColor()).strength(3.5F).sound(TwigsSoundEvents.SHROOMLAMP).lightLevel(blockState -> 15))); - public static final Block WARPED_SHROOMLAMP = register("warped_shroomlamp", new Block(FabricBlockSettings.copyOf(CRIMSON_SHROOMLAMP).mapColor(Blocks.WARPED_PLANKS.defaultMapColor()))); + public static final Block LAMP = register("lamp", new LampBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(4.5F).sound(TwigsSoundEvents.LAMP).lightLevel(createLampLightLevel()))); + public static final Block SOUL_LAMP = register("soul_lamp", new LampBlock(BlockBehaviour.Properties.ofFullCopy(TwigsBlocks.LAMP))); + public static final Block CRIMSON_SHROOMLAMP = register("crimson_shroomlamp", new Block(BlockBehaviour.Properties.of().mapColor(Blocks.CRIMSON_PLANKS.defaultMapColor()).strength(3.5F).sound(TwigsSoundEvents.SHROOMLAMP).lightLevel((state) -> 15))); + public static final Block WARPED_SHROOMLAMP = register("warped_shroomlamp", new Block(BlockBehaviour.Properties.ofFullCopy(CRIMSON_SHROOMLAMP).mapColor(Blocks.WARPED_PLANKS.defaultMapColor()))); //tables - public static final Block OAK_TABLE = register("oak_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS))); - public static final Block SPRUCE_TABLE = register("spruce_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.SPRUCE_PLANKS))); - public static final Block BIRCH_TABLE = register("birch_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.BIRCH_PLANKS))); - public static final Block JUNGLE_TABLE = register("jungle_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.JUNGLE_PLANKS))); - public static final Block ACACIA_TABLE = register("acacia_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.ACACIA_PLANKS))); - public static final Block DARK_OAK_TABLE = register("dark_oak_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.DARK_OAK_PLANKS))); - public static final Block MANGROVE_TABLE = register("mangrove_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.MANGROVE_PLANKS))); - public static final Block CHERRY_TABLE = register("cherry_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.CHERRY_PLANKS))); - public static final Block BAMBOO_TABLE = register("bamboo_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.BAMBOO_PLANKS))); - public static final Block CRIMSON_TABLE = register("crimson_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.CRIMSON_PLANKS))); - public static final Block WARPED_TABLE = register("warped_table", new TableBlock(FabricBlockSettings.copyOf(Blocks.WARPED_PLANKS))); + public static final Block OAK_TABLE = register("oak_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_PLANKS))); + public static final Block SPRUCE_TABLE = register("spruce_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SPRUCE_PLANKS))); + public static final Block BIRCH_TABLE = register("birch_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BIRCH_PLANKS))); + public static final Block JUNGLE_TABLE = register("jungle_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_PLANKS))); + public static final Block ACACIA_TABLE = register("acacia_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.ACACIA_PLANKS))); + public static final Block DARK_OAK_TABLE = register("dark_oak_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_OAK_PLANKS))); + public static final Block MANGROVE_TABLE = register("mangrove_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MANGROVE_PLANKS))); + public static final Block CHERRY_TABLE = register("cherry_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHERRY_PLANKS))); + public static final Block BAMBOO_TABLE = register("bamboo_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BAMBOO_PLANKS))); + public static final Block CRIMSON_TABLE = register("crimson_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CRIMSON_PLANKS))); + public static final Block WARPED_TABLE = register("warped_table", new TableBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WARPED_PLANKS))); //basalt blocks - public static final Block POLISHED_BASALT_BRICKS = register("polished_basalt_bricks", new RotatedPillarBlock(FabricBlockSettings.copyOf(Blocks.POLISHED_BASALT).strength(1.75F, 4.2F).sounds(TwigsSoundEvents.BASALT_BRICKS))); - public static final Block SMOOTH_BASALT_BRICKS = register("smooth_basalt_bricks", new Block(FabricBlockSettings.copyOf(Blocks.SMOOTH_BASALT).strength(1.75F, 4.2F).sounds(TwigsSoundEvents.BASALT_BRICKS))); - public static final Block SMOOTH_BASALT_BRICK_STAIRS = register("smooth_basalt_brick_stairs", new StairBlock(SMOOTH_BASALT_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(SMOOTH_BASALT_BRICKS))); - public static final Block SMOOTH_BASALT_BRICK_SLAB = register("smooth_basalt_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(SMOOTH_BASALT_BRICKS))); - public static final Block SMOOTH_BASALT_BRICK_WALL = register("smooth_basalt_brick_wall", new WallBlock(FabricBlockSettings.copyOf(SMOOTH_BASALT_BRICKS))); - public static final Block CHISELED_SMOOTH_BASALT_BRICKS = register("chiseled_smooth_basalt_bricks", new Block(FabricBlockSettings.copyOf(SMOOTH_BASALT_BRICKS))); + public static final Block POLISHED_BASALT_BRICKS = register("polished_basalt_bricks", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_BASALT).strength(1.75F, 4.2F).sound(TwigsSoundEvents.BASALT_BRICKS))); + public static final Block SMOOTH_BASALT_BRICKS = register("smooth_basalt_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.SMOOTH_BASALT).strength(1.75F, 4.2F).sound(TwigsSoundEvents.BASALT_BRICKS))); + public static final Block SMOOTH_BASALT_BRICK_STAIRS = register("smooth_basalt_brick_stairs", new StairBlock(SMOOTH_BASALT_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS))); + public static final Block SMOOTH_BASALT_BRICK_SLAB = register("smooth_basalt_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS))); + public static final Block SMOOTH_BASALT_BRICK_WALL = register("smooth_basalt_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS))); + public static final Block CHISELED_SMOOTH_BASALT_BRICKS = register("chiseled_smooth_basalt_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(SMOOTH_BASALT_BRICKS))); //bricks - public static final Block MIXED_BRICKS = register("mixed_bricks", new Block(FabricBlockSettings.copyOf(BRICKS))); - public static final Block CHISELED_BRICKS = register("chiseled_bricks", new FacingBlock(FabricBlockSettings.copyOf(BRICKS))); - public static final Block CRACKED_BRICKS = register("cracked_bricks", new Block(FabricBlockSettings.copyOf(BRICKS))); - public static final Block MOSSY_BRICKS = register("mossy_bricks", new Block(FabricBlockSettings.copyOf(BRICKS))); - public static final Block MOSSY_BRICK_STAIRS = register("mossy_brick_stairs", new StairBlock(MOSSY_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(MOSSY_BRICKS))); - public static final Block MOSSY_BRICK_SLAB = register("mossy_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(MOSSY_BRICKS))); - public static final Block MOSSY_BRICK_WALL = register("mossy_brick_wall", new WallBlock(FabricBlockSettings.copyOf(MOSSY_BRICKS))); - public static final Block BRICK_TRAIL = register("brick_trail", new BrickTrailBlock(FabricBlockSettings.copyOf(BRICKS).noCollission().noOcclusion().instabreak())); + public static final Block MIXED_BRICKS = register("mixed_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS))); + public static final Block CHISELED_BRICKS = register("chiseled_bricks", new FacingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS))); + public static final Block CRACKED_BRICKS = register("cracked_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS))); + public static final Block MOSSY_BRICKS = register("mossy_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS))); + public static final Block MOSSY_BRICK_STAIRS = register("mossy_brick_stairs", new StairBlock(MOSSY_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOSSY_BRICKS))); + public static final Block MOSSY_BRICK_SLAB = register("mossy_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOSSY_BRICKS))); + public static final Block MOSSY_BRICK_WALL = register("mossy_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOSSY_BRICKS))); + public static final Block BRICK_TRAIL = register("brick_trail", new BrickTrailBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).noCollission().noOcclusion().instabreak())); //gravel bricks - public static final Block GRAVEL_BRICKS = register("gravel_bricks", new Block(FabricBlockSettings.of().mapColor(Blocks.GRAVEL.defaultMapColor()).strength(0.8f).sound(TwigsSoundEvents.GRAVEL_BRICKS))); - public static final Block GRAVEL_BRICK_STAIRS = register("gravel_brick_stairs", new StairBlock(GRAVEL_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(GRAVEL_BRICKS))); - public static final Block GRAVEL_BRICK_SLAB = register("gravel_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(GRAVEL_BRICKS))); - public static final Block GRAVEL_BRICK_WALL = register("gravel_brick_wall", new WallBlock(FabricBlockSettings.copyOf(GRAVEL_BRICKS))); + public static final Block GRAVEL_BRICKS = register("gravel_bricks", new Block(BlockBehaviour.Properties.of().mapColor(Blocks.GRAVEL.defaultMapColor()).strength(0.8f).sound(TwigsSoundEvents.GRAVEL_BRICKS))); + public static final Block GRAVEL_BRICK_STAIRS = register("gravel_brick_stairs", new StairBlock(GRAVEL_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(GRAVEL_BRICKS))); + public static final Block GRAVEL_BRICK_SLAB = register("gravel_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(GRAVEL_BRICKS))); + public static final Block GRAVEL_BRICK_WALL = register("gravel_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(GRAVEL_BRICKS))); //smooth stone bricks - public static final Block SMOOTH_STONE_BRICKS = register("smooth_stone_bricks", new Block(FabricBlockSettings.copyOf(Blocks.STONE))); - public static final Block SMOOTH_STONE_BRICK_STAIRS = register("smooth_stone_brick_stairs", new StairBlock(SMOOTH_STONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(SMOOTH_STONE_BRICKS))); - public static final Block SMOOTH_STONE_BRICK_SLAB = register("smooth_stone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(SMOOTH_STONE_BRICKS))); - public static final Block SMOOTH_STONE_BRICK_WALL = register("smooth_stone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(SMOOTH_STONE_BRICKS))); + public static final Block SMOOTH_STONE_BRICKS = register("smooth_stone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE))); + public static final Block SMOOTH_STONE_BRICK_STAIRS = register("smooth_stone_brick_stairs", new StairBlock(SMOOTH_STONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_STONE_BRICKS))); + public static final Block SMOOTH_STONE_BRICK_SLAB = register("smooth_stone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SMOOTH_STONE_BRICKS))); + public static final Block SMOOTH_STONE_BRICK_WALL = register("smooth_stone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(SMOOTH_STONE_BRICKS))); //columns - public static final Block QUARTZ_COLUMN = register("quartz_column", new ColumnBlock(FabricBlockSettings.copyOf(Blocks.QUARTZ_BRICKS))); - public static final Block STONE_COLUMN = register("stone_column", new ColumnBlock(FabricBlockSettings.copyOf(Blocks.STONE_BRICKS))); - public static final Block DEEPSLATE_COLUMN = register("deepslate_column", new ColumnBlock(FabricBlockSettings.copyOf(Blocks.DEEPSLATE_BRICKS))); - public static final Block BLACKSTONE_COLUMN = register("blackstone_column", new ColumnBlock(FabricBlockSettings.copyOf(Blocks.POLISHED_BLACKSTONE_BRICKS))); + public static final Block QUARTZ_COLUMN = register("quartz_column", new ColumnBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BRICKS))); + public static final Block STONE_COLUMN = register("stone_column", new ColumnBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE_BRICKS))); + public static final Block DEEPSLATE_COLUMN = register("deepslate_column", new ColumnBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE_BRICKS))); + public static final Block BLACKSTONE_COLUMN = register("blackstone_column", new ColumnBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_BLACKSTONE_BRICKS))); //copper pillars - public static final Block COPPER_PILLAR = register("copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.copy(Blocks.CUT_COPPER))); - public static final Block EXPOSED_COPPER_PILLAR = register("exposed_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.copy(Blocks.EXPOSED_CUT_COPPER))); - public static final Block WEATHERED_COPPER_PILLAR = register("weathered_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.copy(Blocks.WEATHERED_CUT_COPPER))); - public static final Block OXIDIZED_COPPER_PILLAR = register("oxidized_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.copy(Blocks.OXIDIZED_CUT_COPPER))); - public static final Block WAXED_COPPER_PILLAR = register("waxed_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_CUT_COPPER))); - public static final Block WAXED_EXPOSED_COPPER_PILLAR = register("waxed_exposed_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_EXPOSED_CUT_COPPER))); - public static final Block WAXED_WEATHERED_COPPER_PILLAR = register("waxed_weathered_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_WEATHERED_CUT_COPPER))); - public static final Block WAXED_OXIDIZED_COPPER_PILLAR = register("waxed_oxidized_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.copy(Blocks.WAXED_OXIDIZED_CUT_COPPER))); + public static final Block COPPER_PILLAR = register("copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.ofFullCopy(Blocks.CUT_COPPER))); + public static final Block EXPOSED_COPPER_PILLAR = register("exposed_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.ofFullCopy(Blocks.EXPOSED_CUT_COPPER))); + public static final Block WEATHERED_COPPER_PILLAR = register("weathered_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.WEATHERED, BlockBehaviour.Properties.ofFullCopy(Blocks.WEATHERED_CUT_COPPER))); + public static final Block OXIDIZED_COPPER_PILLAR = register("oxidized_copper_pillar", new PillarOxidizableBlock(WeatheringCopper.WeatherState.OXIDIZED, BlockBehaviour.Properties.ofFullCopy(Blocks.OXIDIZED_CUT_COPPER))); + public static final Block WAXED_COPPER_PILLAR = register("waxed_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WAXED_CUT_COPPER))); + public static final Block WAXED_EXPOSED_COPPER_PILLAR = register("waxed_exposed_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WAXED_EXPOSED_CUT_COPPER))); + public static final Block WAXED_WEATHERED_COPPER_PILLAR = register("waxed_weathered_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WAXED_WEATHERED_CUT_COPPER))); + public static final Block WAXED_OXIDIZED_COPPER_PILLAR = register("waxed_oxidized_copper_pillar", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WAXED_OXIDIZED_CUT_COPPER))); //amethyst blocks - public static final Block POLISHED_AMETHYST = register("polished_amethyst", new AmethystBlock(FabricBlockSettings.copyOf(Blocks.AMETHYST_BLOCK))); - public static final Block CUT_AMETHYST = register("cut_amethyst", new CutAmethystBlock(FabricBlockSettings.copyOf(Blocks.AMETHYST_BLOCK))); + public static final Block POLISHED_AMETHYST = register("polished_amethyst", new AmethystBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK))); + public static final Block CUT_AMETHYST = register("cut_amethyst", new CutAmethystBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK).pushReaction(PushReaction.PUSH_ONLY))); //misc public static final Block PETRIFIED_LICHEN = register("petrified_lichen", new GlowLichenBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).noCollission().strength(0.2f).sound(SoundType.DEEPSLATE).lightLevel(GlowLichenBlock.emission(7)))); - public static final Block COMPACTED_DRIPSTONE = register("compacted_dripstone", new CompactedDripstoneBlock(FabricBlockSettings.copyOf(Blocks.DRIPSTONE_BLOCK))); - public static final Block ROCKY_DIRT = register("rocky_dirt", new Block(FabricBlockSettings.of().mapColor(DyeColor.GRAY).requiresCorrectToolForDrops().strength(1.25F, 6.0F).sound(TwigsSoundEvents.ROCKY_DIRT))); + public static final Block COMPACTED_DRIPSTONE = register("compacted_dripstone", new CompactedDripstoneBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRIPSTONE_BLOCK))); + public static final Block ROCKY_DIRT = register("rocky_dirt", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1.25F, 6.0F).sound(TwigsSoundEvents.ROCKY_DIRT))); //cobblestone bricks - public static final Block COBBLESTONE_BRICKS = register("cobblestone_bricks", new Block(FabricBlockSettings.copyOf(Blocks.COBBLESTONE))); - public static final Block COBBLESTONE_BRICK_STAIRS = register("cobblestone_brick_stairs", new StairBlock(COBBLESTONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(COBBLESTONE_BRICKS))); - public static final Block COBBLESTONE_BRICK_SLAB = register("cobblestone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(COBBLESTONE_BRICKS))); - public static final Block COBBLESTONE_BRICK_WALL = register("cobblestone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(COBBLESTONE_BRICKS))); - public static final Block CRACKED_COBBLESTONE_BRICKS = register("cracked_cobblestone_bricks", new Block(FabricBlockSettings.copyOf(COBBLESTONE_BRICKS))); - public static final Block MOSSY_COBBLESTONE_BRICKS = register("mossy_cobblestone_bricks", new Block(FabricBlockSettings.copyOf(Blocks.MOSSY_COBBLESTONE))); - public static final Block MOSSY_COBBLESTONE_BRICK_STAIRS = register("mossy_cobblestone_brick_stairs", new StairBlock(MOSSY_COBBLESTONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(MOSSY_COBBLESTONE_BRICKS))); - public static final Block MOSSY_COBBLESTONE_BRICK_SLAB = register("mossy_cobblestone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(MOSSY_COBBLESTONE_BRICKS))); - public static final Block MOSSY_COBBLESTONE_BRICK_WALL = register("mossy_cobblestone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(MOSSY_COBBLESTONE_BRICKS))); + public static final Block COBBLESTONE_BRICKS = register("cobblestone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.COBBLESTONE))); + public static final Block COBBLESTONE_BRICK_STAIRS = register("cobblestone_brick_stairs", new StairBlock(COBBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(COBBLESTONE_BRICKS))); + public static final Block COBBLESTONE_BRICK_SLAB = register("cobblestone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(COBBLESTONE_BRICKS))); + public static final Block COBBLESTONE_BRICK_WALL = register("cobblestone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(COBBLESTONE_BRICKS))); + public static final Block CRACKED_COBBLESTONE_BRICKS = register("cracked_cobblestone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(COBBLESTONE_BRICKS))); + public static final Block MOSSY_COBBLESTONE_BRICKS = register("mossy_cobblestone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSSY_COBBLESTONE))); + public static final Block MOSSY_COBBLESTONE_BRICK_STAIRS = register("mossy_cobblestone_brick_stairs", new StairBlock(MOSSY_COBBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOSSY_COBBLESTONE_BRICKS))); + public static final Block MOSSY_COBBLESTONE_BRICK_SLAB = register("mossy_cobblestone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOSSY_COBBLESTONE_BRICKS))); + public static final Block MOSSY_COBBLESTONE_BRICK_WALL = register("mossy_cobblestone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOSSY_COBBLESTONE_BRICKS))); //decorated blackstone bricks - public static final Block TWISTING_POLISHED_BLACKSTONE_BRICKS = register("twisting_polished_blackstone_bricks", new Block(FabricBlockSettings.copyOf(Blocks.POLISHED_BLACKSTONE_BRICKS))); - public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("twisting_polished_blackstone_brick_stairs", new StairBlock(TWISTING_POLISHED_BLACKSTONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(TWISTING_POLISHED_BLACKSTONE_BRICKS))); - public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB = register("twisting_polished_blackstone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(TWISTING_POLISHED_BLACKSTONE_BRICKS))); - public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_WALL = register("twisting_polished_blackstone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(TWISTING_POLISHED_BLACKSTONE_BRICKS))); - public static final Block WEEPING_POLISHED_BLACKSTONE_BRICKS = register("weeping_polished_blackstone_bricks", new Block(FabricBlockSettings.copyOf(Blocks.POLISHED_BLACKSTONE_BRICKS))); - public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("weeping_polished_blackstone_brick_stairs", new StairBlock(WEEPING_POLISHED_BLACKSTONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(WEEPING_POLISHED_BLACKSTONE_BRICKS))); - public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB = register("weeping_polished_blackstone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(WEEPING_POLISHED_BLACKSTONE_BRICKS))); - public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_WALL = register("weeping_polished_blackstone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(WEEPING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block TWISTING_POLISHED_BLACKSTONE_BRICKS = register("twisting_polished_blackstone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_BLACKSTONE_BRICKS))); + public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("twisting_polished_blackstone_brick_stairs", new StairBlock(TWISTING_POLISHED_BLACKSTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(TWISTING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB = register("twisting_polished_blackstone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(TWISTING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block TWISTING_POLISHED_BLACKSTONE_BRICK_WALL = register("twisting_polished_blackstone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(TWISTING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block WEEPING_POLISHED_BLACKSTONE_BRICKS = register("weeping_polished_blackstone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.POLISHED_BLACKSTONE_BRICKS))); + public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("weeping_polished_blackstone_brick_stairs", new StairBlock(WEEPING_POLISHED_BLACKSTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(WEEPING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB = register("weeping_polished_blackstone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(WEEPING_POLISHED_BLACKSTONE_BRICKS))); + public static final Block WEEPING_POLISHED_BLACKSTONE_BRICK_WALL = register("weeping_polished_blackstone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(WEEPING_POLISHED_BLACKSTONE_BRICKS))); //tuff blocks - public static final Block TUFF_STAIRS = register("tuff_stairs", new StairBlock(Blocks.TUFF.defaultBlockState(), FabricBlockSettings.copyOf(Blocks.TUFF))); - public static final Block TUFF_SLAB = register("tuff_slab", new SlabBlock(FabricBlockSettings.copyOf(Blocks.TUFF))); - public static final Block TUFF_WALL = register("tuff_wall", new WallBlock(FabricBlockSettings.copyOf(Blocks.TUFF))); - public static final Block POLISHED_TUFF = register("polished_tuff", new Block(FabricBlockSettings.copyOf(Blocks.TUFF))); - public static final Block POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new StairBlock(POLISHED_TUFF.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_TUFF))); - public static final Block POLISHED_TUFF_SLAB = register("polished_tuff_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_TUFF))); - public static final Block POLISHED_TUFF_BRICKS = register("polished_tuff_bricks", new Block(FabricBlockSettings.copyOf(Blocks.TUFF).sounds(TwigsSoundEvents.TUFF_BRICKS))); - public static final Block POLISHED_TUFF_BRICK_STAIRS = register("polished_tuff_brick_stairs", new StairBlock(POLISHED_TUFF_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_TUFF_BRICKS))); - public static final Block POLISHED_TUFF_BRICK_SLAB = register("polished_tuff_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_TUFF_BRICKS))); - public static final Block POLISHED_TUFF_BRICK_WALL = register("polished_tuff_brick_wall", new WallBlock(FabricBlockSettings.copyOf(POLISHED_TUFF_BRICKS))); - public static final Block CRACKED_POLISHED_TUFF_BRICKS = register("cracked_polished_tuff_bricks", new Block(FabricBlockSettings.copyOf(POLISHED_TUFF_BRICKS))); + public static final Block TUFF_STAIRS = register("tuff_stairs", new StairBlock(Blocks.TUFF.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(Blocks.TUFF))); + public static final Block TUFF_SLAB = register("tuff_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TUFF))); + public static final Block TUFF_WALL = register("tuff_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TUFF))); + public static final Block POLISHED_TUFF = register("polished_tuff", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.TUFF))); + public static final Block POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new StairBlock(POLISHED_TUFF.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF))); + public static final Block POLISHED_TUFF_SLAB = register("polished_tuff_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF))); + public static final Block POLISHED_TUFF_BRICKS = register("polished_tuff_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.TUFF).sound(TwigsSoundEvents.TUFF_BRICKS))); + public static final Block POLISHED_TUFF_BRICK_STAIRS = register("polished_tuff_brick_stairs", new StairBlock(POLISHED_TUFF_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF_BRICKS))); + public static final Block POLISHED_TUFF_BRICK_SLAB = register("polished_tuff_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF_BRICKS))); + public static final Block POLISHED_TUFF_BRICK_WALL = register("polished_tuff_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF_BRICKS))); + public static final Block CRACKED_POLISHED_TUFF_BRICKS = register("cracked_polished_tuff_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(POLISHED_TUFF_BRICKS))); //calcite blocks - public static final Block CALCITE_STAIRS = register("calcite_stairs", new StairBlock(Blocks.CALCITE.defaultBlockState(), FabricBlockSettings.copyOf(Blocks.CALCITE))); - public static final Block CALCITE_SLAB = register("calcite_slab", new SlabBlock(FabricBlockSettings.copyOf(Blocks.CALCITE))); - public static final Block CALCITE_WALL = register("calcite_wall", new WallBlock(FabricBlockSettings.copyOf(Blocks.CALCITE))); - public static final Block POLISHED_CALCITE = register("polished_calcite", new Block(FabricBlockSettings.copyOf(Blocks.CALCITE))); - public static final Block POLISHED_CALCITE_STAIRS = register("polished_calcite_stairs", new StairBlock(POLISHED_CALCITE.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_CALCITE))); - public static final Block POLISHED_CALCITE_SLAB = register("polished_calcite_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_CALCITE))); - public static final Block POLISHED_CALCITE_BRICKS = register("polished_calcite_bricks", new Block(FabricBlockSettings.copyOf(Blocks.CALCITE).sounds(TwigsSoundEvents.CALCITE_BRICKS))); - public static final Block POLISHED_CALCITE_BRICK_STAIRS = register("polished_calcite_brick_stairs", new StairBlock(POLISHED_CALCITE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_CALCITE_BRICKS))); - public static final Block POLISHED_CALCITE_BRICK_SLAB = register("polished_calcite_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_CALCITE_BRICKS))); - public static final Block POLISHED_CALCITE_BRICK_WALL = register("polished_calcite_brick_wall", new WallBlock(FabricBlockSettings.copyOf(POLISHED_CALCITE_BRICKS))); - public static final Block CRACKED_POLISHED_CALCITE_BRICKS = register("cracked_polished_calcite_bricks", new Block(FabricBlockSettings.copyOf(POLISHED_CALCITE_BRICKS))); + public static final Block CALCITE_STAIRS = register("calcite_stairs", new StairBlock(Blocks.CALCITE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(Blocks.CALCITE))); + public static final Block CALCITE_SLAB = register("calcite_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CALCITE))); + public static final Block CALCITE_WALL = register("calcite_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CALCITE))); + public static final Block POLISHED_CALCITE = register("polished_calcite", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.CALCITE))); + public static final Block POLISHED_CALCITE_STAIRS = register("polished_calcite_stairs", new StairBlock(POLISHED_CALCITE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE))); + public static final Block POLISHED_CALCITE_SLAB = register("polished_calcite_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE))); + public static final Block POLISHED_CALCITE_BRICKS = register("polished_calcite_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.CALCITE).sound(TwigsSoundEvents.CALCITE_BRICKS))); + public static final Block POLISHED_CALCITE_BRICK_STAIRS = register("polished_calcite_brick_stairs", new StairBlock(POLISHED_CALCITE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE_BRICKS))); + public static final Block POLISHED_CALCITE_BRICK_SLAB = register("polished_calcite_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE_BRICKS))); + public static final Block POLISHED_CALCITE_BRICK_WALL = register("polished_calcite_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE_BRICKS))); + public static final Block CRACKED_POLISHED_CALCITE_BRICKS = register("cracked_polished_calcite_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(POLISHED_CALCITE_BRICKS))); //schist blocks - public static final Block SCHIST = register("schist", new Block(FabricBlockSettings.of().mapColor(DyeColor.WHITE).requiresCorrectToolForDrops().strength(1F).sound(TwigsSoundEvents.SCHIST))); - public static final Block SCHIST_STAIRS = register("schist_stairs", new StairBlock(SCHIST.defaultBlockState(), FabricBlockSettings.copyOf(SCHIST))); - public static final Block SCHIST_SLAB = register("schist_slab", new SlabBlock(FabricBlockSettings.copyOf(SCHIST))); - public static final Block SCHIST_WALL = register("schist_wall", new WallBlock(FabricBlockSettings.copyOf(SCHIST))); - public static final Block POLISHED_SCHIST = register("polished_schist", new Block(FabricBlockSettings.copyOf(SCHIST))); - public static final Block POLISHED_SCHIST_STAIRS = register("polished_schist_stairs", new StairBlock(POLISHED_SCHIST.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_SCHIST))); - public static final Block POLISHED_SCHIST_SLAB = register("polished_schist_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_SCHIST))); - public static final Block POLISHED_SCHIST_BRICKS = register("polished_schist_bricks", new Block(FabricBlockSettings.copyOf(SCHIST).sounds(TwigsSoundEvents.SCHIST_BRICKS))); - public static final Block POLISHED_SCHIST_BRICK_STAIRS = register("polished_schist_brick_stairs", new StairBlock(POLISHED_SCHIST_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_SCHIST_BRICKS))); - public static final Block POLISHED_SCHIST_BRICK_SLAB = register("polished_schist_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_SCHIST_BRICKS))); - public static final Block POLISHED_SCHIST_BRICK_WALL = register("polished_schist_brick_wall", new WallBlock(FabricBlockSettings.copyOf(POLISHED_SCHIST_BRICKS))); - public static final Block CRACKED_POLISHED_SCHIST_BRICKS = register("cracked_polished_schist_bricks", new Block(FabricBlockSettings.copyOf(POLISHED_SCHIST_BRICKS))); + public static final Block SCHIST = register("schist", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_WHITE).requiresCorrectToolForDrops().strength(1F).sound(TwigsSoundEvents.SCHIST))); + public static final Block SCHIST_STAIRS = register("schist_stairs", new StairBlock(SCHIST.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SCHIST))); + public static final Block SCHIST_SLAB = register("schist_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SCHIST))); + public static final Block SCHIST_WALL = register("schist_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(SCHIST))); + public static final Block POLISHED_SCHIST = register("polished_schist", new Block(BlockBehaviour.Properties.ofFullCopy(SCHIST))); + public static final Block POLISHED_SCHIST_STAIRS = register("polished_schist_stairs", new StairBlock(POLISHED_SCHIST.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST))); + public static final Block POLISHED_SCHIST_SLAB = register("polished_schist_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST))); + public static final Block POLISHED_SCHIST_BRICKS = register("polished_schist_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(SCHIST).sound(TwigsSoundEvents.SCHIST_BRICKS))); + public static final Block POLISHED_SCHIST_BRICK_STAIRS = register("polished_schist_brick_stairs", new StairBlock(POLISHED_SCHIST_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST_BRICKS))); + public static final Block POLISHED_SCHIST_BRICK_SLAB = register("polished_schist_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST_BRICKS))); + public static final Block POLISHED_SCHIST_BRICK_WALL = register("polished_schist_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST_BRICKS))); + public static final Block CRACKED_POLISHED_SCHIST_BRICKS = register("cracked_polished_schist_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(POLISHED_SCHIST_BRICKS))); //rhyolite blocks - public static final Block RHYOLITE = register("rhyolite", new RotatedPillarBlock(FabricBlockSettings.of().mapColor(DyeColor.BROWN).requiresCorrectToolForDrops().strength(1.5F).sound(TwigsSoundEvents.RHYOLITE))); - public static final Block RHYOLITE_STAIRS = register("rhyolite_stairs", new StairBlock(RHYOLITE.defaultBlockState(), FabricBlockSettings.copyOf(RHYOLITE))); - public static final Block RHYOLITE_SLAB = register("rhyolite_slab", new SlabBlock(FabricBlockSettings.copyOf(RHYOLITE))); - public static final Block RHYOLITE_WALL = register("rhyolite_wall", new WallBlock(FabricBlockSettings.copyOf(RHYOLITE))); - public static final Block POLISHED_RHYOLITE = register("polished_rhyolite", new Block(FabricBlockSettings.copyOf(RHYOLITE))); - public static final Block POLISHED_RHYOLITE_STAIRS = register("polished_rhyolite_stairs", new StairBlock(POLISHED_RHYOLITE.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_RHYOLITE))); - public static final Block POLISHED_RHYOLITE_SLAB = register("polished_rhyolite_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_RHYOLITE))); - public static final Block POLISHED_RHYOLITE_BRICKS = register("polished_rhyolite_bricks", new Block(FabricBlockSettings.copyOf(RHYOLITE).sounds(TwigsSoundEvents.RHYOLITE_BRICKS))); - public static final Block POLISHED_RHYOLITE_BRICK_STAIRS = register("polished_rhyolite_brick_stairs", new StairBlock(POLISHED_RHYOLITE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_RHYOLITE_BRICKS))); - public static final Block POLISHED_RHYOLITE_BRICK_SLAB = register("polished_rhyolite_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_RHYOLITE_BRICKS))); - public static final Block POLISHED_RHYOLITE_BRICK_WALL = register("polished_rhyolite_brick_wall", new WallBlock(FabricBlockSettings.copyOf(POLISHED_RHYOLITE_BRICKS))); - public static final Block CRACKED_POLISHED_RHYOLITE_BRICKS = register("cracked_polished_rhyolite_bricks", new Block(FabricBlockSettings.copyOf(POLISHED_RHYOLITE_BRICKS))); + public static final Block RHYOLITE = register("rhyolite", new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).requiresCorrectToolForDrops().strength(1.5F).sound(TwigsSoundEvents.RHYOLITE))); + public static final Block RHYOLITE_STAIRS = register("rhyolite_stairs", new StairBlock(RHYOLITE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(RHYOLITE))); + public static final Block RHYOLITE_SLAB = register("rhyolite_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(RHYOLITE))); + public static final Block RHYOLITE_WALL = register("rhyolite_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(RHYOLITE))); + public static final Block POLISHED_RHYOLITE = register("polished_rhyolite", new Block(BlockBehaviour.Properties.ofFullCopy(RHYOLITE))); + public static final Block POLISHED_RHYOLITE_STAIRS = register("polished_rhyolite_stairs", new StairBlock(POLISHED_RHYOLITE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE))); + public static final Block POLISHED_RHYOLITE_SLAB = register("polished_rhyolite_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE))); + public static final Block POLISHED_RHYOLITE_BRICKS = register("polished_rhyolite_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(RHYOLITE).sound(TwigsSoundEvents.RHYOLITE_BRICKS))); + public static final Block POLISHED_RHYOLITE_BRICK_STAIRS = register("polished_rhyolite_brick_stairs", new StairBlock(POLISHED_RHYOLITE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE_BRICKS))); + public static final Block POLISHED_RHYOLITE_BRICK_SLAB = register("polished_rhyolite_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE_BRICKS))); + public static final Block POLISHED_RHYOLITE_BRICK_WALL = register("polished_rhyolite_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE_BRICKS))); + public static final Block CRACKED_POLISHED_RHYOLITE_BRICKS = register("cracked_polished_rhyolite_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(POLISHED_RHYOLITE_BRICKS))); //bloodstone blocks - public static final Block BLOODSTONE = register("bloodstone", new Block(FabricBlockSettings.of().mapColor(DyeColor.GRAY).requiresCorrectToolForDrops().strength(1F).sound(TwigsSoundEvents.BLOODSTONE))); - public static final Block BLOODSTONE_STAIRS = register("bloodstone_stairs", new StairBlock(BLOODSTONE.defaultBlockState(), FabricBlockSettings.copyOf(BLOODSTONE))); - public static final Block BLOODSTONE_SLAB = register("bloodstone_slab", new SlabBlock(FabricBlockSettings.copyOf(BLOODSTONE))); - public static final Block BLOODSTONE_WALL = register("bloodstone_wall", new WallBlock(FabricBlockSettings.copyOf(BLOODSTONE))); - public static final Block POLISHED_BLOODSTONE = register("polished_bloodstone", new Block(FabricBlockSettings.copyOf(BLOODSTONE))); - public static final Block POLISHED_BLOODSTONE_STAIRS = register("polished_bloodstone_stairs", new StairBlock(POLISHED_BLOODSTONE.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_BLOODSTONE))); - public static final Block POLISHED_BLOODSTONE_SLAB = register("polished_bloodstone_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_BLOODSTONE))); - public static final Block POLISHED_BLOODSTONE_BRICKS = register("polished_bloodstone_bricks", new Block(FabricBlockSettings.copyOf(BLOODSTONE).sounds(TwigsSoundEvents.BLOODSTONE_BRICKS))); - public static final Block POLISHED_BLOODSTONE_BRICK_STAIRS = register("polished_bloodstone_brick_stairs", new StairBlock(POLISHED_BLOODSTONE_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(POLISHED_BLOODSTONE_BRICKS))); - public static final Block POLISHED_BLOODSTONE_BRICK_SLAB = register("polished_bloodstone_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(POLISHED_BLOODSTONE_BRICKS))); - public static final Block POLISHED_BLOODSTONE_BRICK_WALL = register("polished_bloodstone_brick_wall", new WallBlock(FabricBlockSettings.copyOf(POLISHED_BLOODSTONE_BRICKS))); - public static final Block CRACKED_POLISHED_BLOODSTONE_BRICKS = register("cracked_polished_bloodstone_bricks", new Block(FabricBlockSettings.copyOf(POLISHED_BLOODSTONE_BRICKS))); + public static final Block BLOODSTONE = register("bloodstone", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).requiresCorrectToolForDrops().strength(1F).sound(TwigsSoundEvents.BLOODSTONE))); + public static final Block BLOODSTONE_STAIRS = register("bloodstone_stairs", new StairBlock(BLOODSTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLOODSTONE))); + public static final Block BLOODSTONE_SLAB = register("bloodstone_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BLOODSTONE))); + public static final Block BLOODSTONE_WALL = register("bloodstone_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(BLOODSTONE))); + public static final Block POLISHED_BLOODSTONE = register("polished_bloodstone", new Block(BlockBehaviour.Properties.ofFullCopy(BLOODSTONE))); + public static final Block POLISHED_BLOODSTONE_STAIRS = register("polished_bloodstone_stairs", new StairBlock(POLISHED_BLOODSTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE))); + public static final Block POLISHED_BLOODSTONE_SLAB = register("polished_bloodstone_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE))); + public static final Block POLISHED_BLOODSTONE_BRICKS = register("polished_bloodstone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(BLOODSTONE).sound(TwigsSoundEvents.BLOODSTONE_BRICKS))); + public static final Block POLISHED_BLOODSTONE_BRICK_STAIRS = register("polished_bloodstone_brick_stairs", new StairBlock(POLISHED_BLOODSTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE_BRICKS))); + public static final Block POLISHED_BLOODSTONE_BRICK_SLAB = register("polished_bloodstone_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE_BRICKS))); + public static final Block POLISHED_BLOODSTONE_BRICK_WALL = register("polished_bloodstone_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE_BRICKS))); + public static final Block CRACKED_POLISHED_BLOODSTONE_BRICKS = register("cracked_polished_bloodstone_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(POLISHED_BLOODSTONE_BRICKS))); //silt blocks - public static final Block SILT = register("silt", new RotatedPillarBlock(FabricBlockSettings.copyOf(Blocks.CLAY).mapColor(DyeColor.BROWN).sound(TwigsSoundEvents.SILT))); - public static final Block SILT_BRICKS = register("silt_bricks", new Block(FabricBlockSettings.copyOf(BRICKS).mapColor(DyeColor.YELLOW))); - public static final Block SILT_BRICK_STAIRS = register("silt_brick_stairs", new StairBlock(SILT_BRICKS.defaultBlockState(), FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block SILT_BRICK_SLAB = register("silt_brick_slab", new SlabBlock(FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block SILT_BRICK_WALL = register("silt_brick_wall", new WallBlock(FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block MIXED_SILT_BRICKS = register("mixed_silt_bricks", new Block(FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block CHISELED_SILT_BRICKS = register("chiseled_silt_bricks", new FacingBlock(FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block CRACKED_SILT_BRICKS = register("cracked_silt_bricks", new Block(FabricBlockSettings.copyOf(SILT_BRICKS))); - public static final Block SILT_BRICK_TRAIL = register("silt_brick_trail", new BrickTrailBlock(FabricBlockSettings.copyOf(SILT_BRICKS).noCollission().noOcclusion().instabreak())); - - public static final Block SILT_POT = register("silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(Blocks.TERRACOTTA).strength(0.5f, 2f).pushReaction(PushReaction.NORMAL))); - public static final Block WHITE_SILT_POT = register("white_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.TERRACOTTA_WHITE))); - public static final Block ORANGE_SILT_POT = register("orange_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_ORANGE))); - public static final Block MAGENTA_SILT_POT = register("magenta_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_MAGENTA))); - public static final Block LIGHT_BLUE_SILT_POT = register("light_blue_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_LIGHT_BLUE))); - public static final Block YELLOW_SILT_POT = register("yellow_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_YELLOW))); - public static final Block LIME_SILT_POT = register("lime_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_LIGHT_GREEN))); - public static final Block PINK_SILT_POT = register("pink_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_PINK))); - public static final Block GRAY_SILT_POT = register("gray_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_GRAY))); - public static final Block LIGHT_GRAY_SILT_POT = register("light_gray_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_LIGHT_GRAY))); - public static final Block CYAN_SILT_POT = register("cyan_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_CYAN))); - public static final Block PURPLE_SILT_POT = register("purple_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_PURPLE))); - public static final Block BLUE_SILT_POT = register("blue_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_BLUE))); - public static final Block BROWN_SILT_POT = register("brown_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_BROWN))); - public static final Block GREEN_SILT_POT = register("green_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_GREEN))); - public static final Block RED_SILT_POT = register("red_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_RED))); - public static final Block BLACK_SILT_POT = register("black_silt_pot", new SiltPotBlock(FabricBlockSettings.copyOf(SILT_POT).mapColor(MapColor.COLOR_BLACK))); - - public static final Block PACKED_SILT = register("packed_silt", new Block(FabricBlockSettings.copyOf(Blocks.TERRACOTTA).sounds(TwigsSoundEvents.PACKED_SILT))); - public static final Block WHITE_PACKED_SILT = register("white_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.TERRACOTTA_WHITE))); - public static final Block ORANGE_PACKED_SILT = register("orange_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_ORANGE))); - public static final Block MAGENTA_PACKED_SILT = register("magenta_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_MAGENTA))); - public static final Block LIGHT_BLUE_PACKED_SILT = register("light_blue_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_BLUE))); - public static final Block YELLOW_PACKED_SILT = register("yellow_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_YELLOW))); - public static final Block LIME_PACKED_SILT = register("lime_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_GREEN))); - public static final Block PINK_PACKED_SILT = register("pink_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_PINK))); - public static final Block GRAY_PACKED_SILT = register("gray_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_GRAY))); - public static final Block LIGHT_GRAY_PACKED_SILT = register("light_gray_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_GRAY))); - public static final Block CYAN_PACKED_SILT = register("cyan_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_CYAN))); - public static final Block PURPLE_PACKED_SILT = register("purple_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_PURPLE))); - public static final Block BLUE_PACKED_SILT = register("blue_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_BLUE))); - public static final Block BROWN_PACKED_SILT = register("brown_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_BROWN))); - public static final Block GREEN_PACKED_SILT = register("green_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_GREEN))); - public static final Block RED_PACKED_SILT = register("red_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_RED))); - public static final Block BLACK_PACKED_SILT = register("black_packed_silt", new Block(FabricBlockSettings.copyOf(PACKED_SILT).mapColor(MapColor.COLOR_BLACK))); - - public static final Block SILT_SHINGLES = register("silt_shingles", new Block(FabricBlockSettings.copyOf(Blocks.TERRACOTTA).sounds(TwigsSoundEvents.SILT_SHINGLES))); - public static final Block WHITE_SILT_SHINGLES = register("white_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.TERRACOTTA_WHITE))); - public static final Block ORANGE_SILT_SHINGLES = register("orange_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_ORANGE))); - public static final Block MAGENTA_SILT_SHINGLES = register("magenta_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_MAGENTA))); - public static final Block LIGHT_BLUE_SILT_SHINGLES = register("light_blue_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_BLUE))); - public static final Block YELLOW_SILT_SHINGLES = register("yellow_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_YELLOW))); - public static final Block LIME_SILT_SHINGLES = register("lime_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_GREEN))); - public static final Block PINK_SILT_SHINGLES = register("pink_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_PINK))); - public static final Block GRAY_SILT_SHINGLES = register("gray_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_GRAY))); - public static final Block LIGHT_GRAY_SILT_SHINGLES = register("light_gray_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_GRAY))); - public static final Block CYAN_SILT_SHINGLES = register("cyan_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_CYAN))); - public static final Block PURPLE_SILT_SHINGLES = register("purple_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_PURPLE))); - public static final Block BLUE_SILT_SHINGLES = register("blue_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_BLUE))); - public static final Block BROWN_SILT_SHINGLES = register("brown_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_BROWN))); - public static final Block GREEN_SILT_SHINGLES = register("green_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_GREEN))); - public static final Block RED_SILT_SHINGLES = register("red_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_RED))); - public static final Block BLACK_SILT_SHINGLES = register("black_silt_shingles", new Block(FabricBlockSettings.copyOf(SILT_SHINGLES).mapColor(MapColor.COLOR_BLACK))); - - public static final Block SILT_SHINGLE_STAIRS = register("silt_shingle_stairs", new StairBlock(SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(SILT_SHINGLES))); - public static final Block WHITE_SILT_SHINGLE_STAIRS = register("white_silt_shingle_stairs", new StairBlock(WHITE_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(WHITE_SILT_SHINGLES))); - public static final Block ORANGE_SILT_SHINGLE_STAIRS = register("orange_silt_shingle_stairs", new StairBlock(ORANGE_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(ORANGE_SILT_SHINGLES))); - public static final Block MAGENTA_SILT_SHINGLE_STAIRS = register("magenta_silt_shingle_stairs", new StairBlock(MAGENTA_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(MAGENTA_SILT_SHINGLES))); - public static final Block LIGHT_BLUE_SILT_SHINGLE_STAIRS = register("light_blue_silt_shingle_stairs", new StairBlock(LIGHT_BLUE_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(LIGHT_BLUE_SILT_SHINGLES))); - public static final Block YELLOW_SILT_SHINGLE_STAIRS = register("yellow_silt_shingle_stairs", new StairBlock(YELLOW_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(YELLOW_SILT_SHINGLES))); - public static final Block LIME_SILT_SHINGLE_STAIRS = register("lime_silt_shingle_stairs", new StairBlock(LIME_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(LIME_SILT_SHINGLES))); - public static final Block PINK_SILT_SHINGLE_STAIRS = register("pink_silt_shingle_stairs", new StairBlock(PINK_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(PINK_SILT_SHINGLES))); - public static final Block GRAY_SILT_SHINGLE_STAIRS = register("gray_silt_shingle_stairs", new StairBlock(GRAY_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(GRAY_SILT_SHINGLES))); - public static final Block LIGHT_GRAY_SILT_SHINGLE_STAIRS = register("light_gray_silt_shingle_stairs", new StairBlock(LIGHT_GRAY_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(LIGHT_GRAY_SILT_SHINGLES))); - public static final Block CYAN_SILT_SHINGLE_STAIRS = register("cyan_silt_shingle_stairs", new StairBlock(CYAN_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(CYAN_SILT_SHINGLES))); - public static final Block PURPLE_SILT_SHINGLE_STAIRS = register("purple_silt_shingle_stairs", new StairBlock(PURPLE_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(PURPLE_SILT_SHINGLES))); - public static final Block BLUE_SILT_SHINGLE_STAIRS = register("blue_silt_shingle_stairs", new StairBlock(BLUE_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(BLUE_SILT_SHINGLES))); - public static final Block BROWN_SILT_SHINGLE_STAIRS = register("brown_silt_shingle_stairs", new StairBlock(BROWN_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(BROWN_SILT_SHINGLES))); - public static final Block GREEN_SILT_SHINGLE_STAIRS = register("green_silt_shingle_stairs", new StairBlock(GREEN_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(GREEN_SILT_SHINGLES))); - public static final Block RED_SILT_SHINGLE_STAIRS = register("red_silt_shingle_stairs", new StairBlock(RED_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(RED_SILT_SHINGLES))); - public static final Block BLACK_SILT_SHINGLE_STAIRS = register("black_silt_shingle_stairs", new StairBlock(BLACK_SILT_SHINGLES.defaultBlockState(), FabricBlockSettings.copyOf(BLACK_SILT_SHINGLES))); - - public static final Block SILT_SHINGLE_SLAB = register("silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(SILT_SHINGLES))); - public static final Block WHITE_SILT_SHINGLE_SLAB = register("white_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(WHITE_SILT_SHINGLES))); - public static final Block ORANGE_SILT_SHINGLE_SLAB = register("orange_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(ORANGE_SILT_SHINGLES))); - public static final Block MAGENTA_SILT_SHINGLE_SLAB = register("magenta_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(MAGENTA_SILT_SHINGLES))); - public static final Block LIGHT_BLUE_SILT_SHINGLE_SLAB = register("light_blue_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(LIGHT_BLUE_SILT_SHINGLES))); - public static final Block YELLOW_SILT_SHINGLE_SLAB = register("yellow_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(YELLOW_SILT_SHINGLES))); - public static final Block LIME_SILT_SHINGLE_SLAB = register("lime_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(LIME_SILT_SHINGLES))); - public static final Block PINK_SILT_SHINGLE_SLAB = register("pink_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(PINK_SILT_SHINGLES))); - public static final Block GRAY_SILT_SHINGLE_SLAB = register("gray_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(GRAY_SILT_SHINGLES))); - public static final Block LIGHT_GRAY_SILT_SHINGLE_SLAB = register("light_gray_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(LIGHT_GRAY_SILT_SHINGLES))); - public static final Block CYAN_SILT_SHINGLE_SLAB = register("cyan_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(CYAN_SILT_SHINGLES))); - public static final Block PURPLE_SILT_SHINGLE_SLAB = register("purple_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(PURPLE_SILT_SHINGLES))); - public static final Block BLUE_SILT_SHINGLE_SLAB = register("blue_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(BLUE_SILT_SHINGLES))); - public static final Block BROWN_SILT_SHINGLE_SLAB = register("brown_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(BROWN_SILT_SHINGLES))); - public static final Block GREEN_SILT_SHINGLE_SLAB = register("green_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(GREEN_SILT_SHINGLES))); - public static final Block RED_SILT_SHINGLE_SLAB = register("red_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(RED_SILT_SHINGLES))); - public static final Block BLACK_SILT_SHINGLE_SLAB = register("black_silt_shingle_slab", new SlabBlock(FabricBlockSettings.copyOf(BLACK_SILT_SHINGLES))); - - public static final Block SILT_SHINGLE_WALL = register("silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(SILT_SHINGLES))); - public static final Block WHITE_SILT_SHINGLE_WALL = register("white_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(WHITE_SILT_SHINGLES))); - public static final Block ORANGE_SILT_SHINGLE_WALL = register("orange_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(ORANGE_SILT_SHINGLES))); - public static final Block MAGENTA_SILT_SHINGLE_WALL = register("magenta_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(MAGENTA_SILT_SHINGLES))); - public static final Block LIGHT_BLUE_SILT_SHINGLE_WALL = register("light_blue_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(LIGHT_BLUE_SILT_SHINGLES))); - public static final Block YELLOW_SILT_SHINGLE_WALL = register("yellow_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(YELLOW_SILT_SHINGLES))); - public static final Block LIME_SILT_SHINGLE_WALL = register("lime_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(LIME_SILT_SHINGLES))); - public static final Block PINK_SILT_SHINGLE_WALL = register("pink_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(PINK_SILT_SHINGLES))); - public static final Block GRAY_SILT_SHINGLE_WALL = register("gray_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(GRAY_SILT_SHINGLES))); - public static final Block LIGHT_GRAY_SILT_SHINGLE_WALL = register("light_gray_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(LIGHT_GRAY_SILT_SHINGLES))); - public static final Block CYAN_SILT_SHINGLE_WALL = register("cyan_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(CYAN_SILT_SHINGLES))); - public static final Block PURPLE_SILT_SHINGLE_WALL = register("purple_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(PURPLE_SILT_SHINGLES))); - public static final Block BLUE_SILT_SHINGLE_WALL = register("blue_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(BLUE_SILT_SHINGLES))); - public static final Block BROWN_SILT_SHINGLE_WALL = register("brown_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(BROWN_SILT_SHINGLES))); - public static final Block GREEN_SILT_SHINGLE_WALL = register("green_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(GREEN_SILT_SHINGLES))); - public static final Block RED_SILT_SHINGLE_WALL = register("red_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(RED_SILT_SHINGLES))); - public static final Block BLACK_SILT_SHINGLE_WALL = register("black_silt_shingle_wall", new WallBlock(FabricBlockSettings.copyOf(BLACK_SILT_SHINGLES))); + public static final Block SILT = register("silt", new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CLAY).mapColor(MapColor.COLOR_BROWN).sound(TwigsSoundEvents.SILT))); + public static final Block SILT_BRICKS = register("silt_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.BRICKS).mapColor(MapColor.COLOR_YELLOW))); + public static final Block SILT_BRICK_STAIRS = register("silt_brick_stairs", new StairBlock(SILT_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block SILT_BRICK_SLAB = register("silt_brick_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block SILT_BRICK_WALL = register("silt_brick_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block MIXED_SILT_BRICKS = register("mixed_silt_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block CHISELED_SILT_BRICKS = register("chiseled_silt_bricks", new FacingBlock(BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block CRACKED_SILT_BRICKS = register("cracked_silt_bricks", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_BRICKS))); + public static final Block SILT_BRICK_TRAIL = register("silt_brick_trail", new BrickTrailBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).noCollission().noOcclusion().instabreak())); + + public static final Block SILT_POT = register("silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TERRACOTTA).strength(0.5f, 2f))); + public static final Block WHITE_SILT_POT = register("white_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.TERRACOTTA_WHITE))); + public static final Block ORANGE_SILT_POT = register("orange_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_ORANGE))); + public static final Block MAGENTA_SILT_POT = register("magenta_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_MAGENTA))); + public static final Block LIGHT_BLUE_SILT_POT = register("light_blue_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_LIGHT_BLUE))); + public static final Block YELLOW_SILT_POT = register("yellow_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_YELLOW))); + public static final Block LIME_SILT_POT = register("lime_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_LIGHT_GREEN))); + public static final Block PINK_SILT_POT = register("pink_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_PINK))); + public static final Block GRAY_SILT_POT = register("gray_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_GRAY))); + public static final Block LIGHT_GRAY_SILT_POT = register("light_gray_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_LIGHT_GRAY))); + public static final Block CYAN_SILT_POT = register("cyan_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_CYAN))); + public static final Block PURPLE_SILT_POT = register("purple_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_PURPLE))); + public static final Block BLUE_SILT_POT = register("blue_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_BLUE))); + public static final Block BROWN_SILT_POT = register("brown_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_BROWN))); + public static final Block GREEN_SILT_POT = register("green_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_GREEN))); + public static final Block RED_SILT_POT = register("red_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_RED))); + public static final Block BLACK_SILT_POT = register("black_silt_pot", new SiltPotBlock(BlockBehaviour.Properties.ofFullCopy(SILT_POT).mapColor(MapColor.COLOR_BLACK))); + + public static final Block PACKED_SILT = register("packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.TERRACOTTA).sound(TwigsSoundEvents.PACKED_SILT))); + public static final Block WHITE_PACKED_SILT = register("white_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.TERRACOTTA_WHITE))); + public static final Block ORANGE_PACKED_SILT = register("orange_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_ORANGE))); + public static final Block MAGENTA_PACKED_SILT = register("magenta_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_MAGENTA))); + public static final Block LIGHT_BLUE_PACKED_SILT = register("light_blue_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_BLUE))); + public static final Block YELLOW_PACKED_SILT = register("yellow_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_YELLOW))); + public static final Block LIME_PACKED_SILT = register("lime_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_GREEN))); + public static final Block PINK_PACKED_SILT = register("pink_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_PINK))); + public static final Block GRAY_PACKED_SILT = register("gray_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_GRAY))); + public static final Block LIGHT_GRAY_PACKED_SILT = register("light_gray_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_LIGHT_GRAY))); + public static final Block CYAN_PACKED_SILT = register("cyan_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_CYAN))); + public static final Block PURPLE_PACKED_SILT = register("purple_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_PURPLE))); + public static final Block BLUE_PACKED_SILT = register("blue_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_BLUE))); + public static final Block BROWN_PACKED_SILT = register("brown_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_BROWN))); + public static final Block GREEN_PACKED_SILT = register("green_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_GREEN))); + public static final Block RED_PACKED_SILT = register("red_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_RED))); + public static final Block BLACK_PACKED_SILT = register("black_packed_silt", new Block(BlockBehaviour.Properties.ofFullCopy(PACKED_SILT).mapColor(MapColor.COLOR_BLACK))); + + public static final Block SILT_SHINGLES = register("silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.TERRACOTTA).sound(TwigsSoundEvents.SILT_SHINGLES))); + public static final Block WHITE_SILT_SHINGLES = register("white_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.TERRACOTTA_WHITE))); + public static final Block ORANGE_SILT_SHINGLES = register("orange_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_ORANGE))); + public static final Block MAGENTA_SILT_SHINGLES = register("magenta_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_MAGENTA))); + public static final Block LIGHT_BLUE_SILT_SHINGLES = register("light_blue_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_BLUE))); + public static final Block YELLOW_SILT_SHINGLES = register("yellow_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_YELLOW))); + public static final Block LIME_SILT_SHINGLES = register("lime_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_GREEN))); + public static final Block PINK_SILT_SHINGLES = register("pink_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_PINK))); + public static final Block GRAY_SILT_SHINGLES = register("gray_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_GRAY))); + public static final Block LIGHT_GRAY_SILT_SHINGLES = register("light_gray_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_LIGHT_GRAY))); + public static final Block CYAN_SILT_SHINGLES = register("cyan_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_CYAN))); + public static final Block PURPLE_SILT_SHINGLES = register("purple_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_PURPLE))); + public static final Block BLUE_SILT_SHINGLES = register("blue_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_BLUE))); + public static final Block BROWN_SILT_SHINGLES = register("brown_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_BROWN))); + public static final Block GREEN_SILT_SHINGLES = register("green_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_GREEN))); + public static final Block RED_SILT_SHINGLES = register("red_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_RED))); + public static final Block BLACK_SILT_SHINGLES = register("black_silt_shingles", new Block(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES).mapColor(MapColor.COLOR_BLACK))); + + public static final Block SILT_SHINGLE_STAIRS = register("silt_shingle_stairs", new StairBlock(SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES))); + public static final Block WHITE_SILT_SHINGLE_STAIRS = register("white_silt_shingle_stairs", new StairBlock(WHITE_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(WHITE_SILT_SHINGLES))); + public static final Block ORANGE_SILT_SHINGLE_STAIRS = register("orange_silt_shingle_stairs", new StairBlock(ORANGE_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(ORANGE_SILT_SHINGLES))); + public static final Block MAGENTA_SILT_SHINGLE_STAIRS = register("magenta_silt_shingle_stairs", new StairBlock(MAGENTA_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MAGENTA_SILT_SHINGLES))); + public static final Block LIGHT_BLUE_SILT_SHINGLE_STAIRS = register("light_blue_silt_shingle_stairs", new StairBlock(LIGHT_BLUE_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIGHT_BLUE_SILT_SHINGLES))); + public static final Block YELLOW_SILT_SHINGLE_STAIRS = register("yellow_silt_shingle_stairs", new StairBlock(YELLOW_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(YELLOW_SILT_SHINGLES))); + public static final Block LIME_SILT_SHINGLE_STAIRS = register("lime_silt_shingle_stairs", new StairBlock(LIME_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIME_SILT_SHINGLES))); + public static final Block PINK_SILT_SHINGLE_STAIRS = register("pink_silt_shingle_stairs", new StairBlock(PINK_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(PINK_SILT_SHINGLES))); + public static final Block GRAY_SILT_SHINGLE_STAIRS = register("gray_silt_shingle_stairs", new StairBlock(GRAY_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(GRAY_SILT_SHINGLES))); + public static final Block LIGHT_GRAY_SILT_SHINGLE_STAIRS = register("light_gray_silt_shingle_stairs", new StairBlock(LIGHT_GRAY_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LIGHT_GRAY_SILT_SHINGLES))); + public static final Block CYAN_SILT_SHINGLE_STAIRS = register("cyan_silt_shingle_stairs", new StairBlock(CYAN_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CYAN_SILT_SHINGLES))); + public static final Block PURPLE_SILT_SHINGLE_STAIRS = register("purple_silt_shingle_stairs", new StairBlock(PURPLE_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(PURPLE_SILT_SHINGLES))); + public static final Block BLUE_SILT_SHINGLE_STAIRS = register("blue_silt_shingle_stairs", new StairBlock(BLUE_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLUE_SILT_SHINGLES))); + public static final Block BROWN_SILT_SHINGLE_STAIRS = register("brown_silt_shingle_stairs", new StairBlock(BROWN_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BROWN_SILT_SHINGLES))); + public static final Block GREEN_SILT_SHINGLE_STAIRS = register("green_silt_shingle_stairs", new StairBlock(GREEN_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(GREEN_SILT_SHINGLES))); + public static final Block RED_SILT_SHINGLE_STAIRS = register("red_silt_shingle_stairs", new StairBlock(RED_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(RED_SILT_SHINGLES))); + public static final Block BLACK_SILT_SHINGLE_STAIRS = register("black_silt_shingle_stairs", new StairBlock(BLACK_SILT_SHINGLES.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLACK_SILT_SHINGLES))); + + public static final Block SILT_SHINGLE_SLAB = register("silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES))); + public static final Block WHITE_SILT_SHINGLE_SLAB = register("white_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(WHITE_SILT_SHINGLES))); + public static final Block ORANGE_SILT_SHINGLE_SLAB = register("orange_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(ORANGE_SILT_SHINGLES))); + public static final Block MAGENTA_SILT_SHINGLE_SLAB = register("magenta_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MAGENTA_SILT_SHINGLES))); + public static final Block LIGHT_BLUE_SILT_SHINGLE_SLAB = register("light_blue_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_BLUE_SILT_SHINGLES))); + public static final Block YELLOW_SILT_SHINGLE_SLAB = register("yellow_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(YELLOW_SILT_SHINGLES))); + public static final Block LIME_SILT_SHINGLE_SLAB = register("lime_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIME_SILT_SHINGLES))); + public static final Block PINK_SILT_SHINGLE_SLAB = register("pink_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(PINK_SILT_SHINGLES))); + public static final Block GRAY_SILT_SHINGLE_SLAB = register("gray_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(GRAY_SILT_SHINGLES))); + public static final Block LIGHT_GRAY_SILT_SHINGLE_SLAB = register("light_gray_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_GRAY_SILT_SHINGLES))); + public static final Block CYAN_SILT_SHINGLE_SLAB = register("cyan_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CYAN_SILT_SHINGLES))); + public static final Block PURPLE_SILT_SHINGLE_SLAB = register("purple_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(PURPLE_SILT_SHINGLES))); + public static final Block BLUE_SILT_SHINGLE_SLAB = register("blue_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BLUE_SILT_SHINGLES))); + public static final Block BROWN_SILT_SHINGLE_SLAB = register("brown_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BROWN_SILT_SHINGLES))); + public static final Block GREEN_SILT_SHINGLE_SLAB = register("green_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(GREEN_SILT_SHINGLES))); + public static final Block RED_SILT_SHINGLE_SLAB = register("red_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(RED_SILT_SHINGLES))); + public static final Block BLACK_SILT_SHINGLE_SLAB = register("black_silt_shingle_slab", new SlabBlock(BlockBehaviour.Properties.ofFullCopy(BLACK_SILT_SHINGLES))); + + public static final Block SILT_SHINGLE_WALL = register("silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(SILT_SHINGLES))); + public static final Block WHITE_SILT_SHINGLE_WALL = register("white_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(WHITE_SILT_SHINGLES))); + public static final Block ORANGE_SILT_SHINGLE_WALL = register("orange_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(ORANGE_SILT_SHINGLES))); + public static final Block MAGENTA_SILT_SHINGLE_WALL = register("magenta_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(MAGENTA_SILT_SHINGLES))); + public static final Block LIGHT_BLUE_SILT_SHINGLE_WALL = register("light_blue_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_BLUE_SILT_SHINGLES))); + public static final Block YELLOW_SILT_SHINGLE_WALL = register("yellow_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(YELLOW_SILT_SHINGLES))); + public static final Block LIME_SILT_SHINGLE_WALL = register("lime_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(LIME_SILT_SHINGLES))); + public static final Block PINK_SILT_SHINGLE_WALL = register("pink_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(PINK_SILT_SHINGLES))); + public static final Block GRAY_SILT_SHINGLE_WALL = register("gray_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(GRAY_SILT_SHINGLES))); + public static final Block LIGHT_GRAY_SILT_SHINGLE_WALL = register("light_gray_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(LIGHT_GRAY_SILT_SHINGLES))); + public static final Block CYAN_SILT_SHINGLE_WALL = register("cyan_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(CYAN_SILT_SHINGLES))); + public static final Block PURPLE_SILT_SHINGLE_WALL = register("purple_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(PURPLE_SILT_SHINGLES))); + public static final Block BLUE_SILT_SHINGLE_WALL = register("blue_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(BLUE_SILT_SHINGLES))); + public static final Block BROWN_SILT_SHINGLE_WALL = register("brown_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(BROWN_SILT_SHINGLES))); + public static final Block GREEN_SILT_SHINGLE_WALL = register("green_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(GREEN_SILT_SHINGLES))); + public static final Block RED_SILT_SHINGLE_WALL = register("red_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(RED_SILT_SHINGLES))); + public static final Block BLACK_SILT_SHINGLE_WALL = register("black_silt_shingle_wall", new WallBlock(BlockBehaviour.Properties.ofFullCopy(BLACK_SILT_SHINGLES))); private static ToIntFunction createLampLightLevel() { return (state) -> (Boolean)state.getValue(BlockStateProperties.LIT) ? 15 : 0; } private static Block register(String id, Block block) { - return Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(Twigs.MOD_ID, id), block); + return Registry.register(BuiltInRegistries.BLOCK, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id), block); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsConfiguredFeatures.java b/src/main/java/com/ninni/twigs/registry/TwigsConfiguredFeatures.java index 4eab2e20..f950b825 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsConfiguredFeatures.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsConfiguredFeatures.java @@ -4,7 +4,7 @@ import com.ninni.twigs.world.gen.features.config.AzaleaFlowerPatchConfig; import com.ninni.twigs.world.gen.features.config.NoiseStripConfig; import net.minecraft.core.registries.Registries; -import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.data.worldgen.features.FeatureUtils; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceKey; @@ -34,7 +34,7 @@ public class TwigsConfiguredFeatures { public static final ResourceKey> PATCH_PEBBLE = createKey("patch_pebble"); public static final ResourceKey> PATCH_SEASHELL = createKey("patch_seashell"); - public static void bootstrap(BootstapContext> context) { + public static void bootstrap(BootstrapContext> context) { TagMatchTest baseStoneOverworld = new TagMatchTest(BlockTags.BASE_STONE_OVERWORLD); TagMatchTest baseStoneNether = new TagMatchTest(BlockTags.BASE_STONE_NETHER); registerConfiguredFeature(context, ORE_RHYOLITE, Feature.ORE, new OreConfiguration(baseStoneOverworld, TwigsBlocks.RHYOLITE.defaultBlockState(), 45)); @@ -47,12 +47,12 @@ public static void bootstrap(BootstapContext> context) { registerConfiguredFeature(context, PATCH_SEASHELL, Feature.RANDOM_PATCH, FeatureUtils.simpleRandomPatchConfiguration(2, PlacementUtils.filtered(TwigsFeatures.WATERLOGGABLE_SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(TwigsBlocks.OPALINE_SEASHELL.defaultBlockState(), 20).add(TwigsBlocks.TANGERINE_SEASHELL.defaultBlockState(), 20).add(TwigsBlocks.ROSEATE_SEASHELL.defaultBlockState(), 15).add(TwigsBlocks.BRONZED_SEASHELL.defaultBlockState(), 8))), BlockPredicate.ONLY_IN_AIR_OR_WATER_PREDICATE))); } - private static > void registerConfiguredFeature(BootstapContext> context, ResourceKey> resourceKey, F feature, FC featureConfiguration) { + private static > void registerConfiguredFeature(BootstrapContext> context, ResourceKey> resourceKey, F feature, FC featureConfiguration) { context.register(resourceKey, new ConfiguredFeature<>(feature, featureConfiguration)); } public static ResourceKey> createKey(String string) { - return ResourceKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(Twigs.MOD_ID, string)); + return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, string)); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsCreativeModeTab.java b/src/main/java/com/ninni/twigs/registry/TwigsCreativeModeTab.java index c2be656c..a545bc57 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsCreativeModeTab.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsCreativeModeTab.java @@ -13,7 +13,266 @@ import net.minecraft.world.level.block.Blocks; import static com.ninni.twigs.Twigs.MOD_ID; -import static com.ninni.twigs.registry.TwigsItems.*; +import static com.ninni.twigs.registry.TwigsBlocks.BRICK_TRAIL; +import static com.ninni.twigs.registry.TwigsBlocks.CHERRY_TABLE; +import static com.ninni.twigs.registry.TwigsBlocks.SILT_BRICK_TRAIL; +import static com.ninni.twigs.registry.TwigsBlocks.TORCHFLOWER_PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.ACACIA_TABLE; +import static com.ninni.twigs.registry.TwigsItems.ALLIUM_PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.AZALEA_FLOWERS; +import static com.ninni.twigs.registry.TwigsItems.BAMBOO_LEAVES; +import static com.ninni.twigs.registry.TwigsItems.BAMBOO_MAT; +import static com.ninni.twigs.registry.TwigsItems.BAMBOO_TABLE; +import static com.ninni.twigs.registry.TwigsItems.BAMBOO_THATCH; +import static com.ninni.twigs.registry.TwigsItems.BAMBOO_THATCH_SLAB; +import static com.ninni.twigs.registry.TwigsItems.BIRCH_TABLE; +import static com.ninni.twigs.registry.TwigsItems.BLACKSTONE_COLUMN; +import static com.ninni.twigs.registry.TwigsItems.BLACK_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.BLACK_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.BLACK_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.BLACK_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.BLACK_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.BLACK_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.BLOODSTONE; +import static com.ninni.twigs.registry.TwigsItems.BLOODSTONE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.BLOODSTONE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.BLOODSTONE_WALL; +import static com.ninni.twigs.registry.TwigsItems.BLUE_ORCHID_PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.BLUE_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.BLUE_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.BLUE_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.BLUE_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.BLUE_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.BLUE_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.BRONZED_SEASHELL; +import static com.ninni.twigs.registry.TwigsItems.BROWN_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.BROWN_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.BROWN_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.BROWN_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.BROWN_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.BROWN_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.CALCITE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.CALCITE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.CALCITE_WALL; +import static com.ninni.twigs.registry.TwigsItems.CHISELED_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CHISELED_SILT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CHISELED_SMOOTH_BASALT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.COBBLESTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.COBBLESTONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.COBBLESTONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.COBBLESTONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.COMPACTED_DRIPSTONE; +import static com.ninni.twigs.registry.TwigsItems.COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_COBBLESTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_POLISHED_BLOODSTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_POLISHED_CALCITE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_POLISHED_RHYOLITE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_POLISHED_SCHIST_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_POLISHED_TUFF_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRACKED_SILT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.CRIMSON_ROOTS_PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.CRIMSON_SHROOMLAMP; +import static com.ninni.twigs.registry.TwigsItems.CRIMSON_TABLE; +import static com.ninni.twigs.registry.TwigsItems.CUT_AMETHYST; +import static com.ninni.twigs.registry.TwigsItems.CYAN_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.CYAN_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.CYAN_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.CYAN_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.CYAN_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.CYAN_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.DANDELION_PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.DARK_OAK_TABLE; +import static com.ninni.twigs.registry.TwigsItems.DEEPSLATE_COLUMN; +import static com.ninni.twigs.registry.TwigsItems.EXPOSED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.GRAVEL_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.GRAVEL_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.GRAVEL_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.GRAVEL_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.GRAY_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.GRAY_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.GRAY_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.GRAY_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.GRAY_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.GRAY_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.GREEN_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.GREEN_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.GREEN_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.GREEN_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.GREEN_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.GREEN_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.JUNGLE_TABLE; +import static com.ninni.twigs.registry.TwigsItems.LAMP; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_BLUE_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.LIGHT_GRAY_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.LIME_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.LIME_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.LIME_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.LIME_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.LIME_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.LIME_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.MAGENTA_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.MANGROVE_TABLE; +import static com.ninni.twigs.registry.TwigsItems.MIXED_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.MIXED_SILT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_COBBLESTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_COBBLESTONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_COBBLESTONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.MOSSY_COBBLESTONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.OAK_TABLE; +import static com.ninni.twigs.registry.TwigsItems.OPALINE_SEASHELL; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.ORANGE_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.OXIDIZED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.PAPER_LANTERN; +import static com.ninni.twigs.registry.TwigsItems.PEBBLE; +import static com.ninni.twigs.registry.TwigsItems.PETRIFIED_LICHEN; +import static com.ninni.twigs.registry.TwigsItems.PINK_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.PINK_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.PINK_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.PINK_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.PINK_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.PINK_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_AMETHYST; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BASALT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_BLOODSTONE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_CALCITE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_RHYOLITE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_SCHIST_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_SLAB; +import static com.ninni.twigs.registry.TwigsItems.POLISHED_TUFF_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.PURPLE_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.QUARTZ_COLUMN; +import static com.ninni.twigs.registry.TwigsItems.RED_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.RED_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.RED_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.RED_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.RED_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.RED_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.RHYOLITE; +import static com.ninni.twigs.registry.TwigsItems.RHYOLITE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.RHYOLITE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.RHYOLITE_WALL; +import static com.ninni.twigs.registry.TwigsItems.ROCKY_DIRT; +import static com.ninni.twigs.registry.TwigsItems.ROSEATE_SEASHELL; +import static com.ninni.twigs.registry.TwigsItems.SCHIST; +import static com.ninni.twigs.registry.TwigsItems.SCHIST_SLAB; +import static com.ninni.twigs.registry.TwigsItems.SCHIST_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.SCHIST_WALL; +import static com.ninni.twigs.registry.TwigsItems.SILT; +import static com.ninni.twigs.registry.TwigsItems.SILT_BALL; +import static com.ninni.twigs.registry.TwigsItems.SILT_BRICK; +import static com.ninni.twigs.registry.TwigsItems.SILT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.SILT_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.SILT_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.SILT_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_BASALT_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_BASALT_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_BASALT_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_BASALT_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_STONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_STONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_STONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.SMOOTH_STONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.SOUL_LAMP; +import static com.ninni.twigs.registry.TwigsItems.SPRUCE_TABLE; +import static com.ninni.twigs.registry.TwigsItems.STONE_COLUMN; +import static com.ninni.twigs.registry.TwigsItems.TANGERINE_SEASHELL; +import static com.ninni.twigs.registry.TwigsItems.TUFF_SLAB; +import static com.ninni.twigs.registry.TwigsItems.TUFF_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.TUFF_WALL; +import static com.ninni.twigs.registry.TwigsItems.TWIG; +import static com.ninni.twigs.registry.TwigsItems.TWIGS; +import static com.ninni.twigs.registry.TwigsItems.TWISTING_POLISHED_BLACKSTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.TWISTING_POLISHED_BLACKSTONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.WARPED_SHROOMLAMP; +import static com.ninni.twigs.registry.TwigsItems.WARPED_TABLE; +import static com.ninni.twigs.registry.TwigsItems.WAXED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.WAXED_EXPOSED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.WAXED_OXIDIZED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.WAXED_WEATHERED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.WEATHERED_COPPER_PILLAR; +import static com.ninni.twigs.registry.TwigsItems.WEEPING_POLISHED_BLACKSTONE_BRICKS; +import static com.ninni.twigs.registry.TwigsItems.WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB; +import static com.ninni.twigs.registry.TwigsItems.WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.WEEPING_POLISHED_BLACKSTONE_BRICK_WALL; +import static com.ninni.twigs.registry.TwigsItems.WHITE_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.WHITE_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.WHITE_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.WHITE_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.WHITE_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.WHITE_SILT_SHINGLE_WALL; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_PACKED_SILT; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_SILT_POT; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_SILT_SHINGLES; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_SILT_SHINGLE_SLAB; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_SILT_SHINGLE_STAIRS; +import static com.ninni.twigs.registry.TwigsItems.YELLOW_SILT_SHINGLE_WALL; public class TwigsCreativeModeTab { @@ -28,7 +287,7 @@ public class TwigsCreativeModeTab { CRIMSON_ROOTS_PAPER_LANTERN, DANDELION_PAPER_LANTERN, TORCHFLOWER_PAPER_LANTERN, - lAMP, + LAMP, SOUL_LAMP ); entries.addAfter(Items.GLOW_LICHEN, PETRIFIED_LICHEN); @@ -276,443 +535,438 @@ public class TwigsCreativeModeTab { ); }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COLORED_BLOCKS).register(entries -> { - - entries.addAfter(Items.PINK_TERRACOTTA, - PACKED_SILT, - WHITE_PACKED_SILT, - LIGHT_GRAY_PACKED_SILT, - GRAY_PACKED_SILT, - BLACK_PACKED_SILT, - BROWN_PACKED_SILT, - RED_PACKED_SILT, - ORANGE_PACKED_SILT, - YELLOW_PACKED_SILT, - LIME_PACKED_SILT, - GREEN_PACKED_SILT, - CYAN_PACKED_SILT, - LIGHT_BLUE_PACKED_SILT, - BLUE_PACKED_SILT, - PURPLE_PACKED_SILT, - MAGENTA_PACKED_SILT, - PINK_PACKED_SILT, - - SILT_POT, - WHITE_SILT_POT, - LIGHT_GRAY_SILT_POT, - GRAY_SILT_POT, - BLACK_SILT_POT, - BROWN_SILT_POT, - RED_SILT_POT, - ORANGE_SILT_POT, - YELLOW_SILT_POT, - LIME_SILT_POT, - GREEN_SILT_POT, - CYAN_SILT_POT, - LIGHT_BLUE_SILT_POT, - BLUE_SILT_POT, - PURPLE_SILT_POT, - MAGENTA_SILT_POT, - PINK_SILT_POT, - - SILT_SHINGLES, - WHITE_SILT_SHINGLES, - LIGHT_GRAY_SILT_SHINGLES, - GRAY_SILT_SHINGLES, - BLACK_SILT_SHINGLES, - BROWN_SILT_SHINGLES, - RED_SILT_SHINGLES, - ORANGE_SILT_SHINGLES, - YELLOW_SILT_SHINGLES, - LIME_SILT_SHINGLES, - GREEN_SILT_SHINGLES, - CYAN_SILT_SHINGLES, - LIGHT_BLUE_SILT_SHINGLES, - BLUE_SILT_SHINGLES, - PURPLE_SILT_SHINGLES, - MAGENTA_SILT_SHINGLES, - PINK_SILT_SHINGLES, - - SILT_SHINGLE_STAIRS, - WHITE_SILT_SHINGLE_STAIRS, - LIGHT_GRAY_SILT_SHINGLE_STAIRS, - GRAY_SILT_SHINGLE_STAIRS, - BLACK_SILT_SHINGLE_STAIRS, - BROWN_SILT_SHINGLE_STAIRS, - RED_SILT_SHINGLE_STAIRS, - ORANGE_SILT_SHINGLE_STAIRS, - YELLOW_SILT_SHINGLE_STAIRS, - LIME_SILT_SHINGLE_STAIRS, - GREEN_SILT_SHINGLE_STAIRS, - CYAN_SILT_SHINGLE_STAIRS, - LIGHT_BLUE_SILT_SHINGLE_STAIRS, - BLUE_SILT_SHINGLE_STAIRS, - PURPLE_SILT_SHINGLE_STAIRS, - MAGENTA_SILT_SHINGLE_STAIRS, - PINK_SILT_SHINGLE_STAIRS, - - SILT_SHINGLE_SLAB, - WHITE_SILT_SHINGLE_SLAB, - LIGHT_GRAY_SILT_SHINGLE_SLAB, - GRAY_SILT_SHINGLE_SLAB, - BLACK_SILT_SHINGLE_SLAB, - BROWN_SILT_SHINGLE_SLAB, - RED_SILT_SHINGLE_SLAB, - ORANGE_SILT_SHINGLE_SLAB, - YELLOW_SILT_SHINGLE_SLAB, - LIME_SILT_SHINGLE_SLAB, - GREEN_SILT_SHINGLE_SLAB, - CYAN_SILT_SHINGLE_SLAB, - LIGHT_BLUE_SILT_SHINGLE_SLAB, - BLUE_SILT_SHINGLE_SLAB, - PURPLE_SILT_SHINGLE_SLAB, - MAGENTA_SILT_SHINGLE_SLAB, - PINK_SILT_SHINGLE_SLAB, - - SILT_SHINGLE_WALL, - WHITE_SILT_SHINGLE_WALL, - LIGHT_GRAY_SILT_SHINGLE_WALL, - GRAY_SILT_SHINGLE_WALL, - BLACK_SILT_SHINGLE_WALL, - BROWN_SILT_SHINGLE_WALL, - RED_SILT_SHINGLE_WALL, - ORANGE_SILT_SHINGLE_WALL, - YELLOW_SILT_SHINGLE_WALL, - LIME_SILT_SHINGLE_WALL, - GREEN_SILT_SHINGLE_WALL, - CYAN_SILT_SHINGLE_WALL, - LIGHT_BLUE_SILT_SHINGLE_WALL, - BLUE_SILT_SHINGLE_WALL, - PURPLE_SILT_SHINGLE_WALL, - MAGENTA_SILT_SHINGLE_WALL, - PINK_SILT_SHINGLE_WALL - ); - }); - } - - - public static final CreativeModeTab ITEM_GROUP = register("item_group", FabricItemGroup.builder().icon(TWIGS::getDefaultInstance).title(Component.translatable("twigs.item_group")).displayItems((featureFlagSet, output) -> { - - //collectibles - output.accept(AZALEA_FLOWERS); - output.accept(TWIG); - output.accept(PEBBLE); - output.accept(BRONZED_SEASHELL); - output.accept(OPALINE_SEASHELL); - output.accept(ROSEATE_SEASHELL); - output.accept(TANGERINE_SEASHELL); - - output.accept(BAMBOO_LEAVES); - output.accept(BAMBOO_THATCH); - output.accept(BAMBOO_THATCH_SLAB); - output.accept(BAMBOO_MAT); - - //paper lanterns - output.accept(PAPER_LANTERN); - output.accept(ALLIUM_PAPER_LANTERN); - output.accept(BLUE_ORCHID_PAPER_LANTERN); - output.accept(CRIMSON_ROOTS_PAPER_LANTERN); - output.accept(DANDELION_PAPER_LANTERN); - output.accept(TORCHFLOWER_PAPER_LANTERN); - - //lamps - output.accept(lAMP); - output.accept(SOUL_LAMP); - output.accept(CRIMSON_SHROOMLAMP); - output.accept(WARPED_SHROOMLAMP); - - //tables - output.accept(OAK_TABLE); - output.accept(SPRUCE_TABLE); - output.accept(BIRCH_TABLE); - output.accept(JUNGLE_TABLE); - output.accept(ACACIA_TABLE); - output.accept(DARK_OAK_TABLE); - output.accept(MANGROVE_TABLE); - output.accept(CHERRY_TABLE); - output.accept(BAMBOO_TABLE); - output.accept(CRIMSON_TABLE); - output.accept(WARPED_TABLE); - - //basalt blocks - output.accept(POLISHED_BASALT_BRICKS); - output.accept(CHISELED_SMOOTH_BASALT_BRICKS); - output.accept(SMOOTH_BASALT_BRICKS); - output.accept(SMOOTH_BASALT_BRICK_STAIRS); - output.accept(SMOOTH_BASALT_BRICK_SLAB); - output.accept(SMOOTH_BASALT_BRICK_WALL); - - //bricks - output.accept(CRACKED_BRICKS); - output.accept(MIXED_BRICKS); - output.accept(CHISELED_BRICKS); - output.accept(MOSSY_BRICKS); - output.accept(MOSSY_BRICK_STAIRS); - output.accept(MOSSY_BRICK_SLAB); - output.accept(MOSSY_BRICK_WALL); - - //gravel bricks - output.accept(GRAVEL_BRICKS); - output.accept(GRAVEL_BRICK_STAIRS); - output.accept(GRAVEL_BRICK_SLAB); - output.accept(GRAVEL_BRICK_WALL); - - //smooth stone bricks - output.accept(SMOOTH_STONE_BRICKS); - output.accept(SMOOTH_STONE_BRICK_STAIRS); - output.accept(SMOOTH_STONE_BRICK_SLAB); - output.accept(SMOOTH_STONE_BRICK_WALL); - - //columns - output.accept(QUARTZ_COLUMN); - output.accept(STONE_COLUMN); - output.accept(DEEPSLATE_COLUMN); - output.accept(BLACKSTONE_COLUMN); - - //copper pillars - output.accept(COPPER_PILLAR); - output.accept(EXPOSED_COPPER_PILLAR); - output.accept(WEATHERED_COPPER_PILLAR); - output.accept(OXIDIZED_COPPER_PILLAR); - output.accept(WAXED_COPPER_PILLAR); - output.accept(WAXED_EXPOSED_COPPER_PILLAR); - output.accept(WAXED_WEATHERED_COPPER_PILLAR); - output.accept(WAXED_OXIDIZED_COPPER_PILLAR); - - //amethyst blocks - output.accept(POLISHED_AMETHYST); - output.accept(CUT_AMETHYST); - - //misc - output.accept(PETRIFIED_LICHEN); - output.accept(COMPACTED_DRIPSTONE); - output.accept(ROCKY_DIRT); - - //cobblestone bricks - output.accept(COBBLESTONE_BRICKS); - output.accept(COBBLESTONE_BRICK_STAIRS); - output.accept(COBBLESTONE_BRICK_SLAB); - output.accept(COBBLESTONE_BRICK_WALL); - output.accept(CRACKED_COBBLESTONE_BRICKS); - output.accept(MOSSY_COBBLESTONE_BRICKS); - output.accept(MOSSY_COBBLESTONE_BRICK_STAIRS); - output.accept(MOSSY_COBBLESTONE_BRICK_SLAB); - output.accept(MOSSY_COBBLESTONE_BRICK_WALL); - - //decorated blackstone bricks - output.accept(TWISTING_POLISHED_BLACKSTONE_BRICKS); - output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS); - output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB); - output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_WALL); - output.accept(WEEPING_POLISHED_BLACKSTONE_BRICKS); - output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS); - output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB); - output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_WALL); - - //tuff blocks - output.accept(TUFF_STAIRS); - output.accept(TUFF_SLAB); - output.accept(TUFF_WALL); - output.accept(POLISHED_TUFF); - output.accept(POLISHED_TUFF_STAIRS); - output.accept(POLISHED_TUFF_SLAB); - output.accept(POLISHED_TUFF_BRICKS); - output.accept(CRACKED_POLISHED_TUFF_BRICKS); - output.accept(POLISHED_TUFF_BRICK_STAIRS); - output.accept(POLISHED_TUFF_BRICK_SLAB); - output.accept(POLISHED_TUFF_BRICK_WALL); - - //calcite blocks - output.accept(CALCITE_STAIRS); - output.accept(CALCITE_SLAB); - output.accept(CALCITE_WALL); - output.accept(POLISHED_CALCITE); - output.accept(POLISHED_CALCITE_STAIRS); - output.accept(POLISHED_CALCITE_SLAB); - output.accept(POLISHED_CALCITE_BRICKS); - output.accept(CRACKED_POLISHED_CALCITE_BRICKS); - output.accept(POLISHED_CALCITE_BRICK_STAIRS); - output.accept(POLISHED_CALCITE_BRICK_SLAB); - output.accept(POLISHED_CALCITE_BRICK_WALL); - - //schist blocks - output.accept(SCHIST); - output.accept(SCHIST_STAIRS); - output.accept(SCHIST_SLAB); - output.accept(SCHIST_WALL); - output.accept(POLISHED_SCHIST); - output.accept(POLISHED_SCHIST_STAIRS); - output.accept(POLISHED_SCHIST_SLAB); - output.accept(POLISHED_SCHIST_BRICKS); - output.accept(CRACKED_POLISHED_SCHIST_BRICKS); - output.accept(POLISHED_SCHIST_BRICK_STAIRS); - output.accept(POLISHED_SCHIST_BRICK_SLAB); - output.accept(POLISHED_SCHIST_BRICK_WALL); - - //rhyolite blocks - output.accept(RHYOLITE); - output.accept(RHYOLITE_STAIRS); - output.accept(RHYOLITE_SLAB); - output.accept(RHYOLITE_WALL); - output.accept(POLISHED_RHYOLITE); - output.accept(POLISHED_RHYOLITE_STAIRS); - output.accept(POLISHED_RHYOLITE_SLAB); - output.accept(POLISHED_RHYOLITE_BRICKS); - output.accept(CRACKED_POLISHED_RHYOLITE_BRICKS); - output.accept(POLISHED_RHYOLITE_BRICK_STAIRS); - output.accept(POLISHED_RHYOLITE_BRICK_SLAB); - output.accept(POLISHED_RHYOLITE_BRICK_WALL); - - //bloodstone blocks - output.accept(BLOODSTONE); - output.accept(BLOODSTONE_STAIRS); - output.accept(BLOODSTONE_SLAB); - output.accept(BLOODSTONE_WALL); - output.accept(POLISHED_BLOODSTONE); - output.accept(POLISHED_BLOODSTONE_STAIRS); - output.accept(POLISHED_BLOODSTONE_SLAB); - output.accept(POLISHED_BLOODSTONE_BRICKS); - output.accept(CRACKED_POLISHED_BLOODSTONE_BRICKS); - output.accept(POLISHED_BLOODSTONE_BRICK_STAIRS); - output.accept(POLISHED_BLOODSTONE_BRICK_SLAB); - output.accept(POLISHED_BLOODSTONE_BRICK_WALL); - - //silt blocks - output.accept(SILT); - output.accept(SILT_BALL); - output.accept(SILT_BRICK); - output.accept(SILT_BRICKS); - output.accept(CRACKED_SILT_BRICKS); - output.accept(SILT_BRICK_STAIRS); - output.accept(SILT_BRICK_SLAB); - output.accept(SILT_BRICK_WALL); - output.accept(CHISELED_SILT_BRICKS); - output.accept(MIXED_SILT_BRICKS); - - - output.accept(PACKED_SILT); - output.accept(SILT_POT); - output.accept(SILT_SHINGLES); - output.accept(SILT_SHINGLE_STAIRS); - output.accept(SILT_SHINGLE_SLAB); - output.accept(SILT_SHINGLE_WALL); - - output.accept(WHITE_PACKED_SILT); - output.accept(WHITE_SILT_POT); - output.accept(WHITE_SILT_SHINGLES); - output.accept(WHITE_SILT_SHINGLE_STAIRS); - output.accept(WHITE_SILT_SHINGLE_SLAB); - output.accept(WHITE_SILT_SHINGLE_WALL); - - output.accept(LIGHT_GRAY_PACKED_SILT); - output.accept(LIGHT_GRAY_SILT_POT); - output.accept(LIGHT_GRAY_SILT_SHINGLES); - output.accept(LIGHT_GRAY_SILT_SHINGLE_STAIRS); - output.accept(LIGHT_GRAY_SILT_SHINGLE_SLAB); - output.accept(LIGHT_GRAY_SILT_SHINGLE_WALL); - - output.accept(GRAY_PACKED_SILT); - output.accept(GRAY_SILT_POT); - output.accept(GRAY_SILT_SHINGLES); - output.accept(GRAY_SILT_SHINGLE_STAIRS); - output.accept(GRAY_SILT_SHINGLE_SLAB); - output.accept(GRAY_SILT_SHINGLE_WALL); - - output.accept(BLACK_PACKED_SILT); - output.accept(BLACK_SILT_POT); - output.accept(BLACK_SILT_SHINGLES); - output.accept(BLACK_SILT_SHINGLE_STAIRS); - output.accept(BLACK_SILT_SHINGLE_SLAB); - output.accept(BLACK_SILT_SHINGLE_WALL); - - output.accept(BROWN_PACKED_SILT); - output.accept(BROWN_SILT_POT); - output.accept(BROWN_SILT_SHINGLES); - output.accept(BROWN_SILT_SHINGLE_STAIRS); - output.accept(BROWN_SILT_SHINGLE_SLAB); - output.accept(BROWN_SILT_SHINGLE_WALL); - - output.accept(RED_PACKED_SILT); - output.accept(RED_SILT_POT); - output.accept(RED_SILT_SHINGLES); - output.accept(RED_SILT_SHINGLE_STAIRS); - output.accept(RED_SILT_SHINGLE_SLAB); - output.accept(RED_SILT_SHINGLE_WALL); - - output.accept(ORANGE_PACKED_SILT); - output.accept(ORANGE_SILT_POT); - output.accept(ORANGE_SILT_SHINGLES); - output.accept(ORANGE_SILT_SHINGLE_STAIRS); - output.accept(ORANGE_SILT_SHINGLE_SLAB); - output.accept(ORANGE_SILT_SHINGLE_WALL); - - output.accept(YELLOW_PACKED_SILT); - output.accept(YELLOW_SILT_POT); - output.accept(YELLOW_SILT_SHINGLES); - output.accept(YELLOW_SILT_SHINGLE_STAIRS); - output.accept(YELLOW_SILT_SHINGLE_SLAB); - output.accept(YELLOW_SILT_SHINGLE_WALL); - - output.accept(LIME_PACKED_SILT); - output.accept(LIME_SILT_POT); - output.accept(LIME_SILT_SHINGLES); - output.accept(LIME_SILT_SHINGLE_STAIRS); - output.accept(LIME_SILT_SHINGLE_SLAB); - output.accept(LIME_SILT_SHINGLE_WALL); - - output.accept(GREEN_PACKED_SILT); - output.accept(GREEN_SILT_POT); - output.accept(GREEN_SILT_SHINGLES); - output.accept(GREEN_SILT_SHINGLE_STAIRS); - output.accept(GREEN_SILT_SHINGLE_SLAB); - output.accept(GREEN_SILT_SHINGLE_WALL); - - output.accept(CYAN_PACKED_SILT); - output.accept(CYAN_SILT_POT); - output.accept(CYAN_SILT_SHINGLES); - output.accept(CYAN_SILT_SHINGLE_STAIRS); - output.accept(CYAN_SILT_SHINGLE_SLAB); - output.accept(CYAN_SILT_SHINGLE_WALL); - - output.accept(LIGHT_BLUE_PACKED_SILT); - output.accept(LIGHT_BLUE_SILT_POT); - output.accept(LIGHT_BLUE_SILT_SHINGLES); - output.accept(LIGHT_BLUE_SILT_SHINGLE_STAIRS); - output.accept(LIGHT_BLUE_SILT_SHINGLE_SLAB); - output.accept(LIGHT_BLUE_SILT_SHINGLE_WALL); - - output.accept(BLUE_PACKED_SILT); - output.accept(BLUE_SILT_POT); - output.accept(BLUE_SILT_SHINGLES); - output.accept(BLUE_SILT_SHINGLE_STAIRS); - output.accept(BLUE_SILT_SHINGLE_SLAB); - output.accept(BLUE_SILT_SHINGLE_WALL); - - output.accept(PURPLE_PACKED_SILT); - output.accept(PURPLE_SILT_POT); - output.accept(PURPLE_SILT_SHINGLES); - output.accept(PURPLE_SILT_SHINGLE_STAIRS); - output.accept(PURPLE_SILT_SHINGLE_SLAB); - output.accept(PURPLE_SILT_SHINGLE_WALL); - - output.accept(MAGENTA_PACKED_SILT); - output.accept(MAGENTA_SILT_POT); - output.accept(MAGENTA_SILT_SHINGLES); - output.accept(MAGENTA_SILT_SHINGLE_STAIRS); - output.accept(MAGENTA_SILT_SHINGLE_SLAB); - output.accept(MAGENTA_SILT_SHINGLE_WALL); - - output.accept(PINK_PACKED_SILT); - output.accept(PINK_SILT_POT); - output.accept(PINK_SILT_SHINGLES); - output.accept(PINK_SILT_SHINGLE_STAIRS); - output.accept(PINK_SILT_SHINGLE_SLAB); - output.accept(PINK_SILT_SHINGLE_WALL); - - }).build() - ); - - private static CreativeModeTab register(String id, CreativeModeTab tab) { - return Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation(Twigs.MOD_ID, id), tab); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COLORED_BLOCKS).register(entries -> entries.addAfter(Items.PINK_TERRACOTTA, + PACKED_SILT, + WHITE_PACKED_SILT, + LIGHT_GRAY_PACKED_SILT, + GRAY_PACKED_SILT, + BLACK_PACKED_SILT, + BROWN_PACKED_SILT, + RED_PACKED_SILT, + ORANGE_PACKED_SILT, + YELLOW_PACKED_SILT, + LIME_PACKED_SILT, + GREEN_PACKED_SILT, + CYAN_PACKED_SILT, + LIGHT_BLUE_PACKED_SILT, + BLUE_PACKED_SILT, + PURPLE_PACKED_SILT, + MAGENTA_PACKED_SILT, + PINK_PACKED_SILT, + + SILT_POT, + WHITE_SILT_POT, + LIGHT_GRAY_SILT_POT, + GRAY_SILT_POT, + BLACK_SILT_POT, + BROWN_SILT_POT, + RED_SILT_POT, + ORANGE_SILT_POT, + YELLOW_SILT_POT, + LIME_SILT_POT, + GREEN_SILT_POT, + CYAN_SILT_POT, + LIGHT_BLUE_SILT_POT, + BLUE_SILT_POT, + PURPLE_SILT_POT, + MAGENTA_SILT_POT, + PINK_SILT_POT, + + SILT_SHINGLES, + WHITE_SILT_SHINGLES, + LIGHT_GRAY_SILT_SHINGLES, + GRAY_SILT_SHINGLES, + BLACK_SILT_SHINGLES, + BROWN_SILT_SHINGLES, + RED_SILT_SHINGLES, + ORANGE_SILT_SHINGLES, + YELLOW_SILT_SHINGLES, + LIME_SILT_SHINGLES, + GREEN_SILT_SHINGLES, + CYAN_SILT_SHINGLES, + LIGHT_BLUE_SILT_SHINGLES, + BLUE_SILT_SHINGLES, + PURPLE_SILT_SHINGLES, + MAGENTA_SILT_SHINGLES, + PINK_SILT_SHINGLES, + + SILT_SHINGLE_STAIRS, + WHITE_SILT_SHINGLE_STAIRS, + LIGHT_GRAY_SILT_SHINGLE_STAIRS, + GRAY_SILT_SHINGLE_STAIRS, + BLACK_SILT_SHINGLE_STAIRS, + BROWN_SILT_SHINGLE_STAIRS, + RED_SILT_SHINGLE_STAIRS, + ORANGE_SILT_SHINGLE_STAIRS, + YELLOW_SILT_SHINGLE_STAIRS, + LIME_SILT_SHINGLE_STAIRS, + GREEN_SILT_SHINGLE_STAIRS, + CYAN_SILT_SHINGLE_STAIRS, + LIGHT_BLUE_SILT_SHINGLE_STAIRS, + BLUE_SILT_SHINGLE_STAIRS, + PURPLE_SILT_SHINGLE_STAIRS, + MAGENTA_SILT_SHINGLE_STAIRS, + PINK_SILT_SHINGLE_STAIRS, + + SILT_SHINGLE_SLAB, + WHITE_SILT_SHINGLE_SLAB, + LIGHT_GRAY_SILT_SHINGLE_SLAB, + GRAY_SILT_SHINGLE_SLAB, + BLACK_SILT_SHINGLE_SLAB, + BROWN_SILT_SHINGLE_SLAB, + RED_SILT_SHINGLE_SLAB, + ORANGE_SILT_SHINGLE_SLAB, + YELLOW_SILT_SHINGLE_SLAB, + LIME_SILT_SHINGLE_SLAB, + GREEN_SILT_SHINGLE_SLAB, + CYAN_SILT_SHINGLE_SLAB, + LIGHT_BLUE_SILT_SHINGLE_SLAB, + BLUE_SILT_SHINGLE_SLAB, + PURPLE_SILT_SHINGLE_SLAB, + MAGENTA_SILT_SHINGLE_SLAB, + PINK_SILT_SHINGLE_SLAB, + + SILT_SHINGLE_WALL, + WHITE_SILT_SHINGLE_WALL, + LIGHT_GRAY_SILT_SHINGLE_WALL, + GRAY_SILT_SHINGLE_WALL, + BLACK_SILT_SHINGLE_WALL, + BROWN_SILT_SHINGLE_WALL, + RED_SILT_SHINGLE_WALL, + ORANGE_SILT_SHINGLE_WALL, + YELLOW_SILT_SHINGLE_WALL, + LIME_SILT_SHINGLE_WALL, + GREEN_SILT_SHINGLE_WALL, + CYAN_SILT_SHINGLE_WALL, + LIGHT_BLUE_SILT_SHINGLE_WALL, + BLUE_SILT_SHINGLE_WALL, + PURPLE_SILT_SHINGLE_WALL, + MAGENTA_SILT_SHINGLE_WALL, + PINK_SILT_SHINGLE_WALL + )); + + CreativeModeTab tab = FabricItemGroup.builder().title(Component.translatable("itemGroup." + Twigs.MOD_ID + ".item_group")).icon(TWIGS::getDefaultInstance).displayItems((featureFlagSet, output) -> { + + //collectibles + output.accept(AZALEA_FLOWERS); + output.accept(TWIG); + output.accept(PEBBLE); + output.accept(BRONZED_SEASHELL); + output.accept(OPALINE_SEASHELL); + output.accept(ROSEATE_SEASHELL); + output.accept(TANGERINE_SEASHELL); + + output.accept(BAMBOO_LEAVES); + output.accept(BAMBOO_THATCH); + output.accept(BAMBOO_THATCH_SLAB); + output.accept(BAMBOO_MAT); + + //paper lanterns + output.accept(PAPER_LANTERN); + output.accept(ALLIUM_PAPER_LANTERN); + output.accept(BLUE_ORCHID_PAPER_LANTERN); + output.accept(CRIMSON_ROOTS_PAPER_LANTERN); + output.accept(DANDELION_PAPER_LANTERN); + output.accept(TORCHFLOWER_PAPER_LANTERN); + + //lamps + output.accept(LAMP); + output.accept(SOUL_LAMP); + output.accept(CRIMSON_SHROOMLAMP); + output.accept(WARPED_SHROOMLAMP); + + //tables + output.accept(OAK_TABLE); + output.accept(SPRUCE_TABLE); + output.accept(BIRCH_TABLE); + output.accept(JUNGLE_TABLE); + output.accept(ACACIA_TABLE); + output.accept(DARK_OAK_TABLE); + output.accept(MANGROVE_TABLE); + output.accept(CHERRY_TABLE); + output.accept(BAMBOO_TABLE); + output.accept(CRIMSON_TABLE); + output.accept(WARPED_TABLE); + + //basalt blocks + output.accept(POLISHED_BASALT_BRICKS); + output.accept(CHISELED_SMOOTH_BASALT_BRICKS); + output.accept(SMOOTH_BASALT_BRICKS); + output.accept(SMOOTH_BASALT_BRICK_STAIRS); + output.accept(SMOOTH_BASALT_BRICK_SLAB); + output.accept(SMOOTH_BASALT_BRICK_WALL); + + //bricks + output.accept(CRACKED_BRICKS); + output.accept(MIXED_BRICKS); + output.accept(CHISELED_BRICKS); + output.accept(MOSSY_BRICKS); + output.accept(MOSSY_BRICK_STAIRS); + output.accept(MOSSY_BRICK_SLAB); + output.accept(MOSSY_BRICK_WALL); + output.accept(BRICK_TRAIL); + + //gravel bricks + output.accept(GRAVEL_BRICKS); + output.accept(GRAVEL_BRICK_STAIRS); + output.accept(GRAVEL_BRICK_SLAB); + output.accept(GRAVEL_BRICK_WALL); + + //smooth stone bricks + output.accept(SMOOTH_STONE_BRICKS); + output.accept(SMOOTH_STONE_BRICK_STAIRS); + output.accept(SMOOTH_STONE_BRICK_SLAB); + output.accept(SMOOTH_STONE_BRICK_WALL); + + //columns + output.accept(QUARTZ_COLUMN); + output.accept(STONE_COLUMN); + output.accept(DEEPSLATE_COLUMN); + output.accept(BLACKSTONE_COLUMN); + + //copper pillars + output.accept(COPPER_PILLAR); + output.accept(EXPOSED_COPPER_PILLAR); + output.accept(WEATHERED_COPPER_PILLAR); + output.accept(OXIDIZED_COPPER_PILLAR); + output.accept(WAXED_COPPER_PILLAR); + output.accept(WAXED_EXPOSED_COPPER_PILLAR); + output.accept(WAXED_WEATHERED_COPPER_PILLAR); + output.accept(WAXED_OXIDIZED_COPPER_PILLAR); + + //amethyst blocks + output.accept(POLISHED_AMETHYST); + output.accept(CUT_AMETHYST); + + //misc + output.accept(PETRIFIED_LICHEN); + output.accept(COMPACTED_DRIPSTONE); + output.accept(ROCKY_DIRT); + + //cobblestone bricks + output.accept(COBBLESTONE_BRICKS); + output.accept(COBBLESTONE_BRICK_STAIRS); + output.accept(COBBLESTONE_BRICK_SLAB); + output.accept(COBBLESTONE_BRICK_WALL); + output.accept(CRACKED_COBBLESTONE_BRICKS); + output.accept(MOSSY_COBBLESTONE_BRICKS); + output.accept(MOSSY_COBBLESTONE_BRICK_STAIRS); + output.accept(MOSSY_COBBLESTONE_BRICK_SLAB); + output.accept(MOSSY_COBBLESTONE_BRICK_WALL); + + //decorated blackstone bricks + output.accept(TWISTING_POLISHED_BLACKSTONE_BRICKS); + output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS); + output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB); + output.accept(TWISTING_POLISHED_BLACKSTONE_BRICK_WALL); + output.accept(WEEPING_POLISHED_BLACKSTONE_BRICKS); + output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS); + output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB); + output.accept(WEEPING_POLISHED_BLACKSTONE_BRICK_WALL); + + //tuff blocks + output.accept(TUFF_STAIRS); + output.accept(TUFF_SLAB); + output.accept(TUFF_WALL); + output.accept(POLISHED_TUFF); + output.accept(POLISHED_TUFF_STAIRS); + output.accept(POLISHED_TUFF_SLAB); + output.accept(POLISHED_TUFF_BRICKS); + output.accept(CRACKED_POLISHED_TUFF_BRICKS); + output.accept(POLISHED_TUFF_BRICK_STAIRS); + output.accept(POLISHED_TUFF_BRICK_SLAB); + output.accept(POLISHED_TUFF_BRICK_WALL); + + //calcite blocks + output.accept(CALCITE_STAIRS); + output.accept(CALCITE_SLAB); + output.accept(CALCITE_WALL); + output.accept(POLISHED_CALCITE); + output.accept(POLISHED_CALCITE_STAIRS); + output.accept(POLISHED_CALCITE_SLAB); + output.accept(POLISHED_CALCITE_BRICKS); + output.accept(CRACKED_POLISHED_CALCITE_BRICKS); + output.accept(POLISHED_CALCITE_BRICK_STAIRS); + output.accept(POLISHED_CALCITE_BRICK_SLAB); + output.accept(POLISHED_CALCITE_BRICK_WALL); + + //schist blocks + output.accept(SCHIST); + output.accept(SCHIST_STAIRS); + output.accept(SCHIST_SLAB); + output.accept(SCHIST_WALL); + output.accept(POLISHED_SCHIST); + output.accept(POLISHED_SCHIST_STAIRS); + output.accept(POLISHED_SCHIST_SLAB); + output.accept(POLISHED_SCHIST_BRICKS); + output.accept(CRACKED_POLISHED_SCHIST_BRICKS); + output.accept(POLISHED_SCHIST_BRICK_STAIRS); + output.accept(POLISHED_SCHIST_BRICK_SLAB); + output.accept(POLISHED_SCHIST_BRICK_WALL); + + //rhyolite blocks + output.accept(RHYOLITE); + output.accept(RHYOLITE_STAIRS); + output.accept(RHYOLITE_SLAB); + output.accept(RHYOLITE_WALL); + output.accept(POLISHED_RHYOLITE); + output.accept(POLISHED_RHYOLITE_STAIRS); + output.accept(POLISHED_RHYOLITE_SLAB); + output.accept(POLISHED_RHYOLITE_BRICKS); + output.accept(CRACKED_POLISHED_RHYOLITE_BRICKS); + output.accept(POLISHED_RHYOLITE_BRICK_STAIRS); + output.accept(POLISHED_RHYOLITE_BRICK_SLAB); + output.accept(POLISHED_RHYOLITE_BRICK_WALL); + + //bloodstone blocks + output.accept(BLOODSTONE); + output.accept(BLOODSTONE_STAIRS); + output.accept(BLOODSTONE_SLAB); + output.accept(BLOODSTONE_WALL); + output.accept(POLISHED_BLOODSTONE); + output.accept(POLISHED_BLOODSTONE_STAIRS); + output.accept(POLISHED_BLOODSTONE_SLAB); + output.accept(POLISHED_BLOODSTONE_BRICKS); + output.accept(CRACKED_POLISHED_BLOODSTONE_BRICKS); + output.accept(POLISHED_BLOODSTONE_BRICK_STAIRS); + output.accept(POLISHED_BLOODSTONE_BRICK_SLAB); + output.accept(POLISHED_BLOODSTONE_BRICK_WALL); + + //silt blocks + output.accept(SILT); + output.accept(SILT_BALL); + output.accept(SILT_BRICK); + output.accept(SILT_BRICKS); + output.accept(CRACKED_SILT_BRICKS); + output.accept(SILT_BRICK_STAIRS); + output.accept(SILT_BRICK_SLAB); + output.accept(SILT_BRICK_WALL); + output.accept(CHISELED_SILT_BRICKS); + output.accept(MIXED_SILT_BRICKS); + output.accept(SILT_BRICK_TRAIL); + + + output.accept(PACKED_SILT); + output.accept(SILT_POT); + output.accept(SILT_SHINGLES); + output.accept(SILT_SHINGLE_STAIRS); + output.accept(SILT_SHINGLE_SLAB); + output.accept(SILT_SHINGLE_WALL); + + output.accept(WHITE_PACKED_SILT); + output.accept(WHITE_SILT_POT); + output.accept(WHITE_SILT_SHINGLES); + output.accept(WHITE_SILT_SHINGLE_STAIRS); + output.accept(WHITE_SILT_SHINGLE_SLAB); + output.accept(WHITE_SILT_SHINGLE_WALL); + + output.accept(LIGHT_GRAY_PACKED_SILT); + output.accept(LIGHT_GRAY_SILT_POT); + output.accept(LIGHT_GRAY_SILT_SHINGLES); + output.accept(LIGHT_GRAY_SILT_SHINGLE_STAIRS); + output.accept(LIGHT_GRAY_SILT_SHINGLE_SLAB); + output.accept(LIGHT_GRAY_SILT_SHINGLE_WALL); + + output.accept(GRAY_PACKED_SILT); + output.accept(GRAY_SILT_POT); + output.accept(GRAY_SILT_SHINGLES); + output.accept(GRAY_SILT_SHINGLE_STAIRS); + output.accept(GRAY_SILT_SHINGLE_SLAB); + output.accept(GRAY_SILT_SHINGLE_WALL); + + output.accept(BLACK_PACKED_SILT); + output.accept(BLACK_SILT_POT); + output.accept(BLACK_SILT_SHINGLES); + output.accept(BLACK_SILT_SHINGLE_STAIRS); + output.accept(BLACK_SILT_SHINGLE_SLAB); + output.accept(BLACK_SILT_SHINGLE_WALL); + + output.accept(BROWN_PACKED_SILT); + output.accept(BROWN_SILT_POT); + output.accept(BROWN_SILT_SHINGLES); + output.accept(BROWN_SILT_SHINGLE_STAIRS); + output.accept(BROWN_SILT_SHINGLE_SLAB); + output.accept(BROWN_SILT_SHINGLE_WALL); + + output.accept(RED_PACKED_SILT); + output.accept(RED_SILT_POT); + output.accept(RED_SILT_SHINGLES); + output.accept(RED_SILT_SHINGLE_STAIRS); + output.accept(RED_SILT_SHINGLE_SLAB); + output.accept(RED_SILT_SHINGLE_WALL); + + output.accept(ORANGE_PACKED_SILT); + output.accept(ORANGE_SILT_POT); + output.accept(ORANGE_SILT_SHINGLES); + output.accept(ORANGE_SILT_SHINGLE_STAIRS); + output.accept(ORANGE_SILT_SHINGLE_SLAB); + output.accept(ORANGE_SILT_SHINGLE_WALL); + + output.accept(YELLOW_PACKED_SILT); + output.accept(YELLOW_SILT_POT); + output.accept(YELLOW_SILT_SHINGLES); + output.accept(YELLOW_SILT_SHINGLE_STAIRS); + output.accept(YELLOW_SILT_SHINGLE_SLAB); + output.accept(YELLOW_SILT_SHINGLE_WALL); + + output.accept(LIME_PACKED_SILT); + output.accept(LIME_SILT_POT); + output.accept(LIME_SILT_SHINGLES); + output.accept(LIME_SILT_SHINGLE_STAIRS); + output.accept(LIME_SILT_SHINGLE_SLAB); + output.accept(LIME_SILT_SHINGLE_WALL); + + output.accept(GREEN_PACKED_SILT); + output.accept(GREEN_SILT_POT); + output.accept(GREEN_SILT_SHINGLES); + output.accept(GREEN_SILT_SHINGLE_STAIRS); + output.accept(GREEN_SILT_SHINGLE_SLAB); + output.accept(GREEN_SILT_SHINGLE_WALL); + + output.accept(CYAN_PACKED_SILT); + output.accept(CYAN_SILT_POT); + output.accept(CYAN_SILT_SHINGLES); + output.accept(CYAN_SILT_SHINGLE_STAIRS); + output.accept(CYAN_SILT_SHINGLE_SLAB); + output.accept(CYAN_SILT_SHINGLE_WALL); + + output.accept(LIGHT_BLUE_PACKED_SILT); + output.accept(LIGHT_BLUE_SILT_POT); + output.accept(LIGHT_BLUE_SILT_SHINGLES); + output.accept(LIGHT_BLUE_SILT_SHINGLE_STAIRS); + output.accept(LIGHT_BLUE_SILT_SHINGLE_SLAB); + output.accept(LIGHT_BLUE_SILT_SHINGLE_WALL); + + output.accept(BLUE_PACKED_SILT); + output.accept(BLUE_SILT_POT); + output.accept(BLUE_SILT_SHINGLES); + output.accept(BLUE_SILT_SHINGLE_STAIRS); + output.accept(BLUE_SILT_SHINGLE_SLAB); + output.accept(BLUE_SILT_SHINGLE_WALL); + + output.accept(PURPLE_PACKED_SILT); + output.accept(PURPLE_SILT_POT); + output.accept(PURPLE_SILT_SHINGLES); + output.accept(PURPLE_SILT_SHINGLE_STAIRS); + output.accept(PURPLE_SILT_SHINGLE_SLAB); + output.accept(PURPLE_SILT_SHINGLE_WALL); + + output.accept(MAGENTA_PACKED_SILT); + output.accept(MAGENTA_SILT_POT); + output.accept(MAGENTA_SILT_SHINGLES); + output.accept(MAGENTA_SILT_SHINGLE_STAIRS); + output.accept(MAGENTA_SILT_SHINGLE_SLAB); + output.accept(MAGENTA_SILT_SHINGLE_WALL); + + output.accept(PINK_PACKED_SILT); + output.accept(PINK_SILT_POT); + output.accept(PINK_SILT_SHINGLES); + output.accept(PINK_SILT_SHINGLE_STAIRS); + output.accept(PINK_SILT_SHINGLE_SLAB); + output.accept(PINK_SILT_SHINGLE_WALL); + + }).build(); + + Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, ResourceLocation.fromNamespaceAndPath(MOD_ID,"item_group"), tab); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsEntityTypes.java b/src/main/java/com/ninni/twigs/registry/TwigsEntityTypes.java index a7d60b38..68ae8935 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsEntityTypes.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsEntityTypes.java @@ -14,7 +14,7 @@ public class TwigsEntityTypes { public static final EntityType PEBBLE = register("pebble", EntityType.Builder.of(Pebble::new, MobCategory.MISC).sized(0.25F, 0.25F).clientTrackingRange(4).updateInterval(10)); public static EntityType register(String id, EntityType.Builder builder) { - ResourceLocation resourceLocation = new ResourceLocation(Twigs.MOD_ID, id); + ResourceLocation resourceLocation = ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id); return Registry.register(BuiltInRegistries.ENTITY_TYPE, resourceLocation, builder.build(resourceLocation.toString())); } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsFeatures.java b/src/main/java/com/ninni/twigs/registry/TwigsFeatures.java index d13bb254..59c8d9e8 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsFeatures.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsFeatures.java @@ -20,7 +20,7 @@ public class TwigsFeatures { public static final Feature WATERLOGGABLE_SIMPLE_BLOCK = register("waterloggable_simple_block", new WaterloggableSimpleBlockFeature(SimpleBlockConfiguration.CODEC)); private static > F register(String string, F feature) { - return Registry.register(BuiltInRegistries.FEATURE, new ResourceLocation(Twigs.MOD_ID, string), feature); + return Registry.register(BuiltInRegistries.FEATURE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, string), feature); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsItems.java b/src/main/java/com/ninni/twigs/registry/TwigsItems.java index 11962b60..29b4144e 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsItems.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsItems.java @@ -4,12 +4,10 @@ import com.ninni.twigs.item.InstrumentBlockItem; import com.ninni.twigs.item.PebbleItem; import com.ninni.twigs.item.TwigItem; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.InstrumentTags; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; @@ -17,10 +15,10 @@ @SuppressWarnings("unused") public class TwigsItems { //logo - public static final Item TWIGS = register("twigs", new Item(new FabricItemSettings().maxCount(1).rarity(Rarity.EPIC).fireproof())); + public static final Item TWIGS = register("twigs", new Item(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).fireResistant())); //collectibles - public static final Item AZALEA_FLOWERS = register("azalea_flowers", new BlockItem(TwigsBlocks.AZALEA_FLOWERS, new FabricItemSettings())); + public static final Item AZALEA_FLOWERS = register("azalea_flowers", new BlockItem(TwigsBlocks.AZALEA_FLOWERS, new Item.Properties())); public static final Item TWIG = register("twig", new TwigItem(TwigsBlocks.TWIG, new Item.Properties())); public static final Item PEBBLE = register("pebble", new PebbleItem(TwigsBlocks.PEBBLE, new Item.Properties())); public static final Item BRONZED_SEASHELL = register("bronzed_seashell", new InstrumentBlockItem(TwigsBlocks.BRONZED_SEASHELL, new Item.Properties().rarity(Rarity.UNCOMMON).stacksTo(1))); @@ -32,299 +30,299 @@ public class TwigsItems { public static final Item BAMBOO_LEAVES = register("bamboo_leaves", new BlockItem(TwigsBlocks.BAMBOO_LEAVES, new Item.Properties())); public static final Item BAMBOO_THATCH = register("bamboo_thatch", new BlockItem(TwigsBlocks.BAMBOO_THATCH, new Item.Properties())); public static final Item BAMBOO_THATCH_SLAB = register("bamboo_thatch_slab", new BlockItem(TwigsBlocks.BAMBOO_THATCH_SLAB, new Item.Properties())); - public static final Item BAMBOO_MAT = register("bamboo_mat", new BlockItem(TwigsBlocks.BAMBOO_MAT, new FabricItemSettings())); + public static final Item BAMBOO_MAT = register("bamboo_mat", new BlockItem(TwigsBlocks.BAMBOO_MAT, new Item.Properties())); //paper lanterns - public static final Item PAPER_LANTERN = register("paper_lantern", new BlockItem(TwigsBlocks.PAPER_LANTERN, new FabricItemSettings())); - public static final Item ALLIUM_PAPER_LANTERN = register("allium_paper_lantern", new BlockItem(TwigsBlocks.ALLIUM_PAPER_LANTERN, new FabricItemSettings())); - public static final Item BLUE_ORCHID_PAPER_LANTERN = register("blue_orchid_paper_lantern", new BlockItem(TwigsBlocks.BLUE_ORCHID_PAPER_LANTERN, new FabricItemSettings())); - public static final Item CRIMSON_ROOTS_PAPER_LANTERN = register("crimson_roots_paper_lantern", new BlockItem(TwigsBlocks.CRIMSON_ROOTS_PAPER_LANTERN, new FabricItemSettings())); - public static final Item DANDELION_PAPER_LANTERN = register("dandelion_paper_lantern", new BlockItem(TwigsBlocks.DANDELION_PAPER_LANTERN, new FabricItemSettings())); - public static final Item TORCHFLOWER_PAPER_LANTERN = register("torchflower_paper_lantern", new BlockItem(TwigsBlocks.TORCHFLOWER_PAPER_LANTERN, new FabricItemSettings())); + public static final Item PAPER_LANTERN = register("paper_lantern", new BlockItem(TwigsBlocks.PAPER_LANTERN, new Item.Properties())); + public static final Item ALLIUM_PAPER_LANTERN = register("allium_paper_lantern", new BlockItem(TwigsBlocks.ALLIUM_PAPER_LANTERN, new Item.Properties())); + public static final Item BLUE_ORCHID_PAPER_LANTERN = register("blue_orchid_paper_lantern", new BlockItem(TwigsBlocks.BLUE_ORCHID_PAPER_LANTERN, new Item.Properties())); + public static final Item CRIMSON_ROOTS_PAPER_LANTERN = register("crimson_roots_paper_lantern", new BlockItem(TwigsBlocks.CRIMSON_ROOTS_PAPER_LANTERN, new Item.Properties())); + public static final Item DANDELION_PAPER_LANTERN = register("dandelion_paper_lantern", new BlockItem(TwigsBlocks.DANDELION_PAPER_LANTERN, new Item.Properties())); + public static final Item TORCHFLOWER_PAPER_LANTERN = register("torchflower_paper_lantern", new BlockItem(TwigsBlocks.TORCHFLOWER_PAPER_LANTERN, new Item.Properties())); //lamps - public static final Item lAMP = register("lamp", new BlockItem(TwigsBlocks.LAMP, new FabricItemSettings())); - public static final Item SOUL_LAMP = register("soul_lamp", new BlockItem(TwigsBlocks.SOUL_LAMP, new FabricItemSettings())); - public static final Item CRIMSON_SHROOMLAMP = register("crimson_shroomlamp", new BlockItem(TwigsBlocks.CRIMSON_SHROOMLAMP, new FabricItemSettings())); - public static final Item WARPED_SHROOMLAMP = register("warped_shroomlamp", new BlockItem(TwigsBlocks.WARPED_SHROOMLAMP, new FabricItemSettings())); + public static final Item LAMP = register("lamp", new BlockItem(TwigsBlocks.LAMP, new Item.Properties())); + public static final Item SOUL_LAMP = register("soul_lamp", new BlockItem(TwigsBlocks.SOUL_LAMP, new Item.Properties())); + public static final Item CRIMSON_SHROOMLAMP = register("crimson_shroomlamp", new BlockItem(TwigsBlocks.CRIMSON_SHROOMLAMP, new Item.Properties())); + public static final Item WARPED_SHROOMLAMP = register("warped_shroomlamp", new BlockItem(TwigsBlocks.WARPED_SHROOMLAMP, new Item.Properties())); //tables - public static final Item OAK_TABLE = register("oak_table", new BlockItem(TwigsBlocks.OAK_TABLE, new FabricItemSettings())); - public static final Item SPRUCE_TABLE = register("spruce_table", new BlockItem(TwigsBlocks.SPRUCE_TABLE, new FabricItemSettings())); - public static final Item BIRCH_TABLE = register("birch_table", new BlockItem(TwigsBlocks.BIRCH_TABLE, new FabricItemSettings())); - public static final Item JUNGLE_TABLE = register("jungle_table", new BlockItem(TwigsBlocks.JUNGLE_TABLE, new FabricItemSettings())); - public static final Item ACACIA_TABLE = register("acacia_table", new BlockItem(TwigsBlocks.ACACIA_TABLE, new FabricItemSettings())); - public static final Item DARK_OAK_TABLE = register("dark_oak_table", new BlockItem(TwigsBlocks.DARK_OAK_TABLE, new FabricItemSettings())); - public static final Item MANGROVE_TABLE = register("mangrove_table", new BlockItem(TwigsBlocks.MANGROVE_TABLE, new FabricItemSettings())); - public static final Item CHERRY_TABLE = register("cherry_table", new BlockItem(TwigsBlocks.CHERRY_TABLE, new FabricItemSettings())); - public static final Item BAMBOO_TABLE = register("bamboo_table", new BlockItem(TwigsBlocks.BAMBOO_TABLE, new FabricItemSettings())); - public static final Item CRIMSON_TABLE = register("crimson_table", new BlockItem(TwigsBlocks.CRIMSON_TABLE, new FabricItemSettings())); - public static final Item WARPED_TABLE = register("warped_table", new BlockItem(TwigsBlocks.WARPED_TABLE, new FabricItemSettings())); + public static final Item OAK_TABLE = register("oak_table", new BlockItem(TwigsBlocks.OAK_TABLE, new Item.Properties())); + public static final Item SPRUCE_TABLE = register("spruce_table", new BlockItem(TwigsBlocks.SPRUCE_TABLE, new Item.Properties())); + public static final Item BIRCH_TABLE = register("birch_table", new BlockItem(TwigsBlocks.BIRCH_TABLE, new Item.Properties())); + public static final Item JUNGLE_TABLE = register("jungle_table", new BlockItem(TwigsBlocks.JUNGLE_TABLE, new Item.Properties())); + public static final Item ACACIA_TABLE = register("acacia_table", new BlockItem(TwigsBlocks.ACACIA_TABLE, new Item.Properties())); + public static final Item DARK_OAK_TABLE = register("dark_oak_table", new BlockItem(TwigsBlocks.DARK_OAK_TABLE, new Item.Properties())); + public static final Item MANGROVE_TABLE = register("mangrove_table", new BlockItem(TwigsBlocks.MANGROVE_TABLE, new Item.Properties())); + public static final Item CHERRY_TABLE = register("cherry_table", new BlockItem(TwigsBlocks.CHERRY_TABLE, new Item.Properties())); + public static final Item BAMBOO_TABLE = register("bamboo_table", new BlockItem(TwigsBlocks.BAMBOO_TABLE, new Item.Properties())); + public static final Item CRIMSON_TABLE = register("crimson_table", new BlockItem(TwigsBlocks.CRIMSON_TABLE, new Item.Properties())); + public static final Item WARPED_TABLE = register("warped_table", new BlockItem(TwigsBlocks.WARPED_TABLE, new Item.Properties())); //basalt blocks - public static final Item POLISHED_BASALT_BRICKS = register("polished_basalt_bricks", new BlockItem(TwigsBlocks.POLISHED_BASALT_BRICKS, new FabricItemSettings())); - public static final Item SMOOTH_BASALT_BRICKS = register("smooth_basalt_bricks", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICKS, new FabricItemSettings())); - public static final Item SMOOTH_BASALT_BRICK_STAIRS = register("smooth_basalt_brick_stairs", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_STAIRS, new FabricItemSettings())); - public static final Item SMOOTH_BASALT_BRICK_SLAB = register("smooth_basalt_brick_slab", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_SLAB, new FabricItemSettings())); - public static final Item SMOOTH_BASALT_BRICK_WALL = register("smooth_basalt_brick_wall", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_WALL, new FabricItemSettings())); - public static final Item CHISELED_SMOOTH_BASALT_BRICKS = register("chiseled_smooth_basalt_bricks", new BlockItem(TwigsBlocks.CHISELED_SMOOTH_BASALT_BRICKS, new FabricItemSettings())); + public static final Item POLISHED_BASALT_BRICKS = register("polished_basalt_bricks", new BlockItem(TwigsBlocks.POLISHED_BASALT_BRICKS, new Item.Properties())); + public static final Item SMOOTH_BASALT_BRICKS = register("smooth_basalt_bricks", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICKS, new Item.Properties())); + public static final Item SMOOTH_BASALT_BRICK_STAIRS = register("smooth_basalt_brick_stairs", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_STAIRS, new Item.Properties())); + public static final Item SMOOTH_BASALT_BRICK_SLAB = register("smooth_basalt_brick_slab", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_SLAB, new Item.Properties())); + public static final Item SMOOTH_BASALT_BRICK_WALL = register("smooth_basalt_brick_wall", new BlockItem(TwigsBlocks.SMOOTH_BASALT_BRICK_WALL, new Item.Properties())); + public static final Item CHISELED_SMOOTH_BASALT_BRICKS = register("chiseled_smooth_basalt_bricks", new BlockItem(TwigsBlocks.CHISELED_SMOOTH_BASALT_BRICKS, new Item.Properties())); //bricks - public static final Item MIXED_BRICKS = register("mixed_bricks", new BlockItem(TwigsBlocks.MIXED_BRICKS, new FabricItemSettings())); - public static final Item CHISELED_BRICKS = register("chiseled_bricks", new BlockItem(TwigsBlocks.CHISELED_BRICKS, new FabricItemSettings())); - public static final Item CRACKED_BRICKS = register("cracked_bricks", new BlockItem(TwigsBlocks.CRACKED_BRICKS, new FabricItemSettings())); - public static final Item MOSSY_BRICKS = register("mossy_bricks", new BlockItem(TwigsBlocks.MOSSY_BRICKS, new FabricItemSettings())); - public static final Item MOSSY_BRICK_STAIRS = register("mossy_brick_stairs", new BlockItem(TwigsBlocks.MOSSY_BRICK_STAIRS, new FabricItemSettings())); - public static final Item MOSSY_BRICK_SLAB = register("mossy_brick_slab", new BlockItem(TwigsBlocks.MOSSY_BRICK_SLAB, new FabricItemSettings())); - public static final Item MOSSY_BRICK_WALL = register("mossy_brick_wall", new BlockItem(TwigsBlocks.MOSSY_BRICK_WALL, new FabricItemSettings())); - public static final Item BRICK_TRAIL = register("brick_trail", new BlockItem(TwigsBlocks.BRICK_TRAIL, new FabricItemSettings())); + public static final Item MIXED_BRICKS = register("mixed_bricks", new BlockItem(TwigsBlocks.MIXED_BRICKS, new Item.Properties())); + public static final Item CHISELED_BRICKS = register("chiseled_bricks", new BlockItem(TwigsBlocks.CHISELED_BRICKS, new Item.Properties())); + public static final Item CRACKED_BRICKS = register("cracked_bricks", new BlockItem(TwigsBlocks.CRACKED_BRICKS, new Item.Properties())); + public static final Item MOSSY_BRICKS = register("mossy_bricks", new BlockItem(TwigsBlocks.MOSSY_BRICKS, new Item.Properties())); + public static final Item MOSSY_BRICK_STAIRS = register("mossy_brick_stairs", new BlockItem(TwigsBlocks.MOSSY_BRICK_STAIRS, new Item.Properties())); + public static final Item MOSSY_BRICK_SLAB = register("mossy_brick_slab", new BlockItem(TwigsBlocks.MOSSY_BRICK_SLAB, new Item.Properties())); + public static final Item MOSSY_BRICK_WALL = register("mossy_brick_wall", new BlockItem(TwigsBlocks.MOSSY_BRICK_WALL, new Item.Properties())); + public static final Item BRICK_TRAIL = register("brick_trail", new BlockItem(TwigsBlocks.BRICK_TRAIL, new Item.Properties())); //gravel bricks - public static final Item GRAVEL_BRICKS = register("gravel_bricks", new BlockItem(TwigsBlocks.GRAVEL_BRICKS, new FabricItemSettings())); - public static final Item GRAVEL_BRICK_STAIRS = register("gravel_brick_stairs", new BlockItem(TwigsBlocks.GRAVEL_BRICK_STAIRS, new FabricItemSettings())); - public static final Item GRAVEL_BRICK_SLAB = register("gravel_brick_slab", new BlockItem(TwigsBlocks.GRAVEL_BRICK_SLAB, new FabricItemSettings())); - public static final Item GRAVEL_BRICK_WALL = register("gravel_brick_wall", new BlockItem(TwigsBlocks.GRAVEL_BRICK_WALL, new FabricItemSettings())); + public static final Item GRAVEL_BRICKS = register("gravel_bricks", new BlockItem(TwigsBlocks.GRAVEL_BRICKS, new Item.Properties())); + public static final Item GRAVEL_BRICK_STAIRS = register("gravel_brick_stairs", new BlockItem(TwigsBlocks.GRAVEL_BRICK_STAIRS, new Item.Properties())); + public static final Item GRAVEL_BRICK_SLAB = register("gravel_brick_slab", new BlockItem(TwigsBlocks.GRAVEL_BRICK_SLAB, new Item.Properties())); + public static final Item GRAVEL_BRICK_WALL = register("gravel_brick_wall", new BlockItem(TwigsBlocks.GRAVEL_BRICK_WALL, new Item.Properties())); //smooth stone bricks - public static final Item SMOOTH_STONE_BRICKS = register("smooth_stone_bricks", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICKS, new FabricItemSettings())); - public static final Item SMOOTH_STONE_BRICK_STAIRS = register("smooth_stone_brick_stairs", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item SMOOTH_STONE_BRICK_SLAB = register("smooth_stone_brick_slab", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item SMOOTH_STONE_BRICK_WALL = register("smooth_stone_brick_wall", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_WALL, new FabricItemSettings())); + public static final Item SMOOTH_STONE_BRICKS = register("smooth_stone_bricks", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICKS, new Item.Properties())); + public static final Item SMOOTH_STONE_BRICK_STAIRS = register("smooth_stone_brick_stairs", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_STAIRS, new Item.Properties())); + public static final Item SMOOTH_STONE_BRICK_SLAB = register("smooth_stone_brick_slab", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_SLAB, new Item.Properties())); + public static final Item SMOOTH_STONE_BRICK_WALL = register("smooth_stone_brick_wall", new BlockItem(TwigsBlocks.SMOOTH_STONE_BRICK_WALL, new Item.Properties())); //columns - public static final Item QUARTZ_COLUMN = register("quartz_column", new BlockItem(TwigsBlocks.QUARTZ_COLUMN, new FabricItemSettings())); - public static final Item STONE_COLUMN = register("stone_column", new BlockItem(TwigsBlocks.STONE_COLUMN, new FabricItemSettings())); - public static final Item DEEPSLATE_COLUMN = register("deepslate_column", new BlockItem(TwigsBlocks.DEEPSLATE_COLUMN, new FabricItemSettings())); - public static final Item BLACKSTONE_COLUMN = register("blackstone_column", new BlockItem(TwigsBlocks.BLACKSTONE_COLUMN, new FabricItemSettings())); + public static final Item QUARTZ_COLUMN = register("quartz_column", new BlockItem(TwigsBlocks.QUARTZ_COLUMN, new Item.Properties())); + public static final Item STONE_COLUMN = register("stone_column", new BlockItem(TwigsBlocks.STONE_COLUMN, new Item.Properties())); + public static final Item DEEPSLATE_COLUMN = register("deepslate_column", new BlockItem(TwigsBlocks.DEEPSLATE_COLUMN, new Item.Properties())); + public static final Item BLACKSTONE_COLUMN = register("blackstone_column", new BlockItem(TwigsBlocks.BLACKSTONE_COLUMN, new Item.Properties())); //copper pillars - public static final Item COPPER_PILLAR = register("copper_pillar", new BlockItem(TwigsBlocks.COPPER_PILLAR, new FabricItemSettings())); - public static final Item EXPOSED_COPPER_PILLAR = register("exposed_copper_pillar", new BlockItem(TwigsBlocks.EXPOSED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item WEATHERED_COPPER_PILLAR = register("weathered_copper_pillar", new BlockItem(TwigsBlocks.WEATHERED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item OXIDIZED_COPPER_PILLAR = register("oxidized_copper_pillar", new BlockItem(TwigsBlocks.OXIDIZED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item WAXED_COPPER_PILLAR = register("waxed_copper_pillar", new BlockItem(TwigsBlocks.WAXED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item WAXED_EXPOSED_COPPER_PILLAR = register("waxed_exposed_copper_pillar", new BlockItem(TwigsBlocks.WAXED_EXPOSED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item WAXED_WEATHERED_COPPER_PILLAR = register("waxed_weathered_copper_pillar", new BlockItem(TwigsBlocks.WAXED_WEATHERED_COPPER_PILLAR, new FabricItemSettings())); - public static final Item WAXED_OXIDIZED_COPPER_PILLAR = register("waxed_oxidized_copper_pillar", new BlockItem(TwigsBlocks.WAXED_OXIDIZED_COPPER_PILLAR, new FabricItemSettings())); + public static final Item COPPER_PILLAR = register("copper_pillar", new BlockItem(TwigsBlocks.COPPER_PILLAR, new Item.Properties())); + public static final Item EXPOSED_COPPER_PILLAR = register("exposed_copper_pillar", new BlockItem(TwigsBlocks.EXPOSED_COPPER_PILLAR, new Item.Properties())); + public static final Item WEATHERED_COPPER_PILLAR = register("weathered_copper_pillar", new BlockItem(TwigsBlocks.WEATHERED_COPPER_PILLAR, new Item.Properties())); + public static final Item OXIDIZED_COPPER_PILLAR = register("oxidized_copper_pillar", new BlockItem(TwigsBlocks.OXIDIZED_COPPER_PILLAR, new Item.Properties())); + public static final Item WAXED_COPPER_PILLAR = register("waxed_copper_pillar", new BlockItem(TwigsBlocks.WAXED_COPPER_PILLAR, new Item.Properties())); + public static final Item WAXED_EXPOSED_COPPER_PILLAR = register("waxed_exposed_copper_pillar", new BlockItem(TwigsBlocks.WAXED_EXPOSED_COPPER_PILLAR, new Item.Properties())); + public static final Item WAXED_WEATHERED_COPPER_PILLAR = register("waxed_weathered_copper_pillar", new BlockItem(TwigsBlocks.WAXED_WEATHERED_COPPER_PILLAR, new Item.Properties())); + public static final Item WAXED_OXIDIZED_COPPER_PILLAR = register("waxed_oxidized_copper_pillar", new BlockItem(TwigsBlocks.WAXED_OXIDIZED_COPPER_PILLAR, new Item.Properties())); //amethyst blocks - public static final Item POLISHED_AMETHYST = register("polished_amethyst", new BlockItem(TwigsBlocks.POLISHED_AMETHYST, new FabricItemSettings())); - public static final Item CUT_AMETHYST = register("cut_amethyst", new BlockItem(TwigsBlocks.CUT_AMETHYST, new FabricItemSettings())); + public static final Item POLISHED_AMETHYST = register("polished_amethyst", new BlockItem(TwigsBlocks.POLISHED_AMETHYST, new Item.Properties())); + public static final Item CUT_AMETHYST = register("cut_amethyst", new BlockItem(TwigsBlocks.CUT_AMETHYST, new Item.Properties())); //misc public static final Item PETRIFIED_LICHEN = register("petrified_lichen", new BlockItem(TwigsBlocks.PETRIFIED_LICHEN, new Item.Properties())); - public static final Item COMPACTED_DRIPSTONE = register("compacted_dripstone", new BlockItem(TwigsBlocks.COMPACTED_DRIPSTONE, new FabricItemSettings())); - public static final Item ROCKY_DIRT = register("rocky_dirt", new BlockItem(TwigsBlocks.ROCKY_DIRT, new FabricItemSettings())); + public static final Item COMPACTED_DRIPSTONE = register("compacted_dripstone", new BlockItem(TwigsBlocks.COMPACTED_DRIPSTONE, new Item.Properties())); + public static final Item ROCKY_DIRT = register("rocky_dirt", new BlockItem(TwigsBlocks.ROCKY_DIRT, new Item.Properties())); //cobblestone bricks - public static final Item COBBLESTONE_BRICKS = register("cobblestone_bricks", new BlockItem(TwigsBlocks.COBBLESTONE_BRICKS, new FabricItemSettings())); - public static final Item COBBLESTONE_BRICK_STAIRS = register("cobblestone_brick_stairs", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item COBBLESTONE_BRICK_SLAB = register("cobblestone_brick_slab", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item COBBLESTONE_BRICK_WALL = register("cobblestone_brick_wall", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_COBBLESTONE_BRICKS = register("cracked_cobblestone_bricks", new BlockItem(TwigsBlocks.CRACKED_COBBLESTONE_BRICKS, new FabricItemSettings())); - public static final Item MOSSY_COBBLESTONE_BRICKS = register("mossy_cobblestone_bricks", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICKS, new FabricItemSettings())); - public static final Item MOSSY_COBBLESTONE_BRICK_STAIRS = register("mossy_cobblestone_brick_stairs", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item MOSSY_COBBLESTONE_BRICK_SLAB = register("mossy_cobblestone_brick_slab", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item MOSSY_COBBLESTONE_BRICK_WALL = register("mossy_cobblestone_brick_wall", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_WALL, new FabricItemSettings())); + public static final Item COBBLESTONE_BRICKS = register("cobblestone_bricks", new BlockItem(TwigsBlocks.COBBLESTONE_BRICKS, new Item.Properties())); + public static final Item COBBLESTONE_BRICK_STAIRS = register("cobblestone_brick_stairs", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_STAIRS, new Item.Properties())); + public static final Item COBBLESTONE_BRICK_SLAB = register("cobblestone_brick_slab", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_SLAB, new Item.Properties())); + public static final Item COBBLESTONE_BRICK_WALL = register("cobblestone_brick_wall", new BlockItem(TwigsBlocks.COBBLESTONE_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_COBBLESTONE_BRICKS = register("cracked_cobblestone_bricks", new BlockItem(TwigsBlocks.CRACKED_COBBLESTONE_BRICKS, new Item.Properties())); + public static final Item MOSSY_COBBLESTONE_BRICKS = register("mossy_cobblestone_bricks", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICKS, new Item.Properties())); + public static final Item MOSSY_COBBLESTONE_BRICK_STAIRS = register("mossy_cobblestone_brick_stairs", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_STAIRS, new Item.Properties())); + public static final Item MOSSY_COBBLESTONE_BRICK_SLAB = register("mossy_cobblestone_brick_slab", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_SLAB, new Item.Properties())); + public static final Item MOSSY_COBBLESTONE_BRICK_WALL = register("mossy_cobblestone_brick_wall", new BlockItem(TwigsBlocks.MOSSY_COBBLESTONE_BRICK_WALL, new Item.Properties())); //decorated blackstone bricks - public static final Item TWISTING_POLISHED_BLACKSTONE_BRICKS = register("twisting_polished_blackstone_bricks", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICKS, new FabricItemSettings())); - public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("twisting_polished_blackstone_brick_stairs", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB = register("twisting_polished_blackstone_brick_slab", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_WALL = register("twisting_polished_blackstone_brick_wall", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_WALL, new FabricItemSettings())); - public static final Item WEEPING_POLISHED_BLACKSTONE_BRICKS = register("weeping_polished_blackstone_bricks", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICKS, new FabricItemSettings())); - public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("weeping_polished_blackstone_brick_stairs", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB = register("weeping_polished_blackstone_brick_slab", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_WALL = register("weeping_polished_blackstone_brick_wall", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_WALL, new FabricItemSettings())); + public static final Item TWISTING_POLISHED_BLACKSTONE_BRICKS = register("twisting_polished_blackstone_bricks", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICKS, new Item.Properties())); + public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("twisting_polished_blackstone_brick_stairs", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_STAIRS, new Item.Properties())); + public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB = register("twisting_polished_blackstone_brick_slab", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_SLAB, new Item.Properties())); + public static final Item TWISTING_POLISHED_BLACKSTONE_BRICK_WALL = register("twisting_polished_blackstone_brick_wall", new BlockItem(TwigsBlocks.TWISTING_POLISHED_BLACKSTONE_BRICK_WALL, new Item.Properties())); + public static final Item WEEPING_POLISHED_BLACKSTONE_BRICKS = register("weeping_polished_blackstone_bricks", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICKS, new Item.Properties())); + public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS = register("weeping_polished_blackstone_brick_stairs", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_STAIRS, new Item.Properties())); + public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB = register("weeping_polished_blackstone_brick_slab", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_SLAB, new Item.Properties())); + public static final Item WEEPING_POLISHED_BLACKSTONE_BRICK_WALL = register("weeping_polished_blackstone_brick_wall", new BlockItem(TwigsBlocks.WEEPING_POLISHED_BLACKSTONE_BRICK_WALL, new Item.Properties())); //tuff blocks - public static final Item TUFF_STAIRS = register("tuff_stairs", new BlockItem(TwigsBlocks.TUFF_STAIRS, new FabricItemSettings())); - public static final Item TUFF_SLAB = register("tuff_slab", new BlockItem(TwigsBlocks.TUFF_SLAB, new FabricItemSettings())); - public static final Item TUFF_WALL = register("tuff_wall", new BlockItem(TwigsBlocks.TUFF_WALL, new FabricItemSettings())); - public static final Item POLISHED_TUFF = register("polished_tuff", new BlockItem(TwigsBlocks.POLISHED_TUFF, new FabricItemSettings())); - public static final Item POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new BlockItem(TwigsBlocks.POLISHED_TUFF_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_TUFF_SLAB = register("polished_tuff_slab", new BlockItem(TwigsBlocks.POLISHED_TUFF_SLAB, new FabricItemSettings())); - public static final Item POLISHED_TUFF_BRICKS = register("polished_tuff_bricks", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICKS, new FabricItemSettings())); - public static final Item POLISHED_TUFF_BRICK_STAIRS = register("polished_tuff_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_TUFF_BRICK_SLAB = register("polished_tuff_brick_slab", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_SLAB, new FabricItemSettings())); - public static final Item POLISHED_TUFF_BRICK_WALL = register("polished_tuff_brick_wall", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_POLISHED_TUFF_BRICKS = register("cracked_polished_tuff_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_TUFF_BRICKS, new FabricItemSettings())); + public static final Item TUFF_STAIRS = register("tuff_stairs", new BlockItem(TwigsBlocks.TUFF_STAIRS, new Item.Properties())); + public static final Item TUFF_SLAB = register("tuff_slab", new BlockItem(TwigsBlocks.TUFF_SLAB, new Item.Properties())); + public static final Item TUFF_WALL = register("tuff_wall", new BlockItem(TwigsBlocks.TUFF_WALL, new Item.Properties())); + public static final Item POLISHED_TUFF = register("polished_tuff", new BlockItem(TwigsBlocks.POLISHED_TUFF, new Item.Properties())); + public static final Item POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new BlockItem(TwigsBlocks.POLISHED_TUFF_STAIRS, new Item.Properties())); + public static final Item POLISHED_TUFF_SLAB = register("polished_tuff_slab", new BlockItem(TwigsBlocks.POLISHED_TUFF_SLAB, new Item.Properties())); + public static final Item POLISHED_TUFF_BRICKS = register("polished_tuff_bricks", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICKS, new Item.Properties())); + public static final Item POLISHED_TUFF_BRICK_STAIRS = register("polished_tuff_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_STAIRS, new Item.Properties())); + public static final Item POLISHED_TUFF_BRICK_SLAB = register("polished_tuff_brick_slab", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_SLAB, new Item.Properties())); + public static final Item POLISHED_TUFF_BRICK_WALL = register("polished_tuff_brick_wall", new BlockItem(TwigsBlocks.POLISHED_TUFF_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_POLISHED_TUFF_BRICKS = register("cracked_polished_tuff_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_TUFF_BRICKS, new Item.Properties())); //calcite blocks - public static final Item CALCITE_STAIRS = register("calcite_stairs", new BlockItem(TwigsBlocks.CALCITE_STAIRS, new FabricItemSettings())); - public static final Item CALCITE_SLAB = register("calcite_slab", new BlockItem(TwigsBlocks.CALCITE_SLAB, new FabricItemSettings())); - public static final Item CALCITE_WALL = register("calcite_wall", new BlockItem(TwigsBlocks.CALCITE_WALL, new FabricItemSettings())); - public static final Item POLISHED_CALCITE = register("polished_calcite", new BlockItem(TwigsBlocks.POLISHED_CALCITE, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_STAIRS = register("polished_calcite_stairs", new BlockItem(TwigsBlocks.POLISHED_CALCITE_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_SLAB = register("polished_calcite_slab", new BlockItem(TwigsBlocks.POLISHED_CALCITE_SLAB, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_BRICKS = register("polished_calcite_bricks", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICKS, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_BRICK_STAIRS = register("polished_calcite_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_BRICK_SLAB = register("polished_calcite_brick_slab", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_SLAB, new FabricItemSettings())); - public static final Item POLISHED_CALCITE_BRICK_WALL = register("polished_calcite_brick_wall", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_POLISHED_CALCITE_BRICKS = register("cracked_polished_calcite_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_CALCITE_BRICKS, new FabricItemSettings())); + public static final Item CALCITE_STAIRS = register("calcite_stairs", new BlockItem(TwigsBlocks.CALCITE_STAIRS, new Item.Properties())); + public static final Item CALCITE_SLAB = register("calcite_slab", new BlockItem(TwigsBlocks.CALCITE_SLAB, new Item.Properties())); + public static final Item CALCITE_WALL = register("calcite_wall", new BlockItem(TwigsBlocks.CALCITE_WALL, new Item.Properties())); + public static final Item POLISHED_CALCITE = register("polished_calcite", new BlockItem(TwigsBlocks.POLISHED_CALCITE, new Item.Properties())); + public static final Item POLISHED_CALCITE_STAIRS = register("polished_calcite_stairs", new BlockItem(TwigsBlocks.POLISHED_CALCITE_STAIRS, new Item.Properties())); + public static final Item POLISHED_CALCITE_SLAB = register("polished_calcite_slab", new BlockItem(TwigsBlocks.POLISHED_CALCITE_SLAB, new Item.Properties())); + public static final Item POLISHED_CALCITE_BRICKS = register("polished_calcite_bricks", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICKS, new Item.Properties())); + public static final Item POLISHED_CALCITE_BRICK_STAIRS = register("polished_calcite_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_STAIRS, new Item.Properties())); + public static final Item POLISHED_CALCITE_BRICK_SLAB = register("polished_calcite_brick_slab", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_SLAB, new Item.Properties())); + public static final Item POLISHED_CALCITE_BRICK_WALL = register("polished_calcite_brick_wall", new BlockItem(TwigsBlocks.POLISHED_CALCITE_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_POLISHED_CALCITE_BRICKS = register("cracked_polished_calcite_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_CALCITE_BRICKS, new Item.Properties())); //schist blocks - public static final Item SCHIST = register("schist", new BlockItem(TwigsBlocks.SCHIST, new FabricItemSettings())); - public static final Item SCHIST_STAIRS = register("schist_stairs", new BlockItem(TwigsBlocks.SCHIST_STAIRS, new FabricItemSettings())); - public static final Item SCHIST_SLAB = register("schist_slab", new BlockItem(TwigsBlocks.SCHIST_SLAB, new FabricItemSettings())); - public static final Item SCHIST_WALL = register("schist_wall", new BlockItem(TwigsBlocks.SCHIST_WALL, new FabricItemSettings())); - public static final Item POLISHED_SCHIST = register("polished_schist", new BlockItem(TwigsBlocks.POLISHED_SCHIST, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_STAIRS = register("polished_schist_stairs", new BlockItem(TwigsBlocks.POLISHED_SCHIST_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_SLAB = register("polished_schist_slab", new BlockItem(TwigsBlocks.POLISHED_SCHIST_SLAB, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_BRICKS = register("polished_schist_bricks", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICKS, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_BRICK_STAIRS = register("polished_schist_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_BRICK_SLAB = register("polished_schist_brick_slab", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_SLAB, new FabricItemSettings())); - public static final Item POLISHED_SCHIST_BRICK_WALL = register("polished_schist_brick_wall", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_POLISHED_SCHIST_BRICKS = register("cracked_polished_schist_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_SCHIST_BRICKS, new FabricItemSettings())); + public static final Item SCHIST = register("schist", new BlockItem(TwigsBlocks.SCHIST, new Item.Properties())); + public static final Item SCHIST_STAIRS = register("schist_stairs", new BlockItem(TwigsBlocks.SCHIST_STAIRS, new Item.Properties())); + public static final Item SCHIST_SLAB = register("schist_slab", new BlockItem(TwigsBlocks.SCHIST_SLAB, new Item.Properties())); + public static final Item SCHIST_WALL = register("schist_wall", new BlockItem(TwigsBlocks.SCHIST_WALL, new Item.Properties())); + public static final Item POLISHED_SCHIST = register("polished_schist", new BlockItem(TwigsBlocks.POLISHED_SCHIST, new Item.Properties())); + public static final Item POLISHED_SCHIST_STAIRS = register("polished_schist_stairs", new BlockItem(TwigsBlocks.POLISHED_SCHIST_STAIRS, new Item.Properties())); + public static final Item POLISHED_SCHIST_SLAB = register("polished_schist_slab", new BlockItem(TwigsBlocks.POLISHED_SCHIST_SLAB, new Item.Properties())); + public static final Item POLISHED_SCHIST_BRICKS = register("polished_schist_bricks", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICKS, new Item.Properties())); + public static final Item POLISHED_SCHIST_BRICK_STAIRS = register("polished_schist_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_STAIRS, new Item.Properties())); + public static final Item POLISHED_SCHIST_BRICK_SLAB = register("polished_schist_brick_slab", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_SLAB, new Item.Properties())); + public static final Item POLISHED_SCHIST_BRICK_WALL = register("polished_schist_brick_wall", new BlockItem(TwigsBlocks.POLISHED_SCHIST_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_POLISHED_SCHIST_BRICKS = register("cracked_polished_schist_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_SCHIST_BRICKS, new Item.Properties())); //rhyolite blocks - public static final Item RHYOLITE = register("rhyolite", new BlockItem(TwigsBlocks.RHYOLITE, new FabricItemSettings())); - public static final Item RHYOLITE_STAIRS = register("rhyolite_stairs", new BlockItem(TwigsBlocks.RHYOLITE_STAIRS, new FabricItemSettings())); - public static final Item RHYOLITE_SLAB = register("rhyolite_slab", new BlockItem(TwigsBlocks.RHYOLITE_SLAB, new FabricItemSettings())); - public static final Item RHYOLITE_WALL = register("rhyolite_wall", new BlockItem(TwigsBlocks.RHYOLITE_WALL, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE = register("polished_rhyolite", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_STAIRS = register("polished_rhyolite_stairs", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_SLAB = register("polished_rhyolite_slab", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_SLAB, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_BRICKS = register("polished_rhyolite_bricks", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICKS, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_BRICK_STAIRS = register("polished_rhyolite_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_BRICK_SLAB = register("polished_rhyolite_brick_slab", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_SLAB, new FabricItemSettings())); - public static final Item POLISHED_RHYOLITE_BRICK_WALL = register("polished_rhyolite_brick_wall", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_POLISHED_RHYOLITE_BRICKS = register("cracked_polished_rhyolite_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_RHYOLITE_BRICKS, new FabricItemSettings())); + public static final Item RHYOLITE = register("rhyolite", new BlockItem(TwigsBlocks.RHYOLITE, new Item.Properties())); + public static final Item RHYOLITE_STAIRS = register("rhyolite_stairs", new BlockItem(TwigsBlocks.RHYOLITE_STAIRS, new Item.Properties())); + public static final Item RHYOLITE_SLAB = register("rhyolite_slab", new BlockItem(TwigsBlocks.RHYOLITE_SLAB, new Item.Properties())); + public static final Item RHYOLITE_WALL = register("rhyolite_wall", new BlockItem(TwigsBlocks.RHYOLITE_WALL, new Item.Properties())); + public static final Item POLISHED_RHYOLITE = register("polished_rhyolite", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_STAIRS = register("polished_rhyolite_stairs", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_STAIRS, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_SLAB = register("polished_rhyolite_slab", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_SLAB, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_BRICKS = register("polished_rhyolite_bricks", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICKS, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_BRICK_STAIRS = register("polished_rhyolite_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_STAIRS, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_BRICK_SLAB = register("polished_rhyolite_brick_slab", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_SLAB, new Item.Properties())); + public static final Item POLISHED_RHYOLITE_BRICK_WALL = register("polished_rhyolite_brick_wall", new BlockItem(TwigsBlocks.POLISHED_RHYOLITE_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_POLISHED_RHYOLITE_BRICKS = register("cracked_polished_rhyolite_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_RHYOLITE_BRICKS, new Item.Properties())); //bloodstone blocks - public static final Item BLOODSTONE = register("bloodstone", new BlockItem(TwigsBlocks.BLOODSTONE, new FabricItemSettings())); - public static final Item BLOODSTONE_STAIRS = register("bloodstone_stairs", new BlockItem(TwigsBlocks.BLOODSTONE_STAIRS, new FabricItemSettings())); - public static final Item BLOODSTONE_SLAB = register("bloodstone_slab", new BlockItem(TwigsBlocks.BLOODSTONE_SLAB, new FabricItemSettings())); - public static final Item BLOODSTONE_WALL = register("bloodstone_wall", new BlockItem(TwigsBlocks.BLOODSTONE_WALL, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE = register("polished_bloodstone", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_STAIRS = register("polished_bloodstone_stairs", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_SLAB = register("polished_bloodstone_slab", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_SLAB, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_BRICKS = register("polished_bloodstone_bricks", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICKS, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_BRICK_STAIRS = register("polished_bloodstone_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_BRICK_SLAB = register("polished_bloodstone_brick_slab", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_SLAB, new FabricItemSettings())); - public static final Item POLISHED_BLOODSTONE_BRICK_WALL = register("polished_bloodstone_brick_wall", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_POLISHED_BLOODSTONE_BRICKS = register("cracked_polished_bloodstone_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_BLOODSTONE_BRICKS, new FabricItemSettings())); + public static final Item BLOODSTONE = register("bloodstone", new BlockItem(TwigsBlocks.BLOODSTONE, new Item.Properties())); + public static final Item BLOODSTONE_STAIRS = register("bloodstone_stairs", new BlockItem(TwigsBlocks.BLOODSTONE_STAIRS, new Item.Properties())); + public static final Item BLOODSTONE_SLAB = register("bloodstone_slab", new BlockItem(TwigsBlocks.BLOODSTONE_SLAB, new Item.Properties())); + public static final Item BLOODSTONE_WALL = register("bloodstone_wall", new BlockItem(TwigsBlocks.BLOODSTONE_WALL, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE = register("polished_bloodstone", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_STAIRS = register("polished_bloodstone_stairs", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_STAIRS, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_SLAB = register("polished_bloodstone_slab", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_SLAB, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_BRICKS = register("polished_bloodstone_bricks", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICKS, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_BRICK_STAIRS = register("polished_bloodstone_brick_stairs", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_STAIRS, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_BRICK_SLAB = register("polished_bloodstone_brick_slab", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_SLAB, new Item.Properties())); + public static final Item POLISHED_BLOODSTONE_BRICK_WALL = register("polished_bloodstone_brick_wall", new BlockItem(TwigsBlocks.POLISHED_BLOODSTONE_BRICK_WALL, new Item.Properties())); + public static final Item CRACKED_POLISHED_BLOODSTONE_BRICKS = register("cracked_polished_bloodstone_bricks", new BlockItem(TwigsBlocks.CRACKED_POLISHED_BLOODSTONE_BRICKS, new Item.Properties())); //silt blocks - public static final Item SILT = register("silt", new BlockItem(TwigsBlocks.SILT, new FabricItemSettings())); - public static final Item SILT_BALL = register("silt_ball", new Item(new FabricItemSettings())); - public static final Item SILT_BRICK = register("silt_brick", new Item(new FabricItemSettings())); - public static final Item SILT_BRICKS = register("silt_bricks", new BlockItem(TwigsBlocks.SILT_BRICKS, new FabricItemSettings())); - public static final Item SILT_BRICK_STAIRS = register("silt_brick_stairs", new BlockItem(TwigsBlocks.SILT_BRICK_STAIRS, new FabricItemSettings())); - public static final Item SILT_BRICK_SLAB = register("silt_brick_slab", new BlockItem(TwigsBlocks.SILT_BRICK_SLAB, new FabricItemSettings())); - public static final Item SILT_BRICK_WALL = register("silt_brick_wall", new BlockItem(TwigsBlocks.SILT_BRICK_WALL, new FabricItemSettings())); - public static final Item MIXED_SILT_BRICKS = register("mixed_silt_bricks", new BlockItem(TwigsBlocks.MIXED_SILT_BRICKS, new FabricItemSettings())); - public static final Item CHISELED_SILT_BRICKS = register("chiseled_silt_bricks", new BlockItem(TwigsBlocks.CHISELED_SILT_BRICKS, new FabricItemSettings())); - public static final Item CRACKED_SILT_BRICKS = register("cracked_silt_bricks", new BlockItem(TwigsBlocks.CRACKED_SILT_BRICKS, new FabricItemSettings())); - public static final Item SILT_BRICK_TRAIL = register("silt_brick_trail", new BlockItem(TwigsBlocks.SILT_BRICK_TRAIL, new FabricItemSettings())); + public static final Item SILT = register("silt", new BlockItem(TwigsBlocks.SILT, new Item.Properties())); + public static final Item SILT_BALL = register("silt_ball", new Item(new Item.Properties())); + public static final Item SILT_BRICK = register("silt_brick", new Item(new Item.Properties())); + public static final Item SILT_BRICKS = register("silt_bricks", new BlockItem(TwigsBlocks.SILT_BRICKS, new Item.Properties())); + public static final Item SILT_BRICK_STAIRS = register("silt_brick_stairs", new BlockItem(TwigsBlocks.SILT_BRICK_STAIRS, new Item.Properties())); + public static final Item SILT_BRICK_SLAB = register("silt_brick_slab", new BlockItem(TwigsBlocks.SILT_BRICK_SLAB, new Item.Properties())); + public static final Item SILT_BRICK_WALL = register("silt_brick_wall", new BlockItem(TwigsBlocks.SILT_BRICK_WALL, new Item.Properties())); + public static final Item MIXED_SILT_BRICKS = register("mixed_silt_bricks", new BlockItem(TwigsBlocks.MIXED_SILT_BRICKS, new Item.Properties())); + public static final Item CHISELED_SILT_BRICKS = register("chiseled_silt_bricks", new BlockItem(TwigsBlocks.CHISELED_SILT_BRICKS, new Item.Properties())); + public static final Item CRACKED_SILT_BRICKS = register("cracked_silt_bricks", new BlockItem(TwigsBlocks.CRACKED_SILT_BRICKS, new Item.Properties())); + public static final Item SILT_BRICK_TRAIL = register("silt_brick_trail", new BlockItem(TwigsBlocks.SILT_BRICK_TRAIL, new Item.Properties())); - public static final Item SILT_POT = register("silt_pot", new BlockItem(TwigsBlocks.SILT_POT, new FabricItemSettings())); - public static final Item WHITE_SILT_POT = register("white_silt_pot", new BlockItem(TwigsBlocks.WHITE_SILT_POT, new FabricItemSettings())); - public static final Item ORANGE_SILT_POT = register("orange_silt_pot", new BlockItem(TwigsBlocks.ORANGE_SILT_POT, new FabricItemSettings())); - public static final Item MAGENTA_SILT_POT = register("magenta_silt_pot", new BlockItem(TwigsBlocks.MAGENTA_SILT_POT, new FabricItemSettings())); - public static final Item LIGHT_BLUE_SILT_POT = register("light_blue_silt_pot", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_POT, new FabricItemSettings())); - public static final Item YELLOW_SILT_POT = register("yellow_silt_pot", new BlockItem(TwigsBlocks.YELLOW_SILT_POT, new FabricItemSettings())); - public static final Item LIME_SILT_POT = register("lime_silt_pot", new BlockItem(TwigsBlocks.LIME_SILT_POT, new FabricItemSettings())); - public static final Item PINK_SILT_POT = register("pink_silt_pot", new BlockItem(TwigsBlocks.PINK_SILT_POT, new FabricItemSettings())); - public static final Item GRAY_SILT_POT = register("gray_silt_pot", new BlockItem(TwigsBlocks.GRAY_SILT_POT, new FabricItemSettings())); - public static final Item LIGHT_GRAY_SILT_POT = register("light_gray_silt_pot", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_POT, new FabricItemSettings())); - public static final Item CYAN_SILT_POT = register("cyan_silt_pot", new BlockItem(TwigsBlocks.CYAN_SILT_POT, new FabricItemSettings())); - public static final Item PURPLE_SILT_POT = register("purple_silt_pot", new BlockItem(TwigsBlocks.PURPLE_SILT_POT, new FabricItemSettings())); - public static final Item BLUE_SILT_POT = register("blue_silt_pot", new BlockItem(TwigsBlocks.BLUE_SILT_POT, new FabricItemSettings())); - public static final Item BROWN_SILT_POT = register("brown_silt_pot", new BlockItem(TwigsBlocks.BROWN_SILT_POT, new FabricItemSettings())); - public static final Item GREEN_SILT_POT = register("green_silt_pot", new BlockItem(TwigsBlocks.GREEN_SILT_POT, new FabricItemSettings())); - public static final Item RED_SILT_POT = register("red_silt_pot", new BlockItem(TwigsBlocks.RED_SILT_POT, new FabricItemSettings())); - public static final Item BLACK_SILT_POT = register("black_silt_pot", new BlockItem(TwigsBlocks.BLACK_SILT_POT, new FabricItemSettings())); + public static final Item SILT_POT = register("silt_pot", new BlockItem(TwigsBlocks.SILT_POT, new Item.Properties())); + public static final Item WHITE_SILT_POT = register("white_silt_pot", new BlockItem(TwigsBlocks.WHITE_SILT_POT, new Item.Properties())); + public static final Item ORANGE_SILT_POT = register("orange_silt_pot", new BlockItem(TwigsBlocks.ORANGE_SILT_POT, new Item.Properties())); + public static final Item MAGENTA_SILT_POT = register("magenta_silt_pot", new BlockItem(TwigsBlocks.MAGENTA_SILT_POT, new Item.Properties())); + public static final Item LIGHT_BLUE_SILT_POT = register("light_blue_silt_pot", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_POT, new Item.Properties())); + public static final Item YELLOW_SILT_POT = register("yellow_silt_pot", new BlockItem(TwigsBlocks.YELLOW_SILT_POT, new Item.Properties())); + public static final Item LIME_SILT_POT = register("lime_silt_pot", new BlockItem(TwigsBlocks.LIME_SILT_POT, new Item.Properties())); + public static final Item PINK_SILT_POT = register("pink_silt_pot", new BlockItem(TwigsBlocks.PINK_SILT_POT, new Item.Properties())); + public static final Item GRAY_SILT_POT = register("gray_silt_pot", new BlockItem(TwigsBlocks.GRAY_SILT_POT, new Item.Properties())); + public static final Item LIGHT_GRAY_SILT_POT = register("light_gray_silt_pot", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_POT, new Item.Properties())); + public static final Item CYAN_SILT_POT = register("cyan_silt_pot", new BlockItem(TwigsBlocks.CYAN_SILT_POT, new Item.Properties())); + public static final Item PURPLE_SILT_POT = register("purple_silt_pot", new BlockItem(TwigsBlocks.PURPLE_SILT_POT, new Item.Properties())); + public static final Item BLUE_SILT_POT = register("blue_silt_pot", new BlockItem(TwigsBlocks.BLUE_SILT_POT, new Item.Properties())); + public static final Item BROWN_SILT_POT = register("brown_silt_pot", new BlockItem(TwigsBlocks.BROWN_SILT_POT, new Item.Properties())); + public static final Item GREEN_SILT_POT = register("green_silt_pot", new BlockItem(TwigsBlocks.GREEN_SILT_POT, new Item.Properties())); + public static final Item RED_SILT_POT = register("red_silt_pot", new BlockItem(TwigsBlocks.RED_SILT_POT, new Item.Properties())); + public static final Item BLACK_SILT_POT = register("black_silt_pot", new BlockItem(TwigsBlocks.BLACK_SILT_POT, new Item.Properties())); - public static final Item PACKED_SILT = register("packed_silt", new BlockItem(TwigsBlocks.PACKED_SILT, new FabricItemSettings())); - public static final Item WHITE_PACKED_SILT = register("white_packed_silt", new BlockItem(TwigsBlocks.WHITE_PACKED_SILT, new FabricItemSettings())); - public static final Item ORANGE_PACKED_SILT = register("orange_packed_silt", new BlockItem(TwigsBlocks.ORANGE_PACKED_SILT, new FabricItemSettings())); - public static final Item MAGENTA_PACKED_SILT = register("magenta_packed_silt", new BlockItem(TwigsBlocks.MAGENTA_PACKED_SILT, new FabricItemSettings())); - public static final Item LIGHT_BLUE_PACKED_SILT = register("light_blue_packed_silt", new BlockItem(TwigsBlocks.LIGHT_BLUE_PACKED_SILT, new FabricItemSettings())); - public static final Item YELLOW_PACKED_SILT = register("yellow_packed_silt", new BlockItem(TwigsBlocks.YELLOW_PACKED_SILT, new FabricItemSettings())); - public static final Item LIME_PACKED_SILT = register("lime_packed_silt", new BlockItem(TwigsBlocks.LIME_PACKED_SILT, new FabricItemSettings())); - public static final Item PINK_PACKED_SILT = register("pink_packed_silt", new BlockItem(TwigsBlocks.PINK_PACKED_SILT, new FabricItemSettings())); - public static final Item GRAY_PACKED_SILT = register("gray_packed_silt", new BlockItem(TwigsBlocks.GRAY_PACKED_SILT, new FabricItemSettings())); - public static final Item LIGHT_GRAY_PACKED_SILT = register("light_gray_packed_silt", new BlockItem(TwigsBlocks.LIGHT_GRAY_PACKED_SILT, new FabricItemSettings())); - public static final Item CYAN_PACKED_SILT = register("cyan_packed_silt", new BlockItem(TwigsBlocks.CYAN_PACKED_SILT, new FabricItemSettings())); - public static final Item PURPLE_PACKED_SILT = register("purple_packed_silt", new BlockItem(TwigsBlocks.PURPLE_PACKED_SILT, new FabricItemSettings())); - public static final Item BLUE_PACKED_SILT = register("blue_packed_silt", new BlockItem(TwigsBlocks.BLUE_PACKED_SILT, new FabricItemSettings())); - public static final Item BROWN_PACKED_SILT = register("brown_packed_silt", new BlockItem(TwigsBlocks.BROWN_PACKED_SILT, new FabricItemSettings())); - public static final Item GREEN_PACKED_SILT = register("green_packed_silt", new BlockItem(TwigsBlocks.GREEN_PACKED_SILT, new FabricItemSettings())); - public static final Item RED_PACKED_SILT = register("red_packed_silt", new BlockItem(TwigsBlocks.RED_PACKED_SILT, new FabricItemSettings())); - public static final Item BLACK_PACKED_SILT = register("black_packed_silt", new BlockItem(TwigsBlocks.BLACK_PACKED_SILT, new FabricItemSettings())); + public static final Item PACKED_SILT = register("packed_silt", new BlockItem(TwigsBlocks.PACKED_SILT, new Item.Properties())); + public static final Item WHITE_PACKED_SILT = register("white_packed_silt", new BlockItem(TwigsBlocks.WHITE_PACKED_SILT, new Item.Properties())); + public static final Item ORANGE_PACKED_SILT = register("orange_packed_silt", new BlockItem(TwigsBlocks.ORANGE_PACKED_SILT, new Item.Properties())); + public static final Item MAGENTA_PACKED_SILT = register("magenta_packed_silt", new BlockItem(TwigsBlocks.MAGENTA_PACKED_SILT, new Item.Properties())); + public static final Item LIGHT_BLUE_PACKED_SILT = register("light_blue_packed_silt", new BlockItem(TwigsBlocks.LIGHT_BLUE_PACKED_SILT, new Item.Properties())); + public static final Item YELLOW_PACKED_SILT = register("yellow_packed_silt", new BlockItem(TwigsBlocks.YELLOW_PACKED_SILT, new Item.Properties())); + public static final Item LIME_PACKED_SILT = register("lime_packed_silt", new BlockItem(TwigsBlocks.LIME_PACKED_SILT, new Item.Properties())); + public static final Item PINK_PACKED_SILT = register("pink_packed_silt", new BlockItem(TwigsBlocks.PINK_PACKED_SILT, new Item.Properties())); + public static final Item GRAY_PACKED_SILT = register("gray_packed_silt", new BlockItem(TwigsBlocks.GRAY_PACKED_SILT, new Item.Properties())); + public static final Item LIGHT_GRAY_PACKED_SILT = register("light_gray_packed_silt", new BlockItem(TwigsBlocks.LIGHT_GRAY_PACKED_SILT, new Item.Properties())); + public static final Item CYAN_PACKED_SILT = register("cyan_packed_silt", new BlockItem(TwigsBlocks.CYAN_PACKED_SILT, new Item.Properties())); + public static final Item PURPLE_PACKED_SILT = register("purple_packed_silt", new BlockItem(TwigsBlocks.PURPLE_PACKED_SILT, new Item.Properties())); + public static final Item BLUE_PACKED_SILT = register("blue_packed_silt", new BlockItem(TwigsBlocks.BLUE_PACKED_SILT, new Item.Properties())); + public static final Item BROWN_PACKED_SILT = register("brown_packed_silt", new BlockItem(TwigsBlocks.BROWN_PACKED_SILT, new Item.Properties())); + public static final Item GREEN_PACKED_SILT = register("green_packed_silt", new BlockItem(TwigsBlocks.GREEN_PACKED_SILT, new Item.Properties())); + public static final Item RED_PACKED_SILT = register("red_packed_silt", new BlockItem(TwigsBlocks.RED_PACKED_SILT, new Item.Properties())); + public static final Item BLACK_PACKED_SILT = register("black_packed_silt", new BlockItem(TwigsBlocks.BLACK_PACKED_SILT, new Item.Properties())); - public static final Item SILT_SHINGLES = register("silt_shingles", new BlockItem(TwigsBlocks.SILT_SHINGLES, new FabricItemSettings())); - public static final Item WHITE_SILT_SHINGLES = register("white_silt_shingles", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLES, new FabricItemSettings())); - public static final Item ORANGE_SILT_SHINGLES = register("orange_silt_shingles", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLES, new FabricItemSettings())); - public static final Item MAGENTA_SILT_SHINGLES = register("magenta_silt_shingles", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLES, new FabricItemSettings())); - public static final Item LIGHT_BLUE_SILT_SHINGLES = register("light_blue_silt_shingles", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLES, new FabricItemSettings())); - public static final Item YELLOW_SILT_SHINGLES = register("yellow_silt_shingles", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLES, new FabricItemSettings())); - public static final Item LIME_SILT_SHINGLES = register("lime_silt_shingles", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLES, new FabricItemSettings())); - public static final Item PINK_SILT_SHINGLES = register("pink_silt_shingles", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLES, new FabricItemSettings())); - public static final Item GRAY_SILT_SHINGLES = register("gray_silt_shingles", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLES, new FabricItemSettings())); - public static final Item LIGHT_GRAY_SILT_SHINGLES = register("light_gray_silt_shingles", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLES, new FabricItemSettings())); - public static final Item CYAN_SILT_SHINGLES = register("cyan_silt_shingles", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLES, new FabricItemSettings())); - public static final Item PURPLE_SILT_SHINGLES = register("purple_silt_shingles", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLES, new FabricItemSettings())); - public static final Item BLUE_SILT_SHINGLES = register("blue_silt_shingles", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLES, new FabricItemSettings())); - public static final Item BROWN_SILT_SHINGLES = register("brown_silt_shingles", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLES, new FabricItemSettings())); - public static final Item GREEN_SILT_SHINGLES = register("green_silt_shingles", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLES, new FabricItemSettings())); - public static final Item RED_SILT_SHINGLES = register("red_silt_shingles", new BlockItem(TwigsBlocks.RED_SILT_SHINGLES, new FabricItemSettings())); - public static final Item BLACK_SILT_SHINGLES = register("black_silt_shingles", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLES, new FabricItemSettings())); + public static final Item SILT_SHINGLES = register("silt_shingles", new BlockItem(TwigsBlocks.SILT_SHINGLES, new Item.Properties())); + public static final Item WHITE_SILT_SHINGLES = register("white_silt_shingles", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLES, new Item.Properties())); + public static final Item ORANGE_SILT_SHINGLES = register("orange_silt_shingles", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLES, new Item.Properties())); + public static final Item MAGENTA_SILT_SHINGLES = register("magenta_silt_shingles", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLES, new Item.Properties())); + public static final Item LIGHT_BLUE_SILT_SHINGLES = register("light_blue_silt_shingles", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLES, new Item.Properties())); + public static final Item YELLOW_SILT_SHINGLES = register("yellow_silt_shingles", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLES, new Item.Properties())); + public static final Item LIME_SILT_SHINGLES = register("lime_silt_shingles", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLES, new Item.Properties())); + public static final Item PINK_SILT_SHINGLES = register("pink_silt_shingles", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLES, new Item.Properties())); + public static final Item GRAY_SILT_SHINGLES = register("gray_silt_shingles", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLES, new Item.Properties())); + public static final Item LIGHT_GRAY_SILT_SHINGLES = register("light_gray_silt_shingles", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLES, new Item.Properties())); + public static final Item CYAN_SILT_SHINGLES = register("cyan_silt_shingles", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLES, new Item.Properties())); + public static final Item PURPLE_SILT_SHINGLES = register("purple_silt_shingles", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLES, new Item.Properties())); + public static final Item BLUE_SILT_SHINGLES = register("blue_silt_shingles", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLES, new Item.Properties())); + public static final Item BROWN_SILT_SHINGLES = register("brown_silt_shingles", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLES, new Item.Properties())); + public static final Item GREEN_SILT_SHINGLES = register("green_silt_shingles", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLES, new Item.Properties())); + public static final Item RED_SILT_SHINGLES = register("red_silt_shingles", new BlockItem(TwigsBlocks.RED_SILT_SHINGLES, new Item.Properties())); + public static final Item BLACK_SILT_SHINGLES = register("black_silt_shingles", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLES, new Item.Properties())); - public static final Item SILT_SHINGLE_STAIRS = register("silt_shingle_stairs", new BlockItem(TwigsBlocks.SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item WHITE_SILT_SHINGLE_STAIRS = register("white_silt_shingle_stairs", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item ORANGE_SILT_SHINGLE_STAIRS = register("orange_silt_shingle_stairs", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item MAGENTA_SILT_SHINGLE_STAIRS = register("magenta_silt_shingle_stairs", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item LIGHT_BLUE_SILT_SHINGLE_STAIRS = register("light_blue_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item YELLOW_SILT_SHINGLE_STAIRS = register("yellow_silt_shingle_stairs", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item LIME_SILT_SHINGLE_STAIRS = register("lime_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item PINK_SILT_SHINGLE_STAIRS = register("pink_silt_shingle_stairs", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item GRAY_SILT_SHINGLE_STAIRS = register("gray_silt_shingle_stairs", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item LIGHT_GRAY_SILT_SHINGLE_STAIRS = register("light_gray_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item CYAN_SILT_SHINGLE_STAIRS = register("cyan_silt_shingle_stairs", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item PURPLE_SILT_SHINGLE_STAIRS = register("purple_silt_shingle_stairs", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item BLUE_SILT_SHINGLE_STAIRS = register("blue_silt_shingle_stairs", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item BROWN_SILT_SHINGLE_STAIRS = register("brown_silt_shingle_stairs", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item GREEN_SILT_SHINGLE_STAIRS = register("green_silt_shingle_stairs", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item RED_SILT_SHINGLE_STAIRS = register("red_silt_shingle_stairs", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_STAIRS, new FabricItemSettings())); - public static final Item BLACK_SILT_SHINGLE_STAIRS = register("black_silt_shingle_stairs", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_STAIRS, new FabricItemSettings())); + public static final Item SILT_SHINGLE_STAIRS = register("silt_shingle_stairs", new BlockItem(TwigsBlocks.SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item WHITE_SILT_SHINGLE_STAIRS = register("white_silt_shingle_stairs", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item ORANGE_SILT_SHINGLE_STAIRS = register("orange_silt_shingle_stairs", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item MAGENTA_SILT_SHINGLE_STAIRS = register("magenta_silt_shingle_stairs", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item LIGHT_BLUE_SILT_SHINGLE_STAIRS = register("light_blue_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item YELLOW_SILT_SHINGLE_STAIRS = register("yellow_silt_shingle_stairs", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item LIME_SILT_SHINGLE_STAIRS = register("lime_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item PINK_SILT_SHINGLE_STAIRS = register("pink_silt_shingle_stairs", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item GRAY_SILT_SHINGLE_STAIRS = register("gray_silt_shingle_stairs", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item LIGHT_GRAY_SILT_SHINGLE_STAIRS = register("light_gray_silt_shingle_stairs", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item CYAN_SILT_SHINGLE_STAIRS = register("cyan_silt_shingle_stairs", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item PURPLE_SILT_SHINGLE_STAIRS = register("purple_silt_shingle_stairs", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item BLUE_SILT_SHINGLE_STAIRS = register("blue_silt_shingle_stairs", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item BROWN_SILT_SHINGLE_STAIRS = register("brown_silt_shingle_stairs", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item GREEN_SILT_SHINGLE_STAIRS = register("green_silt_shingle_stairs", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item RED_SILT_SHINGLE_STAIRS = register("red_silt_shingle_stairs", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_STAIRS, new Item.Properties())); + public static final Item BLACK_SILT_SHINGLE_STAIRS = register("black_silt_shingle_stairs", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_STAIRS, new Item.Properties())); - public static final Item SILT_SHINGLE_SLAB = register("silt_shingle_slab", new BlockItem(TwigsBlocks.SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item WHITE_SILT_SHINGLE_SLAB = register("white_silt_shingle_slab", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item ORANGE_SILT_SHINGLE_SLAB = register("orange_silt_shingle_slab", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item MAGENTA_SILT_SHINGLE_SLAB = register("magenta_silt_shingle_slab", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item LIGHT_BLUE_SILT_SHINGLE_SLAB = register("light_blue_silt_shingle_slab", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item YELLOW_SILT_SHINGLE_SLAB = register("yellow_silt_shingle_slab", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item LIME_SILT_SHINGLE_SLAB = register("lime_silt_shingle_slab", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item PINK_SILT_SHINGLE_SLAB = register("pink_silt_shingle_slab", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item GRAY_SILT_SHINGLE_SLAB = register("gray_silt_shingle_slab", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item LIGHT_GRAY_SILT_SHINGLE_SLAB = register("light_gray_silt_shingle_slab", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item CYAN_SILT_SHINGLE_SLAB = register("cyan_silt_shingle_slab", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item PURPLE_SILT_SHINGLE_SLAB = register("purple_silt_shingle_slab", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item BLUE_SILT_SHINGLE_SLAB = register("blue_silt_shingle_slab", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item BROWN_SILT_SHINGLE_SLAB = register("brown_silt_shingle_slab", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item GREEN_SILT_SHINGLE_SLAB = register("green_silt_shingle_slab", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item RED_SILT_SHINGLE_SLAB = register("red_silt_shingle_slab", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_SLAB, new FabricItemSettings())); - public static final Item BLACK_SILT_SHINGLE_SLAB = register("black_silt_shingle_slab", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_SLAB, new FabricItemSettings())); + public static final Item SILT_SHINGLE_SLAB = register("silt_shingle_slab", new BlockItem(TwigsBlocks.SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item WHITE_SILT_SHINGLE_SLAB = register("white_silt_shingle_slab", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item ORANGE_SILT_SHINGLE_SLAB = register("orange_silt_shingle_slab", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item MAGENTA_SILT_SHINGLE_SLAB = register("magenta_silt_shingle_slab", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item LIGHT_BLUE_SILT_SHINGLE_SLAB = register("light_blue_silt_shingle_slab", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item YELLOW_SILT_SHINGLE_SLAB = register("yellow_silt_shingle_slab", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item LIME_SILT_SHINGLE_SLAB = register("lime_silt_shingle_slab", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item PINK_SILT_SHINGLE_SLAB = register("pink_silt_shingle_slab", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item GRAY_SILT_SHINGLE_SLAB = register("gray_silt_shingle_slab", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item LIGHT_GRAY_SILT_SHINGLE_SLAB = register("light_gray_silt_shingle_slab", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item CYAN_SILT_SHINGLE_SLAB = register("cyan_silt_shingle_slab", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item PURPLE_SILT_SHINGLE_SLAB = register("purple_silt_shingle_slab", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item BLUE_SILT_SHINGLE_SLAB = register("blue_silt_shingle_slab", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item BROWN_SILT_SHINGLE_SLAB = register("brown_silt_shingle_slab", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item GREEN_SILT_SHINGLE_SLAB = register("green_silt_shingle_slab", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item RED_SILT_SHINGLE_SLAB = register("red_silt_shingle_slab", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_SLAB, new Item.Properties())); + public static final Item BLACK_SILT_SHINGLE_SLAB = register("black_silt_shingle_slab", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_SLAB, new Item.Properties())); - public static final Item SILT_SHINGLE_WALL = register("silt_shingle_wall", new BlockItem(TwigsBlocks.SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item WHITE_SILT_SHINGLE_WALL = register("white_silt_shingle_wall", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item ORANGE_SILT_SHINGLE_WALL = register("orange_silt_shingle_wall", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item MAGENTA_SILT_SHINGLE_WALL = register("magenta_silt_shingle_wall", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item LIGHT_BLUE_SILT_SHINGLE_WALL = register("light_blue_silt_shingle_wall", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item YELLOW_SILT_SHINGLE_WALL = register("yellow_silt_shingle_wall", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item LIME_SILT_SHINGLE_WALL = register("lime_silt_shingle_wall", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item PINK_SILT_SHINGLE_WALL = register("pink_silt_shingle_wall", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item GRAY_SILT_SHINGLE_WALL = register("gray_silt_shingle_wall", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item LIGHT_GRAY_SILT_SHINGLE_WALL = register("light_gray_silt_shingle_wall", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item CYAN_SILT_SHINGLE_WALL = register("cyan_silt_shingle_wall", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item PURPLE_SILT_SHINGLE_WALL = register("purple_silt_shingle_wall", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item BLUE_SILT_SHINGLE_WALL = register("blue_silt_shingle_wall", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item BROWN_SILT_SHINGLE_WALL = register("brown_silt_shingle_wall", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item GREEN_SILT_SHINGLE_WALL = register("green_silt_shingle_wall", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item RED_SILT_SHINGLE_WALL = register("red_silt_shingle_wall", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_WALL, new FabricItemSettings())); - public static final Item BLACK_SILT_SHINGLE_WALL = register("black_silt_shingle_wall", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_WALL, new FabricItemSettings())); + public static final Item SILT_SHINGLE_WALL = register("silt_shingle_wall", new BlockItem(TwigsBlocks.SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item WHITE_SILT_SHINGLE_WALL = register("white_silt_shingle_wall", new BlockItem(TwigsBlocks.WHITE_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item ORANGE_SILT_SHINGLE_WALL = register("orange_silt_shingle_wall", new BlockItem(TwigsBlocks.ORANGE_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item MAGENTA_SILT_SHINGLE_WALL = register("magenta_silt_shingle_wall", new BlockItem(TwigsBlocks.MAGENTA_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item LIGHT_BLUE_SILT_SHINGLE_WALL = register("light_blue_silt_shingle_wall", new BlockItem(TwigsBlocks.LIGHT_BLUE_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item YELLOW_SILT_SHINGLE_WALL = register("yellow_silt_shingle_wall", new BlockItem(TwigsBlocks.YELLOW_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item LIME_SILT_SHINGLE_WALL = register("lime_silt_shingle_wall", new BlockItem(TwigsBlocks.LIME_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item PINK_SILT_SHINGLE_WALL = register("pink_silt_shingle_wall", new BlockItem(TwigsBlocks.PINK_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item GRAY_SILT_SHINGLE_WALL = register("gray_silt_shingle_wall", new BlockItem(TwigsBlocks.GRAY_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item LIGHT_GRAY_SILT_SHINGLE_WALL = register("light_gray_silt_shingle_wall", new BlockItem(TwigsBlocks.LIGHT_GRAY_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item CYAN_SILT_SHINGLE_WALL = register("cyan_silt_shingle_wall", new BlockItem(TwigsBlocks.CYAN_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item PURPLE_SILT_SHINGLE_WALL = register("purple_silt_shingle_wall", new BlockItem(TwigsBlocks.PURPLE_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item BLUE_SILT_SHINGLE_WALL = register("blue_silt_shingle_wall", new BlockItem(TwigsBlocks.BLUE_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item BROWN_SILT_SHINGLE_WALL = register("brown_silt_shingle_wall", new BlockItem(TwigsBlocks.BROWN_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item GREEN_SILT_SHINGLE_WALL = register("green_silt_shingle_wall", new BlockItem(TwigsBlocks.GREEN_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item RED_SILT_SHINGLE_WALL = register("red_silt_shingle_wall", new BlockItem(TwigsBlocks.RED_SILT_SHINGLE_WALL, new Item.Properties())); + public static final Item BLACK_SILT_SHINGLE_WALL = register("black_silt_shingle_wall", new BlockItem(TwigsBlocks.BLACK_SILT_SHINGLE_WALL, new Item.Properties())); static { CompostingChanceRegistry composting = CompostingChanceRegistry.INSTANCE; @@ -332,6 +330,6 @@ public class TwigsItems { } private static Item register(String id, Item item) { - return Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(Twigs.MOD_ID, id), item); + return Registry.register(BuiltInRegistries.ITEM, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id), item); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsLootTableAdditions.java b/src/main/java/com/ninni/twigs/registry/TwigsLootTableAdditions.java index bba3040f..d3f200bf 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsLootTableAdditions.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsLootTableAdditions.java @@ -1,16 +1,20 @@ package com.ninni.twigs.registry; - import com.google.common.base.Suppliers; import com.ninni.twigs.mixin.LootItemAccessor; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.fabric.api.loot.v3.LootTableEvents; import net.minecraft.advancements.critereon.EnchantmentPredicate; +import net.minecraft.advancements.critereon.ItemEnchantmentsPredicate; import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.advancements.critereon.ItemSubPredicates; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.advancements.critereon.StatePropertiesPredicate; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Items; +import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.block.BambooStalkBlock; import net.minecraft.world.level.block.Block; @@ -18,6 +22,7 @@ import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.properties.BambooLeaves; import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.functions.LootItemFunction; @@ -29,22 +34,22 @@ import net.minecraft.world.level.storage.loot.predicates.MatchTool; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; +import java.util.List; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; +@SuppressWarnings("deprecation") public class TwigsLootTableAdditions { static { - Supplier> leafTablesSupplier = Suppliers.memoize(() -> { - return BuiltInRegistries.BLOCK.stream() - .filter(LeavesBlock.class::isInstance) - .map(Block::getLootTable) - .collect(Collectors.toSet()); - }); - LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { + Supplier>> leafTablesSupplier = Suppliers.memoize(() -> BuiltInRegistries.BLOCK.stream() + .filter(LeavesBlock.class::isInstance) + .map(Block::getLootTable) + .collect(Collectors.toSet())); + LootTableEvents.MODIFY.register((id, builder, source, registries) -> { if (equals(id, Blocks.BAMBOO)) { - tableBuilder.pool( + builder.pool( LootPool.lootPool() .with( LootItem.lootTableItem(TwigsBlocks.BAMBOO_LEAVES) @@ -57,33 +62,29 @@ public class TwigsLootTableAdditions { ).build() ); } else if (equals(id, Blocks.GRAVEL)) { - tableBuilder.pool( + builder.pool( LootPool.lootPool() .with( LootItem.lootTableItem(TwigsItems.PEBBLE) - .when(InvertedLootItemCondition.invert( - MatchTool.toolMatches( - ItemPredicate.Builder.item() - .hasEnchantment(new EnchantmentPredicate(Enchantments.SILK_TOUCH, MinMaxBounds.Ints.ANY))) - )) + .when(InvertedLootItemCondition.invert(hasSilkTouch(registries))) .when(LootItemRandomChanceCondition.randomChance(0.2F)) .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 3.0F))).build() ).build() ); } else { if (leafTablesSupplier.get().contains(id)) { - tableBuilder.modifyPools(original -> { + builder.modifyPools(original -> { LootPool pool = original.build(); - LootPool.Builder builder = LootPool.lootPool(); + LootPool.Builder newPool = LootPool.lootPool(); - for (LootItemCondition condition : pool.conditions) builder.conditionally(condition); - for (LootItemFunction function : pool.functions) builder.apply(function); - builder.setRolls(pool.rolls); - builder.setBonusRolls(pool.bonusRolls); + for (LootItemCondition condition : pool.conditions) newPool.conditionally(condition); + for (LootItemFunction function : pool.functions) newPool.apply(function); + newPool.setRolls(pool.rolls); + newPool.setBonusRolls(pool.bonusRolls); for (LootPoolEntryContainer entry : pool.entries) { - if (entry instanceof LootItemAccessor itemEntry && itemEntry.getItem() == Items.STICK) itemEntry.setItem(TwigsItems.TWIG); - builder.with(entry); + if (entry instanceof LootItemAccessor itemEntry && itemEntry.getItem() == Items.STICK) itemEntry.setItem(TwigsItems.TWIG.builtInRegistryHolder()); + newPool.with(entry); } }); } @@ -91,7 +92,18 @@ public class TwigsLootTableAdditions { }); } - public static boolean equals(ResourceLocation id, Block block) { + public static LootItemCondition.Builder hasSilkTouch(HolderLookup.Provider registries) { + HolderLookup.RegistryLookup registryLookup = registries.lookupOrThrow(Registries.ENCHANTMENT); + return MatchTool.toolMatches( + ItemPredicate.Builder.item() + .withSubPredicate( + ItemSubPredicates.ENCHANTMENTS, + ItemEnchantmentsPredicate.enchantments(List.of(new EnchantmentPredicate(registryLookup.getOrThrow(Enchantments.SILK_TOUCH), MinMaxBounds.Ints.atLeast(1)))) + ) + ); + } + + public static boolean equals(ResourceKey id, Block block) { return id.equals(block.getLootTable()); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsLootTables.java b/src/main/java/com/ninni/twigs/registry/TwigsLootTables.java index 2b450db0..d1838501 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsLootTables.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsLootTables.java @@ -1,13 +1,15 @@ package com.ninni.twigs.registry; import com.ninni.twigs.Twigs; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.storage.loot.LootTable; public class TwigsLootTables { - public static final ResourceLocation BLOODSTONE_OBELISK_CHEST = create("chests/bloodstone_obelisk"); + public static final ResourceKey BLOODSTONE_OBELISK_CHEST = create("chests/bloodstone_obelisk"); - private static ResourceLocation create(String id) { - return new ResourceLocation(Twigs.MOD_ID, id); + private static ResourceKey create(String id) { + return ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id)); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsParticleTypes.java b/src/main/java/com/ninni/twigs/registry/TwigsParticleTypes.java index 8b4c8212..f58d7915 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsParticleTypes.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsParticleTypes.java @@ -9,6 +9,6 @@ public class TwigsParticleTypes { - public static final SimpleParticleType ITEM_PEBBLE = Registry.register(BuiltInRegistries.PARTICLE_TYPE, new ResourceLocation(Twigs.MOD_ID, "item_pebble"), new TwigsParticleType(false)); + public static final SimpleParticleType ITEM_PEBBLE = Registry.register(BuiltInRegistries.PARTICLE_TYPE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, "item_pebble"), new TwigsParticleType(false)); } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsPlacedFeatures.java b/src/main/java/com/ninni/twigs/registry/TwigsPlacedFeatures.java index 2a4827ea..329fc424 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsPlacedFeatures.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsPlacedFeatures.java @@ -1,10 +1,8 @@ package com.ninni.twigs.registry; import com.ninni.twigs.Twigs; -import com.ninni.twigs.data.TwigsConfiguredFeatureProvider; -import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; -import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.data.worldgen.placement.VegetationPlacements; import net.minecraft.resources.ResourceKey; @@ -34,7 +32,7 @@ public class TwigsPlacedFeatures { public static final ResourceKey PATCH_SEASHELL_LAND = createKey("patch_seashell_land"); public static final ResourceKey PATCH_SEASHELL_WATER = createKey("patch_seashell_water"); - public static void bootstrap(BootstapContext context) { + public static void bootstrap(BootstrapContext context) { register(context, ORE_RHYOLITE, TwigsConfiguredFeatures.ORE_RHYOLITE, commonOrePlacement(2, HeightRangePlacement.uniform(VerticalAnchor.bottom(), VerticalAnchor.absolute(16)))); register(context, ORE_BLOODSTONE, TwigsConfiguredFeatures.ORE_BLOODSTONE, commonOrePlacement(2, HeightRangePlacement.uniform(VerticalAnchor.absolute(5), VerticalAnchor.top()))); register(context, ORE_SCHIST_UPPER, TwigsConfiguredFeatures.ORE_SCHIST, rareOrePlacement(6, HeightRangePlacement.uniform(VerticalAnchor.absolute(64), VerticalAnchor.absolute(128)))); @@ -47,11 +45,11 @@ public static void bootstrap(BootstapContext context) { register(context, PATCH_SEASHELL_WATER, TwigsConfiguredFeatures.PATCH_SEASHELL, CountPlacement.of(2), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_OCEAN_FLOOR, BiomeFilter.biome()); } - public static void register(BootstapContext context, ResourceKey resourceKey, ResourceKey> configuredFeature, PlacementModifier... placementModifiers) { + public static void register(BootstrapContext context, ResourceKey resourceKey, ResourceKey> configuredFeature, PlacementModifier... placementModifiers) { register(context, resourceKey, configuredFeature, List.of(placementModifiers)); } - public static void register(BootstapContext context, ResourceKey resourceKey, ResourceKey> configuredFeature, List placementModifiers) { + public static void register(BootstrapContext context, ResourceKey resourceKey, ResourceKey> configuredFeature, List placementModifiers) { context.register(resourceKey, new PlacedFeature(context.lookup(Registries.CONFIGURED_FEATURE).getOrThrow(configuredFeature), List.copyOf(placementModifiers))); } @@ -68,7 +66,7 @@ private static List rareOrePlacement(int i, PlacementModifier } public static ResourceKey createKey(String string) { - return ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(Twigs.MOD_ID, string)); + return ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, string)); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsSoundEvents.java b/src/main/java/com/ninni/twigs/registry/TwigsSoundEvents.java index 118adacc..41887fe5 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsSoundEvents.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsSoundEvents.java @@ -43,7 +43,7 @@ private static SoundType register(String name, float volume, float pitch) { } private static SoundEvent register(String name) { - ResourceLocation id = new ResourceLocation(Twigs.MOD_ID, name); + ResourceLocation id = ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, name); return Registry.register(BuiltInRegistries.SOUND_EVENT, id, SoundEvent.createVariableRangeEvent(id)); } } diff --git a/src/main/java/com/ninni/twigs/registry/TwigsStructurePieceTypes.java b/src/main/java/com/ninni/twigs/registry/TwigsStructurePieceTypes.java index 33fe5aaf..75304361 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsStructurePieceTypes.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsStructurePieceTypes.java @@ -11,7 +11,7 @@ public class TwigsStructurePieceTypes { public static final StructurePieceType BLOODSTONE_OBELISK = register("bloodstone_obelisk", ObeliskGenerator.Piece::new); private static StructurePieceType register(String id, StructurePieceType type) { - return Registry.register(BuiltInRegistries.STRUCTURE_PIECE, new ResourceLocation(Twigs.MOD_ID, id), type); + return Registry.register(BuiltInRegistries.STRUCTURE_PIECE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id), type); } private static StructurePieceType register(String id, StructurePieceType.StructureTemplateType type) { diff --git a/src/main/java/com/ninni/twigs/registry/TwigsStructureTypes.java b/src/main/java/com/ninni/twigs/registry/TwigsStructureTypes.java index ad29ccde..d6cadc87 100644 --- a/src/main/java/com/ninni/twigs/registry/TwigsStructureTypes.java +++ b/src/main/java/com/ninni/twigs/registry/TwigsStructureTypes.java @@ -1,6 +1,6 @@ package com.ninni.twigs.registry; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.ninni.twigs.Twigs; import com.ninni.twigs.world.gen.structures.ObeliskStructure; import net.minecraft.core.Registry; @@ -13,8 +13,8 @@ public class TwigsStructureTypes { public static final StructureType OBELISK = register("obelisk", ObeliskStructure.CODEC); - private static StructureType register(String string, Codec codec) { - return Registry.register(BuiltInRegistries.STRUCTURE_TYPE, new ResourceLocation(Twigs.MOD_ID, string), () -> codec); + private static StructureType register(String string, MapCodec codec) { + return Registry.register(BuiltInRegistries.STRUCTURE_TYPE, ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, string), () -> codec); } } diff --git a/src/main/java/com/ninni/twigs/stat/TwigsStats.java b/src/main/java/com/ninni/twigs/stat/TwigsStats.java index 51ed0cf4..e9e6a792 100644 --- a/src/main/java/com/ninni/twigs/stat/TwigsStats.java +++ b/src/main/java/com/ninni/twigs/stat/TwigsStats.java @@ -1,9 +1,11 @@ package com.ninni.twigs.stat; +import com.ninni.twigs.Twigs; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.stats.StatFormatter; + import static net.minecraft.stats.Stats.CUSTOM; public interface TwigsStats { @@ -12,7 +14,7 @@ public interface TwigsStats { private static ResourceLocation register(String id, StatFormatter formatter) { - ResourceLocation rl = new ResourceLocation(id); + ResourceLocation rl = ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, id); Registry.register(BuiltInRegistries.CUSTOM_STAT, id, rl); CUSTOM.get(rl, formatter); return rl; diff --git a/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskGenerator.java b/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskGenerator.java index 14344fd3..9a5b035d 100644 --- a/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskGenerator.java +++ b/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskGenerator.java @@ -13,7 +13,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.MobSpawnType; -import net.minecraft.world.entity.SpawnGroupData; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.StructureManager; @@ -30,12 +29,10 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; public class ObeliskGenerator { - private static final ResourceLocation OBELISK = new ResourceLocation(Twigs.MOD_ID, "bloodstone_obelisk/bloodstone_obelisk"); + private static final ResourceLocation OBELISK = ResourceLocation.fromNamespaceAndPath(Twigs.MOD_ID, "bloodstone_obelisk/bloodstone_obelisk"); public static void addPieces(StructureTemplateManager manager, BlockPos pos, Rotation rotation, StructurePiecesBuilder holder) { holder.addPiece(new ObeliskGenerator.Piece(manager, OBELISK, pos, rotation)); @@ -76,10 +73,10 @@ protected void handleDataMarker(String metadata, BlockPos pos, ServerLevelAccess Rotation rotation = this.placeSettings.getRotation(); this.createChest(world, boundingBox, random, pos, TwigsLootTables.BLOODSTONE_OBELISK_CHEST, Blocks.CHEST.defaultBlockState().setValue(ChestBlock.FACING, rotation.rotate( switch (metadata) { - default -> Direction.NORTH; case "ChestEast" -> Direction.EAST; case "ChestSouth" -> Direction.SOUTH; case "ChestWest" -> Direction.WEST; + default -> Direction.NORTH; } ))); } else { @@ -98,7 +95,7 @@ protected void handleDataMarker(String metadata, BlockPos pos, ServerLevelAccess if (mob != null) { mob.setPersistenceRequired(); mob.moveTo(pos, 0.0F, 0.0F); - mob.finalizeSpawn(world, world.getCurrentDifficultyAt(mob.blockPosition()), MobSpawnType.STRUCTURE, (SpawnGroupData) null, (CompoundTag) null); + mob.finalizeSpawn(world, world.getCurrentDifficultyAt(mob.blockPosition()), MobSpawnType.STRUCTURE, null); world.addFreshEntityWithPassengers(mob); world.setBlock(pos, Blocks.AIR.defaultBlockState(), 2); } diff --git a/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskStructure.java b/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskStructure.java index ee4ea34a..a5587d0e 100644 --- a/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskStructure.java +++ b/src/main/java/com/ninni/twigs/world/gen/structures/ObeliskStructure.java @@ -1,6 +1,6 @@ package com.ninni.twigs.world.gen.structures; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.ninni.twigs.registry.TwigsStructureTypes; import net.minecraft.core.BlockPos; import net.minecraft.world.level.ChunkPos; @@ -15,7 +15,7 @@ import java.util.Optional; public class ObeliskStructure extends Structure { - public static final Codec CODEC = ObeliskStructure.simpleCodec(ObeliskStructure::new); + public static final MapCodec CODEC = ObeliskStructure.simpleCodec(ObeliskStructure::new); public ObeliskStructure(StructureSettings structureSettings) { super(structureSettings); diff --git a/src/main/resources/assets/twigs/lang/en_us.json b/src/main/resources/assets/twigs/lang/en_us.json index 5fc52a9f..baa81dc3 100644 --- a/src/main/resources/assets/twigs/lang/en_us.json +++ b/src/main/resources/assets/twigs/lang/en_us.json @@ -1,6 +1,6 @@ { "mod.twigs.name": "Twigs", - "twigs.item_group": "Twigs", + "itemGroup.twigs.item_group": "Twigs", "mod.twigs.contact.discord": "Discord", "item.twigs.twigs": "Twigs", @@ -206,7 +206,7 @@ "block.twigs.green_silt_pot": "Green Silt Pot", "block.twigs.red_silt_pot": "Red Silt Pot", "block.twigs.black_silt_pot": "Black Silt Pot", - "stat.minecraft.open_silt_pot": "Silt Pots opened", + "stat.twigs.open_silt_pot": "Silt Pots opened", "block.twigs.packed_silt": "Packed Silt", "block.twigs.white_packed_silt": "White Packed Silt", @@ -294,4 +294,4 @@ "block.twigs.green_silt_shingle_wall": "Green Silt Shingle Wall", "block.twigs.red_silt_shingle_wall": "Red Silt Shingle Wall", "block.twigs.black_silt_shingle_wall": "Black Silt Shingle Wall" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/twigs/lang/it_it.json b/src/main/resources/assets/twigs/lang/it_it.json index fa13db38..66a94f43 100644 --- a/src/main/resources/assets/twigs/lang/it_it.json +++ b/src/main/resources/assets/twigs/lang/it_it.json @@ -1,9 +1,8 @@ { "mod.twigs.name": "Twigs", - "twigs.item_group": "Twigs", + "itemGroup.twigs.item_group": "Twigs", "mod.twigs.contact.discord": "Discord", "item.twigs.twigs": "Twigs", - "block.twigs.azalea_flowers": "Fiori di azalea", "block.twigs.potted_azalea_flowers": "Potted Azalea Flowers", "block.twigs.twig": "Ramoscello", @@ -19,21 +18,18 @@ "block.twigs.roseate_seashell": "Conchiglia rosata", "block.twigs.tangerine_seashell": "Conchiglia arancione", "block.twigs.petrified_lichen": "Lichene pietrificato", - "block.twigs.paper_lantern": "Lanterna di carta", "block.twigs.allium_paper_lantern": "Lanterna di carta", "block.twigs.dandelion_paper_lantern": "Lanterna di carta", "block.twigs.crimson_roots_paper_lantern": "Lanterna di carta", "block.twigs.blue_orchid_paper_lantern": "Lanterna di carta", "block.twigs.torchflower_paper_lantern": "Lanterna di carta", - "block.twigs.lamp": "Lucerna", "block.twigs.soul_lamp": "Lucerna delle anime", "subtitles.block.lamp.on": "Lucerna è accesa", "subtitles.block.lamp.off": "Lucerna è spenta", "block.twigs.crimson_shroomlamp": "Fungolampada cremisi", "block.twigs.warped_shroomlamp": "Fungolampada distorta", - "block.twigs.oak_table": "Tavolo di quercia", "block.twigs.spruce_table": "Tavolo di abete", "block.twigs.birch_table": "Tavolo di betulla", @@ -45,14 +41,12 @@ "block.twigs.crimson_table": "Tavolo cremisi", "block.twigs.warped_table": "Tavolo distorto", "block.twigs.bamboo_table": "Tavolo di bambù", - "block.twigs.polished_basalt_bricks": "Mattoni di basalto levigato", "block.twigs.chiseled_smooth_basalt_bricks": "Mattoni di basalto liscio cesellati", "block.twigs.smooth_basalt_bricks": "Mattoni di basalto liscio", "block.twigs.smooth_basalt_brick_stairs": "Scalini di mattoni di basalto liscio", "block.twigs.smooth_basalt_brick_slab": "Lastra di mattoni di basalto liscio", "block.twigs.smooth_basalt_brick_wall": "Muretto di mattoni di basalto liscio", - "block.twigs.chiseled_bricks": "Mattoni cesellati", "block.twigs.cracked_bricks": "Mattoni crepati", "block.twigs.mixed_bricks": "Mattoni mischiati", @@ -61,22 +55,18 @@ "block.twigs.mossy_brick_slab": "Lastra di mattoni muschiosi", "block.twigs.mossy_brick_wall": "Muretto di mattoni muschiosi", "block.twigs.brick_trail": "Traccia di mattoni", - "block.twigs.gravel_bricks": "Mattoni di ghiaia", "block.twigs.gravel_brick_wall": "Muretto di mattoni di ghiaia", "block.twigs.gravel_brick_slab": "Lastra di mattoni di ghiaia", "block.twigs.gravel_brick_stairs": "Scalini di mattoni di ghiaia", - "block.twigs.smooth_stone_bricks": "Mattoni di pietra liscia", "block.twigs.smooth_stone_brick_wall": "Muretto di mattoni di pietra liscia", "block.twigs.smooth_stone_brick_slab": "Lastra di mattoni di pietra liscia", "block.twigs.smooth_stone_brick_stairs": "Scalini di mattoni di pietra liscia", - "block.twigs.quartz_column": "Colonna di quarzo", "block.twigs.stone_column": "Colonna di pietra", "block.twigs.deepslate_column": "Colonna di ardesia profonda", "block.twigs.blackstone_column": "Colonna di pietranera", - "block.twigs.copper_pillar": "Pilastro di rame", "block.twigs.exposed_copper_pillar": "Pilastro di rame esposto", "block.twigs.weathered_copper_pillar": "Pilastro di rame corroso", @@ -85,14 +75,11 @@ "block.twigs.waxed_exposed_copper_pillar": "Pilastro di rame esposto cerato", "block.twigs.waxed_weathered_copper_pillar": "Pilastro di rame corroso cerato", "block.twigs.waxed_oxidized_copper_pillar": "Pilastro di rame ossidato cerato", - "block.twigs.polished_amethyst": "Ametista levigata", "block.twigs.cut_amethyst": "Ametista intagliata", - "block.twigs.bamboo_mat": "Tappeto di bambù", "block.twigs.compacted_dripstone": "Speleotema compatto", "block.twigs.rocky_dirt": "Terra rocciosa", - "block.twigs.cobblestone_bricks": "Mattoni di pietrisco", "block.twigs.cobblestone_brick_stairs": "Scalini di mattoni di pietrisco", "block.twigs.cobblestone_brick_slab": "Lastra di mattoni di pietrisco", @@ -102,7 +89,6 @@ "block.twigs.mossy_cobblestone_brick_stairs": "Scalini di mattoni di pietrisco muschioso", "block.twigs.mossy_cobblestone_brick_slab": "Lastra di mattoni di pietrisco muschioso", "block.twigs.mossy_cobblestone_brick_wall": "Muretto di mattoni di pietrisco muschioso", - "block.twigs.twisting_polished_blackstone_bricks": "Mattoni di pietranera levigata distorta", "block.twigs.twisting_polished_blackstone_brick_wall": "Muretto di mattoni di pietranera levigata distorta", "block.twigs.twisting_polished_blackstone_brick_slab": "Lastra di mattoni di pietranera levigata distorta", @@ -111,7 +97,6 @@ "block.twigs.weeping_polished_blackstone_brick_wall": "Muretto di mattoni di pietranera levigata cremisi", "block.twigs.weeping_polished_blackstone_brick_slab": "Lastra di mattoni di pietranera levigata cremisi", "block.twigs.weeping_polished_blackstone_brick_stairs": "Scalini di mattoni di pietranera levigata cremisi", - "block.twigs.tuff_stairs": "Scalini di tufo", "block.twigs.tuff_slab": "Lastra di tufo", "block.twigs.tuff_wall": "Muretto di tufo", @@ -123,7 +108,6 @@ "block.twigs.polished_tuff_brick_slab": "Lastra di mattoni di tufo levigato", "block.twigs.polished_tuff_brick_wall": "Muretto di mattoni di tufo levigato", "block.twigs.cracked_polished_tuff_bricks": "Mattoni di tufo levigato crepati", - "block.twigs.calcite_stairs": "Scalini di calcite", "block.twigs.calcite_slab": "Lastra di calcite", "block.twigs.calcite_wall": "Muretto di calcite", @@ -135,7 +119,6 @@ "block.twigs.polished_calcite_brick_slab": "Lastra di mattoni di calcite levigata", "block.twigs.polished_calcite_brick_wall": "Muretto di mattoni di calcite levigata", "block.twigs.cracked_polished_calcite_bricks": "Mattoni di calcite levigata crepati", - "block.twigs.schist": "Scisto", "block.twigs.schist_wall": "Muretto di scisto", "block.twigs.schist_slab": "Lastra di scisto", @@ -148,7 +131,6 @@ "block.twigs.polished_schist_brick_slab": "Lastra di mattoni di scisto levigato", "block.twigs.polished_schist_brick_stairs": "Scalini di mattoni di scisto levigato", "block.twigs.cracked_polished_schist_bricks": "Mattoni di scisto levigato crepati", - "block.twigs.rhyolite": "Riolite", "block.twigs.rhyolite_wall": "Muretto di riolite", "block.twigs.rhyolite_slab": "Lastra di riolite", @@ -161,7 +143,6 @@ "block.twigs.polished_rhyolite_brick_slab": "Lastra di mattoni di riolite levigata", "block.twigs.polished_rhyolite_brick_stairs": "Scalini di mattoni di riolite levigata", "block.twigs.cracked_polished_rhyolite_bricks": "Mattoni di riolite levigata crepati", - "block.twigs.bloodstone": "Eliotropio", "block.twigs.bloodstone_wall": "Muretto di eliotropio", "block.twigs.bloodstone_slab": "Lastra di eliotropio", @@ -174,11 +155,9 @@ "block.twigs.polished_bloodstone_brick_slab": "Lastra di mattoni di eliotropio levigato", "block.twigs.polished_bloodstone_brick_stairs": "Scalini di mattoni di eliotropio levigato", "block.twigs.cracked_polished_bloodstone_bricks": "Mattoni di eliotropio levigato crepati", - "block.twigs.silt": "Limo", "item.twigs.silt_ball": "Zolla di limo", "item.twigs.silt_brick": "Mattone di limo", - "block.twigs.silt_bricks": "Mattoni di limo", "block.twigs.silt_brick_wall": "Muretto di mattoni di limo", "block.twigs.silt_brick_slab": "Lastra di mattoni di limo", @@ -187,7 +166,6 @@ "block.twigs.cracked_silt_bricks": "Mattoni di limo crepati", "block.twigs.mixed_silt_bricks": "Mattoni di limo mischiati", "block.twigs.silt_brick_trail": "Traccia di mattoni di limo", - "container.twigs.silt_pot": "Vaso di limo", "block.twigs.silt_pot": "Vaso di limo", "block.twigs.white_silt_pot": "Vaso di limo bianco", @@ -206,8 +184,7 @@ "block.twigs.green_silt_pot": "Vaso di limo verde", "block.twigs.red_silt_pot": "Vaso di limo rosso", "block.twigs.black_silt_pot": "Vaso di limo nero", - "stat.minecraft.open_silt_pot": "Vasi di limo aperti", - + "stat.twigs.open_silt_pot": "Vasi di limo aperti", "block.twigs.packed_silt": "Limo compatto", "block.twigs.white_packed_silt": "Limo compatto bianco", "block.twigs.orange_packed_silt": "Limo compatto arancione", @@ -225,7 +202,6 @@ "block.twigs.green_packed_silt": "Limo compatto verde", "block.twigs.red_packed_silt": "Limo compatto rosso", "block.twigs.black_packed_silt": "Limo compatto nero", - "block.twigs.silt_shingles": "Tegole di limo", "block.twigs.white_silt_shingles": "Tegole di limo bianche", "block.twigs.orange_silt_shingles": "Tegole di limo arancioni", @@ -294,4 +270,4 @@ "block.twigs.green_silt_shingle_wall": "Muretto di tegole di limo verde", "block.twigs.red_silt_shingle_wall": "Muretto di tegole di limo rosso", "block.twigs.black_silt_shingle_wall": "Muretto di tegole di limo nero" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/twigs/lang/uk_ua.json b/src/main/resources/assets/twigs/lang/uk_ua.json index 3107ff1a..bae6dca8 100644 --- a/src/main/resources/assets/twigs/lang/uk_ua.json +++ b/src/main/resources/assets/twigs/lang/uk_ua.json @@ -1,6 +1,6 @@ { "mod.twigs.name": "Twigs", - "twigs.item_group": "Twigs", + "itemGroup.twigs.item_group": "Twigs", "mod.twigs.contact.discord": "Discord", "item.twigs.twigs": "Twigs", @@ -125,7 +125,7 @@ "block.twigs.green_silt_pot": "Зелений мулистий глек", "block.twigs.red_silt_pot": "Червоний мулистий глек", "block.twigs.black_silt_pot": "Чорний мулистий глек", - "stat.minecraft.open_silt_pot": "Відкрито мул. глеків", + "stat.twigs.open_silt_pot": "Відкрито мул. глеків", "block.twigs.packed_silt": "Ущільнений мул", "block.twigs.white_packed_silt": "Білий ущільнений мул", diff --git a/src/main/resources/data/minecraft/tags/blocks/crystal_sound_blocks.json b/src/main/resources/data/minecraft/tags/block/crystal_sound_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/crystal_sound_blocks.json rename to src/main/resources/data/minecraft/tags/block/crystal_sound_blocks.json diff --git a/src/main/resources/data/minecraft/tags/blocks/enchantment_power_transmitter.json b/src/main/resources/data/minecraft/tags/block/enchantment_power_transmitter.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/enchantment_power_transmitter.json rename to src/main/resources/data/minecraft/tags/block/enchantment_power_transmitter.json diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/main/resources/data/minecraft/tags/block/flower_pots.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json rename to src/main/resources/data/minecraft/tags/block/flower_pots.json diff --git a/src/main/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json b/src/main/resources/data/minecraft/tags/block/inside_step_sound_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json rename to src/main/resources/data/minecraft/tags/block/inside_step_sound_blocks.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/main/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json b/src/main/resources/data/minecraft/tags/block/piglin_repellents.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json rename to src/main/resources/data/minecraft/tags/block/piglin_repellents.json diff --git a/src/main/resources/data/minecraft/tags/blocks/replaceable_plants.json b/src/main/resources/data/minecraft/tags/block/replaceable_plants.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/replaceable_plants.json rename to src/main/resources/data/minecraft/tags/block/replaceable_plants.json diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/block/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/slabs.json rename to src/main/resources/data/minecraft/tags/block/slabs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/main/resources/data/minecraft/tags/block/small_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/small_flowers.json rename to src/main/resources/data/minecraft/tags/block/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/block/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/stairs.json rename to src/main/resources/data/minecraft/tags/block/stairs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/block/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/walls.json rename to src/main/resources/data/minecraft/tags/block/walls.json diff --git a/src/main/resources/data/minecraft/tags/items/piglin_repellents.json b/src/main/resources/data/minecraft/tags/item/piglin_repellents.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/piglin_repellents.json rename to src/main/resources/data/minecraft/tags/item/piglin_repellents.json diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/item/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/slabs.json rename to src/main/resources/data/minecraft/tags/item/slabs.json diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/main/resources/data/minecraft/tags/item/small_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/small_flowers.json rename to src/main/resources/data/minecraft/tags/item/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/item/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stairs.json rename to src/main/resources/data/minecraft/tags/item/stairs.json diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/item/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/walls.json rename to src/main/resources/data/minecraft/tags/item/walls.json diff --git a/src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst.json b/src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst.json rename to src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst.json diff --git a/src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst_from_amethyst_block_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst_from_amethyst_block_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst_from_amethyst_block_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst_from_amethyst_block_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/cut_amethyst_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/cut_amethyst_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/polished_amethyst.json b/src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/polished_amethyst.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/polished_amethyst.json rename to src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/polished_amethyst.json diff --git a/src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/polished_amethyst_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/polished_amethyst_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/amethyst_blocks/polished_amethyst_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/amethyst_blocks/polished_amethyst_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/azalea_flowers_from_flowering_azalea.json b/src/main/resources/data/twigs/advancement/recipes/azalea_flowers_from_flowering_azalea.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/azalea_flowers_from_flowering_azalea.json rename to src/main/resources/data/twigs/advancement/recipes/azalea_flowers_from_flowering_azalea.json diff --git a/src/main/resources/data/twigs/advancements/recipes/azalea_flowers_from_flowering_azalea_leaves.json b/src/main/resources/data/twigs/advancement/recipes/azalea_flowers_from_flowering_azalea_leaves.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/azalea_flowers_from_flowering_azalea_leaves.json rename to src/main/resources/data/twigs/advancement/recipes/azalea_flowers_from_flowering_azalea_leaves.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bamboo_mat.json b/src/main/resources/data/twigs/advancement/recipes/bamboo_mat.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bamboo_mat.json rename to src/main/resources/data/twigs/advancement/recipes/bamboo_mat.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bamboo_thatch/bamboo_thatch.json b/src/main/resources/data/twigs/advancement/recipes/bamboo_thatch/bamboo_thatch.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bamboo_thatch/bamboo_thatch.json rename to src/main/resources/data/twigs/advancement/recipes/bamboo_thatch/bamboo_thatch.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bamboo_thatch/bamboo_thatch_slab.json b/src/main/resources/data/twigs/advancement/recipes/bamboo_thatch/bamboo_thatch_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bamboo_thatch/bamboo_thatch_slab.json rename to src/main/resources/data/twigs/advancement/recipes/bamboo_thatch/bamboo_thatch_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/chiseled_smooth_basalt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/chiseled_smooth_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/chiseled_smooth_basalt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/chiseled_smooth_basalt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/chiseled_smooth_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/chiseled_smooth_basalt_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/chiseled_smooth_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/chiseled_smooth_basalt_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/polished_basalt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/polished_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/polished_basalt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/polished_basalt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/polished_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/polished_basalt_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/polished_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/polished_basalt_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/basalt_blocks/smooth_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/basalt_blocks/smooth_basalt_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_slab.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_slab.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_stairs.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_wall.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_wall.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/bloodstone_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/bloodstone_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/cracked_polished_bloodstone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/cracked_polished_bloodstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/cracked_polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/cracked_polished_bloodstone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks_from_bloodstone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks_from_bloodstone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_slab.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_slab.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stairs.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bloodstone/polished_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bloodstone/polished_bloodstone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bone_meal_from_seashells.json b/src/main/resources/data/twigs/advancement/recipes/bone_meal_from_seashells.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bone_meal_from_seashells.json rename to src/main/resources/data/twigs/advancement/recipes/bone_meal_from_seashells.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/brick_trail.json b/src/main/resources/data/twigs/advancement/recipes/bricks/brick_trail.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/brick_trail.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/brick_trail.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/chiseled_bricks.json b/src/main/resources/data/twigs/advancement/recipes/bricks/chiseled_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/chiseled_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/chiseled_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/chiseled_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bricks/chiseled_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/chiseled_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/chiseled_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/cracked_bricks.json b/src/main/resources/data/twigs/advancement/recipes/bricks/cracked_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/cracked_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/cracked_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mixed_bricks.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mixed_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mixed_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mixed_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mixed_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mixed_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mixed_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mixed_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_bricks_from_moss_block.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_bricks_from_moss_block.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_bricks_from_moss_block.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_bricks_from_moss_block.json diff --git a/src/main/resources/data/twigs/advancements/recipes/bricks/mossy_bricks_from_vine.json b/src/main/resources/data/twigs/advancement/recipes/bricks/mossy_bricks_from_vine.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/bricks/mossy_bricks_from_vine.json rename to src/main/resources/data/twigs/advancement/recipes/bricks/mossy_bricks_from_vine.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_slab.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_slab.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_stairs.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_wall.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_wall.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/calcite_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/calcite_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/calcite_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/calcite_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/cracked_polished_calcite_bricks.json b/src/main/resources/data/twigs/advancement/recipes/calcite/cracked_polished_calcite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/cracked_polished_calcite_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/cracked_polished_calcite_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks_from_calcite_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks_from_calcite_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks_from_calcite_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_slab.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_slab.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stairs.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/calcite/polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/calcite/polished_calcite_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab_from_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab_from_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs_from_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs_from_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall_from_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall_from_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cobblestone_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cobblestone_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cracked_cobblestone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cracked_cobblestone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/cracked_cobblestone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/cracked_cobblestone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_cobblestone.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_cobblestone.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_cobblestone.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_cobblestone.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_moss.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_moss.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_moss.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_moss.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_mossy_cobblestone.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_mossy_cobblestone.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_mossy_cobblestone.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_from_mossy_cobblestone.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_bricks/mossy_cobblestone_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_bricks/mossy_cobblestone_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/cobblestone_from_pebble.json b/src/main/resources/data/twigs/advancement/recipes/cobblestone_from_pebble.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/cobblestone_from_pebble.json rename to src/main/resources/data/twigs/advancement/recipes/cobblestone_from_pebble.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/blackstone_column.json b/src/main/resources/data/twigs/advancement/recipes/columns/blackstone_column.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/blackstone_column.json rename to src/main/resources/data/twigs/advancement/recipes/columns/blackstone_column.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/blackstone_column_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/columns/blackstone_column_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/blackstone_column_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/columns/blackstone_column_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/deepslate_column.json b/src/main/resources/data/twigs/advancement/recipes/columns/deepslate_column.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/deepslate_column.json rename to src/main/resources/data/twigs/advancement/recipes/columns/deepslate_column.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/deepslate_column_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/columns/deepslate_column_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/deepslate_column_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/columns/deepslate_column_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/quartz_column.json b/src/main/resources/data/twigs/advancement/recipes/columns/quartz_column.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/quartz_column.json rename to src/main/resources/data/twigs/advancement/recipes/columns/quartz_column.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/quartz_column_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/columns/quartz_column_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/quartz_column_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/columns/quartz_column_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/stone_column.json b/src/main/resources/data/twigs/advancement/recipes/columns/stone_column.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/stone_column.json rename to src/main/resources/data/twigs/advancement/recipes/columns/stone_column.json diff --git a/src/main/resources/data/twigs/advancements/recipes/columns/stone_column_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/columns/stone_column_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/columns/stone_column_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/columns/stone_column_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/compacted_dripstone.json b/src/main/resources/data/twigs/advancement/recipes/compacted_dripstone.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/compacted_dripstone.json rename to src/main/resources/data/twigs/advancement/recipes/compacted_dripstone.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/exposed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/exposed_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/oxidized_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/oxidized_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_exposed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_exposed_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_oxidized_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_oxidized_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/waxed_weathered_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/waxed_weathered_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar_from_cut_copper_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar_from_cut_copper_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/copper_pillar/weathered_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/copper_pillar/weathered_copper_pillar_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/twisting_polished_blackstone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/decorated_blackstone_bricks/weeping_polished_blackstone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_bricks.json b/src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/gravel_bricks/gravel_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/gravel_bricks/gravel_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/lamps/crimson_shroomlamp.json b/src/main/resources/data/twigs/advancement/recipes/lamps/crimson_shroomlamp.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/lamps/crimson_shroomlamp.json rename to src/main/resources/data/twigs/advancement/recipes/lamps/crimson_shroomlamp.json diff --git a/src/main/resources/data/twigs/advancements/recipes/lamps/lamp.json b/src/main/resources/data/twigs/advancement/recipes/lamps/lamp.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/lamps/lamp.json rename to src/main/resources/data/twigs/advancement/recipes/lamps/lamp.json diff --git a/src/main/resources/data/twigs/advancements/recipes/lamps/soul_lamp.json b/src/main/resources/data/twigs/advancement/recipes/lamps/soul_lamp.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/lamps/soul_lamp.json rename to src/main/resources/data/twigs/advancement/recipes/lamps/soul_lamp.json diff --git a/src/main/resources/data/twigs/advancements/recipes/lamps/warped_shroomlamp.json b/src/main/resources/data/twigs/advancement/recipes/lamps/warped_shroomlamp.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/lamps/warped_shroomlamp.json rename to src/main/resources/data/twigs/advancement/recipes/lamps/warped_shroomlamp.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/allium_paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/allium_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/allium_paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/allium_paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/blue_orchid_paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/blue_orchid_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/blue_orchid_paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/blue_orchid_paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/crimson_roots_paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/crimson_roots_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/crimson_roots_paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/crimson_roots_paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/dandelion_paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/dandelion_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/dandelion_paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/dandelion_paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/paper_lanterns/torchflower_paper_lantern.json b/src/main/resources/data/twigs/advancement/recipes/paper_lanterns/torchflower_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/paper_lanterns/torchflower_paper_lantern.json rename to src/main/resources/data/twigs/advancement/recipes/paper_lanterns/torchflower_paper_lantern.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/cracked_polished_rhyolite_bricks.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/cracked_polished_rhyolite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/cracked_polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/cracked_polished_rhyolite_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks_from_rhyolite_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks_from_rhyolite_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_slab.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_slab.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stairs.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/polished_rhyolite_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_slab.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_slab.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_stairs.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_wall.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_wall.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rhyolite/rhyolite_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/rhyolite/rhyolite_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/rocky_dirt.json b/src/main/resources/data/twigs/advancement/recipes/rocky_dirt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/rocky_dirt.json rename to src/main/resources/data/twigs/advancement/recipes/rocky_dirt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/cracked_polished_schist_bricks.json b/src/main/resources/data/twigs/advancement/recipes/schist/cracked_polished_schist_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/cracked_polished_schist_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/schist/cracked_polished_schist_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks_from_schist_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks_from_schist_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks_from_schist_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks_from_schist_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_slab.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_slab.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stairs.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/polished_schist_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/polished_schist_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_slab.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_slab.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_stairs.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_wall.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_wall.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/schist/schist_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/schist/schist_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/schist/schist_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/schist/schist_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/black_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/black_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/blue_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/blue_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/brown_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/brown_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/chiseled_silt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/silt/chiseled_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/chiseled_silt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/silt/chiseled_silt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/chiseled_silt_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/chiseled_silt_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/chiseled_silt_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/chiseled_silt_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cracked_silt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/silt/cracked_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cracked_silt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cracked_silt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/cyan_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/cyan_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/gray_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/gray_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/green_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/green_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_blue_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_blue_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/light_gray_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/light_gray_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/lime_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/lime_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/magenta_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/magenta_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/mixed_silt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/silt/mixed_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/mixed_silt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/silt/mixed_silt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/mixed_silt_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/mixed_silt_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/mixed_silt_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/mixed_silt_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/orange_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/orange_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/pink_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/pink_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/purple_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/purple_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/red_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/red_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_slab_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_slab_from_silt_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_slab_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_slab_from_silt_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_stairs_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_stairs_from_silt_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_stairs_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_stairs_from_silt_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_trail.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_trail.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_trail.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_trail.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_wall_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_wall_from_silt_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_brick_wall_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_brick_wall_from_silt_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_bricks.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_from_clay.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_from_clay.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_from_clay.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_from_clay.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_from_sand.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_from_sand.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_from_sand.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_from_sand.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_from_silt_balls.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_from_silt_balls.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_from_silt_balls.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_from_silt_balls.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab_from_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_slab_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_slab_from_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs_from_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_stairs_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_stairs_from_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall_from_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingle_wall_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingle_wall_from_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/white_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/white_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_packed_silt_from_packed_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_packed_silt_from_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_packed_silt_from_packed_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_packed_silt_from_packed_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_packed_silt_from_silt.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_packed_silt_from_silt.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_packed_silt_from_silt.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_packed_silt_from_silt.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_pot_from_silt_pot.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_pot_from_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_pot_from_silt_pot.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_pot_from_silt_pot.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingles.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingles.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingles.json diff --git a/src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingles_from_packed_silt_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/silt/yellow_silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/silt/yellow_silt_shingles_from_packed_silt_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_bricks.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_bricks_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_bricks_from_smooth_stone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/smooth_stone_bricks/smooth_stone_bricks_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/smooth_stone_bricks/smooth_stone_bricks_from_smooth_stone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/stick_from_twig.json b/src/main/resources/data/twigs/advancement/recipes/stick_from_twig.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/stick_from_twig.json rename to src/main/resources/data/twigs/advancement/recipes/stick_from_twig.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/acacia_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/acacia_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/acacia_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/acacia_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/acacia_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/acacia_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/acacia_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/acacia_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/bamboo_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/bamboo_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/bamboo_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/bamboo_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/bamboo_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/bamboo_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/bamboo_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/bamboo_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/birch_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/birch_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/birch_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/birch_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/birch_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/birch_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/birch_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/birch_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/cherry_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/cherry_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/cherry_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/cherry_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/cherry_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/cherry_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/cherry_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/cherry_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/crimson_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/crimson_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/crimson_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/crimson_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/crimson_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/crimson_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/crimson_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/crimson_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/dark_oak_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/dark_oak_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/dark_oak_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/dark_oak_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/dark_oak_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/dark_oak_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/dark_oak_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/dark_oak_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/jungle_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/jungle_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/jungle_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/jungle_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/jungle_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/jungle_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/jungle_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/jungle_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/mangrove_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/mangrove_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/mangrove_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/mangrove_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/mangrove_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/mangrove_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/mangrove_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/mangrove_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/oak_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/oak_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/oak_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/oak_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/oak_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/oak_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/oak_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/oak_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/spruce_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/spruce_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/spruce_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/spruce_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/spruce_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/spruce_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/spruce_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/spruce_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/warped_table.json b/src/main/resources/data/twigs/advancement/recipes/tables/warped_table.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/warped_table.json rename to src/main/resources/data/twigs/advancement/recipes/tables/warped_table.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tables/warped_table_slab.json b/src/main/resources/data/twigs/advancement/recipes/tables/warped_table_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tables/warped_table_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tables/warped_table_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/cracked_polished_tuff_bricks.json b/src/main/resources/data/twigs/advancement/recipes/tuff/cracked_polished_tuff_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/cracked_polished_tuff_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/cracked_polished_tuff_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_slab.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_stairs.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_wall.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_wall.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_brick_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks_from_bloodstone_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks_from_bloodstone_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_bricks_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_bricks_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_slab.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stairs.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/polished_tuff_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_slab.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_slab.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_slab.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_slab.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_slab_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_slab_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_slab_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_slab_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_stairs.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_stairs.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_stairs.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_stairs.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_stairs_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_stairs_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_stairs_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_stairs_stonecutting.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_wall.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_wall.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_wall.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_wall.json diff --git a/src/main/resources/data/twigs/advancements/recipes/tuff/tuff_wall_stonecutting.json b/src/main/resources/data/twigs/advancement/recipes/tuff/tuff_wall_stonecutting.json similarity index 100% rename from src/main/resources/data/twigs/advancements/recipes/tuff/tuff_wall_stonecutting.json rename to src/main/resources/data/twigs/advancement/recipes/tuff/tuff_wall_stonecutting.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/acacia_table.json b/src/main/resources/data/twigs/loot_table/blocks/acacia_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/acacia_table.json rename to src/main/resources/data/twigs/loot_table/blocks/acacia_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/allium_paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/allium_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/allium_paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/allium_paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/azalea_flowers.json b/src/main/resources/data/twigs/loot_table/blocks/azalea_flowers.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/azalea_flowers.json rename to src/main/resources/data/twigs/loot_table/blocks/azalea_flowers.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bamboo_leaves.json b/src/main/resources/data/twigs/loot_table/blocks/bamboo_leaves.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bamboo_leaves.json rename to src/main/resources/data/twigs/loot_table/blocks/bamboo_leaves.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bamboo_mat.json b/src/main/resources/data/twigs/loot_table/blocks/bamboo_mat.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bamboo_mat.json rename to src/main/resources/data/twigs/loot_table/blocks/bamboo_mat.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bamboo_table.json b/src/main/resources/data/twigs/loot_table/blocks/bamboo_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bamboo_table.json rename to src/main/resources/data/twigs/loot_table/blocks/bamboo_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bamboo_thatch.json b/src/main/resources/data/twigs/loot_table/blocks/bamboo_thatch.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bamboo_thatch.json rename to src/main/resources/data/twigs/loot_table/blocks/bamboo_thatch.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bamboo_thatch_slab.json b/src/main/resources/data/twigs/loot_table/blocks/bamboo_thatch_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bamboo_thatch_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/bamboo_thatch_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/birch_table.json b/src/main/resources/data/twigs/loot_table/blocks/birch_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/birch_table.json rename to src/main/resources/data/twigs/loot_table/blocks/birch_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/black_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/black_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/black_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/black_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/black_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/black_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/black_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/black_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blackstone_column.json b/src/main/resources/data/twigs/loot_table/blocks/blackstone_column.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blackstone_column.json rename to src/main/resources/data/twigs/loot_table/blocks/blackstone_column.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bloodstone.json b/src/main/resources/data/twigs/loot_table/blocks/bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bloodstone.json rename to src/main/resources/data/twigs/loot_table/blocks/bloodstone.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bloodstone_slab.json b/src/main/resources/data/twigs/loot_table/blocks/bloodstone_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bloodstone_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/bloodstone_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bloodstone_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/bloodstone_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bloodstone_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/bloodstone_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bloodstone_wall.json b/src/main/resources/data/twigs/loot_table/blocks/bloodstone_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bloodstone_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/bloodstone_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_orchid_paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/blue_orchid_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_orchid_paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_orchid_paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/blue_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/blue_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/blue_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/blue_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brick_trail.json b/src/main/resources/data/twigs/loot_table/blocks/brick_trail.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brick_trail.json rename to src/main/resources/data/twigs/loot_table/blocks/brick_trail.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/bronzed_seashell.json b/src/main/resources/data/twigs/loot_table/blocks/bronzed_seashell.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/bronzed_seashell.json rename to src/main/resources/data/twigs/loot_table/blocks/bronzed_seashell.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/brown_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/brown_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/brown_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/brown_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/calcite_slab.json b/src/main/resources/data/twigs/loot_table/blocks/calcite_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/calcite_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/calcite_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/calcite_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/calcite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/calcite_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/calcite_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/calcite_wall.json b/src/main/resources/data/twigs/loot_table/blocks/calcite_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/calcite_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/calcite_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cherry_table.json b/src/main/resources/data/twigs/loot_table/blocks/cherry_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cherry_table.json rename to src/main/resources/data/twigs/loot_table/blocks/cherry_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/chiseled_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/chiseled_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/chiseled_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/chiseled_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/chiseled_silt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/chiseled_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/chiseled_silt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/chiseled_silt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/chiseled_smooth_basalt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/chiseled_smooth_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/chiseled_smooth_basalt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/chiseled_smooth_basalt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cobblestone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/cobblestone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cobblestone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cobblestone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cobblestone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cobblestone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/compacted_dripstone.json b/src/main/resources/data/twigs/loot_table/blocks/compacted_dripstone.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/compacted_dripstone.json rename to src/main/resources/data/twigs/loot_table/blocks/compacted_dripstone.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_cobblestone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_cobblestone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_cobblestone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_cobblestone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_bloodstone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_polished_bloodstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_polished_bloodstone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_calcite_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_polished_calcite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_calcite_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_polished_calcite_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_rhyolite_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_polished_rhyolite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_polished_rhyolite_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_schist_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_polished_schist_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_schist_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_polished_schist_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_tuff_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_polished_tuff_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_polished_tuff_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_polished_tuff_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cracked_silt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/cracked_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cracked_silt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/cracked_silt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/crimson_roots_paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/crimson_roots_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/crimson_roots_paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/crimson_roots_paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/crimson_shroomlamp.json b/src/main/resources/data/twigs/loot_table/blocks/crimson_shroomlamp.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/crimson_shroomlamp.json rename to src/main/resources/data/twigs/loot_table/blocks/crimson_shroomlamp.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/crimson_table.json b/src/main/resources/data/twigs/loot_table/blocks/crimson_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/crimson_table.json rename to src/main/resources/data/twigs/loot_table/blocks/crimson_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cut_amethyst.json b/src/main/resources/data/twigs/loot_table/blocks/cut_amethyst.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cut_amethyst.json rename to src/main/resources/data/twigs/loot_table/blocks/cut_amethyst.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/cyan_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/cyan_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/dandelion_paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/dandelion_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/dandelion_paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/dandelion_paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/dark_oak_table.json b/src/main/resources/data/twigs/loot_table/blocks/dark_oak_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/dark_oak_table.json rename to src/main/resources/data/twigs/loot_table/blocks/dark_oak_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/deepslate_column.json b/src/main/resources/data/twigs/loot_table/blocks/deepslate_column.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/deepslate_column.json rename to src/main/resources/data/twigs/loot_table/blocks/deepslate_column.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/exposed_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/exposed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/exposed_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/exposed_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/gravel_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/gravel_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/gravel_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/gravel_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/gravel_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gravel_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/gravel_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gravel_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/gravel_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gravel_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/gravel_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/gray_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/gray_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/gray_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/gray_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/green_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/green_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/green_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/green_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/green_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/green_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/green_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/green_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/jungle_table.json b/src/main/resources/data/twigs/loot_table/blocks/jungle_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/jungle_table.json rename to src/main/resources/data/twigs/loot_table/blocks/jungle_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lamp.json b/src/main/resources/data/twigs/loot_table/blocks/lamp.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lamp.json rename to src/main/resources/data/twigs/loot_table/blocks/lamp.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_blue_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/light_blue_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/light_gray_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/light_gray_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/lime_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/lime_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/lime_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/lime_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/magenta_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/magenta_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mangrove_table.json b/src/main/resources/data/twigs/loot_table/blocks/mangrove_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mangrove_table.json rename to src/main/resources/data/twigs/loot_table/blocks/mangrove_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mixed_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/mixed_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mixed_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/mixed_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mixed_silt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/mixed_silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mixed_silt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/mixed_silt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/mossy_cobblestone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/mossy_cobblestone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/oak_table.json b/src/main/resources/data/twigs/loot_table/blocks/oak_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/oak_table.json rename to src/main/resources/data/twigs/loot_table/blocks/oak_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/opaline_seashell.json b/src/main/resources/data/twigs/loot_table/blocks/opaline_seashell.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/opaline_seashell.json rename to src/main/resources/data/twigs/loot_table/blocks/opaline_seashell.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/orange_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/orange_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/orange_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/orange_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/oxidized_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/oxidized_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/oxidized_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/oxidized_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pebble.json b/src/main/resources/data/twigs/loot_table/blocks/pebble.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pebble.json rename to src/main/resources/data/twigs/loot_table/blocks/pebble.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/petrified_lichen.json b/src/main/resources/data/twigs/loot_table/blocks/petrified_lichen.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/petrified_lichen.json rename to src/main/resources/data/twigs/loot_table/blocks/petrified_lichen.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/pink_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/pink_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/pink_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/pink_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_amethyst.json b/src/main/resources/data/twigs/loot_table/blocks/polished_amethyst.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_amethyst.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_amethyst.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_basalt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_basalt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_basalt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_bloodstone_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_bloodstone_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_calcite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_calcite_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_calcite_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_rhyolite_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_rhyolite_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_schist_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_schist_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_schist_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_schist_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_slab.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/polished_tuff_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/polished_tuff_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/polished_tuff_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/potted_azalea_flowers.json b/src/main/resources/data/twigs/loot_table/blocks/potted_azalea_flowers.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/potted_azalea_flowers.json rename to src/main/resources/data/twigs/loot_table/blocks/potted_azalea_flowers.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/purple_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/purple_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/purple_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/purple_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/quartz_column.json b/src/main/resources/data/twigs/loot_table/blocks/quartz_column.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/quartz_column.json rename to src/main/resources/data/twigs/loot_table/blocks/quartz_column.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/red_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/red_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/red_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/red_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/red_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/red_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/red_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/red_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/rhyolite.json b/src/main/resources/data/twigs/loot_table/blocks/rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/rhyolite.json rename to src/main/resources/data/twigs/loot_table/blocks/rhyolite.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/rhyolite_slab.json b/src/main/resources/data/twigs/loot_table/blocks/rhyolite_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/rhyolite_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/rhyolite_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/rhyolite_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/rhyolite_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/rhyolite_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/rhyolite_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/rhyolite_wall.json b/src/main/resources/data/twigs/loot_table/blocks/rhyolite_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/rhyolite_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/rhyolite_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/rocky_dirt.json b/src/main/resources/data/twigs/loot_table/blocks/rocky_dirt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/rocky_dirt.json rename to src/main/resources/data/twigs/loot_table/blocks/rocky_dirt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/roseate_seashell.json b/src/main/resources/data/twigs/loot_table/blocks/roseate_seashell.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/roseate_seashell.json rename to src/main/resources/data/twigs/loot_table/blocks/roseate_seashell.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/schist.json b/src/main/resources/data/twigs/loot_table/blocks/schist.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/schist.json rename to src/main/resources/data/twigs/loot_table/blocks/schist.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/schist_slab.json b/src/main/resources/data/twigs/loot_table/blocks/schist_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/schist_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/schist_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/schist_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/schist_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/schist_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/schist_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/schist_wall.json b/src/main/resources/data/twigs/loot_table/blocks/schist_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/schist_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/schist_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt.json b/src/main/resources/data/twigs/loot_table/blocks/silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt.json rename to src/main/resources/data/twigs/loot_table/blocks/silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/silt_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/silt_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_brick_trail.json b/src/main/resources/data/twigs/loot_table/blocks/silt_brick_trail.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_brick_trail.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_brick_trail.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/silt_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/silt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_basalt_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_basalt_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_stone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/smooth_stone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/smooth_stone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/smooth_stone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/soul_lamp.json b/src/main/resources/data/twigs/loot_table/blocks/soul_lamp.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/soul_lamp.json rename to src/main/resources/data/twigs/loot_table/blocks/soul_lamp.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/spruce_table.json b/src/main/resources/data/twigs/loot_table/blocks/spruce_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/spruce_table.json rename to src/main/resources/data/twigs/loot_table/blocks/spruce_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/stone_column.json b/src/main/resources/data/twigs/loot_table/blocks/stone_column.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/stone_column.json rename to src/main/resources/data/twigs/loot_table/blocks/stone_column.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/tangerine_seashell.json b/src/main/resources/data/twigs/loot_table/blocks/tangerine_seashell.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/tangerine_seashell.json rename to src/main/resources/data/twigs/loot_table/blocks/tangerine_seashell.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/torchflower_paper_lantern.json b/src/main/resources/data/twigs/loot_table/blocks/torchflower_paper_lantern.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/torchflower_paper_lantern.json rename to src/main/resources/data/twigs/loot_table/blocks/torchflower_paper_lantern.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/tuff_slab.json b/src/main/resources/data/twigs/loot_table/blocks/tuff_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/tuff_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/tuff_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/tuff_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/tuff_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/tuff_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/tuff_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/tuff_wall.json b/src/main/resources/data/twigs/loot_table/blocks/tuff_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/tuff_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/tuff_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/twig.json b/src/main/resources/data/twigs/loot_table/blocks/twig.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/twig.json rename to src/main/resources/data/twigs/loot_table/blocks/twig.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/twisting_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/twisting_polished_blackstone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/warped_shroomlamp.json b/src/main/resources/data/twigs/loot_table/blocks/warped_shroomlamp.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/warped_shroomlamp.json rename to src/main/resources/data/twigs/loot_table/blocks/warped_shroomlamp.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/warped_table.json b/src/main/resources/data/twigs/loot_table/blocks/warped_table.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/warped_table.json rename to src/main/resources/data/twigs/loot_table/blocks/warped_table.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/waxed_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/waxed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/waxed_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/waxed_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/waxed_exposed_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/waxed_exposed_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/waxed_exposed_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/waxed_exposed_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/waxed_oxidized_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/waxed_oxidized_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/waxed_oxidized_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/waxed_oxidized_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/waxed_weathered_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/waxed_weathered_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/waxed_weathered_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/waxed_weathered_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/weathered_copper_pillar.json b/src/main/resources/data/twigs/loot_table/blocks/weathered_copper_pillar.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/weathered_copper_pillar.json rename to src/main/resources/data/twigs/loot_table/blocks/weathered_copper_pillar.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_brick_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_bricks.json b/src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_bricks.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/weeping_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/loot_table/blocks/weeping_polished_blackstone_bricks.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/white_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/white_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/white_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/white_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/white_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/white_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/white_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/white_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_packed_silt.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_packed_silt.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_packed_silt.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_pot.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_silt_pot.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_pot.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_silt_pot.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_slab.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_slab.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_slab.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_slab.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_stairs.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_stairs.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_stairs.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_stairs.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_wall.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_wall.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingle_wall.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingle_wall.json diff --git a/src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingles.json b/src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingles.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/blocks/yellow_silt_shingles.json rename to src/main/resources/data/twigs/loot_table/blocks/yellow_silt_shingles.json diff --git a/src/main/resources/data/twigs/loot_tables/chests/bloodstone_obelisk.json b/src/main/resources/data/twigs/loot_table/chests/bloodstone_obelisk.json similarity index 100% rename from src/main/resources/data/twigs/loot_tables/chests/bloodstone_obelisk.json rename to src/main/resources/data/twigs/loot_table/chests/bloodstone_obelisk.json diff --git a/src/main/resources/data/twigs/recipes/acacia_table.json b/src/main/resources/data/twigs/recipe/acacia_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/acacia_table.json rename to src/main/resources/data/twigs/recipe/acacia_table.json index 1efe84d6..104396cd 100644 --- a/src/main/resources/data/twigs/recipes/acacia_table.json +++ b/src/main/resources/data/twigs/recipe/acacia_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:acacia_table", + "id": "twigs:acacia_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/allium_paper_lantern.json b/src/main/resources/data/twigs/recipe/allium_paper_lantern.json similarity index 83% rename from src/main/resources/data/twigs/recipes/allium_paper_lantern.json rename to src/main/resources/data/twigs/recipe/allium_paper_lantern.json index 2791727f..9359a5e8 100644 --- a/src/main/resources/data/twigs/recipes/allium_paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/allium_paper_lantern.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:allium_paper_lantern", + "id": "twigs:allium_paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea.json b/src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea.json similarity index 80% rename from src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea.json rename to src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea.json index 68a85f93..29421c2a 100644 --- a/src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea.json +++ b/src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "twigs:azalea_flowers", + "id": "twigs:azalea_flowers", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea_leaves.json b/src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea_leaves.json similarity index 81% rename from src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea_leaves.json rename to src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea_leaves.json index 91051f32..5976428e 100644 --- a/src/main/resources/data/twigs/recipes/azalea_flowers_from_flowering_azalea_leaves.json +++ b/src/main/resources/data/twigs/recipe/azalea_flowers_from_flowering_azalea_leaves.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "twigs:azalea_flowers", + "id": "twigs:azalea_flowers", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bamboo_mat.json b/src/main/resources/data/twigs/recipe/bamboo_mat.json similarity index 86% rename from src/main/resources/data/twigs/recipes/bamboo_mat.json rename to src/main/resources/data/twigs/recipe/bamboo_mat.json index 873fb4d2..07197d84 100644 --- a/src/main/resources/data/twigs/recipes/bamboo_mat.json +++ b/src/main/resources/data/twigs/recipe/bamboo_mat.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:bamboo_mat", + "id": "twigs:bamboo_mat", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bamboo_table.json b/src/main/resources/data/twigs/recipe/bamboo_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/bamboo_table.json rename to src/main/resources/data/twigs/recipe/bamboo_table.json index bd5106e6..d4635552 100644 --- a/src/main/resources/data/twigs/recipes/bamboo_table.json +++ b/src/main/resources/data/twigs/recipe/bamboo_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:bamboo_table", + "id": "twigs:bamboo_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bamboo_thatch.json b/src/main/resources/data/twigs/recipe/bamboo_thatch.json similarity index 83% rename from src/main/resources/data/twigs/recipes/bamboo_thatch.json rename to src/main/resources/data/twigs/recipe/bamboo_thatch.json index c6204455..dae4fc65 100644 --- a/src/main/resources/data/twigs/recipes/bamboo_thatch.json +++ b/src/main/resources/data/twigs/recipe/bamboo_thatch.json @@ -11,6 +11,6 @@ ], "result": { "count": 2, - "item": "twigs:bamboo_thatch" + "id": "twigs:bamboo_thatch" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bamboo_thatch_slab.json b/src/main/resources/data/twigs/recipe/bamboo_thatch_slab.json similarity index 83% rename from src/main/resources/data/twigs/recipes/bamboo_thatch_slab.json rename to src/main/resources/data/twigs/recipe/bamboo_thatch_slab.json index f599203b..d41c5ba5 100644 --- a/src/main/resources/data/twigs/recipes/bamboo_thatch_slab.json +++ b/src/main/resources/data/twigs/recipe/bamboo_thatch_slab.json @@ -11,6 +11,6 @@ ], "result": { "count": 6, - "item": "twigs:bamboo_thatch_slab" + "id": "twigs:bamboo_thatch_slab" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/birch_table.json b/src/main/resources/data/twigs/recipe/birch_table.json similarity index 89% rename from src/main/resources/data/twigs/recipes/birch_table.json rename to src/main/resources/data/twigs/recipe/birch_table.json index 1b0bd7b9..2042da73 100644 --- a/src/main/resources/data/twigs/recipes/birch_table.json +++ b/src/main/resources/data/twigs/recipe/birch_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:birch_table", + "id": "twigs:birch_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/black_silt_pot.json b/src/main/resources/data/twigs/recipe/black_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/black_silt_pot.json rename to src/main/resources/data/twigs/recipe/black_silt_pot.json index c6ae6df1..2119a73a 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/black_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:black_silt_pot" + "id": "twigs:black_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_slab.json index b89e9eb4..b70eba38 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:black_silt_shingle_slab", + "id": "twigs:black_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json index f01b8b68..e1520f15 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_packed_silt" }, - "result": "twigs:black_silt_shingle_slab", + "result": { + "id": "twigs:black_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json index 8e38f663..7b87bb4d 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_slab_from_black_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_silt_shingles" }, - "result": "twigs:black_silt_shingle_slab", + "result": { + "id": "twigs:black_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_stairs.json index 2fcdcfbd..654649fa 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:black_silt_shingle_stairs", + "id": "twigs:black_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json index c8ad439b..b0f21803 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_packed_silt" }, - "result": "twigs:black_silt_shingle_stairs", + "result": { + "id": "twigs:black_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json index 3906ee36..f447a88e 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_stairs_from_black_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_silt_shingles" }, - "result": "twigs:black_silt_shingle_stairs", + "result": { + "id": "twigs:black_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_wall.json index c176a445..f1315c4f 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:black_silt_shingle_wall", + "id": "twigs:black_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json index c7b39d0f..3e79c3f2 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_packed_silt" }, - "result": "twigs:black_silt_shingle_wall", + "result": { + "id": "twigs:black_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json index f12c3432..630e835b 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingle_wall_from_black_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_silt_shingles" }, - "result": "twigs:black_silt_shingle_wall", + "result": { + "id": "twigs:black_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingles.json b/src/main/resources/data/twigs/recipe/black_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/black_silt_shingles.json rename to src/main/resources/data/twigs/recipe/black_silt_shingles.json index c2e69f0a..53cc3622 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:black_silt_shingles" + "id": "twigs:black_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingles_from_black_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/black_silt_shingles_from_black_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/black_silt_shingles_from_black_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/black_silt_shingles_from_black_packed_silt_stonecutting.json index 19b779e8..08e96e57 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingles_from_black_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingles_from_black_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:black_packed_silt" }, - "result": "twigs:black_silt_shingles", + "result": { + "id": "twigs:black_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/black_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/black_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/black_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/black_silt_shingles_from_packed_silt.json index 34f10909..08ec0d87 100644 --- a/src/main/resources/data/twigs/recipes/black_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/black_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:black_silt_shingles" + "id": "twigs:black_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blackstone_column.json b/src/main/resources/data/twigs/recipe/blackstone_column.json similarity index 82% rename from src/main/resources/data/twigs/recipes/blackstone_column.json rename to src/main/resources/data/twigs/recipe/blackstone_column.json index d646f432..f27c4dd8 100644 --- a/src/main/resources/data/twigs/recipes/blackstone_column.json +++ b/src/main/resources/data/twigs/recipe/blackstone_column.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:blackstone_column", + "id": "twigs:blackstone_column", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blackstone_column_stonecutting.json b/src/main/resources/data/twigs/recipe/blackstone_column_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/blackstone_column_stonecutting.json rename to src/main/resources/data/twigs/recipe/blackstone_column_stonecutting.json index 82e51d84..d2ad63c3 100644 --- a/src/main/resources/data/twigs/recipes/blackstone_column_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blackstone_column_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:blackstone" }, - "result": "twigs:blackstone_column", + "result": { + "id": "twigs:blackstone_column" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/bloodstone.json b/src/main/resources/data/twigs/recipe/bloodstone.json similarity index 89% rename from src/main/resources/data/twigs/recipes/bloodstone.json rename to src/main/resources/data/twigs/recipe/bloodstone.json index bf59afdd..1d99c19c 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone.json +++ b/src/main/resources/data/twigs/recipe/bloodstone.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:bloodstone", + "id": "twigs:bloodstone", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bloodstone_slab.json b/src/main/resources/data/twigs/recipe/bloodstone_slab.json similarity index 82% rename from src/main/resources/data/twigs/recipes/bloodstone_slab.json rename to src/main/resources/data/twigs/recipe/bloodstone_slab.json index f803d15a..014c9acb 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_slab.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:bloodstone_slab", + "id": "twigs:bloodstone_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/bloodstone_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/bloodstone_slab_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/bloodstone_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/bloodstone_slab_stonecutting.json index 79b2f819..4d103b3f 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:bloodstone_slab", + "result": { + "id": "twigs:bloodstone_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/bloodstone_stairs.json b/src/main/resources/data/twigs/recipe/bloodstone_stairs.json similarity index 83% rename from src/main/resources/data/twigs/recipes/bloodstone_stairs.json rename to src/main/resources/data/twigs/recipe/bloodstone_stairs.json index 38726430..07d4ea31 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_stairs.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:bloodstone_stairs", + "id": "twigs:bloodstone_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/bloodstone_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/bloodstone_stairs_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/bloodstone_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/bloodstone_stairs_stonecutting.json index d561e088..03c5a8ab 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:bloodstone_stairs", + "result": { + "id": "twigs:bloodstone_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/bloodstone_wall.json b/src/main/resources/data/twigs/recipe/bloodstone_wall.json similarity index 83% rename from src/main/resources/data/twigs/recipes/bloodstone_wall.json rename to src/main/resources/data/twigs/recipe/bloodstone_wall.json index 2245bc88..bcf21ee5 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_wall.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:bloodstone_wall", + "id": "twigs:bloodstone_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/bloodstone_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/bloodstone_wall_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/bloodstone_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/bloodstone_wall_stonecutting.json index 0a76d368..69204516 100644 --- a/src/main/resources/data/twigs/recipes/bloodstone_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/bloodstone_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:bloodstone_wall", + "result": { + "id": "twigs:bloodstone_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_orchid_paper_lantern.json b/src/main/resources/data/twigs/recipe/blue_orchid_paper_lantern.json similarity index 82% rename from src/main/resources/data/twigs/recipes/blue_orchid_paper_lantern.json rename to src/main/resources/data/twigs/recipe/blue_orchid_paper_lantern.json index 88003f20..a2bb98f6 100644 --- a/src/main/resources/data/twigs/recipes/blue_orchid_paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/blue_orchid_paper_lantern.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:blue_orchid_paper_lantern", + "id": "twigs:blue_orchid_paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blue_packed_silt.json b/src/main/resources/data/twigs/recipe/blue_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/blue_packed_silt.json rename to src/main/resources/data/twigs/recipe/blue_packed_silt.json index 60d06ddc..238d8ffc 100644 --- a/src/main/resources/data/twigs/recipes/blue_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/blue_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:blue_packed_silt" + "id": "twigs:blue_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blue_silt_pot.json b/src/main/resources/data/twigs/recipe/blue_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/blue_silt_pot.json rename to src/main/resources/data/twigs/recipe/blue_silt_pot.json index 5c836b72..4e77bab5 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:blue_silt_pot" + "id": "twigs:blue_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_slab.json index 2875aa98..574e89b1 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:blue_silt_shingle_slab", + "id": "twigs:blue_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json index b728960a..3a826038 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_packed_silt" }, - "result": "twigs:blue_silt_shingle_slab", + "result": { + "id": "twigs:blue_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json index fb417be8..a966d398 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_slab_from_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_silt_shingles" }, - "result": "twigs:blue_silt_shingle_slab", + "result": { + "id": "twigs:blue_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs.json index 6c46aa64..4adafd88 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:blue_silt_shingle_stairs", + "id": "twigs:blue_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json index f00231fb..e694410c 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_packed_silt" }, - "result": "twigs:blue_silt_shingle_stairs", + "result": { + "id": "twigs:blue_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json index 2c55b31b..2abe3082 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_stairs_from_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_silt_shingles" }, - "result": "twigs:blue_silt_shingle_stairs", + "result": { + "id": "twigs:blue_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_wall.json index 99ce007b..fc5b44ea 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:blue_silt_shingle_wall", + "id": "twigs:blue_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json index b1819fee..f5d0c0d8 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_packed_silt" }, - "result": "twigs:blue_silt_shingle_wall", + "result": { + "id": "twigs:blue_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json index 4c1c94e1..88c8f990 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingle_wall_from_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_silt_shingles" }, - "result": "twigs:blue_silt_shingle_wall", + "result": { + "id": "twigs:blue_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingles.json b/src/main/resources/data/twigs/recipe/blue_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/blue_silt_shingles.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingles.json index 9ae317e8..7ef7eed2 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:blue_silt_shingles" + "id": "twigs:blue_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingles_from_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/blue_silt_shingles_from_blue_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/blue_silt_shingles_from_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingles_from_blue_packed_silt_stonecutting.json index 31aaf2bd..5405d104 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingles_from_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingles_from_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:blue_packed_silt" }, - "result": "twigs:blue_silt_shingles", + "result": { + "id": "twigs:blue_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/blue_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/blue_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/blue_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/blue_silt_shingles_from_packed_silt.json index 46e00fb2..2e38fcb1 100644 --- a/src/main/resources/data/twigs/recipes/blue_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/blue_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:blue_silt_shingles" + "id": "twigs:blue_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/bone_meal_from_seashells.json b/src/main/resources/data/twigs/recipe/bone_meal_from_seashells.json similarity index 83% rename from src/main/resources/data/twigs/recipes/bone_meal_from_seashells.json rename to src/main/resources/data/twigs/recipe/bone_meal_from_seashells.json index c8573e0d..5cf048f6 100644 --- a/src/main/resources/data/twigs/recipes/bone_meal_from_seashells.json +++ b/src/main/resources/data/twigs/recipe/bone_meal_from_seashells.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "minecraft:bone_meal", + "id": "minecraft:bone_meal", "count": 3 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/brick_trail.json b/src/main/resources/data/twigs/recipe/brick_trail.json similarity index 85% rename from src/main/resources/data/twigs/recipes/brick_trail.json rename to src/main/resources/data/twigs/recipe/brick_trail.json index f8b90c18..89cb584b 100644 --- a/src/main/resources/data/twigs/recipes/brick_trail.json +++ b/src/main/resources/data/twigs/recipe/brick_trail.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:brick_trail", + "id": "twigs:brick_trail", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/brown_packed_silt.json b/src/main/resources/data/twigs/recipe/brown_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/brown_packed_silt.json rename to src/main/resources/data/twigs/recipe/brown_packed_silt.json index 41db41f1..145d48ee 100644 --- a/src/main/resources/data/twigs/recipes/brown_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/brown_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:brown_packed_silt" + "id": "twigs:brown_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/brown_silt_pot.json b/src/main/resources/data/twigs/recipe/brown_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/brown_silt_pot.json rename to src/main/resources/data/twigs/recipe/brown_silt_pot.json index aafa254e..e43eb717 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:brown_silt_pot" + "id": "twigs:brown_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_slab.json index 3195519b..a8d1cba1 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:brown_silt_shingle_slab", + "id": "twigs:brown_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json index b980efba..8bd57204 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_packed_silt" }, - "result": "twigs:brown_silt_shingle_slab", + "result": { + "id": "twigs:brown_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json index 8597d132..8f90fd17 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_slab_from_brown_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_silt_shingles" }, - "result": "twigs:brown_silt_shingle_slab", + "result": { + "id": "twigs:brown_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs.json index e69a18ef..1fb825b4 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:brown_silt_shingle_stairs", + "id": "twigs:brown_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json index 7f95baa0..889acbd8 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_packed_silt" }, - "result": "twigs:brown_silt_shingle_stairs", + "result": { + "id": "twigs:brown_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json index 70e32e5c..cbc1fccf 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_stairs_from_brown_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_silt_shingles" }, - "result": "twigs:brown_silt_shingle_stairs", + "result": { + "id": "twigs:brown_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_wall.json index c97a53ba..4b6479af 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:brown_silt_shingle_wall", + "id": "twigs:brown_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json index 3e6d5ed6..a7d6e693 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_packed_silt" }, - "result": "twigs:brown_silt_shingle_wall", + "result": { + "id": "twigs:brown_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json index 3fa47b61..2d2f07a8 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingle_wall_from_brown_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_silt_shingles" }, - "result": "twigs:brown_silt_shingle_wall", + "result": { + "id": "twigs:brown_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingles.json b/src/main/resources/data/twigs/recipe/brown_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/brown_silt_shingles.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingles.json index b58c2607..84b6bec8 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:brown_silt_shingles" + "id": "twigs:brown_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingles_from_brown_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/brown_silt_shingles_from_brown_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/brown_silt_shingles_from_brown_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingles_from_brown_packed_silt_stonecutting.json index 1549c8c4..c52be89d 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingles_from_brown_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingles_from_brown_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:brown_packed_silt" }, - "result": "twigs:brown_silt_shingles", + "result": { + "id": "twigs:brown_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/brown_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/brown_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/brown_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/brown_silt_shingles_from_packed_silt.json index 938d7b63..ff0cbf06 100644 --- a/src/main/resources/data/twigs/recipes/brown_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/brown_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:brown_silt_shingles" + "id": "twigs:brown_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/calcite_slab_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/calcite_slab_from_calcite_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/calcite_slab_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/calcite_slab_from_calcite_stonecutting.json index 66eae3d5..782a294f 100644 --- a/src/main/resources/data/twigs/recipes/calcite_slab_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/calcite_slab_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:calcite_slab", + "result": { + "id": "twigs:calcite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/calcite_stairs.json b/src/main/resources/data/twigs/recipe/calcite_stairs.json similarity index 84% rename from src/main/resources/data/twigs/recipes/calcite_stairs.json rename to src/main/resources/data/twigs/recipe/calcite_stairs.json index 5fbf04c2..1edb2e6d 100644 --- a/src/main/resources/data/twigs/recipes/calcite_stairs.json +++ b/src/main/resources/data/twigs/recipe/calcite_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:calcite_stairs", + "id": "twigs:calcite_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/calcite_stairs_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/calcite_stairs_from_calcite_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/calcite_stairs_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/calcite_stairs_from_calcite_stonecutting.json index 5ea45d36..4eb619c7 100644 --- a/src/main/resources/data/twigs/recipes/calcite_stairs_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/calcite_stairs_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:calcite_stairs", + "result": { + "id": "twigs:calcite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/calcite_wall.json b/src/main/resources/data/twigs/recipe/calcite_wall.json similarity index 84% rename from src/main/resources/data/twigs/recipes/calcite_wall.json rename to src/main/resources/data/twigs/recipe/calcite_wall.json index 562a98bd..dca5e475 100644 --- a/src/main/resources/data/twigs/recipes/calcite_wall.json +++ b/src/main/resources/data/twigs/recipe/calcite_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:calcite_wall", + "id": "twigs:calcite_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/calcite_wall_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/calcite_wall_from_calcite_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/calcite_wall_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/calcite_wall_from_calcite_stonecutting.json index 907f3f76..015ec853 100644 --- a/src/main/resources/data/twigs/recipes/calcite_wall_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/calcite_wall_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:calcite_wall", + "result": { + "id": "twigs:calcite_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cherry_table.json b/src/main/resources/data/twigs/recipe/cherry_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/cherry_table.json rename to src/main/resources/data/twigs/recipe/cherry_table.json index 5b982032..22efccbc 100644 --- a/src/main/resources/data/twigs/recipes/cherry_table.json +++ b/src/main/resources/data/twigs/recipe/cherry_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:cherry_table", + "id": "twigs:cherry_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_bricks.json b/src/main/resources/data/twigs/recipe/chiseled_bricks.json similarity index 85% rename from src/main/resources/data/twigs/recipes/chiseled_bricks.json rename to src/main/resources/data/twigs/recipe/chiseled_bricks.json index 2e96c993..608f3c3f 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_bricks.json +++ b/src/main/resources/data/twigs/recipe/chiseled_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:chiseled_bricks", + "id": "twigs:chiseled_bricks", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/chiseled_bricks_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/chiseled_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/chiseled_bricks_stonecutting.json index 4459fcbb..ab01512b 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/chiseled_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:bricks" }, - "result": "twigs:chiseled_bricks", + "result": { + "id": "twigs:chiseled_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_silt_bricks.json b/src/main/resources/data/twigs/recipe/chiseled_silt_bricks.json similarity index 83% rename from src/main/resources/data/twigs/recipes/chiseled_silt_bricks.json rename to src/main/resources/data/twigs/recipe/chiseled_silt_bricks.json index 49442730..14b0c618 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_silt_bricks.json +++ b/src/main/resources/data/twigs/recipe/chiseled_silt_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:chiseled_silt_bricks", + "id": "twigs:chiseled_silt_bricks", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_silt_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/chiseled_silt_bricks_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/chiseled_silt_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/chiseled_silt_bricks_stonecutting.json index 1f9d02b3..049622e4 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_silt_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/chiseled_silt_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:chiseled_silt_bricks", + "result": { + "id": "twigs:chiseled_silt_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks.json b/src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks.json similarity index 77% rename from src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks.json rename to src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks.json index 62a0b16c..727c57ec 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks.json +++ b/src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:chiseled_smooth_basalt_bricks" + "id": "twigs:chiseled_smooth_basalt_bricks" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks_stonecutting.json index fb1300a7..820911bf 100644 --- a/src/main/resources/data/twigs/recipes/chiseled_smooth_basalt_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/chiseled_smooth_basalt_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_basalt_bricks" }, - "result": "twigs:chiseled_smooth_basalt_bricks", + "result": { + "id": "twigs:chiseled_smooth_basalt_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab.json similarity index 83% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_slab.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_slab.json index 0cfb334d..223721ba 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:cobblestone_brick_slab", + "id": "twigs:cobblestone_brick_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab_from_cobblestone_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_slab_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_slab_from_cobblestone_stonecutting.json index d8d0b85e..3b885e8c 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab_from_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab_from_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:cobblestone" }, - "result": "twigs:cobblestone_brick_slab", + "result": { + "id": "twigs:cobblestone_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_slab_stonecutting.json index a07c8d40..7fcffeea 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cobblestone_bricks" }, - "result": "twigs:cobblestone_brick_slab", + "result": { + "id": "twigs:cobblestone_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs.json similarity index 82% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_stairs.json index c7778575..a7c9d000 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:cobblestone_brick_stairs", + "id": "twigs:cobblestone_brick_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_from_cobblestone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_from_cobblestone_stonecutting.json index 318e2212..e5eaf23d 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_from_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_from_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:cobblestone" }, - "result": "twigs:cobblestone_brick_stairs", + "result": { + "id": "twigs:cobblestone_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_stonecutting.json index 2dbd3a3b..6954383b 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cobblestone_bricks" }, - "result": "twigs:cobblestone_brick_stairs", + "result": { + "id": "twigs:cobblestone_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall.json similarity index 83% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_wall.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_wall.json index c6d08bd8..3019df97 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:cobblestone_brick_wall", + "id": "twigs:cobblestone_brick_wall", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall_from_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall_from_cobblestone_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_wall_from_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_wall_from_cobblestone_stonecutting.json index 00961faf..d7f94c14 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall_from_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall_from_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:cobblestone" }, - "result": "twigs:cobblestone_brick_wall", + "result": { + "id": "twigs:cobblestone_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/cobblestone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_brick_wall_stonecutting.json index 1e631ebf..b7d1b394 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cobblestone_bricks" }, - "result": "twigs:cobblestone_brick_wall", + "result": { + "id": "twigs:cobblestone_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_bricks.json b/src/main/resources/data/twigs/recipe/cobblestone_bricks.json similarity index 83% rename from src/main/resources/data/twigs/recipes/cobblestone_bricks.json rename to src/main/resources/data/twigs/recipe/cobblestone_bricks.json index 8733f631..5a447ff8 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_bricks.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:cobblestone_bricks", + "id": "twigs:cobblestone_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/cobblestone_bricks_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cobblestone_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/cobblestone_bricks_stonecutting.json index 8c0eb1cf..0b389107 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:cobblestone" }, - "result": "twigs:cobblestone_bricks", + "result": { + "id": "twigs:cobblestone_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cobblestone_from_pebble.json b/src/main/resources/data/twigs/recipe/cobblestone_from_pebble.json similarity index 81% rename from src/main/resources/data/twigs/recipes/cobblestone_from_pebble.json rename to src/main/resources/data/twigs/recipe/cobblestone_from_pebble.json index cdba6b27..a8bcc24e 100644 --- a/src/main/resources/data/twigs/recipes/cobblestone_from_pebble.json +++ b/src/main/resources/data/twigs/recipe/cobblestone_from_pebble.json @@ -10,6 +10,6 @@ "##" ], "result": { - "item": "minecraft:cobblestone" + "id": "minecraft:cobblestone" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/compacted_dripstone.json b/src/main/resources/data/twigs/recipe/compacted_dripstone.json similarity index 81% rename from src/main/resources/data/twigs/recipes/compacted_dripstone.json rename to src/main/resources/data/twigs/recipe/compacted_dripstone.json index 8b64cbf1..fd0d6634 100644 --- a/src/main/resources/data/twigs/recipes/compacted_dripstone.json +++ b/src/main/resources/data/twigs/recipe/compacted_dripstone.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:compacted_dripstone", + "id": "twigs:compacted_dripstone", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/copper_pillar.json b/src/main/resources/data/twigs/recipe/copper_pillar.json similarity index 83% rename from src/main/resources/data/twigs/recipes/copper_pillar.json rename to src/main/resources/data/twigs/recipe/copper_pillar.json index 340607ae..4f12e2d6 100644 --- a/src/main/resources/data/twigs/recipes/copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:copper_pillar" + "id": "twigs:copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/copper_pillar_from_cut_copper_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/copper_pillar_from_cut_copper_stonecutting.json index 75537b03..12ee3477 100644 --- a/src/main/resources/data/twigs/recipes/copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:cut_copper" }, - "result": "twigs:copper_pillar", + "result": { + "id": "twigs:copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/copper_pillar_stonecutting.json similarity index 69% rename from src/main/resources/data/twigs/recipes/copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/copper_pillar_stonecutting.json index daf42b20..b4f0ab1c 100644 --- a/src/main/resources/data/twigs/recipes/copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:copper_block" }, - "result": "twigs:copper_pillar", + "result": { + "id": "twigs:copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cracked_bricks.json b/src/main/resources/data/twigs/recipe/cracked_bricks.json similarity index 70% rename from src/main/resources/data/twigs/recipes/cracked_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_bricks.json index d53558fb..df886fd5 100644 --- a/src/main/resources/data/twigs/recipes/cracked_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "minecraft:bricks" }, - "result": "twigs:cracked_bricks", + "result": { + "id": "twigs:cracked_bricks" + }, "experience": 0.1, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cracked_cobblestone_bricks.json b/src/main/resources/data/twigs/recipe/cracked_cobblestone_bricks.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cracked_cobblestone_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_cobblestone_bricks.json index 28e3603c..1d2e7f54 100644 --- a/src/main/resources/data/twigs/recipes/cracked_cobblestone_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_cobblestone_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:cobblestone_bricks" }, - "result": "twigs:cracked_cobblestone_bricks", + "result": { + "id": "twigs:cracked_cobblestone_bricks" + }, "experience": 0.1, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cracked_polished_bloodstone_bricks.json b/src/main/resources/data/twigs/recipe/cracked_polished_bloodstone_bricks.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cracked_polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_polished_bloodstone_bricks.json index a7ee305d..b7a0a448 100644 --- a/src/main/resources/data/twigs/recipes/cracked_polished_bloodstone_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_polished_bloodstone_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:polished_bloodstone_bricks" }, - "result": "twigs:cracked_polished_bloodstone_bricks", + "result": { + "id": "twigs:cracked_polished_bloodstone_bricks" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/twigs/recipes/cracked_polished_calcite_bricks.json b/src/main/resources/data/twigs/recipe/cracked_polished_calcite_bricks.json similarity index 66% rename from src/main/resources/data/twigs/recipes/cracked_polished_calcite_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_polished_calcite_bricks.json index 61b45292..1bee7955 100644 --- a/src/main/resources/data/twigs/recipes/cracked_polished_calcite_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_polished_calcite_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:polished_calcite_bricks" }, - "result": "twigs:cracked_polished_calcite_bricks", + "result": { + "id": "twigs:cracked_polished_calcite_bricks" + }, "experience": 0.1, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cracked_polished_rhyolite_bricks.json b/src/main/resources/data/twigs/recipe/cracked_polished_rhyolite_bricks.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cracked_polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_polished_rhyolite_bricks.json index 3ce8f4b7..0d1a49ac 100644 --- a/src/main/resources/data/twigs/recipes/cracked_polished_rhyolite_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_polished_rhyolite_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:polished_rhyolite_bricks" }, - "result": "twigs:cracked_polished_rhyolite_bricks", + "result": { + "id": "twigs:cracked_polished_rhyolite_bricks" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/twigs/recipes/cracked_polished_schist_bricks.json b/src/main/resources/data/twigs/recipe/cracked_polished_schist_bricks.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cracked_polished_schist_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_polished_schist_bricks.json index 62b781da..718f72cc 100644 --- a/src/main/resources/data/twigs/recipes/cracked_polished_schist_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_polished_schist_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:polished_schist_bricks" }, - "result": "twigs:cracked_polished_schist_bricks", + "result": { + "id": "twigs:cracked_polished_schist_bricks" + }, "experience": 0.1, "cookingtime": 200 } diff --git a/src/main/resources/data/twigs/recipes/cracked_polished_tuff_bricks.json b/src/main/resources/data/twigs/recipe/cracked_polished_tuff_bricks.json similarity index 67% rename from src/main/resources/data/twigs/recipes/cracked_polished_tuff_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_polished_tuff_bricks.json index 74aba836..1e785584 100644 --- a/src/main/resources/data/twigs/recipes/cracked_polished_tuff_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_polished_tuff_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:polished_tuff_bricks" }, - "result": "twigs:cracked_polished_tuff_bricks", + "result": { + "id": "twigs:cracked_polished_tuff_bricks" + }, "experience": 0.1, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cracked_silt_bricks.json b/src/main/resources/data/twigs/recipe/cracked_silt_bricks.json similarity index 68% rename from src/main/resources/data/twigs/recipes/cracked_silt_bricks.json rename to src/main/resources/data/twigs/recipe/cracked_silt_bricks.json index 63219cef..c17ae27b 100644 --- a/src/main/resources/data/twigs/recipes/cracked_silt_bricks.json +++ b/src/main/resources/data/twigs/recipe/cracked_silt_bricks.json @@ -3,7 +3,9 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:cracked_silt_bricks", + "result": { + "id": "twigs:cracked_silt_bricks" + }, "experience": 0.1, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/crimson_roots_paper_lantern.json b/src/main/resources/data/twigs/recipe/crimson_roots_paper_lantern.json similarity index 81% rename from src/main/resources/data/twigs/recipes/crimson_roots_paper_lantern.json rename to src/main/resources/data/twigs/recipe/crimson_roots_paper_lantern.json index ef5dae43..12108d77 100644 --- a/src/main/resources/data/twigs/recipes/crimson_roots_paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/crimson_roots_paper_lantern.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:crimson_roots_paper_lantern", + "id": "twigs:crimson_roots_paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/crimson_shroomlamp.json b/src/main/resources/data/twigs/recipe/crimson_shroomlamp.json similarity index 86% rename from src/main/resources/data/twigs/recipes/crimson_shroomlamp.json rename to src/main/resources/data/twigs/recipe/crimson_shroomlamp.json index 6a76402f..47b105b1 100644 --- a/src/main/resources/data/twigs/recipes/crimson_shroomlamp.json +++ b/src/main/resources/data/twigs/recipe/crimson_shroomlamp.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:crimson_shroomlamp", + "id": "twigs:crimson_shroomlamp", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/crimson_table.json b/src/main/resources/data/twigs/recipe/crimson_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/crimson_table.json rename to src/main/resources/data/twigs/recipe/crimson_table.json index 9a1b0984..8be8e705 100644 --- a/src/main/resources/data/twigs/recipes/crimson_table.json +++ b/src/main/resources/data/twigs/recipe/crimson_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:crimson_table", + "id": "twigs:crimson_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cut_amethyst.json b/src/main/resources/data/twigs/recipe/cut_amethyst.json similarity index 84% rename from src/main/resources/data/twigs/recipes/cut_amethyst.json rename to src/main/resources/data/twigs/recipe/cut_amethyst.json index c906ce14..32147a7b 100644 --- a/src/main/resources/data/twigs/recipes/cut_amethyst.json +++ b/src/main/resources/data/twigs/recipe/cut_amethyst.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:cut_amethyst" + "id": "twigs:cut_amethyst" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cut_amethyst_from_amethyst_block_stonecutting.json b/src/main/resources/data/twigs/recipe/cut_amethyst_from_amethyst_block_stonecutting.json similarity index 69% rename from src/main/resources/data/twigs/recipes/cut_amethyst_from_amethyst_block_stonecutting.json rename to src/main/resources/data/twigs/recipe/cut_amethyst_from_amethyst_block_stonecutting.json index d823774b..ff054b84 100644 --- a/src/main/resources/data/twigs/recipes/cut_amethyst_from_amethyst_block_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cut_amethyst_from_amethyst_block_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:amethyst_block" }, - "result": "twigs:cut_amethyst", + "result": { + "id": "twigs:cut_amethyst" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cut_amethyst_stonecutting.json b/src/main/resources/data/twigs/recipe/cut_amethyst_stonecutting.json similarity index 69% rename from src/main/resources/data/twigs/recipes/cut_amethyst_stonecutting.json rename to src/main/resources/data/twigs/recipe/cut_amethyst_stonecutting.json index d327f191..901bfdc4 100644 --- a/src/main/resources/data/twigs/recipes/cut_amethyst_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cut_amethyst_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_amethyst" }, - "result": "twigs:cut_amethyst", + "result": { + "id": "twigs:cut_amethyst" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_packed_silt.json b/src/main/resources/data/twigs/recipe/cyan_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/cyan_packed_silt.json rename to src/main/resources/data/twigs/recipe/cyan_packed_silt.json index f7fa6ccb..255af2b4 100644 --- a/src/main/resources/data/twigs/recipes/cyan_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/cyan_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:cyan_packed_silt" + "id": "twigs:cyan_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_pot.json b/src/main/resources/data/twigs/recipe/cyan_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/cyan_silt_pot.json rename to src/main/resources/data/twigs/recipe/cyan_silt_pot.json index 00ec660b..9e931046 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:cyan_silt_pot" + "id": "twigs:cyan_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab.json index 5dcabcb5..e36d9545 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:cyan_silt_shingle_slab", + "id": "twigs:cyan_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json index a75adf4e..7e7d638c 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_packed_silt" }, - "result": "twigs:cyan_silt_shingle_slab", + "result": { + "id": "twigs:cyan_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json index b1ebac07..f491c353 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_slab_from_cyan_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_silt_shingles" }, - "result": "twigs:cyan_silt_shingle_slab", + "result": { + "id": "twigs:cyan_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs.json index fe4a5d7c..717f7dbb 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:cyan_silt_shingle_stairs", + "id": "twigs:cyan_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json index db33d044..39130a29 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_packed_silt" }, - "result": "twigs:cyan_silt_shingle_stairs", + "result": { + "id": "twigs:cyan_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json index 7e9b9c49..f3efb981 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_stairs_from_cyan_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_silt_shingles" }, - "result": "twigs:cyan_silt_shingle_stairs", + "result": { + "id": "twigs:cyan_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall.json index 0cebdbcb..d772d4c2 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:cyan_silt_shingle_wall", + "id": "twigs:cyan_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json index 4917a9d0..82da92c0 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_packed_silt" }, - "result": "twigs:cyan_silt_shingle_wall", + "result": { + "id": "twigs:cyan_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json index 586fc7b6..0088eb19 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingle_wall_from_cyan_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_silt_shingles" }, - "result": "twigs:cyan_silt_shingle_wall", + "result": { + "id": "twigs:cyan_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingles.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingles.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingles.json index 4e95d137..b3ea858d 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:cyan_silt_shingles" + "id": "twigs:cyan_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json index 506e7d1c..cbfd436e 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_cyan_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:cyan_packed_silt" }, - "result": "twigs:cyan_silt_shingles", + "result": { + "id": "twigs:cyan_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_packed_silt.json index 0d0c7db3..5ea2f4ba 100644 --- a/src/main/resources/data/twigs/recipes/cyan_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/cyan_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:cyan_silt_shingles" + "id": "twigs:cyan_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/dandelion_paper_lantern.json b/src/main/resources/data/twigs/recipe/dandelion_paper_lantern.json similarity index 82% rename from src/main/resources/data/twigs/recipes/dandelion_paper_lantern.json rename to src/main/resources/data/twigs/recipe/dandelion_paper_lantern.json index 89c154b1..14984c36 100644 --- a/src/main/resources/data/twigs/recipes/dandelion_paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/dandelion_paper_lantern.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:dandelion_paper_lantern", + "id": "twigs:dandelion_paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/dark_oak_table.json b/src/main/resources/data/twigs/recipe/dark_oak_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/dark_oak_table.json rename to src/main/resources/data/twigs/recipe/dark_oak_table.json index 72641f62..c46a3075 100644 --- a/src/main/resources/data/twigs/recipes/dark_oak_table.json +++ b/src/main/resources/data/twigs/recipe/dark_oak_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:dark_oak_table", + "id": "twigs:dark_oak_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/deepslate_column.json b/src/main/resources/data/twigs/recipe/deepslate_column.json similarity index 82% rename from src/main/resources/data/twigs/recipes/deepslate_column.json rename to src/main/resources/data/twigs/recipe/deepslate_column.json index d2dc5be7..08498cdb 100644 --- a/src/main/resources/data/twigs/recipes/deepslate_column.json +++ b/src/main/resources/data/twigs/recipe/deepslate_column.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:deepslate_column", + "id": "twigs:deepslate_column", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/deepslate_column_stonecutting.json b/src/main/resources/data/twigs/recipe/deepslate_column_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/deepslate_column_stonecutting.json rename to src/main/resources/data/twigs/recipe/deepslate_column_stonecutting.json index 31cfd1c9..5637166c 100644 --- a/src/main/resources/data/twigs/recipes/deepslate_column_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/deepslate_column_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:deepslate" }, - "result": "twigs:deepslate_column", + "result": { + "id": "twigs:deepslate_column" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/exposed_copper_pillar.json b/src/main/resources/data/twigs/recipe/exposed_copper_pillar.json similarity index 80% rename from src/main/resources/data/twigs/recipes/exposed_copper_pillar.json rename to src/main/resources/data/twigs/recipe/exposed_copper_pillar.json index fd2a83e2..23c73818 100644 --- a/src/main/resources/data/twigs/recipes/exposed_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/exposed_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:exposed_copper_pillar" + "id": "twigs:exposed_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/exposed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/exposed_copper_pillar_from_cut_copper_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/exposed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/exposed_copper_pillar_from_cut_copper_stonecutting.json index 546c776f..8f44e435 100644 --- a/src/main/resources/data/twigs/recipes/exposed_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/exposed_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:exposed_cut_copper" }, - "result": "twigs:exposed_copper_pillar", + "result": { + "id": "twigs:exposed_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/exposed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/exposed_copper_pillar_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/exposed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/exposed_copper_pillar_stonecutting.json index 8258b407..2af8a1cf 100644 --- a/src/main/resources/data/twigs/recipes/exposed_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/exposed_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:exposed_copper" }, - "result": "twigs:exposed_copper_pillar", + "result": { + "id": "twigs:exposed_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/gravel_brick_slab.json b/src/main/resources/data/twigs/recipe/gravel_brick_slab.json similarity index 81% rename from src/main/resources/data/twigs/recipes/gravel_brick_slab.json rename to src/main/resources/data/twigs/recipe/gravel_brick_slab.json index 2f64944b..9ccea7e3 100644 --- a/src/main/resources/data/twigs/recipes/gravel_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/gravel_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:gravel_brick_slab", + "id": "twigs:gravel_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/gravel_brick_stairs.json b/src/main/resources/data/twigs/recipe/gravel_brick_stairs.json similarity index 82% rename from src/main/resources/data/twigs/recipes/gravel_brick_stairs.json rename to src/main/resources/data/twigs/recipe/gravel_brick_stairs.json index 5857aa0f..79f832b1 100644 --- a/src/main/resources/data/twigs/recipes/gravel_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/gravel_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:gravel_brick_stairs", + "id": "twigs:gravel_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/gravel_brick_wall.json b/src/main/resources/data/twigs/recipe/gravel_brick_wall.json similarity index 82% rename from src/main/resources/data/twigs/recipes/gravel_brick_wall.json rename to src/main/resources/data/twigs/recipe/gravel_brick_wall.json index 686e963c..030a145d 100644 --- a/src/main/resources/data/twigs/recipes/gravel_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/gravel_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:gravel_brick_wall", + "id": "twigs:gravel_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/gravel_bricks.json b/src/main/resources/data/twigs/recipe/gravel_bricks.json similarity index 83% rename from src/main/resources/data/twigs/recipes/gravel_bricks.json rename to src/main/resources/data/twigs/recipe/gravel_bricks.json index 1d33b3af..bce7ff1f 100644 --- a/src/main/resources/data/twigs/recipes/gravel_bricks.json +++ b/src/main/resources/data/twigs/recipe/gravel_bricks.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:gravel_bricks", + "id": "twigs:gravel_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/gray_packed_silt.json b/src/main/resources/data/twigs/recipe/gray_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/gray_packed_silt.json rename to src/main/resources/data/twigs/recipe/gray_packed_silt.json index b41c3f2f..90da85a4 100644 --- a/src/main/resources/data/twigs/recipes/gray_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/gray_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:gray_packed_silt" + "id": "twigs:gray_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/gray_silt_pot.json b/src/main/resources/data/twigs/recipe/gray_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/gray_silt_pot.json rename to src/main/resources/data/twigs/recipe/gray_silt_pot.json index 31b1aa36..0ca63f1f 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:gray_silt_pot" + "id": "twigs:gray_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_slab.json index ee91296d..abc965d1 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:gray_silt_shingle_slab", + "id": "twigs:gray_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json index 0fb36b6d..6ac9a548 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_packed_silt" }, - "result": "twigs:gray_silt_shingle_slab", + "result": { + "id": "twigs:gray_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json index e4c24d36..01c7ec30 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_slab_from_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_silt_shingles" }, - "result": "twigs:gray_silt_shingle_slab", + "result": { + "id": "twigs:gray_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs.json index 899bcb05..0541cb4e 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:gray_silt_shingle_stairs", + "id": "twigs:gray_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json index 74fcbd1e..f5368487 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_packed_silt" }, - "result": "twigs:gray_silt_shingle_stairs", + "result": { + "id": "twigs:gray_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json index 0e8abb69..61d7494c 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_stairs_from_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_silt_shingles" }, - "result": "twigs:gray_silt_shingle_stairs", + "result": { + "id": "twigs:gray_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_wall.json index 575bf711..343363c4 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:gray_silt_shingle_wall", + "id": "twigs:gray_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json index 341af190..f7ba9e43 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_packed_silt" }, - "result": "twigs:gray_silt_shingle_wall", + "result": { + "id": "twigs:gray_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json index 8b81b9b1..b954b552 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingle_wall_from_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_silt_shingles" }, - "result": "twigs:gray_silt_shingle_wall", + "result": { + "id": "twigs:gray_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingles.json b/src/main/resources/data/twigs/recipe/gray_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/gray_silt_shingles.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingles.json index 73f3990b..1ac2b490 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:gray_silt_shingles" + "id": "twigs:gray_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingles_from_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/gray_silt_shingles_from_gray_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/gray_silt_shingles_from_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingles_from_gray_packed_silt_stonecutting.json index 996a8a8f..8068fdf9 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingles_from_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingles_from_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:gray_packed_silt" }, - "result": "twigs:gray_silt_shingles", + "result": { + "id": "twigs:gray_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/gray_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/gray_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/gray_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/gray_silt_shingles_from_packed_silt.json index 39863f6b..ddd8b7c7 100644 --- a/src/main/resources/data/twigs/recipes/gray_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/gray_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:gray_silt_shingles" + "id": "twigs:gray_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/green_packed_silt.json b/src/main/resources/data/twigs/recipe/green_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/green_packed_silt.json rename to src/main/resources/data/twigs/recipe/green_packed_silt.json index 7c3ee2f4..cf45f6b7 100644 --- a/src/main/resources/data/twigs/recipes/green_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/green_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:green_packed_silt" + "id": "twigs:green_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/green_silt_pot.json b/src/main/resources/data/twigs/recipe/green_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/green_silt_pot.json rename to src/main/resources/data/twigs/recipe/green_silt_pot.json index d1736f65..3732ca16 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/green_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:green_silt_pot" + "id": "twigs:green_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_slab.json index 131a3898..356d3ee9 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:green_silt_shingle_slab", + "id": "twigs:green_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json index b45da0c8..3e23e284 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_packed_silt" }, - "result": "twigs:green_silt_shingle_slab", + "result": { + "id": "twigs:green_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json index 5d9fc3d3..fc2b7580 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_slab_from_green_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_silt_shingles" }, - "result": "twigs:green_silt_shingle_slab", + "result": { + "id": "twigs:green_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_stairs.json index 5ff0efb6..db90beef 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:green_silt_shingle_stairs", + "id": "twigs:green_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json index a319271f..adb20f1d 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_packed_silt" }, - "result": "twigs:green_silt_shingle_stairs", + "result": { + "id": "twigs:green_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json index 7b660244..eb13c428 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_stairs_from_green_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_silt_shingles" }, - "result": "twigs:green_silt_shingle_stairs", + "result": { + "id": "twigs:green_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_wall.json index 2b78a1b8..9450d8e3 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:green_silt_shingle_wall", + "id": "twigs:green_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json index 8d8c5673..4d3774fb 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_packed_silt" }, - "result": "twigs:green_silt_shingle_wall", + "result": { + "id": "twigs:green_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json index 2ef94e93..e9d11255 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingle_wall_from_green_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_silt_shingles" }, - "result": "twigs:green_silt_shingle_wall", + "result": { + "id": "twigs:green_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingles.json b/src/main/resources/data/twigs/recipe/green_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/green_silt_shingles.json rename to src/main/resources/data/twigs/recipe/green_silt_shingles.json index a9dbe692..4985f3d3 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:green_silt_shingles" + "id": "twigs:green_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingles_from_green_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/green_silt_shingles_from_green_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/green_silt_shingles_from_green_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/green_silt_shingles_from_green_packed_silt_stonecutting.json index 16557bf2..0575da28 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingles_from_green_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingles_from_green_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:green_packed_silt" }, - "result": "twigs:green_silt_shingles", + "result": { + "id": "twigs:green_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/green_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/green_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/green_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/green_silt_shingles_from_packed_silt.json index 2383e80c..16fee122 100644 --- a/src/main/resources/data/twigs/recipes/green_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/green_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:green_silt_shingles" + "id": "twigs:green_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/jungle_table.json b/src/main/resources/data/twigs/recipe/jungle_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/jungle_table.json rename to src/main/resources/data/twigs/recipe/jungle_table.json index 38959324..ba15b64f 100644 --- a/src/main/resources/data/twigs/recipes/jungle_table.json +++ b/src/main/resources/data/twigs/recipe/jungle_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:jungle_table", + "id": "twigs:jungle_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/lamp.json b/src/main/resources/data/twigs/recipe/lamp.json similarity index 92% rename from src/main/resources/data/twigs/recipes/lamp.json rename to src/main/resources/data/twigs/recipe/lamp.json index a8ac2ccc..25767235 100644 --- a/src/main/resources/data/twigs/recipes/lamp.json +++ b/src/main/resources/data/twigs/recipe/lamp.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "twigs:lamp", + "id": "twigs:lamp", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_blue_packed_silt.json b/src/main/resources/data/twigs/recipe/light_blue_packed_silt.json similarity index 86% rename from src/main/resources/data/twigs/recipes/light_blue_packed_silt.json rename to src/main/resources/data/twigs/recipe/light_blue_packed_silt.json index 7c2fe54a..80cb7b9b 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/light_blue_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:light_blue_packed_silt" + "id": "twigs:light_blue_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_pot.json b/src/main/resources/data/twigs/recipe/light_blue_silt_pot.json similarity index 81% rename from src/main/resources/data/twigs/recipes/light_blue_silt_pot.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_pot.json index 2773440d..4c93dc58 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:light_blue_silt_pot" + "id": "twigs:light_blue_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab.json similarity index 78% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab.json index 3033ca87..acdcccd1 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:light_blue_silt_shingle_slab", + "id": "twigs:light_blue_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json index 2421ce76..8c3a471b 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_packed_silt" }, - "result": "twigs:light_blue_silt_shingle_slab", + "result": { + "id": "twigs:light_blue_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json index 9243aaa3..dc4b9a2f 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_slab_from_light_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_silt_shingles" }, - "result": "twigs:light_blue_silt_shingle_slab", + "result": { + "id": "twigs:light_blue_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs.json index fcd80fde..9634642a 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:light_blue_silt_shingle_stairs", + "id": "twigs:light_blue_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json index 4e54a279..8fd39788 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_packed_silt" }, - "result": "twigs:light_blue_silt_shingle_stairs", + "result": { + "id": "twigs:light_blue_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json index 3742221c..eda79cf9 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_stairs_from_light_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_silt_shingles" }, - "result": "twigs:light_blue_silt_shingle_stairs", + "result": { + "id": "twigs:light_blue_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall.json similarity index 79% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall.json index 9d302fc4..b96501e1 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:light_blue_silt_shingle_wall", + "id": "twigs:light_blue_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json index 381dba3a..e4d3767f 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_packed_silt" }, - "result": "twigs:light_blue_silt_shingle_wall", + "result": { + "id": "twigs:light_blue_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json index c9412aa1..54971f64 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingle_wall_from_light_blue_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_silt_shingles" }, - "result": "twigs:light_blue_silt_shingle_wall", + "result": { + "id": "twigs:light_blue_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles.json similarity index 86% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingles.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingles.json index 5e90d187..29d82dce 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:light_blue_silt_shingles" + "id": "twigs:light_blue_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json index 6c0e2c33..a4fce98c 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_light_blue_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_blue_packed_silt" }, - "result": "twigs:light_blue_silt_shingles", + "result": { + "id": "twigs:light_blue_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_packed_silt.json similarity index 80% rename from src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_packed_silt.json index 34d44f0f..952ddd8f 100644 --- a/src/main/resources/data/twigs/recipes/light_blue_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/light_blue_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:light_blue_silt_shingles" + "id": "twigs:light_blue_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_gray_packed_silt.json b/src/main/resources/data/twigs/recipe/light_gray_packed_silt.json similarity index 86% rename from src/main/resources/data/twigs/recipes/light_gray_packed_silt.json rename to src/main/resources/data/twigs/recipe/light_gray_packed_silt.json index ed7648b3..d381775a 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/light_gray_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:light_gray_packed_silt" + "id": "twigs:light_gray_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_pot.json b/src/main/resources/data/twigs/recipe/light_gray_silt_pot.json similarity index 81% rename from src/main/resources/data/twigs/recipes/light_gray_silt_pot.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_pot.json index 2d5389c2..23ff0c03 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:light_gray_silt_pot" + "id": "twigs:light_gray_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab.json similarity index 78% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab.json index 158fa8a2..2faa676b 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:light_gray_silt_shingle_slab", + "id": "twigs:light_gray_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json index c8d78176..449a6c87 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_packed_silt" }, - "result": "twigs:light_gray_silt_shingle_slab", + "result": { + "id": "twigs:light_gray_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json index 750e9b77..b63fcb60 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_slab_from_light_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_silt_shingles" }, - "result": "twigs:light_gray_silt_shingle_slab", + "result": { + "id": "twigs:light_gray_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs.json index 0907f143..19e022f5 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:light_gray_silt_shingle_stairs", + "id": "twigs:light_gray_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json index 1c43f045..ef252806 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_packed_silt" }, - "result": "twigs:light_gray_silt_shingle_stairs", + "result": { + "id": "twigs:light_gray_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json index 9c8cc926..d7763a13 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_stairs_from_light_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_silt_shingles" }, - "result": "twigs:light_gray_silt_shingle_stairs", + "result": { + "id": "twigs:light_gray_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall.json similarity index 79% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall.json index 3ebfb85c..247c6ddb 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:light_gray_silt_shingle_wall", + "id": "twigs:light_gray_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json index 61a75beb..4b186257 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_packed_silt" }, - "result": "twigs:light_gray_silt_shingle_wall", + "result": { + "id": "twigs:light_gray_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json index 380075fa..98f1dab3 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingle_wall_from_light_gray_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_silt_shingles" }, - "result": "twigs:light_gray_silt_shingle_wall", + "result": { + "id": "twigs:light_gray_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles.json similarity index 86% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingles.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingles.json index f528c398..99ffb1e4 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:light_gray_silt_shingles" + "id": "twigs:light_gray_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json index de2d2bdc..6cf2d755 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_light_gray_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:light_gray_packed_silt" }, - "result": "twigs:light_gray_silt_shingles", + "result": { + "id": "twigs:light_gray_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_packed_silt.json similarity index 80% rename from src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_packed_silt.json index f1ff012c..61933970 100644 --- a/src/main/resources/data/twigs/recipes/light_gray_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/light_gray_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:light_gray_silt_shingles" + "id": "twigs:light_gray_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/lime_packed_silt.json b/src/main/resources/data/twigs/recipe/lime_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/lime_packed_silt.json rename to src/main/resources/data/twigs/recipe/lime_packed_silt.json index d8acfa90..0507a918 100644 --- a/src/main/resources/data/twigs/recipes/lime_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/lime_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:lime_packed_silt" + "id": "twigs:lime_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/lime_silt_pot.json b/src/main/resources/data/twigs/recipe/lime_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/lime_silt_pot.json rename to src/main/resources/data/twigs/recipe/lime_silt_pot.json index 984d1a02..c0cdc91c 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:lime_silt_pot" + "id": "twigs:lime_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_slab.json index 3291537e..44e31e5c 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:lime_silt_shingle_slab", + "id": "twigs:lime_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json index ff118836..fb3b8be2 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_packed_silt" }, - "result": "twigs:lime_silt_shingle_slab", + "result": { + "id": "twigs:lime_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json index 697c8cb3..f2b54a60 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_slab_from_lime_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_silt_shingles" }, - "result": "twigs:lime_silt_shingle_slab", + "result": { + "id": "twigs:lime_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs.json index 9a68df35..eb2024d1 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:lime_silt_shingle_stairs", + "id": "twigs:lime_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json index 08f1ff07..fcaa8001 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_packed_silt" }, - "result": "twigs:lime_silt_shingle_stairs", + "result": { + "id": "twigs:lime_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json index 13f1eeed..876e6767 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_stairs_from_lime_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_silt_shingles" }, - "result": "twigs:lime_silt_shingle_stairs", + "result": { + "id": "twigs:lime_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_wall.json index 9cc87497..2cde6ee3 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:lime_silt_shingle_wall", + "id": "twigs:lime_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json index 65ee4b03..8098f655 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_packed_silt" }, - "result": "twigs:lime_silt_shingle_wall", + "result": { + "id": "twigs:lime_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json index dc2624f4..19abcf40 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingle_wall_from_lime_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_silt_shingles" }, - "result": "twigs:lime_silt_shingle_wall", + "result": { + "id": "twigs:lime_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingles.json b/src/main/resources/data/twigs/recipe/lime_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/lime_silt_shingles.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingles.json index 55c2f955..70d4b05d 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:lime_silt_shingles" + "id": "twigs:lime_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingles_from_lime_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/lime_silt_shingles_from_lime_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/lime_silt_shingles_from_lime_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingles_from_lime_packed_silt_stonecutting.json index 92e77a7f..bfc6109b 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingles_from_lime_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingles_from_lime_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:lime_packed_silt" }, - "result": "twigs:lime_silt_shingles", + "result": { + "id": "twigs:lime_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/lime_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/lime_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/lime_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/lime_silt_shingles_from_packed_silt.json index f46f9f07..098b9499 100644 --- a/src/main/resources/data/twigs/recipes/lime_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/lime_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:lime_silt_shingles" + "id": "twigs:lime_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/magenta_packed_silt.json b/src/main/resources/data/twigs/recipe/magenta_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/magenta_packed_silt.json rename to src/main/resources/data/twigs/recipe/magenta_packed_silt.json index 60839e83..95b3952e 100644 --- a/src/main/resources/data/twigs/recipes/magenta_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/magenta_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:magenta_packed_silt" + "id": "twigs:magenta_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_pot.json b/src/main/resources/data/twigs/recipe/magenta_silt_pot.json similarity index 82% rename from src/main/resources/data/twigs/recipes/magenta_silt_pot.json rename to src/main/resources/data/twigs/recipe/magenta_silt_pot.json index a8ed9559..cc0bb221 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:magenta_silt_pot" + "id": "twigs:magenta_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab.json index e20fd957..7da4f1f2 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:magenta_silt_shingle_slab", + "id": "twigs:magenta_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json index b58e0c4d..43d2b89c 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_packed_silt" }, - "result": "twigs:magenta_silt_shingle_slab", + "result": { + "id": "twigs:magenta_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json index f04cc85e..a4d761b0 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_slab_from_magenta_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_silt_shingles" }, - "result": "twigs:magenta_silt_shingle_slab", + "result": { + "id": "twigs:magenta_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs.json index c9c78346..b348b1a1 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:magenta_silt_shingle_stairs", + "id": "twigs:magenta_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json index 038c8759..8c343a6a 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_packed_silt" }, - "result": "twigs:magenta_silt_shingle_stairs", + "result": { + "id": "twigs:magenta_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json index 48d4860b..7b347a85 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_stairs_from_magenta_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_silt_shingles" }, - "result": "twigs:magenta_silt_shingle_stairs", + "result": { + "id": "twigs:magenta_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall.json index 4cd5c69a..2156f58c 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:magenta_silt_shingle_wall", + "id": "twigs:magenta_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json index 9f4e4751..b7b53f9a 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_packed_silt" }, - "result": "twigs:magenta_silt_shingle_wall", + "result": { + "id": "twigs:magenta_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json index 3c9762bc..e999e4b6 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingle_wall_from_magenta_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_silt_shingles" }, - "result": "twigs:magenta_silt_shingle_wall", + "result": { + "id": "twigs:magenta_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingles.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingles.json similarity index 86% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingles.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingles.json index efbf1749..b8d19ffc 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:magenta_silt_shingles" + "id": "twigs:magenta_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json index 4a8e1f8b..33c5a1e4 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_magenta_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:magenta_packed_silt" }, - "result": "twigs:magenta_silt_shingles", + "result": { + "id": "twigs:magenta_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_packed_silt.json similarity index 81% rename from src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_packed_silt.json index 102ac28f..0cc944d6 100644 --- a/src/main/resources/data/twigs/recipes/magenta_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/magenta_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:magenta_silt_shingles" + "id": "twigs:magenta_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mangrove_table.json b/src/main/resources/data/twigs/recipe/mangrove_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/mangrove_table.json rename to src/main/resources/data/twigs/recipe/mangrove_table.json index 575747d7..368c0a71 100644 --- a/src/main/resources/data/twigs/recipes/mangrove_table.json +++ b/src/main/resources/data/twigs/recipe/mangrove_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:mangrove_table", + "id": "twigs:mangrove_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mixed_bricks.json b/src/main/resources/data/twigs/recipe/mixed_bricks.json similarity index 83% rename from src/main/resources/data/twigs/recipes/mixed_bricks.json rename to src/main/resources/data/twigs/recipe/mixed_bricks.json index f74f000a..d2b02aab 100644 --- a/src/main/resources/data/twigs/recipes/mixed_bricks.json +++ b/src/main/resources/data/twigs/recipe/mixed_bricks.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:mixed_bricks", + "id": "twigs:mixed_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mixed_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/mixed_bricks_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/mixed_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/mixed_bricks_stonecutting.json index bf5f0d32..9cfc94f2 100644 --- a/src/main/resources/data/twigs/recipes/mixed_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mixed_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:bricks" }, - "result": "twigs:mixed_bricks", + "result": { + "id": "twigs:mixed_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mixed_silt_bricks.json b/src/main/resources/data/twigs/recipe/mixed_silt_bricks.json similarity index 81% rename from src/main/resources/data/twigs/recipes/mixed_silt_bricks.json rename to src/main/resources/data/twigs/recipe/mixed_silt_bricks.json index 2e89eb5c..1aca9889 100644 --- a/src/main/resources/data/twigs/recipes/mixed_silt_bricks.json +++ b/src/main/resources/data/twigs/recipe/mixed_silt_bricks.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:mixed_silt_bricks", + "id": "twigs:mixed_silt_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mixed_silt_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/mixed_silt_bricks_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/mixed_silt_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/mixed_silt_bricks_stonecutting.json index cb86ca8f..059dc3a1 100644 --- a/src/main/resources/data/twigs/recipes/mixed_silt_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mixed_silt_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:mixed_silt_bricks", + "result": { + "id": "twigs:mixed_silt_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_slab.json b/src/main/resources/data/twigs/recipe/mossy_brick_slab.json similarity index 84% rename from src/main/resources/data/twigs/recipes/mossy_brick_slab.json rename to src/main/resources/data/twigs/recipe/mossy_brick_slab.json index 811431fe..e90a953f 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_slab.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_brick_slab", + "id": "twigs:mossy_brick_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_brick_slab_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/mossy_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_brick_slab_stonecutting.json index 4ed98724..4c6f8231 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_bricks" }, - "result": "twigs:mossy_brick_slab", + "result": { + "id": "twigs:mossy_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_stairs.json b/src/main/resources/data/twigs/recipe/mossy_brick_stairs.json similarity index 84% rename from src/main/resources/data/twigs/recipes/mossy_brick_stairs.json rename to src/main/resources/data/twigs/recipe/mossy_brick_stairs.json index 19f2d9cc..60e5ca54 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_brick_stairs", + "id": "twigs:mossy_brick_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_brick_stairs_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/mossy_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_brick_stairs_stonecutting.json index 52daa396..4e13cb17 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_bricks" }, - "result": "twigs:mossy_brick_stairs", + "result": { + "id": "twigs:mossy_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_wall.json b/src/main/resources/data/twigs/recipe/mossy_brick_wall.json similarity index 84% rename from src/main/resources/data/twigs/recipes/mossy_brick_wall.json rename to src/main/resources/data/twigs/recipe/mossy_brick_wall.json index c593ca90..d252b8dd 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_wall.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_brick_wall", + "id": "twigs:mossy_brick_wall", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_brick_wall_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/mossy_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_brick_wall_stonecutting.json index 94e72073..a959d107 100644 --- a/src/main/resources/data/twigs/recipes/mossy_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_bricks" }, - "result": "twigs:mossy_brick_wall", + "result": { + "id": "twigs:mossy_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_bricks_from_moss_block.json b/src/main/resources/data/twigs/recipe/mossy_bricks_from_moss_block.json similarity index 85% rename from src/main/resources/data/twigs/recipes/mossy_bricks_from_moss_block.json rename to src/main/resources/data/twigs/recipe/mossy_bricks_from_moss_block.json index d3002559..01865ac4 100644 --- a/src/main/resources/data/twigs/recipes/mossy_bricks_from_moss_block.json +++ b/src/main/resources/data/twigs/recipe/mossy_bricks_from_moss_block.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:mossy_bricks", + "id": "twigs:mossy_bricks", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_bricks_from_vine.json b/src/main/resources/data/twigs/recipe/mossy_bricks_from_vine.json similarity index 85% rename from src/main/resources/data/twigs/recipes/mossy_bricks_from_vine.json rename to src/main/resources/data/twigs/recipe/mossy_bricks_from_vine.json index 43bbc2e1..ae0ebeb5 100644 --- a/src/main/resources/data/twigs/recipes/mossy_bricks_from_vine.json +++ b/src/main/resources/data/twigs/recipe/mossy_bricks_from_vine.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:mossy_bricks", + "id": "twigs:mossy_bricks", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab.json similarity index 81% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab.json index e825ff56..c00d5d2e 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_cobblestone_brick_slab", + "id": "twigs:mossy_cobblestone_brick_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json index 46c726d0..5a6b7f32 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_from_mossy_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:mossy_cobblestone" }, - "result": "twigs:mossy_cobblestone_brick_slab", + "result": { + "id": "twigs:mossy_cobblestone_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_stonecutting.json index 9f62896a..00d1ae11 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_cobblestone_bricks" }, - "result": "twigs:mossy_cobblestone_brick_slab", + "result": { + "id": "twigs:mossy_cobblestone_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs.json index c92787e1..65ca835d 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_cobblestone_brick_stairs", + "id": "twigs:mossy_cobblestone_brick_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json index cbb6d388..af009a42 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_from_mossy_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:mossy_cobblestone" }, - "result": "twigs:mossy_cobblestone_brick_stairs", + "result": { + "id": "twigs:mossy_cobblestone_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_stonecutting.json index 9df5f6be..04327359 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_cobblestone_bricks" }, - "result": "twigs:mossy_cobblestone_brick_stairs", + "result": { + "id": "twigs:mossy_cobblestone_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall.json index d5e7d369..854e6ca4 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_cobblestone_brick_wall", + "id": "twigs:mossy_cobblestone_brick_wall", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json index be393111..ea101915 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_from_mossy_cobblestone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:mossy_cobblestone" }, - "result": "twigs:mossy_cobblestone_brick_wall", + "result": { + "id": "twigs:mossy_cobblestone_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_stonecutting.json index 93fc1b31..6f02d4d1 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:mossy_cobblestone_bricks" }, - "result": "twigs:mossy_cobblestone_brick_wall", + "result": { + "id": "twigs:mossy_cobblestone_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks.json similarity index 82% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks.json index ef8c3e2c..7375084d 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:mossy_cobblestone_bricks", + "id": "twigs:mossy_cobblestone_bricks", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_cobblestone.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_cobblestone.json similarity index 81% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_cobblestone.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_cobblestone.json index e4e2520c..7f8ba355 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_cobblestone.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_cobblestone.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:mossy_cobblestone_bricks", + "id": "twigs:mossy_cobblestone_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_stonecutting.json index 5c3fbf40..e77022aa 100644 --- a/src/main/resources/data/twigs/recipes/mossy_cobblestone_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/mossy_cobblestone_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:mossy_cobblestone" }, - "result": "twigs:mossy_cobblestone_bricks", + "result": { + "id": "twigs:mossy_cobblestone_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/oak_table.json b/src/main/resources/data/twigs/recipe/oak_table.json similarity index 89% rename from src/main/resources/data/twigs/recipes/oak_table.json rename to src/main/resources/data/twigs/recipe/oak_table.json index 8739e411..e1f92ba6 100644 --- a/src/main/resources/data/twigs/recipes/oak_table.json +++ b/src/main/resources/data/twigs/recipe/oak_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:oak_table", + "id": "twigs:oak_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/orange_packed_silt.json b/src/main/resources/data/twigs/recipe/orange_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/orange_packed_silt.json rename to src/main/resources/data/twigs/recipe/orange_packed_silt.json index b875c4e2..52df68bc 100644 --- a/src/main/resources/data/twigs/recipes/orange_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/orange_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:orange_packed_silt" + "id": "twigs:orange_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/orange_silt_pot.json b/src/main/resources/data/twigs/recipe/orange_silt_pot.json similarity index 82% rename from src/main/resources/data/twigs/recipes/orange_silt_pot.json rename to src/main/resources/data/twigs/recipe/orange_silt_pot.json index c47765d1..790700e1 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:orange_silt_pot" + "id": "twigs:orange_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_slab.json index 9fb79e3f..6434f1c7 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:orange_silt_shingle_slab", + "id": "twigs:orange_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json index 323fe2ae..119f26a5 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_packed_silt" }, - "result": "twigs:orange_silt_shingle_slab", + "result": { + "id": "twigs:orange_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json index 5dbd8453..fca27571 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_slab_from_orange_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_silt_shingles" }, - "result": "twigs:orange_silt_shingle_slab", + "result": { + "id": "twigs:orange_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs.json index b031b9dd..61a10a60 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:orange_silt_shingle_stairs", + "id": "twigs:orange_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json index fb17f81f..b218da91 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_packed_silt" }, - "result": "twigs:orange_silt_shingle_stairs", + "result": { + "id": "twigs:orange_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json index c9615084..a6b5bdae 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_stairs_from_orange_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_silt_shingles" }, - "result": "twigs:orange_silt_shingle_stairs", + "result": { + "id": "twigs:orange_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_wall.json index 15ba58b0..ea395772 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:orange_silt_shingle_wall", + "id": "twigs:orange_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json index 6e1490e4..faf1b2b8 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_packed_silt" }, - "result": "twigs:orange_silt_shingle_wall", + "result": { + "id": "twigs:orange_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json index 2935f01c..341e3b2f 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingle_wall_from_orange_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_silt_shingles" }, - "result": "twigs:orange_silt_shingle_wall", + "result": { + "id": "twigs:orange_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingles.json b/src/main/resources/data/twigs/recipe/orange_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/orange_silt_shingles.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingles.json index b3792d9d..49d9b8a9 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:orange_silt_shingles" + "id": "twigs:orange_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingles_from_orange_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/orange_silt_shingles_from_orange_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/orange_silt_shingles_from_orange_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingles_from_orange_packed_silt_stonecutting.json index 91ada0f4..0d32a875 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingles_from_orange_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingles_from_orange_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:orange_packed_silt" }, - "result": "twigs:orange_silt_shingles", + "result": { + "id": "twigs:orange_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/orange_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/orange_silt_shingles_from_packed_silt.json similarity index 81% rename from src/main/resources/data/twigs/recipes/orange_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/orange_silt_shingles_from_packed_silt.json index 1ac7b12b..e235a897 100644 --- a/src/main/resources/data/twigs/recipes/orange_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/orange_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:orange_silt_shingles" + "id": "twigs:orange_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar.json b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar.json similarity index 80% rename from src/main/resources/data/twigs/recipes/oxidized_copper_pillar.json rename to src/main/resources/data/twigs/recipe/oxidized_copper_pillar.json index c3b23ec7..9b335ea6 100644 --- a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:oxidized_copper_pillar" + "id": "twigs:oxidized_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar_from_cut_copper_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/oxidized_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/oxidized_copper_pillar_from_cut_copper_stonecutting.json index 22c927e7..3d1c2a35 100644 --- a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:oxidized_cut_copper" }, - "result": "twigs:oxidized_copper_pillar", + "result": { + "id": "twigs:oxidized_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/oxidized_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/oxidized_copper_pillar_stonecutting.json index 44e95ae8..07b99886 100644 --- a/src/main/resources/data/twigs/recipes/oxidized_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/oxidized_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:oxidized_copper" }, - "result": "twigs:oxidized_copper_pillar", + "result": { + "id": "twigs:oxidized_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/packed_silt.json b/src/main/resources/data/twigs/recipe/packed_silt.json similarity index 83% rename from src/main/resources/data/twigs/recipes/packed_silt.json rename to src/main/resources/data/twigs/recipe/packed_silt.json index 7d6f7aa4..dab7857a 100644 --- a/src/main/resources/data/twigs/recipes/packed_silt.json +++ b/src/main/resources/data/twigs/recipe/packed_silt.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:packed_silt" + "id": "twigs:packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/paper_lantern.json b/src/main/resources/data/twigs/recipe/paper_lantern.json similarity index 88% rename from src/main/resources/data/twigs/recipes/paper_lantern.json rename to src/main/resources/data/twigs/recipe/paper_lantern.json index f5e34ab7..5a1992b3 100644 --- a/src/main/resources/data/twigs/recipes/paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/paper_lantern.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:paper_lantern", + "id": "twigs:paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/pink_packed_silt.json b/src/main/resources/data/twigs/recipe/pink_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/pink_packed_silt.json rename to src/main/resources/data/twigs/recipe/pink_packed_silt.json index 93388e06..224e5994 100644 --- a/src/main/resources/data/twigs/recipes/pink_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/pink_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:pink_packed_silt" + "id": "twigs:pink_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/pink_silt_pot.json b/src/main/resources/data/twigs/recipe/pink_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/pink_silt_pot.json rename to src/main/resources/data/twigs/recipe/pink_silt_pot.json index a5c119d2..0688b7a8 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:pink_silt_pot" + "id": "twigs:pink_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_slab.json index 73fadae5..e8b0006e 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:pink_silt_shingle_slab", + "id": "twigs:pink_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json index 2a450eb6..43439ece 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_packed_silt" }, - "result": "twigs:pink_silt_shingle_slab", + "result": { + "id": "twigs:pink_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json index ce662c24..001409b1 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_slab_from_pink_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_silt_shingles" }, - "result": "twigs:pink_silt_shingle_slab", + "result": { + "id": "twigs:pink_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs.json index 9a1ea992..f035a2eb 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:pink_silt_shingle_stairs", + "id": "twigs:pink_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json index 3550024f..2a94d0c2 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_packed_silt" }, - "result": "twigs:pink_silt_shingle_stairs", + "result": { + "id": "twigs:pink_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json index fa70085b..799907c2 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_stairs_from_pink_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_silt_shingles" }, - "result": "twigs:pink_silt_shingle_stairs", + "result": { + "id": "twigs:pink_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_wall.json index 80336fb2..b6d0b8b9 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:pink_silt_shingle_wall", + "id": "twigs:pink_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json index 8c61bf76..94dd5bb4 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_packed_silt" }, - "result": "twigs:pink_silt_shingle_wall", + "result": { + "id": "twigs:pink_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json index f70c5ec9..3ab6eea2 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingle_wall_from_pink_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_silt_shingles" }, - "result": "twigs:pink_silt_shingle_wall", + "result": { + "id": "twigs:pink_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingles.json b/src/main/resources/data/twigs/recipe/pink_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/pink_silt_shingles.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingles.json index 479f2fd4..e5c9f5b3 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:pink_silt_shingles" + "id": "twigs:pink_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/pink_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/pink_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingles_from_packed_silt.json index e3440918..2dcb9573 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:pink_silt_shingles" + "id": "twigs:pink_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/pink_silt_shingles_from_pink_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/pink_silt_shingles_from_pink_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/pink_silt_shingles_from_pink_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/pink_silt_shingles_from_pink_packed_silt_stonecutting.json index eb8b71e1..863287a4 100644 --- a/src/main/resources/data/twigs/recipes/pink_silt_shingles_from_pink_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/pink_silt_shingles_from_pink_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:pink_packed_silt" }, - "result": "twigs:pink_silt_shingles", + "result": { + "id": "twigs:pink_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_amethyst.json b/src/main/resources/data/twigs/recipe/polished_amethyst.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_amethyst.json rename to src/main/resources/data/twigs/recipe/polished_amethyst.json index c6483b07..388b0e79 100644 --- a/src/main/resources/data/twigs/recipes/polished_amethyst.json +++ b/src/main/resources/data/twigs/recipe/polished_amethyst.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_amethyst", + "id": "twigs:polished_amethyst", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_amethyst_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_amethyst_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/polished_amethyst_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_amethyst_stonecutting.json index 294226a2..5cb10971 100644 --- a/src/main/resources/data/twigs/recipes/polished_amethyst_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_amethyst_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:amethyst_block" }, - "result": "twigs:polished_amethyst", + "result": { + "id": "twigs:polished_amethyst" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_basalt_bricks.json b/src/main/resources/data/twigs/recipe/polished_basalt_bricks.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_basalt_bricks.json rename to src/main/resources/data/twigs/recipe/polished_basalt_bricks.json index 53f30978..d2c1c322 100644 --- a/src/main/resources/data/twigs/recipes/polished_basalt_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_basalt_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_basalt_bricks", + "id": "twigs:polished_basalt_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_basalt_bricks_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/polished_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_basalt_bricks_stonecutting.json index 078c174c..5d1e1c42 100644 --- a/src/main/resources/data/twigs/recipes/polished_basalt_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_basalt_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:polished_basalt" }, - "result": "twigs:polished_basalt_bricks", + "result": { + "id": "twigs:polished_basalt_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone.json b/src/main/resources/data/twigs/recipe/polished_bloodstone.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_bloodstone.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone.json index a15f2a62..13ef3734 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone", + "id": "twigs:polished_bloodstone", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab.json similarity index 78% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab.json index 3818ab92..1650ac69 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_brick_slab", + "id": "twigs:polished_bloodstone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json index f7b2e72f..2f25f6c9 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_brick_slab", + "result": { + "id": "twigs:polished_bloodstone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json index b8396d4d..a83e42ca 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_from_polished_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_brick_slab", + "result": { + "id": "twigs:polished_bloodstone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_stonecutting.json index d387f031..831038c6 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone_bricks" }, - "result": "twigs:polished_bloodstone_brick_slab", + "result": { + "id": "twigs:polished_bloodstone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs.json index 0b4072c3..02d25390 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_brick_stairs", + "id": "twigs:polished_bloodstone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json similarity index 60% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json index 554eb0de..29d307d4 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_brick_stairs", + "result": { + "id": "twigs:polished_bloodstone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json index 7b115bf9..6470f1b1 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_from_polished_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_brick_stairs", + "result": { + "id": "twigs:polished_bloodstone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_stonecutting.json index 6b90eab8..7cba0cef 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone_bricks" }, - "result": "twigs:polished_bloodstone_brick_stairs", + "result": { + "id": "twigs:polished_bloodstone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall.json index bddf5a27..a4e489fe 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_brick_wall", + "id": "twigs:polished_bloodstone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json index 0261691a..aa9f91af 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_brick_wall", + "result": { + "id": "twigs:polished_bloodstone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json index 62a9c320..fa7dfb84 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_from_polished_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_brick_wall", + "result": { + "id": "twigs:polished_bloodstone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_stonecutting.json index 64b6de24..ea25db26 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone_bricks" }, - "result": "twigs:polished_bloodstone_brick_wall", + "result": { + "id": "twigs:polished_bloodstone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_bricks.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_bricks.json index 903e4d02..87a45d0c 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_bricks", + "id": "twigs:polished_bloodstone_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_from_bloodstone_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_from_bloodstone_stonecutting.json index c4971b21..03026694 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_bricks", + "result": { + "id": "twigs:polished_bloodstone_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_stonecutting.json index 2a002cf5..f9bb55f9 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_bricks", + "result": { + "id": "twigs:polished_bloodstone_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_slab.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_slab.json index 65be5e5b..97df19ee 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_slab", + "id": "twigs:polished_bloodstone_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab_from_bloodstone_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_slab_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_slab_from_bloodstone_stonecutting.json index e7351e68..3e914cc0 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_slab", + "result": { + "id": "twigs:polished_bloodstone_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_slab_stonecutting.json index 81bbabc2..899cd8c6 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_slab", + "result": { + "id": "twigs:polished_bloodstone_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_stairs.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_stairs.json index a857e116..da4e41fd 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_bloodstone_stairs", + "id": "twigs:polished_bloodstone_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_from_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_from_bloodstone_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_from_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_from_bloodstone_stonecutting.json index 68ec3d7d..fd374e6c 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_from_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_from_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone_stairs", + "result": { + "id": "twigs:polished_bloodstone_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_stonecutting.json index 57ecb7b6..84239aba 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_bloodstone" }, - "result": "twigs:polished_bloodstone_stairs", + "result": { + "id": "twigs:polished_bloodstone_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_bloodstone_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_bloodstone_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_bloodstone_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_bloodstone_stonecutting.json index 9097dc61..4fcd21cb 100644 --- a/src/main/resources/data/twigs/recipes/polished_bloodstone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_bloodstone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:bloodstone" }, - "result": "twigs:polished_bloodstone", + "result": { + "id": "twigs:polished_bloodstone" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_slab.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_slab.json index 50e3ba88..fe089b37 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_calcite_brick_slab", + "id": "twigs:polished_calcite_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json index 3f9bc134..805e4e78 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_brick_slab", + "result": { + "id": "twigs:polished_calcite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json index 36ebaaf9..a21a39c5 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite_bricks" }, - "result": "twigs:polished_calcite_brick_slab", + "result": { + "id": "twigs:polished_calcite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json index 25ec3ddb..4543263b 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_slab_from_polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_brick_slab", + "result": { + "id": "twigs:polished_calcite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs.json index cca65b0e..ccb3fac1 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_calcite_brick_stairs", + "id": "twigs:polished_calcite_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json index 7d46d307..f01afdd2 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_brick_stairs", + "result": { + "id": "twigs:polished_calcite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json index 03161c57..e6e5e0ba 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite_bricks" }, - "result": "twigs:polished_calcite_brick_stairs", + "result": { + "id": "twigs:polished_calcite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json index 38767346..b1322278 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_stairs_from_polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_brick_stairs", + "result": { + "id": "twigs:polished_calcite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_wall.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_wall.json index ed823dea..dba2153f 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_calcite_brick_wall", + "id": "twigs:polished_calcite_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json index 53b0f50c..717907ad 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_brick_wall", + "result": { + "id": "twigs:polished_calcite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json index 312a9291..0f9f63fa 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite_bricks" }, - "result": "twigs:polished_calcite_brick_wall", + "result": { + "id": "twigs:polished_calcite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json index 87e0704d..9a189ea4 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_brick_wall_from_polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_brick_wall", + "result": { + "id": "twigs:polished_calcite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_bricks.json b/src/main/resources/data/twigs/recipe/polished_calcite_bricks.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_calcite_bricks.json rename to src/main/resources/data/twigs/recipe/polished_calcite_bricks.json index 93fdd788..fe05d064 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_calcite_bricks", + "id": "twigs:polished_calcite_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_bricks_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_bricks_from_calcite_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_bricks_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_bricks_from_calcite_stonecutting.json index 64a0ee87..e828b388 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_bricks_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_bricks_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_bricks", + "result": { + "id": "twigs:polished_calcite_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_bricks_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_calcite_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_bricks_stonecutting.json index 4c167799..c2fe384b 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_bricks", + "result": { + "id": "twigs:polished_calcite_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_slab.json b/src/main/resources/data/twigs/recipe/polished_calcite_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_calcite_slab.json rename to src/main/resources/data/twigs/recipe/polished_calcite_slab.json index 66ea1397..d55f8c9d 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_calcite_slab", + "id": "twigs:polished_calcite_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_slab_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_slab_from_calcite_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_slab_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_slab_from_calcite_stonecutting.json index 35164e97..1e26ce74 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_slab_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_slab_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_slab", + "result": { + "id": "twigs:polished_calcite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_slab_from_polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_slab_from_polished_calcite_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_calcite_slab_from_polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_slab_from_polished_calcite_stonecutting.json index 5142f8ad..6a3debc4 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_slab_from_polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_slab_from_polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_slab", + "result": { + "id": "twigs:polished_calcite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_stairs.json b/src/main/resources/data/twigs/recipe/polished_calcite_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_calcite_stairs.json rename to src/main/resources/data/twigs/recipe/polished_calcite_stairs.json index 825e2619..ea5e3046 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_calcite_stairs", + "id": "twigs:polished_calcite_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_calcite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_calcite_stonecutting.json index 08271b88..cf2c656c 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite_stairs", + "result": { + "id": "twigs:polished_calcite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_polished_calcite_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_polished_calcite_stonecutting.json index 204cdbd9..99972888 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_stairs_from_polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_stairs_from_polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_calcite" }, - "result": "twigs:polished_calcite_stairs", + "result": { + "id": "twigs:polished_calcite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_calcite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_calcite_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/polished_calcite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_calcite_stonecutting.json index 1f845b46..0c6c923b 100644 --- a/src/main/resources/data/twigs/recipes/polished_calcite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_calcite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:calcite" }, - "result": "twigs:polished_calcite", + "result": { + "id": "twigs:polished_calcite" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite.json b/src/main/resources/data/twigs/recipe/polished_rhyolite.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_rhyolite.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite.json index 18888e98..6d43d768 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite", + "id": "twigs:polished_rhyolite", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab.json similarity index 78% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab.json index d7f48e0e..259cab6a 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_brick_slab", + "id": "twigs:polished_rhyolite_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json index ee6a6e85..2fe58fe5 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite_bricks" }, - "result": "twigs:polished_rhyolite_brick_slab", + "result": { + "id": "twigs:polished_rhyolite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json index 61e28891..342a7686 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_brick_slab", + "result": { + "id": "twigs:polished_rhyolite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json index 581d7386..3588be30 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_slab_from_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_brick_slab", + "result": { + "id": "twigs:polished_rhyolite_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs.json index 68e68ea8..836fc798 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_brick_stairs", + "id": "twigs:polished_rhyolite_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json index bc764dba..10872f75 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite_bricks" }, - "result": "twigs:polished_rhyolite_brick_stairs", + "result": { + "id": "twigs:polished_rhyolite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json index 1b4a0af1..250c6340 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_brick_stairs", + "result": { + "id": "twigs:polished_rhyolite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json similarity index 60% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json index 355fd3ca..5bead640 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_stairs_from_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_brick_stairs", + "result": { + "id": "twigs:polished_rhyolite_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall.json index e35bd42e..94570b24 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_brick_wall", + "id": "twigs:polished_rhyolite_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json index 546c1553..6eba5a73 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite_bricks" }, - "result": "twigs:polished_rhyolite_brick_wall", + "result": { + "id": "twigs:polished_rhyolite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json index cd49b1f5..7885caf7 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_brick_wall", + "result": { + "id": "twigs:polished_rhyolite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json index 13012f6c..52f43ea8 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_brick_wall_from_rhyolite_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_brick_wall", + "result": { + "id": "twigs:polished_rhyolite_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_bricks.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_bricks.json index 05486e1d..85bcf213 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_bricks", + "id": "twigs:polished_rhyolite_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json index 296fec3b..ffe42673 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_bricks", + "result": { + "id": "twigs:polished_rhyolite_bricks" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_rhyolite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_rhyolite_stonecutting.json index 7215bdd2..9c30aec8 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_bricks_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_bricks_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_bricks", + "result": { + "id": "twigs:polished_rhyolite_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_slab.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_slab.json index 216b5207..a8fba01b 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_slab", + "id": "twigs:polished_rhyolite_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json index 31074d6a..b93eea85 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_slab", + "result": { + "id": "twigs:polished_rhyolite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_rhyolite_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_rhyolite_stonecutting.json index c9bdf1e0..f52d52ab 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_slab_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_slab_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_slab", + "result": { + "id": "twigs:polished_rhyolite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_stairs.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_stairs.json index 2ed136c8..d8160459 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_rhyolite_stairs", + "id": "twigs:polished_rhyolite_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json index 33c62f13..3b531bdf 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_rhyolite" }, - "result": "twigs:polished_rhyolite_stairs", + "result": { + "id": "twigs:polished_rhyolite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_rhyolite_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_rhyolite_stonecutting.json index 7a378376..079fb181 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_stairs_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_stairs_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite_stairs", + "result": { + "id": "twigs:polished_rhyolite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_rhyolite_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/polished_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_rhyolite_stonecutting.json index d1334ce6..535496fe 100644 --- a/src/main/resources/data/twigs/recipes/polished_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:polished_rhyolite", + "result": { + "id": "twigs:polished_rhyolite" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_schist.json b/src/main/resources/data/twigs/recipe/polished_schist.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_schist.json rename to src/main/resources/data/twigs/recipe/polished_schist.json index 1c576698..5d5865c2 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist.json +++ b/src/main/resources/data/twigs/recipe/polished_schist.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_schist", + "id": "twigs:polished_schist", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_slab.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_slab.json index 7609b9bd..48dfe9a7 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_schist_brick_slab", + "id": "twigs:polished_schist_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json index a272caea..413e5d46 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist_bricks" }, - "result": "twigs:polished_schist_brick_slab", + "result": { + "id": "twigs:polished_schist_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_stonecutting.json index ac4f955e..5227526a 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_brick_slab", + "result": { + "id": "twigs:polished_schist_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_schist_brick_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_schist_brick_stonecutting.json index cee1aa39..823f358a 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_slab_from_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_slab_from_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_brick_slab", + "result": { + "id": "twigs:polished_schist_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_stairs.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_stairs.json index d054c53c..e28031e1 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_schist_brick_stairs", + "id": "twigs:polished_schist_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json index d982ebf8..1461e2f5 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist_bricks" }, - "result": "twigs:polished_schist_brick_stairs", + "result": { + "id": "twigs:polished_schist_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_stonecutting.json index cb0cf5eb..bb117ead 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_brick_stairs", + "result": { + "id": "twigs:polished_schist_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_schist_brick_stonecutting.json similarity index 60% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_schist_brick_stonecutting.json index 553ab377..95ea837d 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_stairs_from_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_stairs_from_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_brick_stairs", + "result": { + "id": "twigs:polished_schist_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_wall.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_wall.json index 0c695f61..9198fcdc 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_schist_brick_wall", + "id": "twigs:polished_schist_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json index d9b8ae1e..4ed8ab61 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist_bricks" }, - "result": "twigs:polished_schist_brick_wall", + "result": { + "id": "twigs:polished_schist_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_stonecutting.json index a79e0ee3..31448290 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_brick_wall", + "result": { + "id": "twigs:polished_schist_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_schist_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_schist_brick_stonecutting.json similarity index 61% rename from src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_schist_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_schist_brick_stonecutting.json index 8c28f5e7..3781e3da 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_brick_wall_from_schist_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_brick_wall_from_schist_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_brick_wall", + "result": { + "id": "twigs:polished_schist_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_bricks.json b/src/main/resources/data/twigs/recipe/polished_schist_bricks.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_schist_bricks.json rename to src/main/resources/data/twigs/recipe/polished_schist_bricks.json index 5cc02413..e0482d29 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_schist_bricks", + "id": "twigs:polished_schist_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_schist_bricks_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_bricks_from_schist_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_schist_bricks_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_bricks_from_schist_stonecutting.json index 654677a4..1551cbad 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_bricks_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_bricks_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_bricks", + "result": { + "id": "twigs:polished_schist_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_schist_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_bricks_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_schist_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_bricks_stonecutting.json index 31a2efda..1d0d6219 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_bricks", + "result": { + "id": "twigs:polished_schist_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_schist_slab.json b/src/main/resources/data/twigs/recipe/polished_schist_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_schist_slab.json rename to src/main/resources/data/twigs/recipe/polished_schist_slab.json index 5b07ff18..d33e3699 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_schist_slab", + "id": "twigs:polished_schist_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_slab_from_polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_slab_from_polished_schist_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_schist_slab_from_polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_slab_from_polished_schist_stonecutting.json index 92179685..173a465a 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_slab_from_polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_slab_from_polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_slab", + "result": { + "id": "twigs:polished_schist_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_slab_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_slab_from_schist_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_schist_slab_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_slab_from_schist_stonecutting.json index 591da5db..3d9d84fc 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_slab_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_slab_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_slab", + "result": { + "id": "twigs:polished_schist_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_stairs.json b/src/main/resources/data/twigs/recipe/polished_schist_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_schist_stairs.json rename to src/main/resources/data/twigs/recipe/polished_schist_stairs.json index 0c21b19a..486be557 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_schist_stairs", + "id": "twigs:polished_schist_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_stairs_from_polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_stairs_from_polished_schist_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_schist_stairs_from_polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_stairs_from_polished_schist_stonecutting.json index 8c4c3553..c49aec0f 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_stairs_from_polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_stairs_from_polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_schist" }, - "result": "twigs:polished_schist_stairs", + "result": { + "id": "twigs:polished_schist_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_stairs_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_stairs_from_schist_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_schist_stairs_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_stairs_from_schist_stonecutting.json index 62effe14..e39237c2 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_stairs_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_stairs_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist_stairs", + "result": { + "id": "twigs:polished_schist_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_schist_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/polished_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_schist_stonecutting.json index ad5d2ab3..f5eb9779 100644 --- a/src/main/resources/data/twigs/recipes/polished_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:polished_schist", + "result": { + "id": "twigs:polished_schist" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_slab.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_slab.json index d9162f85..b72e1321 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_tuff_brick_slab", + "id": "twigs:polished_tuff_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json index 9bbc1784..d0a27940 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff_bricks" }, - "result": "twigs:polished_tuff_brick_slab", + "result": { + "id": "twigs:polished_tuff_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json index a48e94f0..678ffe9a 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_brick_slab", + "result": { + "id": "twigs:polished_tuff_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json index cdde8965..2d60ddbd 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_slab_from_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_brick_slab", + "result": { + "id": "twigs:polished_tuff_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs.json index 3fcf752e..8a3fc8b2 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_tuff_brick_stairs", + "id": "twigs:polished_tuff_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json index 1f9d6791..38fab844 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff_bricks" }, - "result": "twigs:polished_tuff_brick_stairs", + "result": { + "id": "twigs:polished_tuff_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json index b80ce8eb..2e3e55fd 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_brick_stairs", + "result": { + "id": "twigs:polished_tuff_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json index 32053e9d..a195dc97 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_stairs_from_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_brick_stairs", + "result": { + "id": "twigs:polished_tuff_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_wall.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_wall.json index 2945aff2..c7fdacc6 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:polished_tuff_brick_wall", + "id": "twigs:polished_tuff_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json index 59be5a8a..cd89de8f 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff_bricks" }, - "result": "twigs:polished_tuff_brick_wall", + "result": { + "id": "twigs:polished_tuff_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json index 04b2787d..37c0088b 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_brick_wall", + "result": { + "id": "twigs:polished_tuff_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json index 577cd02e..beb7c7b0 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_brick_wall_from_tuff_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_brick_wall", + "result": { + "id": "twigs:polished_tuff_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_bricks.json b/src/main/resources/data/twigs/recipe/polished_tuff_bricks.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_tuff_bricks.json rename to src/main/resources/data/twigs/recipe/polished_tuff_bricks.json index 4f9b6b5b..8198d2a6 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_bricks.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_tuff_bricks", + "id": "twigs:polished_tuff_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_bricks_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_bricks_from_tuff_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_tuff_bricks_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_bricks_from_tuff_stonecutting.json index 1a125288..e40bdb12 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_bricks_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_bricks_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_bricks", + "result": { + "id": "twigs:polished_tuff_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_bricks_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_tuff_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_bricks_stonecutting.json index 3a2c62b9..93f6a274 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_bricks", + "result": { + "id": "twigs:polished_tuff_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_slab.json b/src/main/resources/data/twigs/recipe/polished_tuff_slab.json similarity index 81% rename from src/main/resources/data/twigs/recipes/polished_tuff_slab.json rename to src/main/resources/data/twigs/recipe/polished_tuff_slab.json index cc7e11d0..0ca41e14 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_slab.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:polished_tuff_slab", + "id": "twigs:polished_tuff_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_slab_from_polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_slab_from_polished_tuff_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/polished_tuff_slab_from_polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_slab_from_polished_tuff_stonecutting.json index d95509b7..c188b464 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_slab_from_polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_slab_from_polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_slab", + "result": { + "id": "twigs:polished_tuff_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_slab_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_slab_from_tuff_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_tuff_slab_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_slab_from_tuff_stonecutting.json index 30644528..104c7009 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_slab_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_slab_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_slab", + "result": { + "id": "twigs:polished_tuff_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_stairs.json b/src/main/resources/data/twigs/recipe/polished_tuff_stairs.json similarity index 82% rename from src/main/resources/data/twigs/recipes/polished_tuff_stairs.json rename to src/main/resources/data/twigs/recipe/polished_tuff_stairs.json index 2101e00c..6ed2bc26 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_stairs.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:polished_tuff_stairs", + "id": "twigs:polished_tuff_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_polished_tuff_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_polished_tuff_stonecutting.json index 7b3b4371..f7a396c1 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:polished_tuff" }, - "result": "twigs:polished_tuff_stairs", + "result": { + "id": "twigs:polished_tuff_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_tuff_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_tuff_stonecutting.json index cd50e37b..0b9f3174 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_stairs_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_stairs_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff_stairs", + "result": { + "id": "twigs:polished_tuff_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/polished_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/polished_tuff_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/polished_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/polished_tuff_stonecutting.json index d088be48..10b1d073 100644 --- a/src/main/resources/data/twigs/recipes/polished_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/polished_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:polished_tuff", + "result": { + "id": "twigs:polished_tuff" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/purple_packed_silt.json b/src/main/resources/data/twigs/recipe/purple_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/purple_packed_silt.json rename to src/main/resources/data/twigs/recipe/purple_packed_silt.json index c5862d50..6f561d29 100644 --- a/src/main/resources/data/twigs/recipes/purple_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/purple_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:purple_packed_silt" + "id": "twigs:purple_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/purple_silt_pot.json b/src/main/resources/data/twigs/recipe/purple_silt_pot.json similarity index 82% rename from src/main/resources/data/twigs/recipes/purple_silt_pot.json rename to src/main/resources/data/twigs/recipe/purple_silt_pot.json index f0ef3258..bd896c50 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:purple_silt_pot" + "id": "twigs:purple_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_slab.json index 75134454..3d3bf889 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:purple_silt_shingle_slab", + "id": "twigs:purple_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json index dc59936b..1cb89c17 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_packed_silt" }, - "result": "twigs:purple_silt_shingle_slab", + "result": { + "id": "twigs:purple_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json index c46975c4..80953d6a 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_slab_from_purple_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_silt_shingles" }, - "result": "twigs:purple_silt_shingle_slab", + "result": { + "id": "twigs:purple_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs.json index 1f98b8a8..e707b94b 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:purple_silt_shingle_stairs", + "id": "twigs:purple_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json index dc7ecf87..8d97ea21 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_packed_silt" }, - "result": "twigs:purple_silt_shingle_stairs", + "result": { + "id": "twigs:purple_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json index b13a37c5..0ba7b85c 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_stairs_from_purple_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_silt_shingles" }, - "result": "twigs:purple_silt_shingle_stairs", + "result": { + "id": "twigs:purple_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_wall.json index b8ac7e52..395c62b5 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:purple_silt_shingle_wall", + "id": "twigs:purple_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json index ac8af556..241aee9f 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_packed_silt" }, - "result": "twigs:purple_silt_shingle_wall", + "result": { + "id": "twigs:purple_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json index ebe7fce2..371e6e0d 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingle_wall_from_purple_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_silt_shingles" }, - "result": "twigs:purple_silt_shingle_wall", + "result": { + "id": "twigs:purple_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingles.json b/src/main/resources/data/twigs/recipe/purple_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/purple_silt_shingles.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingles.json index da674101..60d6e361 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:purple_silt_shingles" + "id": "twigs:purple_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/purple_silt_shingles_from_packed_silt.json similarity index 81% rename from src/main/resources/data/twigs/recipes/purple_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingles_from_packed_silt.json index f2b692e9..86911d7b 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:purple_silt_shingles" + "id": "twigs:purple_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/purple_silt_shingles_from_purple_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/purple_silt_shingles_from_purple_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/purple_silt_shingles_from_purple_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/purple_silt_shingles_from_purple_packed_silt_stonecutting.json index 9ec4b594..11987f55 100644 --- a/src/main/resources/data/twigs/recipes/purple_silt_shingles_from_purple_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/purple_silt_shingles_from_purple_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:purple_packed_silt" }, - "result": "twigs:purple_silt_shingles", + "result": { + "id": "twigs:purple_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/quartz_column.json b/src/main/resources/data/twigs/recipe/quartz_column.json similarity index 83% rename from src/main/resources/data/twigs/recipes/quartz_column.json rename to src/main/resources/data/twigs/recipe/quartz_column.json index 85fdadc4..ae51de6b 100644 --- a/src/main/resources/data/twigs/recipes/quartz_column.json +++ b/src/main/resources/data/twigs/recipe/quartz_column.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:quartz_column", + "id": "twigs:quartz_column", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/quartz_column_stonecutting.json b/src/main/resources/data/twigs/recipe/quartz_column_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/quartz_column_stonecutting.json rename to src/main/resources/data/twigs/recipe/quartz_column_stonecutting.json index b1bad87f..d0707e58 100644 --- a/src/main/resources/data/twigs/recipes/quartz_column_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/quartz_column_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:quartz_block" }, - "result": "twigs:quartz_column", + "result": { + "id": "twigs:quartz_column" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/red_packed_silt.json b/src/main/resources/data/twigs/recipe/red_packed_silt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/red_packed_silt.json rename to src/main/resources/data/twigs/recipe/red_packed_silt.json index d5a8e196..42f3a54f 100644 --- a/src/main/resources/data/twigs/recipes/red_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/red_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:red_packed_silt" + "id": "twigs:red_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/red_silt_pot.json b/src/main/resources/data/twigs/recipe/red_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/red_silt_pot.json rename to src/main/resources/data/twigs/recipe/red_silt_pot.json index 73b6a7bc..ca1c0565 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/red_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:red_silt_pot" + "id": "twigs:red_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_slab.json index a2a0d1ab..4b386986 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:red_silt_shingle_slab", + "id": "twigs:red_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json index ab50a6c0..bec8597a 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_packed_silt" }, - "result": "twigs:red_silt_shingle_slab", + "result": { + "id": "twigs:red_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json index 5ea35faa..e965c0d4 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_slab_from_red_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_silt_shingles" }, - "result": "twigs:red_silt_shingle_slab", + "result": { + "id": "twigs:red_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_stairs.json index 0b9db6a8..33f0a82b 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:red_silt_shingle_stairs", + "id": "twigs:red_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json index 951edf25..9a8a822e 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_packed_silt" }, - "result": "twigs:red_silt_shingle_stairs", + "result": { + "id": "twigs:red_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json index 3d3d5b9f..ea50445c 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_stairs_from_red_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_silt_shingles" }, - "result": "twigs:red_silt_shingle_stairs", + "result": { + "id": "twigs:red_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_wall.json index 47e40510..23af3670 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:red_silt_shingle_wall", + "id": "twigs:red_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json index 9f663a93..454f0001 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_packed_silt" }, - "result": "twigs:red_silt_shingle_wall", + "result": { + "id": "twigs:red_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json index ff2deb4d..a589fcb5 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingle_wall_from_red_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_silt_shingles" }, - "result": "twigs:red_silt_shingle_wall", + "result": { + "id": "twigs:red_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingles.json b/src/main/resources/data/twigs/recipe/red_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/red_silt_shingles.json rename to src/main/resources/data/twigs/recipe/red_silt_shingles.json index a7a978d0..a11090a7 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:red_silt_shingles" + "id": "twigs:red_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/red_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/red_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/red_silt_shingles_from_packed_silt.json index b94fe70a..03c4305f 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:red_silt_shingles" + "id": "twigs:red_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/red_silt_shingles_from_red_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/red_silt_shingles_from_red_packed_silt_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/red_silt_shingles_from_red_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/red_silt_shingles_from_red_packed_silt_stonecutting.json index d4768cac..2b77f1e8 100644 --- a/src/main/resources/data/twigs/recipes/red_silt_shingles_from_red_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/red_silt_shingles_from_red_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:red_packed_silt" }, - "result": "twigs:red_silt_shingles", + "result": { + "id": "twigs:red_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/rhyolite.json b/src/main/resources/data/twigs/recipe/rhyolite.json similarity index 89% rename from src/main/resources/data/twigs/recipes/rhyolite.json rename to src/main/resources/data/twigs/recipe/rhyolite.json index c191d49a..a0951b38 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite.json +++ b/src/main/resources/data/twigs/recipe/rhyolite.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:rhyolite", + "id": "twigs:rhyolite", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/rhyolite_slab.json b/src/main/resources/data/twigs/recipe/rhyolite_slab.json similarity index 82% rename from src/main/resources/data/twigs/recipes/rhyolite_slab.json rename to src/main/resources/data/twigs/recipe/rhyolite_slab.json index 8274444d..aa1b737f 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_slab.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:rhyolite_slab", + "id": "twigs:rhyolite_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/rhyolite_slab_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/rhyolite_slab_from_rhyolite_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/rhyolite_slab_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/rhyolite_slab_from_rhyolite_stonecutting.json index ae64eb12..3e255b23 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_slab_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_slab_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:rhyolite_slab", + "result": { + "id": "twigs:rhyolite_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/rhyolite_stairs.json b/src/main/resources/data/twigs/recipe/rhyolite_stairs.json similarity index 83% rename from src/main/resources/data/twigs/recipes/rhyolite_stairs.json rename to src/main/resources/data/twigs/recipe/rhyolite_stairs.json index b31f819c..5424856e 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:rhyolite_stairs", + "id": "twigs:rhyolite_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/rhyolite_stairs_from_rhyolite_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/rhyolite_stairs_from_rhyolite_stonecutting.json index 765e1623..5073fb86 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_stairs_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:rhyolite_stairs", + "result": { + "id": "twigs:rhyolite_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/rhyolite_wall.json b/src/main/resources/data/twigs/recipe/rhyolite_wall.json similarity index 83% rename from src/main/resources/data/twigs/recipes/rhyolite_wall.json rename to src/main/resources/data/twigs/recipe/rhyolite_wall.json index 60644e7c..7e8cdcc2 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_wall.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:rhyolite_wall", + "id": "twigs:rhyolite_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/rhyolite_wall_from_rhyolite_stonecutting.json b/src/main/resources/data/twigs/recipe/rhyolite_wall_from_rhyolite_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/rhyolite_wall_from_rhyolite_stonecutting.json rename to src/main/resources/data/twigs/recipe/rhyolite_wall_from_rhyolite_stonecutting.json index 1ef792b0..13e0f778 100644 --- a/src/main/resources/data/twigs/recipes/rhyolite_wall_from_rhyolite_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/rhyolite_wall_from_rhyolite_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:rhyolite" }, - "result": "twigs:rhyolite_wall", + "result": { + "id": "twigs:rhyolite_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/rocky_dirt.json b/src/main/resources/data/twigs/recipe/rocky_dirt.json similarity index 88% rename from src/main/resources/data/twigs/recipes/rocky_dirt.json rename to src/main/resources/data/twigs/recipe/rocky_dirt.json index 7f0c7bf8..f1ba32e5 100644 --- a/src/main/resources/data/twigs/recipes/rocky_dirt.json +++ b/src/main/resources/data/twigs/recipe/rocky_dirt.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:rocky_dirt", + "id": "twigs:rocky_dirt", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/schist.json b/src/main/resources/data/twigs/recipe/schist.json similarity index 90% rename from src/main/resources/data/twigs/recipes/schist.json rename to src/main/resources/data/twigs/recipe/schist.json index c231c0a2..a7f602fd 100644 --- a/src/main/resources/data/twigs/recipes/schist.json +++ b/src/main/resources/data/twigs/recipe/schist.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:schist", + "id": "twigs:schist", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/schist_slab.json b/src/main/resources/data/twigs/recipe/schist_slab.json similarity index 83% rename from src/main/resources/data/twigs/recipes/schist_slab.json rename to src/main/resources/data/twigs/recipe/schist_slab.json index adf4fca5..d0d04021 100644 --- a/src/main/resources/data/twigs/recipes/schist_slab.json +++ b/src/main/resources/data/twigs/recipe/schist_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:schist_slab", + "id": "twigs:schist_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/schist_slab_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/schist_slab_from_schist_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/schist_slab_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/schist_slab_from_schist_stonecutting.json index 7a4d923e..c762a7f7 100644 --- a/src/main/resources/data/twigs/recipes/schist_slab_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/schist_slab_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:schist_slab", + "result": { + "id": "twigs:schist_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/schist_stairs.json b/src/main/resources/data/twigs/recipe/schist_stairs.json similarity index 84% rename from src/main/resources/data/twigs/recipes/schist_stairs.json rename to src/main/resources/data/twigs/recipe/schist_stairs.json index 34057b73..093cfb69 100644 --- a/src/main/resources/data/twigs/recipes/schist_stairs.json +++ b/src/main/resources/data/twigs/recipe/schist_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:schist_stairs", + "id": "twigs:schist_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/schist_stairs_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/schist_stairs_from_schist_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/schist_stairs_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/schist_stairs_from_schist_stonecutting.json index 02cd10c9..206f64c1 100644 --- a/src/main/resources/data/twigs/recipes/schist_stairs_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/schist_stairs_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:schist_stairs", + "result": { + "id": "twigs:schist_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/schist_wall.json b/src/main/resources/data/twigs/recipe/schist_wall.json similarity index 84% rename from src/main/resources/data/twigs/recipes/schist_wall.json rename to src/main/resources/data/twigs/recipe/schist_wall.json index 2a416d2b..ad256de9 100644 --- a/src/main/resources/data/twigs/recipes/schist_wall.json +++ b/src/main/resources/data/twigs/recipe/schist_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:schist_wall", + "id": "twigs:schist_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/schist_wall_from_schist_stonecutting.json b/src/main/resources/data/twigs/recipe/schist_wall_from_schist_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/schist_wall_from_schist_stonecutting.json rename to src/main/resources/data/twigs/recipe/schist_wall_from_schist_stonecutting.json index 8ffa91e1..6a587832 100644 --- a/src/main/resources/data/twigs/recipes/schist_wall_from_schist_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/schist_wall_from_schist_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:schist" }, - "result": "twigs:schist_wall", + "result": { + "id": "twigs:schist_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt.json b/src/main/resources/data/twigs/recipe/silt.json similarity index 89% rename from src/main/resources/data/twigs/recipes/silt.json rename to src/main/resources/data/twigs/recipe/silt.json index db54ed0c..d17a799a 100644 --- a/src/main/resources/data/twigs/recipes/silt.json +++ b/src/main/resources/data/twigs/recipe/silt.json @@ -14,6 +14,6 @@ ], "result": { "count": 4, - "item": "twigs:silt" + "id": "twigs:silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_brick.json b/src/main/resources/data/twigs/recipe/silt_brick.json similarity index 72% rename from src/main/resources/data/twigs/recipes/silt_brick.json rename to src/main/resources/data/twigs/recipe/silt_brick.json index 76582d9f..5ef7405c 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick.json +++ b/src/main/resources/data/twigs/recipe/silt_brick.json @@ -5,5 +5,7 @@ "ingredient": { "item": "twigs:silt_ball" }, - "result": "twigs:silt_brick" -} \ No newline at end of file + "result": { + "id": "twigs:silt_brick" + } +} diff --git a/src/main/resources/data/twigs/recipes/silt_brick_slab.json b/src/main/resources/data/twigs/recipe/silt_brick_slab.json similarity index 82% rename from src/main/resources/data/twigs/recipes/silt_brick_slab.json rename to src/main/resources/data/twigs/recipe/silt_brick_slab.json index f9745192..6db9f486 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:silt_brick_slab", + "id": "twigs:silt_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/silt_brick_slab_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_brick_slab_from_silt_brick_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/silt_brick_slab_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_brick_slab_from_silt_brick_stonecutting.json index fb6a05bb..f451a6ed 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_slab_from_silt_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_slab_from_silt_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:silt_brick_slab", + "result": { + "id": "twigs:silt_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/silt_brick_stairs.json b/src/main/resources/data/twigs/recipe/silt_brick_stairs.json similarity index 83% rename from src/main/resources/data/twigs/recipes/silt_brick_stairs.json rename to src/main/resources/data/twigs/recipe/silt_brick_stairs.json index 25676910..5a0437fa 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:silt_brick_stairs", + "id": "twigs:silt_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/silt_brick_stairs_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_brick_stairs_from_silt_brick_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/silt_brick_stairs_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_brick_stairs_from_silt_brick_stonecutting.json index 512e3c79..a3f10b64 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_stairs_from_silt_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_stairs_from_silt_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:silt_brick_stairs", + "result": { + "id": "twigs:silt_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_brick_trail.json b/src/main/resources/data/twigs/recipe/silt_brick_trail.json similarity index 83% rename from src/main/resources/data/twigs/recipes/silt_brick_trail.json rename to src/main/resources/data/twigs/recipe/silt_brick_trail.json index 5cfb2648..92d78dac 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_trail.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_trail.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:silt_brick_trail", + "id": "twigs:silt_brick_trail", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_brick_wall.json b/src/main/resources/data/twigs/recipe/silt_brick_wall.json similarity index 83% rename from src/main/resources/data/twigs/recipes/silt_brick_wall.json rename to src/main/resources/data/twigs/recipe/silt_brick_wall.json index fbddcb64..1366ff44 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:silt_brick_wall", + "id": "twigs:silt_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/silt_brick_wall_from_silt_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_brick_wall_from_silt_brick_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/silt_brick_wall_from_silt_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_brick_wall_from_silt_brick_stonecutting.json index be02bde1..a58aefc3 100644 --- a/src/main/resources/data/twigs/recipes/silt_brick_wall_from_silt_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_brick_wall_from_silt_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_bricks" }, - "result": "twigs:silt_brick_wall", + "result": { + "id": "twigs:silt_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_bricks.json b/src/main/resources/data/twigs/recipe/silt_bricks.json similarity index 83% rename from src/main/resources/data/twigs/recipes/silt_bricks.json rename to src/main/resources/data/twigs/recipe/silt_bricks.json index c91a087d..1627eaa6 100644 --- a/src/main/resources/data/twigs/recipes/silt_bricks.json +++ b/src/main/resources/data/twigs/recipe/silt_bricks.json @@ -10,6 +10,6 @@ "##" ], "result": { - "item": "twigs:silt_bricks" + "id": "twigs:silt_bricks" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_from_silt_balls.json b/src/main/resources/data/twigs/recipe/silt_from_silt_balls.json similarity index 86% rename from src/main/resources/data/twigs/recipes/silt_from_silt_balls.json rename to src/main/resources/data/twigs/recipe/silt_from_silt_balls.json index 46b900a5..fa31978d 100644 --- a/src/main/resources/data/twigs/recipes/silt_from_silt_balls.json +++ b/src/main/resources/data/twigs/recipe/silt_from_silt_balls.json @@ -10,6 +10,6 @@ "##" ], "result": { - "item": "twigs:silt" + "id": "twigs:silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_pot.json b/src/main/resources/data/twigs/recipe/silt_pot.json similarity index 86% rename from src/main/resources/data/twigs/recipes/silt_pot.json rename to src/main/resources/data/twigs/recipe/silt_pot.json index 1f8a3747..aac00fe9 100644 --- a/src/main/resources/data/twigs/recipes/silt_pot.json +++ b/src/main/resources/data/twigs/recipe/silt_pot.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:silt_pot", + "id": "twigs:silt_pot", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/silt_shingle_slab.json similarity index 81% rename from src/main/resources/data/twigs/recipes/silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/silt_shingle_slab.json index 1aed45cd..1cd20738 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:silt_shingle_slab", + "id": "twigs:silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_slab_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_slab_from_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/silt_shingle_slab_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_slab_from_packed_silt_stonecutting.json index c7dc5326..124add1e 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_slab_from_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_slab_from_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:packed_silt" }, - "result": "twigs:silt_shingle_slab", + "result": { + "id": "twigs:silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_slab_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_slab_from_silt_shingle_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/silt_shingle_slab_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_slab_from_silt_shingle_stonecutting.json index 9395e5c1..bfe323da 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_slab_from_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_slab_from_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_shingles" }, - "result": "twigs:silt_shingle_slab", + "result": { + "id": "twigs:silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/silt_shingle_stairs.json similarity index 82% rename from src/main/resources/data/twigs/recipes/silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/silt_shingle_stairs.json index 5c43d1d3..0a3013de 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:silt_shingle_stairs", + "id": "twigs:silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_packed_silt_stonecutting.json index a8c8607e..dfdd0a64 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:packed_silt" }, - "result": "twigs:silt_shingle_stairs", + "result": { + "id": "twigs:silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_silt_shingle_stonecutting.json index 06a493f2..77b63aec 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_stairs_from_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_stairs_from_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_shingles" }, - "result": "twigs:silt_shingle_stairs", + "result": { + "id": "twigs:silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/silt_shingle_wall.json similarity index 82% rename from src/main/resources/data/twigs/recipes/silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/silt_shingle_wall.json index a929f8ab..4cdf3822 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:silt_shingle_wall", + "id": "twigs:silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_wall_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_wall_from_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/silt_shingle_wall_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_wall_from_packed_silt_stonecutting.json index 73c60cf0..c57cd9dc 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_wall_from_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_wall_from_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:packed_silt" }, - "result": "twigs:silt_shingle_wall", + "result": { + "id": "twigs:silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingle_wall_from_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingle_wall_from_silt_shingle_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/silt_shingle_wall_from_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingle_wall_from_silt_shingle_stonecutting.json index 01ab43aa..6629d755 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingle_wall_from_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingle_wall_from_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:silt_shingles" }, - "result": "twigs:silt_shingle_wall", + "result": { + "id": "twigs:silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/silt_shingles.json b/src/main/resources/data/twigs/recipe/silt_shingles.json similarity index 83% rename from src/main/resources/data/twigs/recipes/silt_shingles.json rename to src/main/resources/data/twigs/recipe/silt_shingles.json index 397e059e..5b2a6529 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/silt_shingles.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:silt_shingles" + "id": "twigs:silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/silt_shingles_from_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/silt_shingles_from_packed_silt_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/silt_shingles_from_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/silt_shingles_from_packed_silt_stonecutting.json index 778247e3..120cd08f 100644 --- a/src/main/resources/data/twigs/recipes/silt_shingles_from_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/silt_shingles_from_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:packed_silt" }, - "result": "twigs:silt_shingles", + "result": { + "id": "twigs:silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab.json similarity index 82% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab.json index cec009f0..06f93295 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:smooth_basalt_brick_slab", + "id": "twigs:smooth_basalt_brick_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json index 89e7a9a0..5d89cc19 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_from_smooth_basalt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_basalt" }, - "result": "twigs:smooth_basalt_brick_slab", + "result": { + "id": "twigs:smooth_basalt_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_stonecutting.json index 1e270380..e6bb8333 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_basalt_bricks" }, - "result": "twigs:smooth_basalt_brick_slab", + "result": { + "id": "twigs:smooth_basalt_brick_slab" + }, "count": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs.json similarity index 82% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs.json index bb2a35f6..5aa24f8c 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:smooth_basalt_brick_stairs", + "id": "twigs:smooth_basalt_brick_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json index efc6d700..951daa47 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_from_smooth_basalt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_basalt" }, - "result": "twigs:smooth_basalt_brick_stairs", + "result": { + "id": "twigs:smooth_basalt_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_stonecutting.json index e667b435..4357be59 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_basalt_bricks" }, - "result": "twigs:smooth_basalt_brick_stairs", + "result": { + "id": "twigs:smooth_basalt_brick_stairs" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall.json similarity index 82% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall.json index 1e512529..3990ec1f 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:smooth_basalt_brick_wall", + "id": "twigs:smooth_basalt_brick_wall", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json index 9e6ac855..2a414f60 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_from_smooth_basalt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_basalt" }, - "result": "twigs:smooth_basalt_brick_wall", + "result": { + "id": "twigs:smooth_basalt_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_stonecutting.json index d556d6f6..79b308ea 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_basalt_bricks" }, - "result": "twigs:smooth_basalt_brick_wall", + "result": { + "id": "twigs:smooth_basalt_brick_wall" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_bricks.json b/src/main/resources/data/twigs/recipe/smooth_basalt_bricks.json similarity index 82% rename from src/main/resources/data/twigs/recipes/smooth_basalt_bricks.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_bricks.json index aca38644..7df2ddf3 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_bricks.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_bricks.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:smooth_basalt_bricks", + "id": "twigs:smooth_basalt_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_basalt_bricks_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_basalt_bricks_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/smooth_basalt_bricks_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_basalt_bricks_stonecutting.json index 089b5109..d82d32dc 100644 --- a/src/main/resources/data/twigs/recipes/smooth_basalt_bricks_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_basalt_bricks_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_basalt" }, - "result": "twigs:smooth_basalt_bricks", + "result": { + "id": "twigs:smooth_basalt_bricks" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_slab.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_slab.json index 4ae16183..d197835d 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:smooth_stone_brick_slab", + "id": "twigs:smooth_stone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json index 904b2ae0..4a9f21c9 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_stone_bricks" }, - "result": "twigs:smooth_stone_brick_slab", + "result": { + "id": "twigs:smooth_stone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json index 8ee87b6d..5f3c595f 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_slab_from_smooth_stone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_stone" }, - "result": "twigs:smooth_stone_brick_slab", + "result": { + "id": "twigs:smooth_stone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs.json index d045b0d9..df073c73 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:smooth_stone_brick_stairs", + "id": "twigs:smooth_stone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json index 7813115d..fcb9c394 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_stone_bricks" }, - "result": "twigs:smooth_stone_brick_stairs", + "result": { + "id": "twigs:smooth_stone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json index cd7011d5..335cccee 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_stairs_from_smooth_stone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_stone" }, - "result": "twigs:smooth_stone_brick_stairs", + "result": { + "id": "twigs:smooth_stone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_wall.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_wall.json index dbb78556..3ce01a0f 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:smooth_stone_brick_wall", + "id": "twigs:smooth_stone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json index 7aa7f426..347315f5 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_brick_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:smooth_stone_bricks" }, - "result": "twigs:smooth_stone_brick_wall", + "result": { + "id": "twigs:smooth_stone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json index d3e52c1f..f25d2869 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_brick_wall_from_smooth_stone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_stone" }, - "result": "twigs:smooth_stone_brick_wall", + "result": { + "id": "twigs:smooth_stone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_bricks.json b/src/main/resources/data/twigs/recipe/smooth_stone_bricks.json similarity index 81% rename from src/main/resources/data/twigs/recipes/smooth_stone_bricks.json rename to src/main/resources/data/twigs/recipe/smooth_stone_bricks.json index e98def37..579ee457 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_bricks.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_bricks.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:smooth_stone_bricks", + "id": "twigs:smooth_stone_bricks", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/smooth_stone_bricks_from_smooth_stone_stonecutting.json b/src/main/resources/data/twigs/recipe/smooth_stone_bricks_from_smooth_stone_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/smooth_stone_bricks_from_smooth_stone_stonecutting.json rename to src/main/resources/data/twigs/recipe/smooth_stone_bricks_from_smooth_stone_stonecutting.json index f3fec8ba..10ca10c5 100644 --- a/src/main/resources/data/twigs/recipes/smooth_stone_bricks_from_smooth_stone_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/smooth_stone_bricks_from_smooth_stone_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:smooth_stone" }, - "result": "twigs:smooth_stone_bricks", + "result": { + "id": "twigs:smooth_stone_bricks" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/soul_lamp.json b/src/main/resources/data/twigs/recipe/soul_lamp.json similarity index 91% rename from src/main/resources/data/twigs/recipes/soul_lamp.json rename to src/main/resources/data/twigs/recipe/soul_lamp.json index 6b318723..c0e6d1b5 100644 --- a/src/main/resources/data/twigs/recipes/soul_lamp.json +++ b/src/main/resources/data/twigs/recipe/soul_lamp.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "twigs:soul_lamp", + "id": "twigs:soul_lamp", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/spruce_table.json b/src/main/resources/data/twigs/recipe/spruce_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/spruce_table.json rename to src/main/resources/data/twigs/recipe/spruce_table.json index 1208f409..bd53cd46 100644 --- a/src/main/resources/data/twigs/recipes/spruce_table.json +++ b/src/main/resources/data/twigs/recipe/spruce_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:spruce_table", + "id": "twigs:spruce_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/stick_from_twig.json b/src/main/resources/data/twigs/recipe/stick_from_twig.json similarity index 83% rename from src/main/resources/data/twigs/recipes/stick_from_twig.json rename to src/main/resources/data/twigs/recipe/stick_from_twig.json index 2206e419..a8157b13 100644 --- a/src/main/resources/data/twigs/recipes/stick_from_twig.json +++ b/src/main/resources/data/twigs/recipe/stick_from_twig.json @@ -8,6 +8,6 @@ ], "result": { "count": 2, - "item": "minecraft:stick" + "id": "minecraft:stick" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/stone_column.json b/src/main/resources/data/twigs/recipe/stone_column.json similarity index 83% rename from src/main/resources/data/twigs/recipes/stone_column.json rename to src/main/resources/data/twigs/recipe/stone_column.json index 8bb1393e..225dee00 100644 --- a/src/main/resources/data/twigs/recipes/stone_column.json +++ b/src/main/resources/data/twigs/recipe/stone_column.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:stone_column", + "id": "twigs:stone_column", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/stone_column_stonecutting.json b/src/main/resources/data/twigs/recipe/stone_column_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/stone_column_stonecutting.json rename to src/main/resources/data/twigs/recipe/stone_column_stonecutting.json index da7e692d..3fb94192 100644 --- a/src/main/resources/data/twigs/recipes/stone_column_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/stone_column_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:stone" }, - "result": "twigs:stone_column", + "result": { + "id": "twigs:stone_column" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/torchflower_paper_lantern.json b/src/main/resources/data/twigs/recipe/torchflower_paper_lantern.json similarity index 82% rename from src/main/resources/data/twigs/recipes/torchflower_paper_lantern.json rename to src/main/resources/data/twigs/recipe/torchflower_paper_lantern.json index 00104438..6f8b7005 100644 --- a/src/main/resources/data/twigs/recipes/torchflower_paper_lantern.json +++ b/src/main/resources/data/twigs/recipe/torchflower_paper_lantern.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "twigs:torchflower_paper_lantern", + "id": "twigs:torchflower_paper_lantern", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/tuff_slab_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/tuff_slab_from_tuff_stonecutting.json similarity index 69% rename from src/main/resources/data/twigs/recipes/tuff_slab_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/tuff_slab_from_tuff_stonecutting.json index 0c5386b0..cf026031 100644 --- a/src/main/resources/data/twigs/recipes/tuff_slab_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/tuff_slab_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:tuff_slab", + "result": { + "id": "twigs:tuff_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/tuff_stairs.json b/src/main/resources/data/twigs/recipe/tuff_stairs.json similarity index 85% rename from src/main/resources/data/twigs/recipes/tuff_stairs.json rename to src/main/resources/data/twigs/recipe/tuff_stairs.json index 02494bd8..eb9604e6 100644 --- a/src/main/resources/data/twigs/recipes/tuff_stairs.json +++ b/src/main/resources/data/twigs/recipe/tuff_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:tuff_stairs", + "id": "twigs:tuff_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/tuff_stairs_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/tuff_stairs_from_tuff_stonecutting.json similarity index 68% rename from src/main/resources/data/twigs/recipes/tuff_stairs_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/tuff_stairs_from_tuff_stonecutting.json index 5c5ac01f..4ad68f5d 100644 --- a/src/main/resources/data/twigs/recipes/tuff_stairs_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/tuff_stairs_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:tuff_stairs", + "result": { + "id": "twigs:tuff_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/tuff_wall.json b/src/main/resources/data/twigs/recipe/tuff_wall.json similarity index 85% rename from src/main/resources/data/twigs/recipes/tuff_wall.json rename to src/main/resources/data/twigs/recipe/tuff_wall.json index b1802913..9102a90a 100644 --- a/src/main/resources/data/twigs/recipes/tuff_wall.json +++ b/src/main/resources/data/twigs/recipe/tuff_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:tuff_wall", + "id": "twigs:tuff_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/tuff_wall_from_tuff_stonecutting.json b/src/main/resources/data/twigs/recipe/tuff_wall_from_tuff_stonecutting.json similarity index 69% rename from src/main/resources/data/twigs/recipes/tuff_wall_from_tuff_stonecutting.json rename to src/main/resources/data/twigs/recipe/tuff_wall_from_tuff_stonecutting.json index bc882973..0f0c324a 100644 --- a/src/main/resources/data/twigs/recipes/tuff_wall_from_tuff_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/tuff_wall_from_tuff_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:tuff" }, - "result": "twigs:tuff_wall", + "result": { + "id": "twigs:tuff_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab.json similarity index 76% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab.json index 5cc15a9b..36b1c295 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:twisting_polished_blackstone_brick_slab", + "id": "twigs:twisting_polished_blackstone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab_stonecutting.json index 8d3eb376..2d042cf7 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:twisting_polished_blackstone_bricks" }, - "result": "twigs:twisting_polished_blackstone_brick_slab", + "result": { + "id": "twigs:twisting_polished_blackstone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs.json similarity index 77% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs.json index e58470c0..97e77156 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:twisting_polished_blackstone_brick_stairs", + "id": "twigs:twisting_polished_blackstone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs_stonecutting.json index e05f1d5e..c1a9bd84 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:twisting_polished_blackstone_bricks" }, - "result": "twigs:twisting_polished_blackstone_brick_stairs", + "result": { + "id": "twigs:twisting_polished_blackstone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall.json similarity index 77% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall.json index e06bdfe4..cd34cd04 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:twisting_polished_blackstone_brick_wall", + "id": "twigs:twisting_polished_blackstone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall_stonecutting.json index 761a6ddf..8b1fbcc0 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:twisting_polished_blackstone_bricks" }, - "result": "twigs:twisting_polished_blackstone_brick_wall", + "result": { + "id": "twigs:twisting_polished_blackstone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_bricks.json b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_bricks.json similarity index 84% rename from src/main/resources/data/twigs/recipes/twisting_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/recipe/twisting_polished_blackstone_bricks.json index 912444da..84574903 100644 --- a/src/main/resources/data/twigs/recipes/twisting_polished_blackstone_bricks.json +++ b/src/main/resources/data/twigs/recipe/twisting_polished_blackstone_bricks.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:twisting_polished_blackstone_bricks", + "id": "twigs:twisting_polished_blackstone_bricks", "count": 8 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/warped_shroomlamp.json b/src/main/resources/data/twigs/recipe/warped_shroomlamp.json similarity index 86% rename from src/main/resources/data/twigs/recipes/warped_shroomlamp.json rename to src/main/resources/data/twigs/recipe/warped_shroomlamp.json index c1f6de2f..4911e050 100644 --- a/src/main/resources/data/twigs/recipes/warped_shroomlamp.json +++ b/src/main/resources/data/twigs/recipe/warped_shroomlamp.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:warped_shroomlamp", + "id": "twigs:warped_shroomlamp", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/warped_table.json b/src/main/resources/data/twigs/recipe/warped_table.json similarity index 88% rename from src/main/resources/data/twigs/recipes/warped_table.json rename to src/main/resources/data/twigs/recipe/warped_table.json index 5d9049d7..5e570d51 100644 --- a/src/main/resources/data/twigs/recipes/warped_table.json +++ b/src/main/resources/data/twigs/recipe/warped_table.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:warped_table", + "id": "twigs:warped_table", "count": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_copper_pillar.json b/src/main/resources/data/twigs/recipe/waxed_copper_pillar.json similarity index 81% rename from src/main/resources/data/twigs/recipes/waxed_copper_pillar.json rename to src/main/resources/data/twigs/recipe/waxed_copper_pillar.json index 486ec46d..f193ad92 100644 --- a/src/main/resources/data/twigs/recipes/waxed_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/waxed_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:waxed_copper_pillar" + "id": "twigs:waxed_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_copper_pillar_from_cut_copper_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/waxed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_copper_pillar_from_cut_copper_stonecutting.json index 7f4f7fd7..5d5ba35b 100644 --- a/src/main/resources/data/twigs/recipes/waxed_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_cut_copper" }, - "result": "twigs:waxed_copper_pillar", + "result": { + "id": "twigs:waxed_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_copper_pillar_stonecutting.json similarity index 67% rename from src/main/resources/data/twigs/recipes/waxed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_copper_pillar_stonecutting.json index 0e9754f9..e33ebe2b 100644 --- a/src/main/resources/data/twigs/recipes/waxed_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_copper_block" }, - "result": "twigs:waxed_copper_pillar", + "result": { + "id": "twigs:waxed_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar.json b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar.json similarity index 79% rename from src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar.json rename to src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar.json index 393a6804..cb0b431a 100644 --- a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:waxed_exposed_copper_pillar" + "id": "twigs:waxed_exposed_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json index 0df740ad..5c5eee98 100644 --- a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_exposed_cut_copper" }, - "result": "twigs:waxed_exposed_copper_pillar", + "result": { + "id": "twigs:waxed_exposed_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_stonecutting.json index 9c441be6..c54c5821 100644 --- a/src/main/resources/data/twigs/recipes/waxed_exposed_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_exposed_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_exposed_copper" }, - "result": "twigs:waxed_exposed_copper_pillar", + "result": { + "id": "twigs:waxed_exposed_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar.json b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar.json similarity index 78% rename from src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar.json rename to src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar.json index 548e1033..9941fa5b 100644 --- a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:waxed_oxidized_copper_pillar" + "id": "twigs:waxed_oxidized_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json index 21b2277b..bfb8a9e1 100644 --- a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_oxidized_cut_copper" }, - "result": "twigs:waxed_oxidized_copper_pillar", + "result": { + "id": "twigs:waxed_oxidized_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_stonecutting.json index 3d9f9df9..babe6888 100644 --- a/src/main/resources/data/twigs/recipes/waxed_oxidized_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_oxidized_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_oxidized_copper" }, - "result": "twigs:waxed_oxidized_copper_pillar", + "result": { + "id": "twigs:waxed_oxidized_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar.json b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar.json similarity index 78% rename from src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar.json rename to src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar.json index 08c65563..723f9d48 100644 --- a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:waxed_weathered_copper_pillar" + "id": "twigs:waxed_weathered_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json index 9922048d..fbd8e4c1 100644 --- a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_weathered_cut_copper" }, - "result": "twigs:waxed_weathered_copper_pillar", + "result": { + "id": "twigs:waxed_weathered_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_stonecutting.json index 7dc7041c..9b362266 100644 --- a/src/main/resources/data/twigs/recipes/waxed_weathered_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/waxed_weathered_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:waxed_weathered_copper" }, - "result": "twigs:waxed_weathered_copper_pillar", + "result": { + "id": "twigs:waxed_weathered_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/weathered_copper_pillar.json b/src/main/resources/data/twigs/recipe/weathered_copper_pillar.json similarity index 80% rename from src/main/resources/data/twigs/recipes/weathered_copper_pillar.json rename to src/main/resources/data/twigs/recipe/weathered_copper_pillar.json index 8a182513..51cf2a50 100644 --- a/src/main/resources/data/twigs/recipes/weathered_copper_pillar.json +++ b/src/main/resources/data/twigs/recipe/weathered_copper_pillar.json @@ -10,6 +10,6 @@ "#" ], "result": { - "item": "twigs:weathered_copper_pillar" + "id": "twigs:weathered_copper_pillar" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/weathered_copper_pillar_from_cut_copper_stonecutting.json b/src/main/resources/data/twigs/recipe/weathered_copper_pillar_from_cut_copper_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/weathered_copper_pillar_from_cut_copper_stonecutting.json rename to src/main/resources/data/twigs/recipe/weathered_copper_pillar_from_cut_copper_stonecutting.json index 2827b086..972e1409 100644 --- a/src/main/resources/data/twigs/recipes/weathered_copper_pillar_from_cut_copper_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/weathered_copper_pillar_from_cut_copper_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:weathered_cut_copper" }, - "result": "twigs:weathered_copper_pillar", + "result": { + "id": "twigs:weathered_copper_pillar" + }, "count": 1 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/weathered_copper_pillar_stonecutting.json b/src/main/resources/data/twigs/recipe/weathered_copper_pillar_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/weathered_copper_pillar_stonecutting.json rename to src/main/resources/data/twigs/recipe/weathered_copper_pillar_stonecutting.json index 92493c29..8f12c247 100644 --- a/src/main/resources/data/twigs/recipes/weathered_copper_pillar_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/weathered_copper_pillar_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:weathered_copper" }, - "result": "twigs:weathered_copper_pillar", + "result": { + "id": "twigs:weathered_copper_pillar" + }, "count": 4 -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab.json similarity index 76% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab.json index d0e177cc..9fb4677e 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:weeping_polished_blackstone_brick_slab", + "id": "twigs:weeping_polished_blackstone_brick_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab_stonecutting.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab_stonecutting.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab_stonecutting.json index 1c3d493c..0f1b96e7 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_slab_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_slab_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:weeping_polished_blackstone_bricks" }, - "result": "twigs:weeping_polished_blackstone_brick_slab", + "result": { + "id": "twigs:weeping_polished_blackstone_brick_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs.json similarity index 77% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs.json index 0d3eff2f..1a6f15ab 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:weeping_polished_blackstone_brick_stairs", + "id": "twigs:weeping_polished_blackstone_brick_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs_stonecutting.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs_stonecutting.json similarity index 62% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs_stonecutting.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs_stonecutting.json index 24550d45..9412571d 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_stairs_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_stairs_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:weeping_polished_blackstone_bricks" }, - "result": "twigs:weeping_polished_blackstone_brick_stairs", + "result": { + "id": "twigs:weeping_polished_blackstone_brick_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall.json similarity index 77% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall.json index 18ea8164..06e68bb2 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:weeping_polished_blackstone_brick_wall", + "id": "twigs:weeping_polished_blackstone_brick_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall_stonecutting.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall_stonecutting.json similarity index 63% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall_stonecutting.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall_stonecutting.json index 8d7ca3b5..9c778021 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_brick_wall_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_brick_wall_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:weeping_polished_blackstone_bricks" }, - "result": "twigs:weeping_polished_blackstone_brick_wall", + "result": { + "id": "twigs:weeping_polished_blackstone_brick_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_bricks.json b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_bricks.json similarity index 84% rename from src/main/resources/data/twigs/recipes/weeping_polished_blackstone_bricks.json rename to src/main/resources/data/twigs/recipe/weeping_polished_blackstone_bricks.json index b9dd753c..0d82caf6 100644 --- a/src/main/resources/data/twigs/recipes/weeping_polished_blackstone_bricks.json +++ b/src/main/resources/data/twigs/recipe/weeping_polished_blackstone_bricks.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "twigs:weeping_polished_blackstone_bricks", + "id": "twigs:weeping_polished_blackstone_bricks", "count": 8 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/white_packed_silt.json b/src/main/resources/data/twigs/recipe/white_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/white_packed_silt.json rename to src/main/resources/data/twigs/recipe/white_packed_silt.json index cf7b2521..728fc1e8 100644 --- a/src/main/resources/data/twigs/recipes/white_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/white_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:white_packed_silt" + "id": "twigs:white_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/white_silt_pot.json b/src/main/resources/data/twigs/recipe/white_silt_pot.json similarity index 83% rename from src/main/resources/data/twigs/recipes/white_silt_pot.json rename to src/main/resources/data/twigs/recipe/white_silt_pot.json index 61e6348d..34d7870c 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/white_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:white_silt_pot" + "id": "twigs:white_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab.json similarity index 80% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_slab.json index 4097adcd..ea688b74 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:white_silt_shingle_slab", + "id": "twigs:white_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json index 0ec33411..fbd18bfa 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_packed_silt" }, - "result": "twigs:white_silt_shingle_slab", + "result": { + "id": "twigs:white_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json index cb1b5d45..1191b91e 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_slab_from_white_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_silt_shingles" }, - "result": "twigs:white_silt_shingle_slab", + "result": { + "id": "twigs:white_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs.json similarity index 81% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_stairs.json index a1f95512..47e5bca6 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:white_silt_shingle_stairs", + "id": "twigs:white_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json index 234eca39..6acfe0d8 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_packed_silt" }, - "result": "twigs:white_silt_shingle_stairs", + "result": { + "id": "twigs:white_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json index 58347913..26615a62 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_stairs_from_white_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_silt_shingles" }, - "result": "twigs:white_silt_shingle_stairs", + "result": { + "id": "twigs:white_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall.json similarity index 81% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_wall.json index e11f0e4f..a6dbab5c 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:white_silt_shingle_wall", + "id": "twigs:white_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json index f4ccbaac..0921f9fe 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_packed_silt" }, - "result": "twigs:white_silt_shingle_wall", + "result": { + "id": "twigs:white_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json index 06872374..da34977f 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingle_wall_from_white_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_silt_shingles" }, - "result": "twigs:white_silt_shingle_wall", + "result": { + "id": "twigs:white_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingles.json b/src/main/resources/data/twigs/recipe/white_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/white_silt_shingles.json rename to src/main/resources/data/twigs/recipe/white_silt_shingles.json index 91e805ea..45edb90d 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:white_silt_shingles" + "id": "twigs:white_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/white_silt_shingles_from_packed_silt.json similarity index 82% rename from src/main/resources/data/twigs/recipes/white_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/white_silt_shingles_from_packed_silt.json index 63703ec2..14a85e33 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:white_silt_shingles" + "id": "twigs:white_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/white_silt_shingles_from_white_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/white_silt_shingles_from_white_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/white_silt_shingles_from_white_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/white_silt_shingles_from_white_packed_silt_stonecutting.json index c05dad16..7da87404 100644 --- a/src/main/resources/data/twigs/recipes/white_silt_shingles_from_white_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/white_silt_shingles_from_white_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:white_packed_silt" }, - "result": "twigs:white_silt_shingles", + "result": { + "id": "twigs:white_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/yellow_packed_silt.json b/src/main/resources/data/twigs/recipe/yellow_packed_silt.json similarity index 87% rename from src/main/resources/data/twigs/recipes/yellow_packed_silt.json rename to src/main/resources/data/twigs/recipe/yellow_packed_silt.json index b3d86cab..c7296fda 100644 --- a/src/main/resources/data/twigs/recipes/yellow_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/yellow_packed_silt.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:yellow_packed_silt" + "id": "twigs:yellow_packed_silt" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_pot.json b/src/main/resources/data/twigs/recipe/yellow_silt_pot.json similarity index 82% rename from src/main/resources/data/twigs/recipes/yellow_silt_pot.json rename to src/main/resources/data/twigs/recipe/yellow_silt_pot.json index b648e10e..6e748ac9 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_pot.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_pot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "twigs:yellow_silt_pot" + "id": "twigs:yellow_silt_pot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab.json similarity index 79% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab.json index dbc4e2f6..f3a091e0 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "twigs:yellow_silt_shingle_slab", + "id": "twigs:yellow_silt_shingle_slab", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json index e783a2fd..3297da69 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_packed_silt" }, - "result": "twigs:yellow_silt_shingle_slab", + "result": { + "id": "twigs:yellow_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json index 74b07ddc..0a81c527 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_slab_from_yellow_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_silt_shingles" }, - "result": "twigs:yellow_silt_shingle_slab", + "result": { + "id": "twigs:yellow_silt_shingle_slab" + }, "count": 2 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs.json similarity index 80% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs.json index 8324a12b..69b6d643 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "twigs:yellow_silt_shingle_stairs", + "id": "twigs:yellow_silt_shingle_stairs", "count": 4 } } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json index 45e92f48..e928234d 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_packed_silt" }, - "result": "twigs:yellow_silt_shingle_stairs", + "result": { + "id": "twigs:yellow_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json index ce5a7f5c..2756c170 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_stairs_from_yellow_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_silt_shingles" }, - "result": "twigs:yellow_silt_shingle_stairs", + "result": { + "id": "twigs:yellow_silt_shingle_stairs" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall.json similarity index 80% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall.json index 6cd677de..0239c15e 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "twigs:yellow_silt_shingle_wall", + "id": "twigs:yellow_silt_shingle_wall", "count": 6 } } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json similarity index 64% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json index 2ebd8e5b..8a795fa3 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_packed_silt" }, - "result": "twigs:yellow_silt_shingle_wall", + "result": { + "id": "twigs:yellow_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json similarity index 65% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json index fa54bfd7..71b8084c 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingle_wall_from_yellow_silt_shingle_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_silt_shingles" }, - "result": "twigs:yellow_silt_shingle_wall", + "result": { + "id": "twigs:yellow_silt_shingle_wall" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingles.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingles.json similarity index 87% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingles.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingles.json index f0812cfe..fab2087a 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingles.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingles.json @@ -16,6 +16,6 @@ ], "result": { "count": 8, - "item": "twigs:yellow_silt_shingles" + "id": "twigs:yellow_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_packed_silt.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_packed_silt.json similarity index 81% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_packed_silt.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_packed_silt.json index 4290b465..debb5a34 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_packed_silt.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_packed_silt.json @@ -11,6 +11,6 @@ ], "result": { "count": 4, - "item": "twigs:yellow_silt_shingles" + "id": "twigs:yellow_silt_shingles" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json b/src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json similarity index 66% rename from src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json rename to src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json index d645cf00..02b5f65e 100644 --- a/src/main/resources/data/twigs/recipes/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json +++ b/src/main/resources/data/twigs/recipe/yellow_silt_shingles_from_yellow_packed_silt_stonecutting.json @@ -3,6 +3,8 @@ "ingredient": { "item": "twigs:yellow_packed_silt" }, - "result": "twigs:yellow_silt_shingles", + "result": { + "id": "twigs:yellow_silt_shingles" + }, "count": 1 } diff --git a/src/main/resources/data/twigs/structures/bloodstone_obelisk/bloodstone_obelisk.nbt b/src/main/resources/data/twigs/structure/bloodstone_obelisk/bloodstone_obelisk.nbt similarity index 100% rename from src/main/resources/data/twigs/structures/bloodstone_obelisk/bloodstone_obelisk.nbt rename to src/main/resources/data/twigs/structure/bloodstone_obelisk/bloodstone_obelisk.nbt diff --git a/src/main/resources/data/twigs/tags/blocks/bloodstone.json b/src/main/resources/data/twigs/tags/block/bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/bloodstone.json rename to src/main/resources/data/twigs/tags/block/bloodstone.json diff --git a/src/main/resources/data/twigs/tags/blocks/offset_remover.json b/src/main/resources/data/twigs/tags/block/offset_remover.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/offset_remover.json rename to src/main/resources/data/twigs/tags/block/offset_remover.json diff --git a/src/main/resources/data/twigs/tags/blocks/packed_silt.json b/src/main/resources/data/twigs/tags/block/packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/packed_silt.json rename to src/main/resources/data/twigs/tags/block/packed_silt.json diff --git a/src/main/resources/data/twigs/tags/blocks/rhyolite.json b/src/main/resources/data/twigs/tags/block/rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/rhyolite.json rename to src/main/resources/data/twigs/tags/block/rhyolite.json diff --git a/src/main/resources/data/twigs/tags/blocks/schist.json b/src/main/resources/data/twigs/tags/block/schist.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/schist.json rename to src/main/resources/data/twigs/tags/block/schist.json diff --git a/src/main/resources/data/twigs/tags/block/sea_shell_placeables.json b/src/main/resources/data/twigs/tags/block/sea_shell_placeables.json new file mode 100644 index 00000000..7c9cd47e --- /dev/null +++ b/src/main/resources/data/twigs/tags/block/sea_shell_placeables.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#minecraft:sand", + "#minecraft:dirt", + "#minecraft:base_stone_overworld", + "minecraft:gravel", + "minecraft:clay" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/twigs/tags/blocks/silt_pots.json b/src/main/resources/data/twigs/tags/block/silt_pots.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/silt_pots.json rename to src/main/resources/data/twigs/tags/block/silt_pots.json diff --git a/src/main/resources/data/twigs/tags/blocks/tables.json b/src/main/resources/data/twigs/tags/block/tables.json similarity index 100% rename from src/main/resources/data/twigs/tags/blocks/tables.json rename to src/main/resources/data/twigs/tags/block/tables.json diff --git a/src/main/resources/data/twigs/tags/entity_types/bamboo_leaves_slow_immune.json b/src/main/resources/data/twigs/tags/entity_type/bamboo_leaves_slow_immune.json similarity index 100% rename from src/main/resources/data/twigs/tags/entity_types/bamboo_leaves_slow_immune.json rename to src/main/resources/data/twigs/tags/entity_type/bamboo_leaves_slow_immune.json diff --git a/src/main/resources/data/twigs/tags/items/bloodstone.json b/src/main/resources/data/twigs/tags/item/bloodstone.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/bloodstone.json rename to src/main/resources/data/twigs/tags/item/bloodstone.json diff --git a/src/main/resources/data/twigs/tags/items/packed_silt.json b/src/main/resources/data/twigs/tags/item/packed_silt.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/packed_silt.json rename to src/main/resources/data/twigs/tags/item/packed_silt.json diff --git a/src/main/resources/data/twigs/tags/items/packed_silt_full_blocks.json b/src/main/resources/data/twigs/tags/item/packed_silt_full_blocks.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/packed_silt_full_blocks.json rename to src/main/resources/data/twigs/tags/item/packed_silt_full_blocks.json diff --git a/src/main/resources/data/twigs/tags/items/rhyolite.json b/src/main/resources/data/twigs/tags/item/rhyolite.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/rhyolite.json rename to src/main/resources/data/twigs/tags/item/rhyolite.json diff --git a/src/main/resources/data/twigs/tags/items/schist.json b/src/main/resources/data/twigs/tags/item/schist.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/schist.json rename to src/main/resources/data/twigs/tags/item/schist.json diff --git a/src/main/resources/data/twigs/tags/items/seashells.json b/src/main/resources/data/twigs/tags/item/seashells.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/seashells.json rename to src/main/resources/data/twigs/tags/item/seashells.json diff --git a/src/main/resources/data/twigs/tags/items/silt_pots.json b/src/main/resources/data/twigs/tags/item/silt_pots.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/silt_pots.json rename to src/main/resources/data/twigs/tags/item/silt_pots.json diff --git a/src/main/resources/data/twigs/tags/items/tables.json b/src/main/resources/data/twigs/tags/item/tables.json similarity index 100% rename from src/main/resources/data/twigs/tags/items/tables.json rename to src/main/resources/data/twigs/tags/item/tables.json diff --git a/src/main/resources/data/twigs/tags/worldgen/biome/schist_generates.json b/src/main/resources/data/twigs/tags/worldgen/biome/schist_generates.json index 11dcece5..f15eb322 100644 --- a/src/main/resources/data/twigs/tags/worldgen/biome/schist_generates.json +++ b/src/main/resources/data/twigs/tags/worldgen/biome/schist_generates.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#c:mountain" + "#c:is_mountain" ] -} \ No newline at end of file +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ec427024..e3336516 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,6 @@ "Ninni" ], "contributors": [ - "Orcinus", "Andante" ], @@ -42,10 +41,8 @@ "mixins": [ "twigs.mixins.json" ], "depends": { - "fabricloader": ">=0.14.21", "fabric-api": "*", - "minecraft": "~1.20", - "java": ">=17" + "minecraft": ">=1.21.1" }, "suggests": { "another-mod": "*"