From f0885d0302cdc54b2851b1715a0cf90712f2caba Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 14:07:43 +0100 Subject: [PATCH] Removed unnecessary codec logic. --- .../block/FlowerBedBlock.java | 3 --- .../mixin/BlockBehaviourAccessor.java | 11 ---------- .../util/BlockBehaviourUtils.java | 22 ------------------- .../wildflowers_backport.mixins.json | 1 - 4 files changed, 37 deletions(-) delete mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java delete mode 100644 src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java diff --git a/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java index 7a1b62d..ad21c37 100644 --- a/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java +++ b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java @@ -1,8 +1,6 @@ package dev.micle.wildflowers_backport.block; import com.google.common.collect.ImmutableMap; -import com.mojang.serialization.MapCodec; -import dev.micle.wildflowers_backport.util.BlockBehaviourUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -27,7 +25,6 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.function.Function; public class FlowerBedBlock extends BushBlock implements BonemealableBlock, SegmentableBlock { - public static final MapCodec CODEC = BlockBehaviourUtils.simpleCodec(FlowerBedBlock::new); public static final EnumProperty FACING = BlockStateProperties.HORIZONTAL_FACING; public static final IntegerProperty AMOUNT = BlockStateProperties.FLOWER_AMOUNT; private final Function shapes; diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java deleted file mode 100644 index ca69491..0000000 --- a/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.micle.wildflowers_backport.mixin; - -import net.minecraft.world.level.block.state.BlockBehaviour; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(BlockBehaviour.class) -public interface BlockBehaviourAccessor { - @Accessor("properties") - BlockBehaviour.Properties wildflowers_backport$getProperties(); -} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java deleted file mode 100644 index 242d660..0000000 --- a/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java +++ /dev/null @@ -1,22 +0,0 @@ -package dev.micle.wildflowers_backport.util; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import dev.micle.wildflowers_backport.mixin.BlockBehaviourAccessor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; - -import java.util.function.Function; - -public class BlockBehaviourUtils { - public static final Codec PROPERTIES_CODEC = Codec.unit(BlockBehaviour.Properties::of); - - public static RecordCodecBuilder propertiesCodec() { - return PROPERTIES_CODEC.fieldOf("properties").forGetter(x -> ((BlockBehaviourAccessor) x).wildflowers_backport$getProperties()); - } - - public static MapCodec simpleCodec(Function blockPropertiesFunc) { - return RecordCodecBuilder.mapCodec(x -> x.group(propertiesCodec()).apply(x, blockPropertiesFunc)); - } -} diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json index c9cbf28..9fb047d 100644 --- a/src/main/resources/wildflowers_backport.mixins.json +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -5,7 +5,6 @@ "compatibilityLevel": "JAVA_8", "refmap": "firefly_bush_backport.refmap.json", "mixins": [ - "BlockBehaviourAccessor", "OctahedralGroupAccessor", "VoxelShapeAccessor", "ArrayVoxelShapeAccessor",