rollback formatting

Author: Garrett-EMS

blocks/src/main/java/net/minestom/vanilla/blocks/placement/CandlePlacementRule.java

@@ -20,7 +20,7 @@
  */
 public class CandlePlacementRule extends BlockPlacementRule {
 
-    private static final Map<Block, Block> CAKE_VARIANTS = Map.copyOf(Map.ofEntries(
+    private static final Map<Block, Block> CAKE_VARIANTS = Map.ofEntries(
         Map.entry(Block.CANDLE, Block.CANDLE_CAKE),
         Map.entry(Block.WHITE_CANDLE, Block.WHITE_CANDLE_CAKE),
         Map.entry(Block.ORANGE_CANDLE, Block.ORANGE_CANDLE_CAKE),
@@ -38,7 +38,7 @@ public class CandlePlacementRule extends BlockPlacementRule {
         Map.entry(Block.GREEN_CANDLE, Block.GREEN_CANDLE_CAKE),
         Map.entry(Block.RED_CANDLE, Block.RED_CANDLE_CAKE),
         Map.entry(Block.BLACK_CANDLE, Block.BLACK_CANDLE_CAKE)
-    ));
+    );
 
     public static Map<Block, Block> getCakeVariants() {
         return CAKE_VARIANTS;

blocks/src/main/java/net/minestom/vanilla/blocks/placement/CoralPlacementRule.java

@@ -19,20 +19,19 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class CoralPlacementRule extends BlockPlacementRule {
-    private static final Map<Block, Block> WALL_CORALS = new HashMap<>();
 
-    static {
-        WALL_CORALS.put(Block.TUBE_CORAL_FAN, Block.TUBE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.BRAIN_CORAL_FAN, Block.BRAIN_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.BUBBLE_CORAL_FAN, Block.BUBBLE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.FIRE_CORAL_FAN, Block.FIRE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.HORN_CORAL_FAN, Block.HORN_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.DEAD_TUBE_CORAL_FAN, Block.DEAD_TUBE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.DEAD_BRAIN_CORAL_FAN, Block.DEAD_BRAIN_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.DEAD_BUBBLE_CORAL_FAN, Block.DEAD_BUBBLE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.DEAD_FIRE_CORAL_FAN, Block.DEAD_FIRE_CORAL_WALL_FAN);
-        WALL_CORALS.put(Block.DEAD_HORN_CORAL_FAN, Block.DEAD_HORN_CORAL_WALL_FAN);
-    }
+    private static final Map<Block, Block> WALL_CORALS = Map.of(
+        Block.TUBE_CORAL_FAN, Block.TUBE_CORAL_WALL_FAN,
+        Block.BRAIN_CORAL_FAN, Block.BRAIN_CORAL_WALL_FAN,
+        Block.BUBBLE_CORAL_FAN, Block.BUBBLE_CORAL_WALL_FAN,
+        Block.FIRE_CORAL_FAN, Block.FIRE_CORAL_WALL_FAN,
+        Block.HORN_CORAL_FAN, Block.HORN_CORAL_WALL_FAN,
+        Block.DEAD_TUBE_CORAL_FAN, Block.DEAD_TUBE_CORAL_WALL_FAN,
+        Block.DEAD_BRAIN_CORAL_FAN, Block.DEAD_BRAIN_CORAL_WALL_FAN,
+        Block.DEAD_BUBBLE_CORAL_FAN, Block.DEAD_BUBBLE_CORAL_WALL_FAN,
+        Block.DEAD_FIRE_CORAL_FAN, Block.DEAD_FIRE_CORAL_WALL_FAN,
+        Block.DEAD_HORN_CORAL_FAN, Block.DEAD_HORN_CORAL_WALL_FAN
+    );
 
     public CoralPlacementRule(Block block) {
         super(block);

blocks/src/main/java/net/minestom/vanilla/blocks/placement/FenceGatePlacementRule.java

@@ -1,12 +1,14 @@
 package net.minestom.vanilla.blocks.placement;
 
+import java.util.Set;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.instance.block.rule.BlockPlacementRule;
 import net.minestom.server.registry.RegistryTag;
 import net.minestom.server.registry.TagKey;
 import net.minestom.server.utils.Direction;
 import net.minestom.vanilla.common.utils.DirectionUtils;
+import net.minestom.vanilla.common.utils.TagHelper;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -18,11 +20,11 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class FenceGatePlacementRule extends BlockPlacementRule {
-    private final RegistryTag<Block> walls;
+    private final Set<Block> walls;
 
     public FenceGatePlacementRule(Block block) {
         super(block);
-        this.walls = Block.staticRegistry().getTag(TagKey.ofHash("#minecraft:walls"));
+        this.walls = TagHelper.getInstance().getHashed("#minecraft:walls");
     }
 
     @Override

blocks/src/main/java/net/minestom/vanilla/blocks/placement/FencePlacementRule.java

@@ -1,5 +1,6 @@
 package net.minestom.vanilla.blocks.placement;
 
+import java.util.Set;
 import net.kyori.adventure.key.Key;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.instance.block.Block;
@@ -8,6 +9,7 @@
 import net.minestom.server.utils.Direction;
 import net.minestom.vanilla.blocks.placement.common.AbstractConnectingBlockPlacementRule;
 import net.minestom.vanilla.blocks.placement.util.States;
+import net.minestom.vanilla.common.utils.TagHelper;
 
 /**
  * This file contains code ported from Kotlin to Java, adapted from the Blocks and Stuff project.
@@ -18,9 +20,10 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class FencePlacementRule extends AbstractConnectingBlockPlacementRule {
-    private final RegistryTag<Block> fences = tagManager.getTag(Key.key("minecraft:fences"));
-    private final RegistryTag<Block> woodenFences = tagManager.getTag(Key.key("minecraft:wooden_fences"));
-    private final RegistryTag<Block> fenceGates = tagManager.getTag(Key.key("minecraft:fence_gates"));
+
+    private final Set<Block> fences = TagHelper.getInstance().getTaggedWith("minecraft:fences");
+    private final Set<Block> woodenFences = TagHelper.getInstance().getTaggedWith("minecraft:wooden_fences");
+    private final Set<Block> fenceGates = TagHelper.getInstance().getTaggedWith("minecraft:fence_gates");
 
     public FencePlacementRule(Block block) {
         super(block);

blocks/src/main/java/net/minestom/vanilla/blocks/placement/GroundedPlantBlockPlacementRule.java

@@ -1,10 +1,12 @@
 package net.minestom.vanilla.blocks.placement;
 
+import java.util.Set;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.instance.block.rule.BlockPlacementRule;
 import net.minestom.server.registry.RegistryTag;
 import net.minestom.server.registry.TagKey;
 import net.minestom.vanilla.common.item.DroppedItemFactory;
+import net.minestom.vanilla.common.utils.TagHelper;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -16,11 +18,11 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class GroundedPlantBlockPlacementRule extends BlockPlacementRule {
-    private final RegistryTag<Block> dirtBlocks;
+    private final Set<Block> dirtBlocks;
 
     public GroundedPlantBlockPlacementRule(Block block) {
         super(block);
-        this.dirtBlocks = Block.staticRegistry().getTag(TagKey.ofHash("#minecraft:dirt"));
+        this.dirtBlocks = TagHelper.getInstance().getHashed("#minecraft:dirt");
     }
 
     @Override

blocks/src/main/java/net/minestom/vanilla/blocks/placement/HeadPlacementRule.java

@@ -19,16 +19,14 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class HeadPlacementRule extends BlockPlacementRule {
-    private static final Map<Block, Block> WALL_VARIANTS = new HashMap<>();
-
-    static {
-        WALL_VARIANTS.put(Block.PLAYER_HEAD, Block.PLAYER_WALL_HEAD);
-        WALL_VARIANTS.put(Block.SKELETON_SKULL, Block.SKELETON_WALL_SKULL);
-        WALL_VARIANTS.put(Block.WITHER_SKELETON_SKULL, Block.WITHER_SKELETON_WALL_SKULL);
-        WALL_VARIANTS.put(Block.ZOMBIE_HEAD, Block.ZOMBIE_WALL_HEAD);
-        WALL_VARIANTS.put(Block.CREEPER_HEAD, Block.CREEPER_WALL_HEAD);
-        WALL_VARIANTS.put(Block.DRAGON_HEAD, Block.DRAGON_WALL_HEAD);
-    }
+    private static final Map<Block, Block> WALL_VARIANTS = Map.of(
+        Block.PLAYER_HEAD, Block.PLAYER_WALL_HEAD,
+        Block.SKELETON_SKULL, Block.SKELETON_WALL_SKULL,
+        Block.WITHER_SKELETON_SKULL, Block.WITHER_SKELETON_WALL_SKULL,
+        Block.ZOMBIE_HEAD, Block.ZOMBIE_WALL_HEAD,
+        Block.CREEPER_HEAD, Block.CREEPER_WALL_HEAD,
+        Block.DRAGON_HEAD, Block.DRAGON_WALL_HEAD
+    );
 
     public HeadPlacementRule(Block block) {
         super(block);

blocks/src/main/java/net/minestom/vanilla/blocks/placement/SignPlacementRule.java

@@ -25,22 +25,21 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class SignPlacementRule extends BlockPlacementRule {
-    private static final Map<Block, Block> WALL_SIGNS = new HashMap<>();
-    private final RegistryTag<Block> wallSigns;
 
-    static {
-        WALL_SIGNS.put(Block.ACACIA_SIGN, Block.ACACIA_WALL_SIGN);
-        WALL_SIGNS.put(Block.BAMBOO_SIGN, Block.BAMBOO_WALL_SIGN);
-        WALL_SIGNS.put(Block.BIRCH_SIGN, Block.BIRCH_WALL_SIGN);
-        WALL_SIGNS.put(Block.CHERRY_SIGN, Block.CHERRY_WALL_SIGN);
-        WALL_SIGNS.put(Block.CRIMSON_SIGN, Block.CRIMSON_WALL_SIGN);
-        WALL_SIGNS.put(Block.DARK_OAK_SIGN, Block.DARK_OAK_WALL_SIGN);
-        WALL_SIGNS.put(Block.JUNGLE_SIGN, Block.JUNGLE_WALL_SIGN);
-        WALL_SIGNS.put(Block.MANGROVE_SIGN, Block.MANGROVE_WALL_SIGN);
-        WALL_SIGNS.put(Block.OAK_SIGN, Block.OAK_WALL_SIGN);
-        WALL_SIGNS.put(Block.SPRUCE_SIGN, Block.SPRUCE_WALL_SIGN);
-        WALL_SIGNS.put(Block.WARPED_SIGN, Block.WARPED_WALL_SIGN);
-    }
+    private static final Map<Block, Block> WALL_SIGNS = Map.ofEntries(
+        Map.entry(Block.ACACIA_SIGN, Block.ACACIA_WALL_SIGN),
+        Map.entry(Block.BAMBOO_SIGN, Block.BAMBOO_WALL_SIGN),
+        Map.entry(Block.BIRCH_SIGN, Block.BIRCH_WALL_SIGN),
+        Map.entry(Block.CHERRY_SIGN, Block.CHERRY_WALL_SIGN),
+        Map.entry(Block.CRIMSON_SIGN, Block.CRIMSON_WALL_SIGN),
+        Map.entry(Block.DARK_OAK_SIGN, Block.DARK_OAK_WALL_SIGN),
+        Map.entry(Block.JUNGLE_SIGN, Block.JUNGLE_WALL_SIGN),
+        Map.entry(Block.MANGROVE_SIGN, Block.MANGROVE_WALL_SIGN),
+        Map.entry(Block.OAK_SIGN, Block.OAK_WALL_SIGN),
+        Map.entry(Block.SPRUCE_SIGN, Block.SPRUCE_WALL_SIGN),
+        Map.entry(Block.WARPED_SIGN, Block.WARPED_WALL_SIGN)
+    );
+    private final RegistryTag<Block> wallSigns;
 
     public SignPlacementRule(Block block) {
         super(block);

blocks/src/main/java/net/minestom/vanilla/blocks/placement/SugarCanePlacementRule.java

@@ -9,6 +9,7 @@
 import net.minestom.server.registry.TagKey;
 import net.minestom.vanilla.common.item.DroppedItemFactory;
 import net.minestom.vanilla.common.utils.FluidUtils;
+import net.minestom.vanilla.common.utils.TagHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -24,22 +25,19 @@
  * Ported from Kotlin to Java and adapted for use in this project with modifications.
  */
 public class SugarCanePlacementRule extends BlockPlacementRule {
-    private final @NotNull Registry<Block> blockRegistry = Block.staticRegistry();
-
-    private final RegistryKey<Block> sand = blockRegistry.getKey(TagKey.ofHash("#minecraft:sand").key());
 
     private final RegistryTag<Block> plantable = RegistryTag.direct(
-      new ArrayList<>() {{
-          add(Block.DIRT);
-          add(Block.COARSE_DIRT);
-          add(Block.GRASS_BLOCK);
-          add(Block.ROOTED_DIRT);
-          add(Block.MUD);
-          add(Block.PODZOL);
-          add(Block.MYCELIUM);
-          add(Block.MOSS_BLOCK);
-          add(sand);
-      }}
+        new ArrayList<>() {{
+            add(Block.DIRT);
+            add(Block.COARSE_DIRT);
+            add(Block.GRASS_BLOCK);
+            add(Block.ROOTED_DIRT);
+            add(Block.MUD);
+            add(Block.PODZOL);
+            add(Block.MYCELIUM);
+            add(Block.MOSS_BLOCK);
+            addAll(TagHelper.getInstance().getHashed("#sand"));
+        }}
     );
 
     private static final Set<Map.Entry<Integer, Integer>> VON_NEUMANN = Set.of(

blocks/src/main/java/net/minestom/vanilla/blocks/placement/TorchPlacementRule.java

@@ -7,6 +7,7 @@
 import net.minestom.server.registry.RegistryTag;
 import net.minestom.vanilla.common.item.DroppedItemFactory;
 import net.minestom.vanilla.common.utils.BlockUtil;
+import net.minestom.vanilla.common.utils.TagHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -24,8 +25,8 @@ public class TorchPlacementRule extends BlockPlacementRule {
 
     private final RegistryTag<Block> nonFullButPlaceable = RegistryTag.direct(
         new ArrayList<>() {{
-            addAll(Block.values().stream().filter(it -> it.name().endsWith("_fence")).toList());
-            addAll(Block.values().stream().filter(it -> it.name().endsWith("_wall")).toList());
+            addAll(TagHelper.getInstance().getHashed("#fences"));
+            addAll(TagHelper.getInstance().getHashed("#walls"));
             addAll(BlockUtil.getGlassPanes());
         }}
     );

blocks/src/main/java/net/minestom/vanilla/blocks/placement/VerticalSlimBlockPlacementRule.java

@@ -24,7 +24,7 @@ public class VerticalSlimBlockPlacementRule extends AbstractConnectingBlockPlace
 
     private final RegistryTag<Block> canConnect = RegistryTag.direct(
         new ArrayList<>() {{
-            addAll(Block.values().stream().filter(it -> it.name().endsWith("_wall")).toList());
+            addAll(TagHelper.getInstance().getHashed("#walls"));
             addAll(BlockUtil.getGlassPanes());
         }}
     );