Allow customizing the block tag that ornaments can be placed on

NucleoidMC · Dec 24, 2023 · fb54749 · fb54749
1 parent 2499d4e
commit fb54749
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/src/main/java/xyz/nucleoid/extras/lobby/NEItems.java b/src/main/java/xyz/nucleoid/extras/lobby/NEItems.java
@@ -857,18 +857,12 @@ private static ActionResult onUseBlock(PlayerEntity player, World world, Hand ha
             var lobbyState = PlayerLobbyState.get(player);
 
             if (lobbyState.collectTaterFromBlock(world, pos, stack, player) == ActionResult.PASS && !(stack.getItem() instanceof TaterBoxItem)) {
-                var state = world.getBlockState(pos);
+                var serverWorld = (ServerWorld) world;
+                var blockEntity = TreeDecorationBlockEntity.findNearestTreeDecoration(serverWorld, pos);
 
-                if (state.isIn(BlockTags.LEAVES)) {
-                    var serverWorld = (ServerWorld) world;
-                    var blockEntity = TreeDecorationBlockEntity.findNearestTreeDecoration(serverWorld, pos);
-
-                    if (blockEntity.isPresent() && blockEntity.get().placeOrnament((ServerPlayerEntity) player, serverWorld, hand, hitResult)) {
-                        return ActionResult.SUCCESS;
-                    }
+                if (blockEntity.isPresent() && blockEntity.get().placeOrnament((ServerPlayerEntity) player, serverWorld, hand, hitResult)) {
+                    return ActionResult.SUCCESS;
                 }
-
-                return ActionResult.PASS;
             }
         }
 

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/NEPointOfInterestTypes.java b/src/main/java/xyz/nucleoid/extras/lobby/NEPointOfInterestTypes.java
@@ -4,8 +4,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.util.Identifier;
 import net.minecraft.world.poi.PointOfInterestType;
+import xyz.nucleoid.extras.NucleoidExtras;
 
 public class NEPointOfInterestTypes {
     public static final RegistryKey<PointOfInterestType> TREE_DECORATION = of("tree_decoration");
@@ -15,7 +15,7 @@ public static void register() {
     }
 
     private static RegistryKey<PointOfInterestType> of(String id) {
-        return RegistryKey.of(RegistryKeys.POINT_OF_INTEREST_TYPE, new Identifier(id));
+        return RegistryKey.of(RegistryKeys.POINT_OF_INTEREST_TYPE, NucleoidExtras.identifier(id));
     }
 
     private static PointOfInterestType register(RegistryKey<PointOfInterestType> key, int ticketCount, int searchDistance, Block... blocks) {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/TreeDecorationBlockEntity.java b/src/main/java/xyz/nucleoid/extras/lobby/block/TreeDecorationBlockEntity.java
@@ -97,13 +97,17 @@ public boolean placeOrnament(ServerPlayerEntity player, ServerWorld world, Hand
         var item = TaterBoxItem.getPrimaryCollectedTater(player).asItem();
         if (item == Items.AIR) return false;
 
+        var blockPos = hitResult.getBlockPos();
+
+        var state = world.getBlockState(blockPos);
+        if (!state.isIn(this.data.getSupportedBlocks())) return false;
+
         var pos = hitResult.getPos();
         var side = hitResult.getSide();
 
         if (side == Direction.UP) {
             return false;
         } else if (side != Direction.DOWN) {
-            var blockPos = hitResult.getBlockPos();
             var belowPos = blockPos.add(side.getOffsetX(), side.getOffsetY() - 1, side.getOffsetZ());
 
             if (world.getBlockState(belowPos).isFullCube(world, belowPos)) {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/tree/TreeDecoration.java b/src/main/java/xyz/nucleoid/extras/lobby/tree/TreeDecoration.java
@@ -7,23 +7,35 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
+import net.minecraft.block.Block;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
+
 public final class TreeDecoration {
     public static final Codec<TreeDecoration> CODEC = RecordCodecBuilder.create(instance ->
         instance.group(
-                Ornament.CODEC.listOf().fieldOf("ornaments").forGetter(t -> t.ornaments)
+                Ornament.CODEC.listOf().fieldOf("ornaments").forGetter(t -> t.ornaments),
+                TagKey.codec(RegistryKeys.BLOCK).fieldOf("supported_blocks").forGetter(TreeDecoration::getSupportedBlocks)
         ).apply(instance, TreeDecoration::new)
     );
 
     private final List<Ornament> ornaments;
+    private final TagKey<Block> supportedBlocks;
 
-    private TreeDecoration(List<Ornament> ornaments) {
+    private TreeDecoration(List<Ornament> ornaments, TagKey<Block> supportedBlocks) {
         this.ornaments = ornaments;
+        this.supportedBlocks = supportedBlocks;
     }
 
     public Collection<Ornament> getOrnaments() {
         return this.ornaments;
     }
 
+    public TagKey<Block> getSupportedBlocks() {
+        return this.supportedBlocks;
+    }
+
     public TreeDecoration withOrnament(Ornament ornament) {
         var ornaments = new ArrayList<>(this.ornaments);
 
@@ -34,18 +46,18 @@ public TreeDecoration withOrnament(Ornament ornament) {
 
         ornaments.add(ornament);
 
-        return new TreeDecoration(ornaments);
+        return new TreeDecoration(ornaments, this.supportedBlocks);
     }
 
     public TreeDecoration exceptOrnament(Ornament ornament) {
         var ornaments = new ArrayList<>(this.ornaments);
 
         ornaments.remove(ornament);
 
-        return new TreeDecoration(ornaments);
+        return new TreeDecoration(ornaments, this.supportedBlocks);
     }
 
     public static TreeDecoration createEmpty() {
-        return new TreeDecoration(List.of());
+        return new TreeDecoration(List.of(), BlockTags.LEAVES);
     }
 }