Place blocks

Author: UnknownSilicon

parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorlds.java

@@ -4,7 +4,7 @@
 import com.github.retrooper.packetevents.event.PacketListenerPriority;
 import org.bukkit.plugin.java.JavaPlugin;
 import parallelmc.parallelworlds.events.BlockPacketListener;
-import parallelmc.parallelworlds.events.BreakBlockListener;
+import parallelmc.parallelworlds.events.BlockBreakPlaceListener;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
 
 public final class ParallelWorlds extends JavaPlugin {
@@ -18,7 +18,7 @@ public void onLoad() {
     public void onEnable() {
         super.onEnable();
 
-        getServer().getPluginManager().registerEvents(new BreakBlockListener(), this);
+        getServer().getPluginManager().registerEvents(new BlockBreakPlaceListener(), this);
     }
 
 

parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorldsBootstrapper.java

@@ -28,16 +28,11 @@ public void bootstrap(BootstrapContext context) {
 
         ParallelBlockRegistry registry = ParallelBlockRegistry.getInstance();
 
-        ResourceKey<Block> testBlockKey = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("parallelutils", "testblock"));
-        Block testBlock = new TestBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(0.5f).sound(SoundType.AMETHYST).setId(testBlockKey));
-        registry.registerBlock(testBlockKey, testBlock,
-                Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 0), Component.literal("Test Block"), 10001);
-
         ResourceKey<Block> quicksandKey = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("parallelutils", "quicksand"));
         Block quicksandBlock = new QuicksandBlock(BlockBehaviour.Properties.of().mapColor(MapColor.SAND).strength(0.25F).sound(SoundType.SAND)
                 .dynamicShape().noOcclusion().isRedstoneConductor((blockState, blockGetter, blockPos) -> false).setId(quicksandKey));
         registry.registerBlock(quicksandKey, quicksandBlock,
-                Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 1), Component.literal("Quicksand"), 10002);
+                Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 1), Component.literal("Quicksand"));
 
         registry.freeze();
     }

…lelworlds/events/BreakBlockListener.java …rlds/events/BlockBreakPlaceListener.javaparallelworlds/src/main/java/parallelmc/parallelworlds/events/BreakBlockListener.java renamed to parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockBreakPlaceListener.java parallelworlds/src/main/java/parallelmc/parallelworlds/events/BreakBlockListener.java renamed to parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockBreakPlaceListener.java

@@ -3,26 +3,25 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ScaffoldingBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
 
 import java.util.List;
 
-public class BreakBlockListener implements Listener {
+public class BlockBreakPlaceListener implements Listener {
 
     private final ParallelBlockRegistry blockRegistry;
 
-    public BreakBlockListener() {
+    public BlockBreakPlaceListener() {
         blockRegistry = ParallelBlockRegistry.getInstance();
     }
 
@@ -48,4 +47,14 @@ public void handleBlockBreak(BlockBreakEvent event) {
             }
         }
     }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void handleBlockPlace(BlockPlaceEvent event) {
+
+        BlockState state = blockRegistry.getBlockState(ItemStack.fromBukkitCopy(event.getItemInHand()));
+
+        if (state != null) {
+            event.getBlock().setBlockData(state.createCraftBlockData());
+        }
+    }
 }

parallelworlds/src/main/java/parallelmc/parallelworlds/registry/ParallelBlockRegistry.java

@@ -7,10 +7,10 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.component.CustomModelData;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
@@ -37,6 +37,7 @@ public class ParallelBlockRegistry {
     private final HashMap<BlockState, Integer> availableStates;
 
     private final HashMap<Integer, List<ItemStack>> dropMap;
+    private final HashMap<Integer, BlockState> placeMap;
 
     private boolean frozen = false;
 
@@ -56,6 +57,7 @@ private ParallelBlockRegistry() throws RuntimeException, NoSuchMethodException {
         stateMap = new HashMap<>();
         availableStates = new HashMap<>();
         dropMap = new HashMap<>();
+        placeMap = new HashMap<>();
 
         // TODO: Fill available states
         for (BlockState state : Blocks.NOTE_BLOCK.getStateDefinition().getPossibleStates()) {
@@ -111,18 +113,18 @@ public void freeze() {
         return null;
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, Component name, float customModelData) {
-        ItemStack stack = Items.PAPER.getDefaultInstance();
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, Component name) {
+        ItemStack stack = Items.DIRT.getDefaultInstance();
 
         stack.applyComponentsAndValidate(
                 DataComponentPatch.builder()
-                        .set(TypedDataComponent.createUnchecked(DataComponents.CUSTOM_MODEL_DATA, new CustomModelData(List.of(customModelData), List.of(), List.of(), List.of())))
+                        .set(TypedDataComponent.createUnchecked(DataComponents.ITEM_MODEL, Identifier.fromNamespaceAndPath("minecraft", "sand")))
                         .set(TypedDataComponent.createUnchecked(DataComponents.ITEM_NAME, name)).build());
 
-        return registerBlock(key, block, targetBlockstate, List.of(stack));
+        return registerBlock(key, block, targetBlockstate, List.of(stack), stack);
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> item) {
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> item, ItemStack placeBlock) {
         if (frozen) return false;
 
         if (!availableStates.containsKey(targetBlockstate)) throw new IllegalStateException("Block state is already used or does not exist");
@@ -136,6 +138,7 @@ public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, Block
 
             stateMap.put(Block.BLOCK_STATE_REGISTRY.size(), stateId); // Map the new block state to an unused state
             dropMap.put(Block.BLOCK_STATE_REGISTRY.size(), item);
+            placeMap.put(ItemStack.hashItemAndComponents(placeBlock), blockState);
 
             Block.BLOCK_STATE_REGISTRY.add(blockState);
 
@@ -158,4 +161,9 @@ public Integer getMappedState(int state) {
     public List<ItemStack> getDrops(int state) {
         return dropMap.get(state);
     }
+
+    @Nullable
+    public BlockState getBlockState(@NotNull ItemStack item) {
+        return placeMap.get(ItemStack.hashItemAndComponents(item));
+    }
 }