diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d9bdc5..aa2c1c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Validate Gradle wrapper diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e44833a..adeebc4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -56,7 +56,7 @@ jobs: files: | ${{ matrix.loader }}/build/libs/!(*-@(dev|sources|javadoc)).jar ${{ matrix.loader }}/build/libs/*-@(dev|sources|javadocs).jar - java: Java 17 + java: Java 21 name: > [ ${{ env.loader_name }} ${{ env.mc_version }} @@ -75,7 +75,7 @@ jobs: files: | ${{ matrix.loader }}/build/libs/!(*-@(dev|sources|javadoc)).jar ${{ matrix.loader }}/build/libs/*-@(dev|sources|javadocs).jar - java: Java 17 + java: Java 21 name: > [ ${{ env.loader_name }} ${{ env.mc_version }} diff --git a/.gitignore b/.gitignore index 3458ece..a1167c2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ eclipse run runs /neoforge/runs/ +/neoforge/src/generated/ diff --git a/build.gradle b/build.gradle index 149d3d9..13f2971 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { - id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7" + id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.9" } subprojects { apply plugin: 'java' - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + java.toolchain.languageVersion = JavaLanguageVersion.of(21) java.withSourcesJar() java.withJavadocJar() @@ -60,27 +60,27 @@ subprojects { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.getRelease().set(17) + it.options.getRelease().set(21) } processResources { def expandProps = [ - "version" : version, - "group" : project.group, //Else we target the task's group. - "minecraft_version" : minecraft_version, - "neoforge_version" : neoforge_version, - "neoforge_loader_version_range": neoforge_loader_version_range, - "minecraft_version_range" : minecraft_version_range, - "fabric_version" : fabric_version, - "fabric_loader_version" : fabric_loader_version, - "mod_name" : mod_name, - "mod_author" : mod_author, - "mod_id" : mod_id, - "mod_license" : mod_license, - "mod_description" : project.mod_description, + "version" : version, + "group" : project.group, //Else we target the task's group. + "minecraft_version" : minecraft_version, + "neoforge_version" : neoforge_version, + "minecraft_neoforge_version_range" : minecraft_neoforge_version_range, + "fabric_version" : fabric_version, + "fabric_loader_version" : fabric_loader_version, + "minecraft_fabric_version_range" : minecraft_fabric_version_range, + "mod_name" : mod_name, + "mod_author" : mod_author, + "mod_id" : mod_id, + "mod_license" : mod_license, + "mod_description" : project.mod_description, ] - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', '*.mixins.json']) { + filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', '*.mixins.json']) { expand expandProps } inputs.properties(expandProps) diff --git a/common/src/main/java/lilypuree/decorative_blocks/Callbacks.java b/common/src/main/java/lilypuree/decorative_blocks/Callbacks.java index 1abbb3e..15ff793 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/Callbacks.java +++ b/common/src/main/java/lilypuree/decorative_blocks/Callbacks.java @@ -1,6 +1,5 @@ package lilypuree.decorative_blocks; -import lilypuree.decorative_blocks.CommonAPI; import lilypuree.decorative_blocks.blocks.BonfireBlock; import lilypuree.decorative_blocks.blocks.SupportBlock; import lilypuree.decorative_blocks.fluid.ThatchBlock; @@ -66,9 +65,7 @@ private static InteractionResult shearThatch(Player player, Level level, ItemSta level.setBlockAndUpdate(pos, CommonAPI.shearMap.get(block).getLiquidBlock().defaultBlockState()); level.gameEvent(player, GameEvent.BLOCK_CHANGE, pos); player.playSound(SoundEvents.CROP_BREAK, 1.2F, 1.0F); - itemStack.hurtAndBreak(1, player, (entity) -> { - entity.broadcastBreakEvent(EquipmentSlot.MAINHAND); - }); + itemStack.hurtAndBreak(1, player, EquipmentSlot.MAINHAND); return InteractionResult.sidedSuccess(level.isClientSide); } return InteractionResult.PASS; diff --git a/common/src/main/java/lilypuree/decorative_blocks/DecorativeBlocksCommon.java b/common/src/main/java/lilypuree/decorative_blocks/DecorativeBlocksCommon.java index add3eb2..fe8ee64 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/DecorativeBlocksCommon.java +++ b/common/src/main/java/lilypuree/decorative_blocks/DecorativeBlocksCommon.java @@ -1,14 +1,10 @@ package lilypuree.decorative_blocks; import lilypuree.decorative_blocks.blocks.IWoodenBlock; -import lilypuree.decorative_blocks.blocks.PalisadeBlock; -import lilypuree.decorative_blocks.blocks.SeatBlock; -import lilypuree.decorative_blocks.blocks.SupportBlock; import lilypuree.decorative_blocks.blocks.types.VanillaWoodTypes; +import lilypuree.decorative_blocks.mixin.FireBlockInvoker; import lilypuree.decorative_blocks.registration.DBBlocks; import lilypuree.decorative_blocks.registration.Registration; -import lilypuree.decorative_blocks.items.BlockstateCopyItem; -import lilypuree.decorative_blocks.mixin.FireBlockInvoker; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.Blocks; @@ -20,16 +16,6 @@ public static void init() { CommonAPI.bonfireMap.put(Blocks.FIRE, DBBlocks.BONFIRE.get()); CommonAPI.bonfireMap.put(Blocks.SOUL_FIRE, DBBlocks.SOUL_BONFIRE.get()); - BuiltInRegistries.BLOCK.forEach(block -> { - if (block instanceof PalisadeBlock) { - BlockstateCopyItem.addProperties(block, PalisadeBlock.NORTH, PalisadeBlock.EAST, PalisadeBlock.SOUTH, PalisadeBlock.WEST); - } else if (block instanceof SeatBlock) { - BlockstateCopyItem.addProperties(block, SeatBlock.FACING, SeatBlock.POST, SeatBlock.ATTACHED); - } else if (block instanceof SupportBlock) { - BlockstateCopyItem.addProperties(block, SupportBlock.HORIZONTAL_SHAPE, SupportBlock.VERTICAL_SHAPE, SupportBlock.FACING, SupportBlock.UP); - } - }); - FireBlockInvoker invoker = ((FireBlockInvoker) ((Object) Blocks.FIRE)); BuiltInRegistries.BLOCK.forEach(block -> { if (block instanceof IWoodenBlock woodenBlock) { diff --git a/common/src/main/java/lilypuree/decorative_blocks/blocks/BarPanelBlock.java b/common/src/main/java/lilypuree/decorative_blocks/blocks/BarPanelBlock.java index ea522ad..c1307d0 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/blocks/BarPanelBlock.java +++ b/common/src/main/java/lilypuree/decorative_blocks/blocks/BarPanelBlock.java @@ -2,7 +2,6 @@ import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; -import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.BlockGetter; @@ -58,15 +57,13 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, } @Override - public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) { state = state.cycle(OPEN); - worldIn.setBlock(pos, state, 2); + level.setBlock(pos, state, 2); if (state.getValue(WATERLOGGED)) { - worldIn.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(worldIn)); + level.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(level)); } - this.playSound(player, worldIn, pos, state.getValue(OPEN)); - return InteractionResult.sidedSuccess(worldIn.isClientSide); + this.playSound(player, level, pos, state.getValue(OPEN)); + return InteractionResult.sidedSuccess(level.isClientSide); } - - } diff --git a/common/src/main/java/lilypuree/decorative_blocks/blocks/BonfireBlock.java b/common/src/main/java/lilypuree/decorative_blocks/blocks/BonfireBlock.java index 235256c..1438b4d 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/blocks/BonfireBlock.java +++ b/common/src/main/java/lilypuree/decorative_blocks/blocks/BonfireBlock.java @@ -1,7 +1,7 @@ package lilypuree.decorative_blocks.blocks; -import lilypuree.decorative_blocks.registration.DBBlocks; import lilypuree.decorative_blocks.platform.Services; +import lilypuree.decorative_blocks.registration.DBBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -11,7 +11,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; @@ -52,12 +51,12 @@ public VoxelShape getCollisionShape(BlockState state, BlockGetter worldIn, Block @Override public void entityInside(BlockState state, Level worldIn, BlockPos pos, Entity entityIn) { - if (!entityIn.fireImmune() && entityIn instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entityIn)) { + if (!entityIn.fireImmune() && entityIn instanceof LivingEntity) { entityIn.hurt(entityIn.damageSources().inFire(), 1.0F); if (Services.PLATFORM.isModLoaded("soulfired")) { Services.SOULFIRED.setSecondsOnFire(entityIn, 3, state.is(DBBlocks.SOUL_BONFIRE.get())); } else - entityIn.setSecondsOnFire(3); + entityIn.igniteForSeconds(3); } super.entityInside(state, worldIn, pos, entityIn); } diff --git a/common/src/main/java/lilypuree/decorative_blocks/blocks/BrazierBlock.java b/common/src/main/java/lilypuree/decorative_blocks/blocks/BrazierBlock.java index b0c56f5..44de940 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/blocks/BrazierBlock.java +++ b/common/src/main/java/lilypuree/decorative_blocks/blocks/BrazierBlock.java @@ -9,7 +9,7 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -18,7 +18,6 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; @@ -50,9 +49,9 @@ public BrazierBlock(Properties properties, boolean isSoul) { @Override public void entityInside(BlockState state, Level worldIn, BlockPos pos, Entity entityIn) { - if (!entityIn.fireImmune() && state.getValue(LIT) && entityIn instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entityIn)) { + if (!entityIn.fireImmune() && state.getValue(LIT) && entityIn instanceof LivingEntity) { if (entityIn.getY() >= state.getCollisionShape(worldIn, pos).max(Direction.Axis.Y) + pos.getY() - 0.1f) { - entityIn.hurt(entityIn.damageSources().inFire(), 1.0F); + entityIn.hurt(entityIn.damageSources().campfire(), 1.0F); } } super.entityInside(state, worldIn, pos, entityIn); @@ -76,27 +75,26 @@ public BlockState updateShape(BlockState stateIn, Direction facing, BlockState f } @Override - public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - ItemStack heldItem = player.getItemInHand(handIn); + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { if (state.getValue(LIT)) { - if (heldItem.getItem() instanceof ShovelItem) { - worldIn.playSound(null, pos, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 0.8F, 1.0F); + if (stack.getItem() instanceof ShovelItem) { + level.playSound(null, pos, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 0.8F, 1.0F); - worldIn.setBlockAndUpdate(pos, state.setValue(LIT, Boolean.FALSE)); - return InteractionResult.SUCCESS; + level.setBlockAndUpdate(pos, state.setValue(LIT, Boolean.FALSE)); + return ItemInteractionResult.SUCCESS; } } else if (!state.getValue(WATERLOGGED)) { - if (hit.getDirection() == Direction.UP && heldItem.getItem() == Items.FLINT_AND_STEEL || heldItem.getItem() == Items.FIRE_CHARGE) { + if (hit.getDirection() == Direction.UP && stack.getItem() == Items.FLINT_AND_STEEL || stack.getItem() == Items.FIRE_CHARGE) { - SoundEvent sound = (heldItem.getItem() == Items.FIRE_CHARGE) ? SoundEvents.FIRECHARGE_USE : SoundEvents.FLINTANDSTEEL_USE; - worldIn.playSound(null, pos, sound, SoundSource.BLOCKS, 1.0F, worldIn.random.nextFloat() * 0.4F + 0.8F); + SoundEvent sound = (stack.getItem() == Items.FIRE_CHARGE) ? SoundEvents.FIRECHARGE_USE : SoundEvents.FLINTANDSTEEL_USE; + level.playSound(null, pos, sound, SoundSource.BLOCKS, 1.0F, level.random.nextFloat() * 0.4F + 0.8F); - worldIn.setBlockAndUpdate(pos, state.setValue(LIT, true)); - return InteractionResult.CONSUME; + level.setBlockAndUpdate(pos, state.setValue(LIT, true)); + return ItemInteractionResult.SUCCESS; } } - return super.use(state, worldIn, pos, player, handIn, hit); + return super.useItemOn(stack, state, level, pos, player, hand, hit); } @Override @@ -166,7 +164,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder) stack.getItem()).getSwitchedState(blockstate, stack); + blockstate = ((SwitchableBlockItem) stack.getItem()).getSwitchedState(blockstate, stack); } return blockstate; } @@ -145,35 +146,36 @@ public FluidState getFluidState(BlockState state) { } @Override - public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - ItemStack heldItem = player.getItemInHand(handIn); - BlockState upperBlock = worldIn.getBlockState(pos.above()); - boolean canSit = hit.getDirection() == Direction.UP && !state.getValue(OCCUPIED) && !state.getValue(POST) && heldItem.isEmpty() && upperBlock.isAir() && isPlayerInRange(player, pos); - Item item = heldItem.getItem(); - boolean isSeatAttachableItem = item instanceof BlockItem && ((BlockItem) item).getBlock() instanceof LanternBlock; - boolean canAttachLantern = hit.getDirection() == Direction.DOWN && isSeatAttachableItem && worldIn.getBlockState(pos.below()).isAir(); - if (!worldIn.isClientSide()) { - if (canSit) { - DummyEntityForSitting seat = Registration.DUMMY_ENTITY_TYPE.get().create(worldIn); - seat.setSeatPos(pos); - worldIn.addFreshEntity(seat); - player.startRiding(seat); - return InteractionResult.SUCCESS; - } else if (canAttachLantern) { - BlockState newState = state.setValue(ATTACHED, Boolean.TRUE); - worldIn.setBlockAndUpdate(pos, newState); - worldIn.sendBlockUpdated(pos, state, newState, 3); - worldIn.setBlock(pos.below(), (((BlockItem) item).getBlock()).defaultBlockState().setValue(BlockStateProperties.HANGING, Boolean.TRUE), 16); - if (!player.isCreative()) { - heldItem.shrink(1); - } - return InteractionResult.SUCCESS; + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + Item item = stack.getItem(); + + if (!level.isClientSide && item instanceof BlockItem && ((BlockItem) item).getBlock() instanceof LanternBlock) { + if (hit.getDirection() != Direction.DOWN || !level.getBlockState(pos.below()).isAir()) { + return ItemInteractionResult.FAIL; } - } - return super.use(state, worldIn, pos, player, handIn, hit); + BlockState newState = state.setValue(ATTACHED, Boolean.TRUE); + level.setBlockAndUpdate(pos, newState); + level.sendBlockUpdated(pos, state, newState, 3); + level.setBlock(pos.below(), (((BlockItem) item).getBlock()).defaultBlockState().setValue(BlockStateProperties.HANGING, Boolean.TRUE), Block.UPDATE_ALL | Block.UPDATE_KNOWN_SHAPE); + stack.consume(1, player); + return ItemInteractionResult.SUCCESS; + } + return super.useItemOn(stack, state, level, pos, player, hand, hit); } + @Override + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) { + if (!level.isClientSide && hit.getDirection() == Direction.UP && !state.getValue(OCCUPIED) + && !state.getValue(POST) && level.getBlockState(pos.above()).isAir() && isPlayerInRange(player, pos)) { + DummyEntityForSitting seat = Registration.DUMMY_ENTITY_TYPE.get().create(level); + seat.setSeatPos(pos); + level.addFreshEntity(seat); + player.startRiding(seat); + return InteractionResult.SUCCESS; + } + return super.useWithoutItem(state, level, pos, player, hit); + } private static boolean isPlayerInRange(Player player, BlockPos pos) { Vec3 position = pos.getCenter(); @@ -196,7 +198,7 @@ public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState n } @Override - public boolean isPathfindable(BlockState p_196266_1_, BlockGetter p_196266_2_, BlockPos p_196266_3_, PathComputationType p_196266_4_) { + public boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } diff --git a/common/src/main/java/lilypuree/decorative_blocks/blocks/SupportBlock.java b/common/src/main/java/lilypuree/decorative_blocks/blocks/SupportBlock.java index 4b7d551..7cfaaf4 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/blocks/SupportBlock.java +++ b/common/src/main/java/lilypuree/decorative_blocks/blocks/SupportBlock.java @@ -87,7 +87,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { BlockState blockstate = this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()).setValue(WATERLOGGED, flag); ItemStack stack = context.getItemInHand(); if (stack.getItem() instanceof SwitchableBlockItem) { - blockstate = ((SwitchableBlockItem) stack.getItem()).getSwitchedState(blockstate, stack); + blockstate = ((SwitchableBlockItem) stack.getItem()).getSwitchedState(blockstate, stack); } if (!blockstate.getValue(UP)) { blockstate = blockstate.setValue(HORIZONTAL_SHAPE, SupportFaceShape.SMALL); @@ -147,7 +147,7 @@ public FluidState getFluidState(BlockState state) { } @Override - public boolean isPathfindable(BlockState p_196266_1_, BlockGetter p_196266_2_, BlockPos p_196266_3_, PathComputationType p_196266_4_) { + public boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } diff --git a/common/src/main/java/lilypuree/decorative_blocks/blocks/types/VanillaWoodTypes.java b/common/src/main/java/lilypuree/decorative_blocks/blocks/types/VanillaWoodTypes.java index ac61b50..0d51d41 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/blocks/types/VanillaWoodTypes.java +++ b/common/src/main/java/lilypuree/decorative_blocks/blocks/types/VanillaWoodTypes.java @@ -27,7 +27,7 @@ private VanillaWoodTypes() { WoodType.BAMBOO); private static ResourceLocation mcLoc(String name) { - return new ResourceLocation("minecraft", name); + return ResourceLocation.withDefaultNamespace(name); } public static Block getLog(WoodType woodType) { diff --git a/common/src/main/java/lilypuree/decorative_blocks/client/ClientSetup.java b/common/src/main/java/lilypuree/decorative_blocks/client/ClientSetup.java index 1262d48..9bd040b 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/client/ClientSetup.java +++ b/common/src/main/java/lilypuree/decorative_blocks/client/ClientSetup.java @@ -3,14 +3,17 @@ import com.mojang.blaze3d.platform.InputConstants; import lilypuree.decorative_blocks.blocks.SeatBlock; import lilypuree.decorative_blocks.blocks.SupportBlock; -import lilypuree.decorative_blocks.registration.DBBlocks; -import lilypuree.decorative_blocks.registration.Registration; +import lilypuree.decorative_blocks.blocks.state.ModBlockProperties; import lilypuree.decorative_blocks.items.SeatItem; import lilypuree.decorative_blocks.items.SupportItem; +import lilypuree.decorative_blocks.items.SwitchableBlockItem; import lilypuree.decorative_blocks.platform.Services; +import lilypuree.decorative_blocks.registration.DBBlocks; +import lilypuree.decorative_blocks.registration.Registration; import net.minecraft.client.KeyMapping; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; public class ClientSetup { @@ -33,13 +36,11 @@ public static void initRenderLayers() { public static void initItemPropertyFunctions() { BuiltInRegistries.BLOCK.forEach(block -> { if (block instanceof SupportBlock) { - Services.PLATFORM.registerItemFunc(block.asItem(), SupportItem.OVERRIDE_TAG, (stack, level, entity, i) -> { - return stack.hasTag() ? stack.getTag().getInt(SupportItem.OVERRIDE_TAG.getPath()) : 0.0f; - }); + Services.PLATFORM.registerItemFunc(block.asItem(), SupportItem.OVERRIDE_TAG, + (stack, level, entity, i) -> SwitchableBlockItem.getValueForStack(stack) ? 0.0f : 1.0f); } else if (block instanceof SeatBlock) { - Services.PLATFORM.registerItemFunc(block.asItem(), SeatItem.OVERRIDE_TAG, (stack, level, entity, i) -> { - return stack.hasTag() ? stack.getTag().getInt(SeatItem.OVERRIDE_TAG.getPath()) : 0.0f; - }); + Services.PLATFORM.registerItemFunc(block.asItem(), SeatItem.OVERRIDE_TAG, + (stack, level, entity, i) -> SwitchableBlockItem.getValueForStack(stack) ? 1.0f : 0.0f); } }); } diff --git a/common/src/main/java/lilypuree/decorative_blocks/client/FogHelper.java b/common/src/main/java/lilypuree/decorative_blocks/client/FogHelper.java index 7bcd6b7..e21147b 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/client/FogHelper.java +++ b/common/src/main/java/lilypuree/decorative_blocks/client/FogHelper.java @@ -1,8 +1,8 @@ package lilypuree.decorative_blocks.client; import com.mojang.blaze3d.systems.RenderSystem; -import lilypuree.decorative_blocks.registration.DBTags; import lilypuree.decorative_blocks.fluid.ThatchFluid; +import lilypuree.decorative_blocks.registration.DBTags; import net.minecraft.client.Camera; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; diff --git a/common/src/main/java/lilypuree/decorative_blocks/entity/DummyEntityForSitting.java b/common/src/main/java/lilypuree/decorative_blocks/entity/DummyEntityForSitting.java index ba28394..6c7557b 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/entity/DummyEntityForSitting.java +++ b/common/src/main/java/lilypuree/decorative_blocks/entity/DummyEntityForSitting.java @@ -5,11 +5,13 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.server.level.ServerEntity; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; -public abstract class DummyEntityForSitting extends Entity { +public class DummyEntityForSitting extends Entity { public DummyEntityForSitting(EntityType type, Level world) { super(type, world); noPhysics = true; @@ -20,7 +22,7 @@ public void setSeatPos(BlockPos pos) { } @Override - protected void defineSynchedData() { + protected void defineSynchedData(SynchedEntityData.Builder builder) { } @Override @@ -41,7 +43,7 @@ protected void removePassenger(Entity entity) { } @Override - public Packet getAddEntityPacket() { - return new ClientboundAddEntityPacket(this); + public Packet getAddEntityPacket(ServerEntity entity) { + return new ClientboundAddEntityPacket(this, entity); } } diff --git a/common/src/main/java/lilypuree/decorative_blocks/items/BlockstateCopyItem.java b/common/src/main/java/lilypuree/decorative_blocks/items/BlockstateCopyItem.java deleted file mode 100644 index 8ec25a2..0000000 --- a/common/src/main/java/lilypuree/decorative_blocks/items/BlockstateCopyItem.java +++ /dev/null @@ -1,140 +0,0 @@ -package lilypuree.decorative_blocks.items; - -import com.google.common.collect.ImmutableSet; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtUtils; -import net.minecraft.network.chat.Component; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.Property; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class BlockstateCopyItem extends Item { - public static Map>> allowedProperties = new HashMap<>(); - - public BlockstateCopyItem(Properties properties) { - super(properties); - - } - - @Override - public InteractionResult useOn(UseOnContext context) { - Level world = context.getLevel(); - HolderLookup holderLookup = world.holderLookup(Registries.BLOCK); - if (!world.isClientSide) { - Player entity = context.getPlayer(); - ItemStack tool = context.getItemInHand(); - BlockPos pos = context.getClickedPos(); - BlockState existing = world.getBlockState(pos); - if (entity.isShiftKeyDown()) { - if (copyBlockState(tool, existing)) { - return InteractionResult.SUCCESS; - } - } else { - BlockState pasteResult = pasteTo(holderLookup, existing, tool); - if (pasteResult != null) { - world.setBlock(pos, pasteResult, 2 | 16); - return InteractionResult.SUCCESS; - } - } - return InteractionResult.FAIL; - } else { - return InteractionResult.PASS; - } - } - - private BlockState pasteTo(HolderLookup holderLookup, BlockState state, ItemStack tool) { - CompoundTag tag = tool.getTagElement("blockstate"); - if (tag != null) { - BlockState clipboard = NbtUtils.readBlockState(holderLookup, tag); - if (state.getBlock() == clipboard.getBlock()) { - for (Property property : allowedProperties.get(state.getBlock())) { - state = state.setValue(property, clipboard.getValue(property)); - } - return state; - } - } - return null; - } - - private boolean copyBlockState(ItemStack tool, BlockState state) { - if (allowedProperties.containsKey(state.getBlock())) { - CompoundTag nbt = tool.getOrCreateTag(); - nbt.put("blockstate", NbtUtils.writeBlockState(state)); - tool.setTag(nbt); - return true; - } else { - return false; - } - } - - @Override - public void appendHoverText(ItemStack stack, Level worldIn, List tooltip, TooltipFlag flagIn) { - if (Screen.hasShiftDown()) { - CompoundTag tag = stack.getTagElement("blockstate"); - String blockstatename = "none"; - if (tag != null) { - blockstatename = NbtUtils.readBlockState(worldIn.holderLookup(Registries.BLOCK), tag).getBlock().getDescriptionId(); - } - tooltip.add(Component.translatable("wiki.decorative_blocks.copy1")); - tooltip.add(Component.translatable("wiki.decorative_blocks.copy2", blockstatename)); - } - - super.appendHoverText(stack, worldIn, tooltip, flagIn); - } - - static { - BuiltInRegistries.BLOCK.forEach(block -> { - if (block instanceof FenceBlock || block instanceof IronBarsBlock) { - addProperties(block, CrossCollisionBlock.NORTH, CrossCollisionBlock.EAST, CrossCollisionBlock.SOUTH, CrossCollisionBlock.WEST); - } else if (block instanceof WallBlock) { - allowedProperties.put(block, ImmutableSet.of(WallBlock.UP, WallBlock.EAST_WALL, WallBlock.NORTH_WALL, WallBlock.SOUTH_WALL, WallBlock.WEST_WALL)); - } else if (block instanceof StairBlock) { - allowedProperties.put(block, ImmutableSet.of(StairBlock.SHAPE, StairBlock.FACING, StairBlock.HALF)); - } else if (block instanceof SlabBlock) { -// allowedProperties.put(block, ImmutableSet.of(SlabBlock.TYPE)); - } else if (block instanceof ComparatorBlock) { - allowedProperties.put(block, ImmutableSet.of(ComparatorBlock.MODE)); - } else if (block.getStateDefinition().getProperties().contains(BlockStateProperties.RAIL_SHAPE_STRAIGHT)) { - allowedProperties.put(block, ImmutableSet.of(BlockStateProperties.RAIL_SHAPE_STRAIGHT)); - } else if (block instanceof DispenserBlock) { - allowedProperties.put(block, ImmutableSet.of(DispenserBlock.FACING)); - } else if (block instanceof GlazedTerracottaBlock || block instanceof RepeaterBlock) { - addProperties(block, HorizontalDirectionalBlock.FACING); - } else if (block instanceof HugeMushroomBlock) { - allowedProperties.put(block, ImmutableSet.of(HugeMushroomBlock.UP, HugeMushroomBlock.EAST, HugeMushroomBlock.WEST, HugeMushroomBlock.DOWN, HugeMushroomBlock.NORTH, HugeMushroomBlock.SOUTH)); - } else if (block instanceof ObserverBlock) { - allowedProperties.put(block, ImmutableSet.of(DirectionalBlock.FACING)); - } else if (block.getStateDefinition().getProperties().contains(BlockStateProperties.RAIL_SHAPE)) { - addProperties(block, BlockStateProperties.RAIL_SHAPE); - } else if (block instanceof TrapDoorBlock) { - addProperties(block, BlockStateProperties.HORIZONTAL_FACING, TrapDoorBlock.HALF, TrapDoorBlock.OPEN); - } else if (block instanceof RotatedPillarBlock) { - addProperties(block, RotatedPillarBlock.AXIS); - } else if (block instanceof RedStoneWireBlock) { - addProperties(block, RedStoneWireBlock.EAST, RedStoneWireBlock.NORTH, RedStoneWireBlock.SOUTH, RedStoneWireBlock.WEST); - } - }); - } - - public static void addProperties(Block block, Property... properties) { - allowedProperties.put(block, ImmutableSet.copyOf(properties)); - } -} diff --git a/common/src/main/java/lilypuree/decorative_blocks/items/SeatItem.java b/common/src/main/java/lilypuree/decorative_blocks/items/SeatItem.java index 6282a75..d710359 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/items/SeatItem.java +++ b/common/src/main/java/lilypuree/decorative_blocks/items/SeatItem.java @@ -5,26 +5,26 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.properties.BooleanProperty; import java.util.List; -public class SeatItem extends SwitchableBlockItem { - public static final ResourceLocation OVERRIDE_TAG = new ResourceLocation(Constants.MOD_ID, "post"); +public class SeatItem extends SwitchableBlockItem { + public static final ResourceLocation OVERRIDE_TAG = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "post"); public SeatItem(Block blockIn, Properties builder) { - super(blockIn, builder, ModBlockProperties.POST, OVERRIDE_TAG.getPath()); + super(blockIn, builder, ModBlockProperties.POST, false); } @Override - public void appendHoverText(ItemStack stack, Level worldIn, List tooltip, TooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, Item.TooltipContext ctx, List tooltip, TooltipFlag tooltipFlag) { if (Screen.hasShiftDown()) { tooltip.add(Component.translatable("wiki.decorative_blocks.seat")); } - super.appendHoverText(stack, worldIn, tooltip, flagIn); + super.appendHoverText(stack, ctx, tooltip, tooltipFlag); } } diff --git a/common/src/main/java/lilypuree/decorative_blocks/items/SupportItem.java b/common/src/main/java/lilypuree/decorative_blocks/items/SupportItem.java index c06bd7b..710e2e4 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/items/SupportItem.java +++ b/common/src/main/java/lilypuree/decorative_blocks/items/SupportItem.java @@ -4,24 +4,24 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import java.util.List; -public class SupportItem extends SwitchableBlockItem { - public static final ResourceLocation OVERRIDE_TAG = new ResourceLocation(Constants.MOD_ID, "up"); +public class SupportItem extends SwitchableBlockItem { + public static final ResourceLocation OVERRIDE_TAG = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "up"); public SupportItem(Block blockIn, Properties builder) { - super(blockIn, builder, BlockStateProperties.UP, OVERRIDE_TAG.getPath()); + super(blockIn, builder, BlockStateProperties.UP, true); } @Override - public void appendHoverText(ItemStack stack, Level worldIn, List tooltip, TooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, Item.TooltipContext ctx, List tooltip, TooltipFlag tooltipFlag) { if (Screen.hasShiftDown()) { tooltip.add(Component.translatable("wiki.decorative_blocks.support.condition1")); tooltip.add(Component.translatable("wiki.decorative_blocks.support.behavior1")); @@ -32,6 +32,6 @@ public void appendHoverText(ItemStack stack, Level worldIn, List tool tooltip.add(Component.translatable("wiki.decorative_blocks.support.condition3")); tooltip.add(Component.translatable("wiki.decorative_blocks.support.behavior3")); } - super.appendHoverText(stack, worldIn, tooltip, flagIn); + super.appendHoverText(stack, ctx, tooltip, tooltipFlag); } } diff --git a/common/src/main/java/lilypuree/decorative_blocks/items/SwitchableBlockItem.java b/common/src/main/java/lilypuree/decorative_blocks/items/SwitchableBlockItem.java index d626371..0f925cb 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/items/SwitchableBlockItem.java +++ b/common/src/main/java/lilypuree/decorative_blocks/items/SwitchableBlockItem.java @@ -1,27 +1,26 @@ package lilypuree.decorative_blocks.items; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.core.component.DataComponents; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.BlockItemStateProperties; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.Property; +import net.minecraft.world.level.block.state.properties.BooleanProperty; -public class SwitchableBlockItem, U extends Comparable> extends BlockItem { - private T switching; - private int max; - private String tagName; +public class SwitchableBlockItem extends BlockItem { + private final BooleanProperty switching; + private final boolean defaultState; - public SwitchableBlockItem(Block blockIn, Properties builder, T switching, String tag) { + public SwitchableBlockItem(Block blockIn, Properties builder, BooleanProperty switching, boolean defaultState) { super(blockIn, builder); this.switching = switching; - this.max = switching.getPossibleValues().size() - 1; - this.tagName = tag; + this.defaultState = defaultState; } @Override @@ -39,45 +38,34 @@ public InteractionResultHolder use(Level worldIn, Player playerIn, In public BlockState getSwitchedState(BlockState state, ItemStack stack) { if (state != null && state.hasProperty(switching)) { state = state.setValue(switching, state.getBlock().defaultBlockState().getValue(switching)); - for (int i = 0; i < getValueTag(stack); i++) { - state = state.cycle(switching); - } + state.setValue(switching, getValue(stack)); } return state; } - private int getValueTag(ItemStack stack) { - if (stack.hasTag()) { - return stack.getTag().getInt(tagName); + private boolean getValue(ItemStack stack) { + BlockItemStateProperties properties = stack.get(DataComponents.BLOCK_STATE); + if (properties == null) { + return defaultState; } - return 0; - } - public ItemStack cycleValueTag(ItemStack stack) { - CompoundTag tag = stack.getOrCreateTag(); - int currentValue = tag.contains(tagName, 3) ? tag.getInt(tagName) : 0; - if (currentValue == max) { - tag.remove(tagName); - if (tag.isEmpty()) { - stack.setTag(null); - } else { - stack.setTag(tag); - } - return stack; - } - tag.putInt(tagName, currentValue + 1); - stack.setTag(tag); - return stack; + Boolean val = properties.get(switching); + return val != null ? val : defaultState; } - public static void switchHeldItem(Player player) { - ItemStack stack = player.getMainHandItem(); - if (stack.getItem() instanceof SwitchableBlockItem switchableBlockItem) { - player.setItemSlot(EquipmentSlot.MAINHAND, switchableBlockItem.cycleValueTag(stack)); + public void cycleValueTag(ItemStack stack) { + BlockItemStateProperties component = stack.get(DataComponents.BLOCK_STATE); + if (component == null) { + component = BlockItemStateProperties.EMPTY; } + + Boolean val = component.get(switching); + stack.set(DataComponents.BLOCK_STATE, component.with(switching, val != null ? !val : !defaultState)); } - public String getTagName() { - return tagName; + public static boolean getValueForStack(ItemStack stack) + { + Item item = stack.getItem(); + return item instanceof SwitchableBlockItem && ((SwitchableBlockItem) item).getValue(stack); } } diff --git a/common/src/main/java/lilypuree/decorative_blocks/mixin/WalkNodeEvaluatorMixin.java b/common/src/main/java/lilypuree/decorative_blocks/mixin/WalkNodeEvaluatorMixin.java deleted file mode 100644 index 5295bd0..0000000 --- a/common/src/main/java/lilypuree/decorative_blocks/mixin/WalkNodeEvaluatorMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package lilypuree.decorative_blocks.mixin; - -import lilypuree.decorative_blocks.blocks.BrazierBlock; -import lilypuree.decorative_blocks.registration.DBTags; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.pathfinder.WalkNodeEvaluator; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(WalkNodeEvaluator.class) -public class WalkNodeEvaluatorMixin { - - @Inject(method = "isBurningBlock", at = @At("HEAD"), cancellable = true) - private static void onCheckBurningBlock(BlockState block, CallbackInfoReturnable cir) { - if (DBTags.Blocks.BONFIRES != null){ //Tagkeys are initialized - if (BrazierBlock.isLitBrazier(block)) cir.setReturnValue(true); - if (block.is(DBTags.Blocks.BONFIRES)) cir.setReturnValue(true); - } - } -} diff --git a/common/src/main/java/lilypuree/decorative_blocks/registration/DBItems.java b/common/src/main/java/lilypuree/decorative_blocks/registration/DBItems.java index 0d509b1..c585c7f 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/registration/DBItems.java +++ b/common/src/main/java/lilypuree/decorative_blocks/registration/DBItems.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableMap; import lilypuree.decorative_blocks.blocks.types.VanillaWoodTypes; -import lilypuree.decorative_blocks.items.BlockstateCopyItem; import lilypuree.decorative_blocks.items.SeatItem; import lilypuree.decorative_blocks.items.SupportItem; import lilypuree.decorative_blocks.platform.Services; @@ -25,7 +24,6 @@ public class DBItems { public static final ItemWrapper CHAIN; public static final ItemWrapper STONE_PILLAR; public static final ItemWrapper ROCKY_DIRT; - public static final ItemWrapper BLOCKSTATE_COPY_ITEM; public static final ImmutableMap> BEAM_ITEMBLOCKS; public static final ImmutableMap> SEAT_ITEMBLOCKS; @@ -43,7 +41,6 @@ public class DBItems { CHAIN = registerBlockItem("chain", DBBlocks.CHAIN); STONE_PILLAR = registerBlockItem("stone_pillar", DBBlocks.STONE_PILLAR); ROCKY_DIRT = registerBlockItem("rocky_dirt", DBBlocks.ROCKY_DIRT); - BLOCKSTATE_COPY_ITEM = registerItem("blockstate_copy_item", () -> new BlockstateCopyItem(new Item.Properties().stacksTo(1))); ImmutableMap.Builder> beams = new ImmutableMap.Builder<>(); ImmutableMap.Builder> palisades = new ImmutableMap.Builder<>(); diff --git a/common/src/main/java/lilypuree/decorative_blocks/registration/DBNames.java b/common/src/main/java/lilypuree/decorative_blocks/registration/DBNames.java index 0020ceb..9068b73 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/registration/DBNames.java +++ b/common/src/main/java/lilypuree/decorative_blocks/registration/DBNames.java @@ -11,7 +11,7 @@ public class DBNames { public static ResourceLocation STILL_THATCH = create("thatch"); protected static ResourceLocation create(String name) { - return new ResourceLocation(Constants.MOD_ID, name); + return ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, name); } public static String name(WoodType wood, WoodDecorativeBlockTypes type) { diff --git a/common/src/main/java/lilypuree/decorative_blocks/registration/DBTags.java b/common/src/main/java/lilypuree/decorative_blocks/registration/DBTags.java index d439798..45054ee 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/registration/DBTags.java +++ b/common/src/main/java/lilypuree/decorative_blocks/registration/DBTags.java @@ -78,6 +78,6 @@ public static void init() { } private static ResourceLocation id(String path) { - return new ResourceLocation(Constants.MOD_ID, path); + return ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, path); } } diff --git a/common/src/main/java/lilypuree/decorative_blocks/registration/Registration.java b/common/src/main/java/lilypuree/decorative_blocks/registration/Registration.java index db35faf..1a0d0cb 100644 --- a/common/src/main/java/lilypuree/decorative_blocks/registration/Registration.java +++ b/common/src/main/java/lilypuree/decorative_blocks/registration/Registration.java @@ -20,8 +20,8 @@ import java.util.function.Supplier; public class Registration { - private static final ResourceLocation thatchStillTexture = new ResourceLocation(Constants.MOD_ID, "block/thatch_still"); - private static final ResourceLocation thatchFlowingTexture = new ResourceLocation(Constants.MOD_ID, "block/thatch_flowing"); + private static final ResourceLocation thatchStillTexture = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "block/thatch_still"); + private static final ResourceLocation thatchFlowingTexture = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "block/thatch_flowing"); public static final ThatchFluid.FluidReferenceHolder referenceHolder; public static final Supplier FLOWING_THATCH; diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_end.png index bc2677c..871817b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_side.png index 9dcc362..37bfd83 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_end.png index 0e79dab..e6afa00 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_side.png index 44ccdff..0b3cdcf 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_seat.png index 16e5f93..ac5a98d 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_end.png index 6222e24..381f723 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_side.png index 788e1f3..9bfb896 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/acacia_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_end.png index 5c0b369..84bd1f4 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_side.png index b3fde50..2714e06 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_seat.png index c63b465..c832dba 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_end.png index ce7dc61..2d8d082 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_side.png index efaa8f5..790c3fb 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bamboo_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_end.png index 95163b2..24b0358 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_side.png index d19b1de..0b78cdf 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bar_panel_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_end.png index 9b36e27..f90d327 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_side.png index 598aa47..d3923f0 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_end.png index 5df0b9a..309b78a 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_side.png index 35d3a09..8af3438 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_seat.png index 1d25c87..fa0ed89 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_end.png index 9e314dd..76d1b4b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_side.png index 4f16aff..25a53b3 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/birch_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire.png index 8b9fc9a..1a3cdf5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_alt.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_alt.png index f351a48..da232e8 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_alt.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_alt.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x.png index a51b630..3ed3999 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x_alt.png b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x_alt.png index 5abea80..68e73a5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x_alt.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/bonfire_x_alt.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/brazier.png b/common/src/main/resources/assets/decorative_blocks/textures/block/brazier.png index 87b514b..a0f3473 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/brazier.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/brazier.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/brazier_base.png b/common/src/main/resources/assets/decorative_blocks/textures/block/brazier_base.png index 8243434..7399753 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/brazier_base.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/brazier_base.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/chain.png b/common/src/main/resources/assets/decorative_blocks/textures/block/chain.png index 2abbb2d..0bc2575 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/chain.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/chain.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/chandelier_base.png b/common/src/main/resources/assets/decorative_blocks/textures/block/chandelier_base.png index 6ec9bc0..21c0bad 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/chandelier_base.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/chandelier_base.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_end.png index dd5aa98..9d72cd9 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_side.png index a4c96e2..af1979e 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_end.png index ea9a53b..3ec8d61 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_side.png index 6a03fe1..ae538bb 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_seat.png index c2da6a0..a793c7d 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_end.png index 8c3d7d0..4d63952 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_side.png index 498fda7..e31f79a 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/cherry_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_end.png index f378e5d..169bade 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_side.png index 293a042..cc8d788 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_end.png index d31daf5..5e38b7c 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_side.png index fdcf612..58dd7a4 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_seat.png index beeaff6..7a6edec 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_end.png index f629cc5..2e39aa9 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_side.png index 0db1b42..7d54015 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/crimson_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_end.png index ab64bde..3bb29ff 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_side.png index 785979c..7d02b9e 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_end.png index 18ef210..2815ecc 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_side.png index 1e93b98..45af185 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_seat.png index 5af75b9..53d3086 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_end.png index ce7ec9a..b624d6c 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_side.png index 614b3fd..18c81b1 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/dark_oak_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/fire.png b/common/src/main/resources/assets/decorative_blocks/textures/block/fire.png index 584e0f4..19f161e 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/fire.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/fire.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_end.png index ad07270..9ab3c5b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_side.png index f533779..e9ea22f 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_end.png index 182fc4a..f193c03 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_side.png index 7b6235d..7dca0f6 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_seat.png index 76dc319..e731dad 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_end.png index 9ae23bf..69afcf7 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_side.png index 8c19beb..887c6a5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/jungle_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/lattice.png b/common/src/main/resources/assets/decorative_blocks/textures/block/lattice.png index d36b5f9..5c32bf4 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/lattice.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/lattice.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_end.png index 05fb1d1..d6f4ff5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_side.png index 1b714b7..3f4acf5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_end.png index 86c6aef..916afb7 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_side.png index 34dfa3e..8fc22c3 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_seat.png index df6fbb4..99eda9a 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_end.png index 6fcec15..2e05acc 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_side.png index e2210ed..9409c5e 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/mangrove_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_end.png index 5cb559b..d401457 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_side.png index abd74a9..b690e91 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_end.png index 7e6ed6d..7c3e0da 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_side.png index 2ac0d46..cc71403 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_seat.png index 7b414df..85a068d 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_end.png index b57a6b1..087feb6 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_side.png index 21e633c..b1222ed 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/oak_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/rocky_dirt.png b/common/src/main/resources/assets/decorative_blocks/textures/block/rocky_dirt.png index 3337c03..0ae880c 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/rocky_dirt.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/rocky_dirt.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire.png index 35df15c..9d4cb73 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_alt.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_alt.png index 75897aa..0e64de2 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_alt.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_alt.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x.png index 5ad9c73..29cbd19 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x_alt.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x_alt.png index b3c7671..455dd53 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x_alt.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_bonfire_x_alt.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_fire.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_fire.png index 82b81ca..f9baa00 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_fire.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_fire.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch.png index 9b2b61a..960d74b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_1.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_1.png index 742126f..43f329d 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_1.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_1.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_2.png b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_2.png index 04b8a40..8a578d0 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_2.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/soul_torch_2.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_end.png index 125a126..e9e8d15 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_side.png index cb89627..6086900 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_end.png index df81f9d..2249c2a 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_side.png index e8cfd12..feafee6 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_seat.png index dd502c8..5ac63cb 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_end.png index 6307fd6..2f6cda5 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_side.png index 3e2aa76..05c7d39 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/spruce_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_end.png index 965de6e..d9f4c94 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_side.png index 615ab4f..eacdad2 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/stone_pillar_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_flowing.png b/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_flowing.png index 7bdbb28..e34dfce 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_flowing.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_flowing.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_still.png b/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_still.png index 125f287..cc1abd2 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_still.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/thatch_still.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/torch.png b/common/src/main/resources/assets/decorative_blocks/textures/block/torch.png index fa4e862..9a780c2 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/torch.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/torch.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/torch_1.png b/common/src/main/resources/assets/decorative_blocks/textures/block/torch_1.png index ea0a693..aca055d 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/torch_1.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/torch_1.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/torch_2.png b/common/src/main/resources/assets/decorative_blocks/textures/block/torch_2.png index e4c3a04..18b0fef 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/torch_2.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/torch_2.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_end.png index aecc769..cec3c0b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_side.png index a4bd056..ff8e07b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_beam_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_end.png index 866402f..c81ebe0 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_side.png index e469c16..d3a21e7 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_palisade_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_seat.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_seat.png index 60198b6..486a607 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_seat.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_seat.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_end.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_end.png index be54ec9..dd44640 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_end.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_end.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_side.png b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_side.png index ef81673..3ebb807 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_side.png and b/common/src/main/resources/assets/decorative_blocks/textures/block/warped_support_side.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/item/blockstate_copy_tool.png b/common/src/main/resources/assets/decorative_blocks/textures/item/blockstate_copy_tool.png index d3847c7..58005dd 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/item/blockstate_copy_tool.png and b/common/src/main/resources/assets/decorative_blocks/textures/item/blockstate_copy_tool.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/item/brazier.png b/common/src/main/resources/assets/decorative_blocks/textures/item/brazier.png index 172f44e..4c77e1b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/item/brazier.png and b/common/src/main/resources/assets/decorative_blocks/textures/item/brazier.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/item/chain.png b/common/src/main/resources/assets/decorative_blocks/textures/item/chain.png index d3847c7..58005dd 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/item/chain.png and b/common/src/main/resources/assets/decorative_blocks/textures/item/chain.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/item/soul_brazier.png b/common/src/main/resources/assets/decorative_blocks/textures/item/soul_brazier.png index 7716839..80c62e7 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/item/soul_brazier.png and b/common/src/main/resources/assets/decorative_blocks/textures/item/soul_brazier.png differ diff --git a/common/src/main/resources/assets/decorative_blocks/textures/item/soul_torch.png b/common/src/main/resources/assets/decorative_blocks/textures/item/soul_torch.png index 9b2b61a..960d74b 100644 Binary files a/common/src/main/resources/assets/decorative_blocks/textures/item/soul_torch.png and b/common/src/main/resources/assets/decorative_blocks/textures/item/soul_torch.png differ diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/acacia_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/acacia_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bamboo_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bamboo_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bar_panel.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bar_panel.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/bar_panel.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/bar_panel.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/birch_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/birch_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/chain.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/chain.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/chain.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/chain.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/cherry_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/cherry_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/crimson_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/crimson_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/dark_oak_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/dark_oak_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/jungle_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/jungle_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/lattice.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/lattice.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/lattice.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/lattice.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/mangrove_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/mangrove_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/oak_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/oak_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/rocky_dirt.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/rocky_dirt.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/rocky_dirt.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/rocky_dirt.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/spruce_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/spruce_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/stone_pillar.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/stone_pillar.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/stone_pillar.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/stone_pillar.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_beam.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_beam.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_palisade.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_palisade.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_seat.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_seat.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_support.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/building_blocks/warped_support.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/building_blocks/warped_support.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/brazier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/brazier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/brazier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/brazier.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/chandelier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/chandelier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_brazier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_brazier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_brazier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_brazier.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_chandelier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_chandelier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_torch_from_soul_chandelier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_torch_from_soul_chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/soul_torch_from_soul_chandelier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/soul_torch_from_soul_chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/torch_from_chandelier.json b/common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/torch_from_chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/advancements/recipes/decorations/torch_from_chandelier.json rename to common/src/main/resources/data/decorative_blocks/advancement/recipes/decorations/torch_from_chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/acacia_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/acacia_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bamboo_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/bamboo_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bar_panel.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/bar_panel.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/bar_panel.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/bar_panel.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/birch_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/birch_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/brazier.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/brazier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/brazier.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/brazier.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/chain.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/chain.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/chain.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/chain.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/chandelier.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/chandelier.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/cherry_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/cherry_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/crimson_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/crimson_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/dark_oak_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/dark_oak_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/jungle_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/jungle_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/lattice.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/lattice.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/lattice.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/lattice.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/mangrove_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/mangrove_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/oak_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/oak_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/rocky_dirt.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/rocky_dirt.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/rocky_dirt.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/rocky_dirt.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/soul_brazier.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/soul_brazier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/soul_brazier.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/soul_brazier.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/soul_chandelier.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/soul_chandelier.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/soul_chandelier.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/soul_chandelier.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/spruce_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/spruce_support.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/stone_pillar.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/stone_pillar.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/stone_pillar.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/stone_pillar.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_beam.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_beam.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_beam.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_beam.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_palisade.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_palisade.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_palisade.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_palisade.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_seat.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_seat.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_seat.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_seat.json diff --git a/common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_support.json b/common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_support.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/loot_tables/blocks/warped_support.json rename to common/src/main/resources/data/decorative_blocks/loot_table/blocks/warped_support.json diff --git a/common/src/main/resources/data/decorative_blocks/recipes/acacia_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/acacia_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/acacia_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/acacia_beam.json index 1e71297..026e354 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/acacia_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/acacia_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:acacia_beam" + "id": "decorative_blocks:acacia_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/acacia_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/acacia_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/acacia_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/acacia_palisade.json index 28b56b2..7edf465 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/acacia_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/acacia_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:acacia_palisade" + "id": "decorative_blocks:acacia_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/acacia_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/acacia_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/acacia_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/acacia_seat.json index ba6ac82..9ddb993 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/acacia_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/acacia_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:acacia_seat" + "id": "decorative_blocks:acacia_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/acacia_support.json b/common/src/main/resources/data/decorative_blocks/recipe/acacia_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/acacia_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/acacia_support.json index c7a0e11..cb7cb87 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/acacia_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/acacia_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:acacia_support" + "id": "decorative_blocks:acacia_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_palisade.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/bamboo_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/bamboo_palisade.json index 4c632a8..665c410 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:bamboo_palisade" + "id": "decorative_blocks:bamboo_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/bamboo_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/bamboo_seat.json index c0a9703..9bd5fe0 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:bamboo_seat" + "id": "decorative_blocks:bamboo_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_support.json b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/bamboo_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/bamboo_support.json index 8e2f74d..6a63850 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/bamboo_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/bamboo_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:bamboo_support" + "id": "decorative_blocks:bamboo_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/bar_panel.json b/common/src/main/resources/data/decorative_blocks/recipe/bar_panel.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/bar_panel.json rename to common/src/main/resources/data/decorative_blocks/recipe/bar_panel.json index 4af49b1..6257a08 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/bar_panel.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/bar_panel.json @@ -11,7 +11,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:bar_panel" + "id": "decorative_blocks:bar_panel" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/birch_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/birch_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/birch_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/birch_beam.json index bab57e3..5638e18 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/birch_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/birch_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:birch_beam" + "id": "decorative_blocks:birch_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/birch_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/birch_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/birch_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/birch_palisade.json index 8ce5098..3e2e794 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/birch_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/birch_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:birch_palisade" + "id": "decorative_blocks:birch_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/birch_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/birch_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/birch_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/birch_seat.json index b016ff9..6058bcf 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/birch_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/birch_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:birch_seat" + "id": "decorative_blocks:birch_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/birch_support.json b/common/src/main/resources/data/decorative_blocks/recipe/birch_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/birch_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/birch_support.json index b13c469..2ee599d 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/birch_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/birch_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:birch_support" + "id": "decorative_blocks:birch_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/brazier.json b/common/src/main/resources/data/decorative_blocks/recipe/brazier.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/brazier.json rename to common/src/main/resources/data/decorative_blocks/recipe/brazier.json index 2517ec8..b57f1d3 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/brazier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/brazier.json @@ -15,7 +15,7 @@ " 0 " ], "result": { - "item": "decorative_blocks:brazier" + "id": "decorative_blocks:brazier" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/chain.json b/common/src/main/resources/data/decorative_blocks/recipe/chain.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/chain.json rename to common/src/main/resources/data/decorative_blocks/recipe/chain.json index a92a041..944a831 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/chain.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/chain.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "decorative_blocks:chain", + "id": "decorative_blocks:chain", "count": 4 } } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/chandelier.json b/common/src/main/resources/data/decorative_blocks/recipe/chandelier.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/chandelier.json rename to common/src/main/resources/data/decorative_blocks/recipe/chandelier.json index c4acfb6..fdbe055 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/chandelier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/chandelier.json @@ -12,7 +12,7 @@ "##" ], "result": { - "item": "decorative_blocks:chandelier" + "id": "decorative_blocks:chandelier" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/cherry_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/cherry_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/cherry_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/cherry_beam.json index c2c22fb..68091fc 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/cherry_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/cherry_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:cherry_beam" + "id": "decorative_blocks:cherry_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/cherry_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/cherry_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/cherry_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/cherry_palisade.json index 3ca8884..0f073e9 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/cherry_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/cherry_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:cherry_palisade" + "id": "decorative_blocks:cherry_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/cherry_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/cherry_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/cherry_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/cherry_seat.json index 7f0d6cc..3826b5d 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/cherry_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/cherry_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:cherry_seat" + "id": "decorative_blocks:cherry_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/cherry_support.json b/common/src/main/resources/data/decorative_blocks/recipe/cherry_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/cherry_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/cherry_support.json index e0a6d8c..7616662 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/cherry_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/cherry_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:cherry_support" + "id": "decorative_blocks:cherry_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/crimson_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/crimson_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/crimson_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/crimson_beam.json index fd26765..c708851 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/crimson_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/crimson_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:crimson_beam" + "id": "decorative_blocks:crimson_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/crimson_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/crimson_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/crimson_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/crimson_palisade.json index 239041f..cd1249f 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/crimson_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/crimson_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:crimson_palisade" + "id": "decorative_blocks:crimson_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/crimson_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/crimson_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/crimson_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/crimson_seat.json index 77382bb..0179f5d 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/crimson_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/crimson_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:crimson_seat" + "id": "decorative_blocks:crimson_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/crimson_support.json b/common/src/main/resources/data/decorative_blocks/recipe/crimson_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/crimson_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/crimson_support.json index 8054a5f..244d9df 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/crimson_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/crimson_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:crimson_support" + "id": "decorative_blocks:crimson_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/dark_oak_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/dark_oak_beam.json index 47dbdf2..cd9b145 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:dark_oak_beam" + "id": "decorative_blocks:dark_oak_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/dark_oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/dark_oak_palisade.json index 6ee5cb6..1e4f765 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:dark_oak_palisade" + "id": "decorative_blocks:dark_oak_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_seat.json similarity index 87% rename from common/src/main/resources/data/decorative_blocks/recipes/dark_oak_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/dark_oak_seat.json index 49a5e83..35addb0 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:dark_oak_seat" + "id": "decorative_blocks:dark_oak_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_support.json b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/dark_oak_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/dark_oak_support.json index fca7acb..aff98db 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/dark_oak_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/dark_oak_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:dark_oak_support" + "id": "decorative_blocks:dark_oak_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/dirt_from_rocky_dirt.json b/common/src/main/resources/data/decorative_blocks/recipe/dirt_from_rocky_dirt.json similarity index 87% rename from common/src/main/resources/data/decorative_blocks/recipes/dirt_from_rocky_dirt.json rename to common/src/main/resources/data/decorative_blocks/recipe/dirt_from_rocky_dirt.json index 8858850..0c4a030 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/dirt_from_rocky_dirt.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/dirt_from_rocky_dirt.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "minecraft:dirt", + "id": "minecraft:dirt", "count": 4 } } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/jungle_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/jungle_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/jungle_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/jungle_beam.json index cda8169..a63de94 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/jungle_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/jungle_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:jungle_beam" + "id": "decorative_blocks:jungle_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/jungle_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/jungle_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/jungle_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/jungle_palisade.json index f41e245..fc9d079 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/jungle_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/jungle_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:jungle_palisade" + "id": "decorative_blocks:jungle_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/jungle_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/jungle_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/jungle_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/jungle_seat.json index 665e232..6904342 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/jungle_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/jungle_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:jungle_seat" + "id": "decorative_blocks:jungle_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/jungle_support.json b/common/src/main/resources/data/decorative_blocks/recipe/jungle_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/jungle_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/jungle_support.json index 1733586..a6a1227 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/jungle_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/jungle_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:jungle_support" + "id": "decorative_blocks:jungle_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/lattice.json b/common/src/main/resources/data/decorative_blocks/recipe/lattice.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/lattice.json rename to common/src/main/resources/data/decorative_blocks/recipe/lattice.json index 4642aa7..a052335 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/lattice.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/lattice.json @@ -12,7 +12,7 @@ " # " ], "result": { - "item": "decorative_blocks:lattice" + "id": "decorative_blocks:lattice" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/mangrove_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/mangrove_beam.json index 0a4ad0a..3660530 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:mangrove_beam" + "id": "decorative_blocks:mangrove_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/mangrove_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/mangrove_palisade.json index 3f39059..e8008e1 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:mangrove_palisade" + "id": "decorative_blocks:mangrove_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_seat.json similarity index 87% rename from common/src/main/resources/data/decorative_blocks/recipes/mangrove_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/mangrove_seat.json index 41b206d..ffc4011 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:mangrove_seat" + "id": "decorative_blocks:mangrove_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_support.json b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/mangrove_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/mangrove_support.json index 4269ebb..75aaeff 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/mangrove_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/mangrove_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:mangrove_support" + "id": "decorative_blocks:mangrove_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/oak_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/oak_beam.json similarity index 87% rename from common/src/main/resources/data/decorative_blocks/recipes/oak_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/oak_beam.json index 08d4e12..429d2e6 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/oak_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/oak_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:oak_beam" + "id": "decorative_blocks:oak_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/oak_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/oak_palisade.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/oak_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/oak_palisade.json index ccac5c3..19be2e8 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/oak_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/oak_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:oak_palisade" + "id": "decorative_blocks:oak_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/oak_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/oak_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/oak_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/oak_seat.json index 0c4798c..d0694fd 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/oak_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/oak_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:oak_seat" + "id": "decorative_blocks:oak_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/oak_support.json b/common/src/main/resources/data/decorative_blocks/recipe/oak_support.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/oak_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/oak_support.json index 75729c3..011867f 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/oak_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/oak_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:oak_support" + "id": "decorative_blocks:oak_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/rocky_dirt.json b/common/src/main/resources/data/decorative_blocks/recipe/rocky_dirt.json similarity index 83% rename from common/src/main/resources/data/decorative_blocks/recipes/rocky_dirt.json rename to common/src/main/resources/data/decorative_blocks/recipe/rocky_dirt.json index 332a7d6..b4a3113 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/rocky_dirt.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/rocky_dirt.json @@ -11,7 +11,7 @@ "##" ], "result": { - "item": "decorative_blocks:rocky_dirt" + "id": "decorative_blocks:rocky_dirt" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/soul_brazier.json b/common/src/main/resources/data/decorative_blocks/recipe/soul_brazier.json similarity index 89% rename from common/src/main/resources/data/decorative_blocks/recipes/soul_brazier.json rename to common/src/main/resources/data/decorative_blocks/recipe/soul_brazier.json index 3f92404..4c93261 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/soul_brazier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/soul_brazier.json @@ -19,7 +19,7 @@ " 0 " ], "result": { - "item": "decorative_blocks:soul_brazier" + "id": "decorative_blocks:soul_brazier" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/soul_chandelier.json b/common/src/main/resources/data/decorative_blocks/recipe/soul_chandelier.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/soul_chandelier.json rename to common/src/main/resources/data/decorative_blocks/recipe/soul_chandelier.json index 9ae4d01..885cf61 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/soul_chandelier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/soul_chandelier.json @@ -12,7 +12,7 @@ "##" ], "result": { - "item": "decorative_blocks:soul_chandelier" + "id": "decorative_blocks:soul_chandelier" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/soul_torch_from_soul_chandelier.json b/common/src/main/resources/data/decorative_blocks/recipe/soul_torch_from_soul_chandelier.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/soul_torch_from_soul_chandelier.json rename to common/src/main/resources/data/decorative_blocks/recipe/soul_torch_from_soul_chandelier.json index 4fd4384..b9cc686 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/soul_torch_from_soul_chandelier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/soul_torch_from_soul_chandelier.json @@ -9,6 +9,6 @@ ], "result": { "count": 4, - "item": "minecraft:soul_torch" + "id": "minecraft:soul_torch" } } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/spruce_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/spruce_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/spruce_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/spruce_beam.json index 2905c2c..f1afa5b 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/spruce_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/spruce_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:spruce_beam" + "id": "decorative_blocks:spruce_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/spruce_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/spruce_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/spruce_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/spruce_palisade.json index 2ff77db..d2e794e 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/spruce_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/spruce_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:spruce_palisade" + "id": "decorative_blocks:spruce_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/spruce_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/spruce_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/spruce_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/spruce_seat.json index 1829a79..9f03901 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/spruce_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/spruce_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:spruce_seat" + "id": "decorative_blocks:spruce_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/spruce_support.json b/common/src/main/resources/data/decorative_blocks/recipe/spruce_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/spruce_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/spruce_support.json index e8d88a2..bf83e39 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/spruce_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/spruce_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:spruce_support" + "id": "decorative_blocks:spruce_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/stone_pillar.json b/common/src/main/resources/data/decorative_blocks/recipe/stone_pillar.json similarity index 63% rename from common/src/main/resources/data/decorative_blocks/recipes/stone_pillar.json rename to common/src/main/resources/data/decorative_blocks/recipe/stone_pillar.json index af15895..6826162 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/stone_pillar.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/stone_pillar.json @@ -4,5 +4,7 @@ "ingredient": { "item": "minecraft:stone" }, - "result": "decorative_blocks:stone_pillar" + "result": { + "id": "decorative_blocks:stone_pillar" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/torch_from_chandelier.json b/common/src/main/resources/data/decorative_blocks/recipe/torch_from_chandelier.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/torch_from_chandelier.json rename to common/src/main/resources/data/decorative_blocks/recipe/torch_from_chandelier.json index 926fed2..278d341 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/torch_from_chandelier.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/torch_from_chandelier.json @@ -9,6 +9,6 @@ ], "result": { "count": 4, - "item": "minecraft:torch" + "id": "minecraft:torch" } } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/warped_beam.json b/common/src/main/resources/data/decorative_blocks/recipe/warped_beam.json similarity index 86% rename from common/src/main/resources/data/decorative_blocks/recipes/warped_beam.json rename to common/src/main/resources/data/decorative_blocks/recipe/warped_beam.json index e53548a..91a3b95 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/warped_beam.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/warped_beam.json @@ -13,7 +13,7 @@ ], "result": { "count": 2, - "item": "decorative_blocks:warped_beam" + "id": "decorative_blocks:warped_beam" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/warped_palisade.json b/common/src/main/resources/data/decorative_blocks/recipe/warped_palisade.json similarity index 84% rename from common/src/main/resources/data/decorative_blocks/recipes/warped_palisade.json rename to common/src/main/resources/data/decorative_blocks/recipe/warped_palisade.json index 0d82400..9c35f27 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/warped_palisade.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/warped_palisade.json @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:warped_palisade" + "id": "decorative_blocks:warped_palisade" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/warped_seat.json b/common/src/main/resources/data/decorative_blocks/recipe/warped_seat.json similarity index 88% rename from common/src/main/resources/data/decorative_blocks/recipes/warped_seat.json rename to common/src/main/resources/data/decorative_blocks/recipe/warped_seat.json index 2670323..e3c1e9a 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/warped_seat.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/warped_seat.json @@ -16,7 +16,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:warped_seat" + "id": "decorative_blocks:warped_seat" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/recipes/warped_support.json b/common/src/main/resources/data/decorative_blocks/recipe/warped_support.json similarity index 85% rename from common/src/main/resources/data/decorative_blocks/recipes/warped_support.json rename to common/src/main/resources/data/decorative_blocks/recipe/warped_support.json index 2996cd7..ac60e1c 100644 --- a/common/src/main/resources/data/decorative_blocks/recipes/warped_support.json +++ b/common/src/main/resources/data/decorative_blocks/recipe/warped_support.json @@ -13,7 +13,7 @@ ], "result": { "count": 6, - "item": "decorative_blocks:warped_support" + "id": "decorative_blocks:warped_support" }, "show_notification": true } \ No newline at end of file diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json b/common/src/main/resources/data/decorative_blocks/tags/block/beams.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/beams.json rename to common/src/main/resources/data/decorative_blocks/tags/block/beams.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/block/beams_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/beams_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/block/beams_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/bonfires.json b/common/src/main/resources/data/decorative_blocks/tags/block/bonfires.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/bonfires.json rename to common/src/main/resources/data/decorative_blocks/tags/block/bonfires.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/braziers.json b/common/src/main/resources/data/decorative_blocks/tags/block/braziers.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/braziers.json rename to common/src/main/resources/data/decorative_blocks/tags/block/braziers.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/chandeliers.json b/common/src/main/resources/data/decorative_blocks/tags/block/chandeliers.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/chandeliers.json rename to common/src/main/resources/data/decorative_blocks/tags/block/chandeliers.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json b/common/src/main/resources/data/decorative_blocks/tags/block/palisades.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/palisades.json rename to common/src/main/resources/data/decorative_blocks/tags/block/palisades.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/block/palisades_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/palisades_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/block/palisades_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json b/common/src/main/resources/data/decorative_blocks/tags/block/seats.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/seats.json rename to common/src/main/resources/data/decorative_blocks/tags/block/seats.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/block/seats_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/seats_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/block/seats_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json b/common/src/main/resources/data/decorative_blocks/tags/block/supports.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/supports.json rename to common/src/main/resources/data/decorative_blocks/tags/block/supports.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/block/supports_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/blocks/supports_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/block/supports_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/fluids/thatch.json b/common/src/main/resources/data/decorative_blocks/tags/fluid/thatch.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/fluids/thatch.json rename to common/src/main/resources/data/decorative_blocks/tags/fluid/thatch.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/beams.json b/common/src/main/resources/data/decorative_blocks/tags/item/beams.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/beams.json rename to common/src/main/resources/data/decorative_blocks/tags/item/beams.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/item/beams_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/beams_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/item/beams_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/bonfire_activators.json b/common/src/main/resources/data/decorative_blocks/tags/item/bonfire_activators.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/bonfire_activators.json rename to common/src/main/resources/data/decorative_blocks/tags/item/bonfire_activators.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/chandeliers.json b/common/src/main/resources/data/decorative_blocks/tags/item/chandeliers.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/chandeliers.json rename to common/src/main/resources/data/decorative_blocks/tags/item/chandeliers.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/palisades.json b/common/src/main/resources/data/decorative_blocks/tags/item/palisades.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/palisades.json rename to common/src/main/resources/data/decorative_blocks/tags/item/palisades.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/item/palisades_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/palisades_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/item/palisades_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/seats.json b/common/src/main/resources/data/decorative_blocks/tags/item/seats.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/seats.json rename to common/src/main/resources/data/decorative_blocks/tags/item/seats.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/item/seats_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/seats_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/item/seats_that_burn.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/supports.json b/common/src/main/resources/data/decorative_blocks/tags/item/supports.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/supports.json rename to common/src/main/resources/data/decorative_blocks/tags/item/supports.json diff --git a/common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json b/common/src/main/resources/data/decorative_blocks/tags/item/supports_that_burn.json similarity index 100% rename from common/src/main/resources/data/decorative_blocks/tags/items/supports_that_burn.json rename to common/src/main/resources/data/decorative_blocks/tags/item/supports_that_burn.json diff --git a/common/src/main/resources/data/minecraft/tags/block/campfires.json b/common/src/main/resources/data/minecraft/tags/block/campfires.json new file mode 100644 index 0000000..f46b002 --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/block/campfires.json @@ -0,0 +1,6 @@ +{ + "values": [ + "decorative_blocks:brazier", + "decorative_blocks:soul_brazier" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json similarity index 69% rename from common/src/main/resources/data/minecraft/tags/blocks/climbable.json rename to common/src/main/resources/data/minecraft/tags/block/climbable.json index 82ded74..5cdf455 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/climbable.json +++ b/common/src/main/resources/data/minecraft/tags/block/climbable.json @@ -1,5 +1,4 @@ { - "replace": "false", "values": [ "decorative_blocks:chain" ] diff --git a/common/src/main/resources/data/minecraft/tags/blocks/dirt.json b/common/src/main/resources/data/minecraft/tags/block/dirt.json similarity index 71% rename from common/src/main/resources/data/minecraft/tags/blocks/dirt.json rename to common/src/main/resources/data/minecraft/tags/block/dirt.json index 75d7e2c..b8345f3 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/block/dirt.json @@ -1,5 +1,4 @@ { - "replace": "false", "values": [ "decorative_blocks:rocky_dirt" ] diff --git a/common/src/main/resources/data/minecraft/tags/block/fire.json b/common/src/main/resources/data/minecraft/tags/block/fire.json new file mode 100644 index 0000000..d53692a --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/block/fire.json @@ -0,0 +1,6 @@ +{ + "values": [ + "decorative_blocks:bonfire", + "decorative_blocks:soul_bonfire" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/logs.json b/common/src/main/resources/data/minecraft/tags/block/logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/logs.json rename to common/src/main/resources/data/minecraft/tags/block/logs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to common/src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/non_flammable_wood.json b/common/src/main/resources/data/minecraft/tags/block/non_flammable_wood.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/non_flammable_wood.json rename to common/src/main/resources/data/minecraft/tags/block/non_flammable_wood.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/piglin_repellants.json b/common/src/main/resources/data/minecraft/tags/block/piglin_repellants.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/piglin_repellants.json rename to common/src/main/resources/data/minecraft/tags/block/piglin_repellants.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/prevent_mob_spawning_inside.json b/common/src/main/resources/data/minecraft/tags/block/prevent_mob_spawning_inside.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/prevent_mob_spawning_inside.json rename to common/src/main/resources/data/minecraft/tags/block/prevent_mob_spawning_inside.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/walls.json b/common/src/main/resources/data/minecraft/tags/block/walls.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/walls.json rename to common/src/main/resources/data/minecraft/tags/block/walls.json diff --git a/common/src/main/resources/data/minecraft/tags/items/acacia_logs.json b/common/src/main/resources/data/minecraft/tags/item/acacia_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/acacia_logs.json rename to common/src/main/resources/data/minecraft/tags/item/acacia_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/birch_logs.json b/common/src/main/resources/data/minecraft/tags/item/birch_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/birch_logs.json rename to common/src/main/resources/data/minecraft/tags/item/birch_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/crimson_stems.json b/common/src/main/resources/data/minecraft/tags/item/crimson_stems.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/crimson_stems.json rename to common/src/main/resources/data/minecraft/tags/item/crimson_stems.json diff --git a/common/src/main/resources/data/minecraft/tags/items/dark_oak_logs.json b/common/src/main/resources/data/minecraft/tags/item/dark_oak_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/dark_oak_logs.json rename to common/src/main/resources/data/minecraft/tags/item/dark_oak_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/jungle_logs.json b/common/src/main/resources/data/minecraft/tags/item/jungle_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/jungle_logs.json rename to common/src/main/resources/data/minecraft/tags/item/jungle_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/non_flammable_wood.json b/common/src/main/resources/data/minecraft/tags/item/non_flammable_wood.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/non_flammable_wood.json rename to common/src/main/resources/data/minecraft/tags/item/non_flammable_wood.json diff --git a/common/src/main/resources/data/minecraft/tags/items/oak_logs.json b/common/src/main/resources/data/minecraft/tags/item/oak_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/oak_logs.json rename to common/src/main/resources/data/minecraft/tags/item/oak_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/spruce_logs.json b/common/src/main/resources/data/minecraft/tags/item/spruce_logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/spruce_logs.json rename to common/src/main/resources/data/minecraft/tags/item/spruce_logs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/warped_stems.json b/common/src/main/resources/data/minecraft/tags/item/warped_stems.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/warped_stems.json rename to common/src/main/resources/data/minecraft/tags/item/warped_stems.json diff --git a/common/src/main/resources/decorative_blocks.mixins.json b/common/src/main/resources/decorative_blocks.mixins.json index 19c30ce..2dcf3e0 100644 --- a/common/src/main/resources/decorative_blocks.mixins.json +++ b/common/src/main/resources/decorative_blocks.mixins.json @@ -3,12 +3,11 @@ "minVersion": "0.8", "package": "lilypuree.decorative_blocks.mixin", "refmap": "${mod_id}.refmap.json", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "FireBlockInvoker", "ItemAccessor", - "ItemEntityMixin", - "WalkNodeEvaluatorMixin" + "ItemEntityMixin" ], "server": [ ], diff --git a/common/src/main/resources/logo.png b/common/src/main/resources/logo.png new file mode 100644 index 0000000..09804e3 Binary files /dev/null and b/common/src/main/resources/logo.png differ diff --git a/fabric/build.gradle b/fabric/build.gradle index 2313054..7e1848a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' } base { archivesName = "${mod_name}-Fabric-${minecraft_version}" @@ -21,7 +21,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' modCompileOnly "curse.maven:soulfired-662413:5029260" diff --git a/fabric/src/main/java/lilypuree/decorative_blocks/ClientInitializer.java b/fabric/src/main/java/lilypuree/decorative_blocks/ClientInitializer.java index 55403bd..f8cf6cf 100644 --- a/fabric/src/main/java/lilypuree/decorative_blocks/ClientInitializer.java +++ b/fabric/src/main/java/lilypuree/decorative_blocks/ClientInitializer.java @@ -1,9 +1,9 @@ package lilypuree.decorative_blocks; import lilypuree.decorative_blocks.client.ClientSetup; -import lilypuree.decorative_blocks.registration.Registration; import lilypuree.decorative_blocks.entity.EmptyRenderer; import lilypuree.decorative_blocks.fluid.ThatchFluid; +import lilypuree.decorative_blocks.registration.Registration; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; diff --git a/fabric/src/main/java/lilypuree/decorative_blocks/platform/FabricPlatformHelper.java b/fabric/src/main/java/lilypuree/decorative_blocks/platform/FabricPlatformHelper.java index 342ee28..1b22805 100644 --- a/fabric/src/main/java/lilypuree/decorative_blocks/platform/FabricPlatformHelper.java +++ b/fabric/src/main/java/lilypuree/decorative_blocks/platform/FabricPlatformHelper.java @@ -15,9 +15,6 @@ import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.client.renderer.item.ItemPropertyFunction; import net.minecraft.core.Registry; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; @@ -40,7 +37,7 @@ public boolean isModLoaded(String modid) { @Override public Supplier register(Registry registry, String name, Supplier sup) { - T object = Registry.register(registry, new ResourceLocation(Constants.MOD_ID, name), sup.get()); + T object = Registry.register(registry, ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, name), sup.get()); return () -> object; } @@ -51,12 +48,7 @@ public GameRules.Key registerGameRule(String name, GameR @Override public DummyEntityForSitting createDummyEntity(EntityType type, Level level) { - return new DummyEntityForSitting(type, level) { - @Override - public Packet getAddEntityPacket() { - return new ClientboundAddEntityPacket(this); - } - }; + return new DummyEntityForSitting(type, level); } @Override diff --git a/fabric/src/main/resources/decorative_blocks.fabric.mixins.json b/fabric/src/main/resources/decorative_blocks.fabric.mixins.json index a7840f1..7dfaa1d 100644 --- a/fabric/src/main/resources/decorative_blocks.fabric.mixins.json +++ b/fabric/src/main/resources/decorative_blocks.fabric.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "lilypuree.decorative_blocks.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "FogRendererMixin" ], diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 9861429..5e50fc7 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -8,7 +8,8 @@ "${mod_author}" ], "contact": { - "sources": "https://github.com/lilypuree/Decorative-Blocks" + "sources": "https://github.com/lilypuree/Decorative-Blocks", + "issues": "https://github.com/lilypuree/Decorative-Blocks/issues" }, "license": "${mod_license}", "icon" : "logo.png", @@ -28,8 +29,8 @@ "depends": { "fabricloader": ">=${fabric_loader_version}", "fabric-api": "*", - "minecraft": "${minecraft_version}", - "java": ">=17" + "minecraft": "${minecraft_fabric_version_range}", + "java": ">=21" }, "suggests": { "soulfired": "^3.2.1.0" diff --git a/fabric/src/main/resources/logo.png b/fabric/src/main/resources/logo.png deleted file mode 100644 index 841fc16..0000000 Binary files a/fabric/src/main/resources/logo.png and /dev/null differ diff --git a/gradle.properties b/gradle.properties index 2abef18..14d32d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Project -version=5.0.2 +version=6.0.0 group=lilypuree # Mod options @@ -14,24 +14,24 @@ mod_license=MIT mod_description=Adds several new decorative blocks # Common -minecraft_version=1.20.4 -minecraft_version_range=[1.20.4, 1.21) +minecraft_version=1.21.1 # NeoForge -neoforge_version=20.4.83-beta -neoforge_loader_version_range=[2,) -neogradle.subsystems.parchment.minecraftVersion=1.20.2 -neogradle.subsystems.parchment.mappingsVersion=2023.12.10 +neoforge_version=21.1.68 +minecraft_neoforge_version_range=[1.21, 1.21.2) +neogradle.subsystems.parchment.minecraftVersion=1.21 +neogradle.subsystems.parchment.mappingsVersion=2024.07.28 # Fabric -fabric_version=0.92.1+1.20.4 -fabric_loader_version=0.15.3 +fabric_version=0.105.0+1.21.1 +fabric_loader_version=0.16.7 +minecraft_fabric_version_range=>=1.21 <1.21.2 # Parchment -parchment_mc_version=1.20.2 -parchment_version=2023.12.10 +parchment_mc_version=1.21 +parchment_version=2024.07.28 # JEI -jei_version=17.1.0.39 +jei_version=19.21.0.246 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index a69d9cb..f5feea6 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index f127cfd..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/logo.png b/logo.png index 841fc16..09804e3 100644 Binary files a/logo.png and b/logo.png differ diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 377795f..ef99d81 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.81' + id 'net.neoforged.gradle.userdev' version '7.0.165' } base { archivesName = "${mod_id}-NeoForge-${minecraft_version}" @@ -29,7 +29,7 @@ runs { } data { - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('../common/src/main/resources/').getAbsolutePath() } } @@ -66,6 +66,10 @@ tasks.withType(ProcessResources).matching(notNeoTask).configureEach { from project(":common").sourceSets.main.resources } +jar { + exclude "lilypuree/decorative_blocks/datagen" +} + publishing { publications { mavenJava(MavenPublication) { diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java b/neoforge/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java index 0f3d077..8caebaa 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/DecorativeBlocks.java @@ -1,7 +1,7 @@ package lilypuree.decorative_blocks; -import lilypuree.decorative_blocks.registration.*; import lilypuree.decorative_blocks.platform.NeoForgePlatformHelper; +import lilypuree.decorative_blocks.registration.*; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/compat/jei/DecorativeBlocksJEIPlugin.java b/neoforge/src/main/java/lilypuree/decorative_blocks/compat/jei/DecorativeBlocksJEIPlugin.java index 095a161..f101f24 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/compat/jei/DecorativeBlocksJEIPlugin.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/compat/jei/DecorativeBlocksJEIPlugin.java @@ -15,7 +15,7 @@ public class DecorativeBlocksJEIPlugin implements IModPlugin { @Override public ResourceLocation getPluginUid() { - return new ResourceLocation(Constants.MOD_ID, "main"); + return ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "main"); } @Override diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/BlockStateGenerationHelper.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/BlockStateGenerationHelper.java index 052bb5f..f95dcbd 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/BlockStateGenerationHelper.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/BlockStateGenerationHelper.java @@ -33,7 +33,7 @@ public BlockStateGenerationHelper(String modid, BlockStateProvider provider) { public void supportBlock(IWoodenBlock block) { WoodType woodType = block.getWoodType(); - String texture = woodType + "_support"; + String texture = woodType.name() + "_support"; MultiPartBlockStateBuilder builder = getMultipartBuilder((Block) block); BlockStateProperties.UP.getAllValues().forEach(up -> { @@ -96,7 +96,7 @@ private final MultiPartBlockStateBuilder.PartBuilder addConditions(MultiPartBloc public void seatBlock(IWoodenBlock block) { WoodType woodType = block.getWoodType(); - String texture = woodType + "_seat"; + String texture = woodType.name() + "_seat"; MultiPartBlockStateBuilder builder = getMultipartBuilder((Block) block); addFourDirections(builder, simpleModel(woodType, SEAT, "", texture)); builder.part().modelFile(simpleModel(woodType, SEAT, "_post", texture)).addModel().condition(BlockStateProperties.ATTACHED, true); @@ -126,12 +126,12 @@ public void beamBlock(IWoodenBlock block) { public ModelFile beamModel(WoodType wood, Direction.Axis axis) { ModelBuilder builder = createModel(wood, BEAM, "_" + axis.getName()); - return withSideEndTextures(builder, wood + "_beam"); + return withSideEndTextures(builder, wood.name() + "_beam"); } public void palisadeBlock(IWoodenBlock block) { WoodType woodType = block.getWoodType(); - String texture = woodType + "_palisade"; + String texture = woodType.name() + "_palisade"; ModelFile postModel = sideEndModel(woodType, PALISADE, "_post", texture); ModelFile sideModel = sideEndModel(woodType, PALISADE, "_side", texture); @@ -168,12 +168,12 @@ private ModelBuilder createModel(WoodType wood, WoodDecorativeBlockTypes type private ModelBuilder createModel(WoodType wood, WoodDecorativeBlockTypes type, String prefix, String suffix) { String name = prefix + type + suffix; return models().getBuilder(wood.name() + "_" + name) - .parent(modelFile(new ResourceLocation(Constants.MOD_ID, "custom/" + name))); + .parent(modelFile(ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "custom/" + name))); } public ModelBuilder createChildModel(String path, String parent) { return models().getBuilder(path) - .parent(modelFile(new ResourceLocation(Constants.MOD_ID, "custom/" + parent))); + .parent(modelFile(ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "custom/" + parent))); } public ModelBuilder withParticleTexture(ModelBuilder model, String name) { @@ -208,6 +208,6 @@ public ResourceLocation modBlockLoc(String name) { } public ResourceLocation modLoc(String name) { - return new ResourceLocation(modid, name); + return ResourceLocation.fromNamespaceAndPath(modid, name); } } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBBlockLoots.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBBlockLoots.java index 088efc7..6957b32 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBBlockLoots.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBBlockLoots.java @@ -1,8 +1,9 @@ package lilypuree.decorative_blocks.datagen; import lilypuree.decorative_blocks.registration.DBBlocks; +import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.BlockLootSubProvider; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.storage.loot.LootTable; @@ -11,8 +12,8 @@ import java.util.function.Supplier; public class DBBlockLoots extends BlockLootSubProvider { - protected DBBlockLoots() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + protected DBBlockLoots(HolderLookup.Provider registries) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), registries); } @Override @@ -21,7 +22,7 @@ protected void generate() { } @Override - public void generate(BiConsumer pOutput) { + public void generate(BiConsumer, LootTable.Builder> output) { dropSelf(DBBlocks.BAR_PANEL.get()); dropSelf(DBBlocks.CHANDELIER.get()); @@ -37,7 +38,7 @@ public void generate(BiConsumer pOutput) { DBBlocks.SEATS.values().stream().map(Supplier::get).forEach(this::dropSelf); DBBlocks.SUPPORTS.values().stream().map(Supplier::get).forEach(this::dropSelf); - map.forEach(pOutput); + map.forEach(output); } } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBItemModels.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBItemModels.java index 114ab1e..94b755e 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBItemModels.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBItemModels.java @@ -2,10 +2,10 @@ import lilypuree.decorative_blocks.Constants; import lilypuree.decorative_blocks.blocks.types.VanillaWoodTypes; -import lilypuree.decorative_blocks.registration.DBBlocks; -import lilypuree.decorative_blocks.registration.DBItems; import lilypuree.decorative_blocks.items.SeatItem; import lilypuree.decorative_blocks.items.SupportItem; +import lilypuree.decorative_blocks.registration.DBBlocks; +import lilypuree.decorative_blocks.registration.DBItems; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -28,8 +28,8 @@ protected void registerModels() { ItemGenerationHelper helper = new ItemGenerationHelper(Constants.MOD_ID, this); for (WoodType wood : VanillaWoodTypes.VANILLA) { if (wood != WoodType.BAMBOO) - getBuilder(wood + "_beam").parent(new ModelFile.UncheckedModelFile(modLoc("block/" + wood + "_beam_y"))); - getBuilder(wood + "_palisade").parent(new ModelFile.UncheckedModelFile(modLoc("block/" + wood + "_palisade_inventory"))); + getBuilder(wood.name() + "_beam").parent(new ModelFile.UncheckedModelFile(modLoc("block/" + wood.name() + "_beam_y"))); + getBuilder(wood.name() + "_palisade").parent(new ModelFile.UncheckedModelFile(modLoc("block/" + wood.name() + "_palisade_inventory"))); helper.seatModel(wood); helper.supportModel(wood); } @@ -99,7 +99,7 @@ public ModelFile newModel(ResourceLocation location) { } public ResourceLocation modBlockLoc(String name) { - return new ResourceLocation(modid, "block/" + name); + return ResourceLocation.fromNamespaceAndPath(modid, "block/" + name); } } } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBLootTables.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBLootTables.java index c5758c7..6fcbc31 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBLootTables.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBLootTables.java @@ -1,16 +1,18 @@ package lilypuree.decorative_blocks.datagen; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; public class DBLootTables extends LootTableProvider { - public DBLootTables(PackOutput pOutput) { - super(pOutput, Set.of(), List.of(new LootTableProvider.SubProviderEntry(DBBlockLoots::new, LootContextParamSets.BLOCK))); + public DBLootTables(PackOutput pOutput, CompletableFuture registries) { + super(pOutput, Set.of(), List.of(new LootTableProvider.SubProviderEntry(DBBlockLoots::new, LootContextParamSets.BLOCK)), registries); } } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBRecipes.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBRecipes.java index b6fb878..530ff79 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBRecipes.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DBRecipes.java @@ -145,7 +145,7 @@ public static void makeChandelierRecipeOf(ItemLike chandelier, Item torch, Recip "has_torch", torch); String chandelierId = BuiltInRegistries.ITEM.getKey(chandelier.asItem()).getPath(); String torchId = BuiltInRegistries.ITEM.getKey(torch).getPath(); - addRecipe(recipeOutput, new ResourceLocation(Constants.MOD_ID, torchId + "_from_" + chandelierId), shapelessRecipe(RecipeCategory.DECORATIONS, torch, 4) + addRecipe(recipeOutput, ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, torchId + "_from_" + chandelierId), shapelessRecipe(RecipeCategory.DECORATIONS, torch, 4) .group("torches_from_chandeliers") .requires(chandelier), "has_torch", torch); diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DataGenerators.java b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DataGenerators.java index 2b96735..d362df4 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DataGenerators.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/datagen/DataGenerators.java @@ -5,14 +5,14 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; import java.util.concurrent.CompletableFuture; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { @SubscribeEvent public static void gatherData(GatherDataEvent event) { @@ -22,7 +22,7 @@ public static void gatherData(GatherDataEvent event) { ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); generator.addProvider(event.includeServer(), new DBRecipes(packOutput, lookupProvider)); - generator.addProvider(event.includeServer(), new DBLootTables(packOutput)); + generator.addProvider(event.includeServer(), new DBLootTables(packOutput, lookupProvider)); BlockTagsProvider blockTagsProvider = new DBBlockTagsProvider(packOutput, lookupProvider, existingFileHelper); generator.addProvider(event.includeServer(), blockTagsProvider); generator.addProvider(event.includeServer(), new DBItemTagsProvider(packOutput, lookupProvider, blockTagsProvider.contentsGetter(), existingFileHelper)); diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/events/ClientEventHandler.java b/neoforge/src/main/java/lilypuree/decorative_blocks/events/ClientEventHandler.java index 1abc274..ce7b703 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/events/ClientEventHandler.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/events/ClientEventHandler.java @@ -2,16 +2,16 @@ import lilypuree.decorative_blocks.Constants; import lilypuree.decorative_blocks.client.ClientSetup; -import lilypuree.decorative_blocks.registration.Registration; import lilypuree.decorative_blocks.entity.EmptyRenderer; +import lilypuree.decorative_blocks.registration.Registration; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(value = Dist.CLIENT, modid = Constants.MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class ClientEventHandler { @SubscribeEvent diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/events/EventHandler.java b/neoforge/src/main/java/lilypuree/decorative_blocks/events/EventHandler.java index 21734ce..bf19294 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/events/EventHandler.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/events/EventHandler.java @@ -1,10 +1,11 @@ package lilypuree.decorative_blocks.events; +import lilypuree.decorative_blocks.Callbacks; import lilypuree.decorative_blocks.Constants; import lilypuree.decorative_blocks.blocks.BrazierBlock; -import lilypuree.decorative_blocks.Callbacks; import lilypuree.decorative_blocks.registration.Registration; import net.minecraft.core.BlockPos; +import net.minecraft.core.component.DataComponents; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; @@ -14,18 +15,18 @@ import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.entity.projectile.ThrownPotion; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.alchemy.PotionUtils; +import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.bus.api.Event; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.util.TriState; import net.neoforged.neoforge.event.entity.ProjectileImpactEvent; import net.neoforged.neoforge.event.entity.living.LivingDamageEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; -@Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@EventBusSubscriber(modid = Constants.MOD_ID, bus = EventBusSubscriber.Bus.GAME) public class EventHandler { @SubscribeEvent @@ -35,7 +36,6 @@ public static void onUseItem(PlayerInteractEvent.RightClickItem event) { if (event.getLevel().isClientSide) { event.getEntity().swing(event.getHand()); } - event.setResult(Event.Result.ALLOW); } } @@ -46,8 +46,8 @@ public static void onRightClick(PlayerInteractEvent.RightClickBlock event) { if (event.getLevel().isClientSide) { event.getEntity().swing(event.getHand()); } - event.setUseBlock(Event.Result.DENY); - event.setUseItem(Event.Result.DENY); + event.setUseBlock(TriState.FALSE); + event.setUseItem(TriState.FALSE); } } @@ -59,13 +59,13 @@ public static void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { } @SubscribeEvent - public static void onEntityDamage(LivingDamageEvent event) { + public static void onEntityDamage(LivingDamageEvent.Pre event) { if (event.getSource() == event.getEntity().damageSources().fall()) { LivingEntity entity = event.getEntity(); BlockPos pos = entity.blockPosition(); Level world = entity.getCommandSenderWorld(); if (world.getFluidState(pos).getType() == Registration.STILL_THATCH) { - event.setAmount(event.getAmount() * 0.2f); + event.setNewDamage(event.getOriginalDamage() * 0.2f); } } } @@ -77,8 +77,9 @@ public static void onProjectileCollisionEvent(ProjectileImpactEvent event) { BlockPos pos = potion.blockPosition(); BlockState state = world.getBlockState(pos); if (world.isClientSide) return; - if (potion instanceof ThrownPotion && PotionUtils.getPotion(((ThrownPotion) potion).getItem()) == Potions.WATER) { - if ((state.getBlock() instanceof BrazierBlock) && state.getValue(BrazierBlock.LIT)) { + if (potion instanceof ThrownPotion) { + PotionContents contents = ((ThrownPotion) potion).getItem().get(DataComponents.POTION_CONTENTS); + if (contents != null && contents.is(Potions.WATER) && (state.getBlock() instanceof BrazierBlock) && state.getValue(BrazierBlock.LIT)) { world.setBlockAndUpdate(pos, state.setValue(BrazierBlock.LIT, Boolean.FALSE)); world.playSound((Player) null, pos, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 0.8F, 1.0F); } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/DBFluidType.java b/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/DBFluidType.java index 3a49763..afb8fa4 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/DBFluidType.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/DBFluidType.java @@ -63,8 +63,6 @@ public ResourceLocation getStillTexture() { public void modifyFogRender(Camera camera, FogRenderer.FogMode mode, float renderDistance, float partialTick, float nearDistance, float farDistance, FogShape shape) { FogHelper.onFogSetup(camera.getEntity(), farDistance); } - - }); } } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/ForgeThatchFluidBlock.java b/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/ForgeThatchFluidBlock.java index 6044025..7403ce9 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/ForgeThatchFluidBlock.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/fluid/ForgeThatchFluidBlock.java @@ -13,10 +13,8 @@ import net.minecraft.world.level.material.FlowingFluid; import org.jetbrains.annotations.Nullable; -import java.util.function.Supplier; - public class ForgeThatchFluidBlock extends LiquidBlock implements ThatchBlock { - public ForgeThatchFluidBlock(Supplier fluid, Properties properties) { + public ForgeThatchFluidBlock(FlowingFluid fluid, Properties properties) { super(fluid, properties); } diff --git a/neoforge/src/main/java/lilypuree/decorative_blocks/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/lilypuree/decorative_blocks/platform/NeoForgePlatformHelper.java index 0dedc31..2b1042e 100644 --- a/neoforge/src/main/java/lilypuree/decorative_blocks/platform/NeoForgePlatformHelper.java +++ b/neoforge/src/main/java/lilypuree/decorative_blocks/platform/NeoForgePlatformHelper.java @@ -11,9 +11,6 @@ import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.client.renderer.item.ItemPropertyFunction; import net.minecraft.core.Registry; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; @@ -56,18 +53,12 @@ public GameRules.Key registerGameRule(String name, GameR @Override public DummyEntityForSitting createDummyEntity(EntityType type, Level level) { - return new DummyEntityForSitting(type, level) { - - @Override - public Packet getAddEntityPacket() { - return new ClientboundAddEntityPacket(this); - } - }; + return new DummyEntityForSitting(type, level); } @Override public LiquidBlock createThatchFluidBlock(Supplier fluid, BlockBehaviour.Properties properties) { - return new ForgeThatchFluidBlock(fluid::get, properties); + return new ForgeThatchFluidBlock(fluid.get(), properties); } @Override @@ -97,7 +88,7 @@ public void registerItemFunc(Item item, ResourceLocation name, ItemPropertyFunct @Override public TagKey getShearTag() { - return Tags.Items.SHEARS; + return Tags.Items.TOOLS_SHEAR; } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 89% rename from neoforge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml index bfbbbbf..c5d2702 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "${neoforge_loader_version_range}" #mandatory +loaderVersion = "*" #mandatory license = "${mod_license}" # A URL to refer people to when problems occur with this mod @@ -27,14 +27,14 @@ config = "${mod_id}.neoforge.mixins.json" [[dependencies.${mod_id}]] #optional modId = "neoforge" #mandatory type="required" #mandatory -versionRange = "${neoforge_loader_version_range}" #mandatory +versionRange = "*" #mandatory ordering = "NONE" side = "BOTH" [[dependencies.${mod_id}]] modId = "minecraft" type="required" -versionRange = "${minecraft_version_range}" +versionRange = "${minecraft_neoforge_version_range}" ordering = "NONE" side = "BOTH" diff --git a/neoforge/src/main/resources/decorative_blocks.neoforge.mixins.json b/neoforge/src/main/resources/decorative_blocks.neoforge.mixins.json index 2ae6b1a..941b3e8 100644 --- a/neoforge/src/main/resources/decorative_blocks.neoforge.mixins.json +++ b/neoforge/src/main/resources/decorative_blocks.neoforge.mixins.json @@ -3,7 +3,7 @@ "minVersion": "0.8", "package": "lilypuree.decorative_blocks.mixin", "refmap": "${mod_id}.refmap.json", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AbstractFurnaceTileEntityMixin" ], diff --git a/settings.gradle b/settings.gradle index 8f341b0..cf7380b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,7 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' } rootProject.name = 'Decorative-Blocks'