Clean up/implement item drop API

UnknownSilicon · UnknownSilicon · commit d67d055b9e20 · 2026-01-25T15:30:13.000-05:00
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorlds.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorlds.java
@@ -4,19 +4,21 @@
 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.registry.ParallelBlockRegistry;
 
 public final class ParallelWorlds extends JavaPlugin {
 
     @Override
     public void onLoad() {
-
         PacketEvents.getAPI().getEventManager().registerListener(new BlockPacketListener(ParallelBlockRegistry.getFirstCustomId()), PacketListenerPriority.HIGHEST);
     }
 
     @Override
     public void onEnable() {
         super.onEnable();
+
+        getServer().getPluginManager().registerEvents(new BreakBlockListener(), this);
     }
 
 
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorldsBootstrapper.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorldsBootstrapper.java
@@ -5,6 +5,7 @@
 import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
 import net.minecraft.core.*;
 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.level.block.Block;
@@ -19,6 +20,7 @@
 import parallelmc.parallelworlds.blocks.TestBlock;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
 
+
 public class ParallelWorldsBootstrapper implements PluginBootstrap {
 
     @Override
@@ -28,13 +30,14 @@ public void bootstrap(BootstrapContext context) {
 
         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));
+        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));
-
+        registry.registerBlock(quicksandKey, quicksandBlock,
+                Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 1), Component.literal("Quicksand"), 10002);
 
         registry.freeze();
     }
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/blocks/TestBlock.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/blocks/TestBlock.java
@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SandBlock;
 
 public class TestBlock extends Block {
     public static final MapCodec<TestBlock> CODEC = simpleCodec(TestBlock::new);
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockPacketListener.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockPacketListener.java
@@ -34,7 +34,7 @@ public class BlockPacketListener implements PacketListener {
 
     public BlockPacketListener(int firstCustomId) {
         this.firstCustomId = firstCustomId;
-        this.defaultReplaceState = Block.BLOCK_STATE_REGISTRY.getId(Blocks.NOTE_BLOCK.defaultBlockState());;
+        this.defaultReplaceState = Block.BLOCK_STATE_REGISTRY.getId(Blocks.NOTE_BLOCK.defaultBlockState());
         this.registry = ParallelBlockRegistry.getInstance();
     }
 
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BreakBlockListener.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BreakBlockListener.java
@@ -1,24 +1,51 @@
 package parallelmc.parallelworlds.events;
 
+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.craftbukkit.block.CraftBlock;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
+import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
+
+import java.util.List;
 
 public class BreakBlockListener implements Listener {
 
+    private final ParallelBlockRegistry blockRegistry;
+
+    public BreakBlockListener() {
+        blockRegistry = ParallelBlockRegistry.getInstance();
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST)
     public void handleBlockBreak(BlockBreakEvent event) {
         CraftBlock cb = (CraftBlock)event.getBlock();
 
-
         BlockState blockState = cb.getNMS();
 
         int id = Block.getId(blockState);
+
+        List<ItemStack> drops = blockRegistry.getDrops(id);
+
+        if (drops != null) {
+            // This is a registered Parallel Block
+            event.setDropItems(false); // Stop normal drops
+
+            ServerLevel level = cb.getCraftWorld().getHandle();
+            BlockPos pos = cb.getPosition();
+
+            for (ItemStack item : drops) {
+                Block.popResource(level, pos, item);
+            }
+        }
     }
 }
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/registry/ParallelBlockRegistry.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/registry/ParallelBlockRegistry.java
@@ -1,21 +1,24 @@
 package parallelmc.parallelworlds.registry;
 
 import net.minecraft.core.*;
+import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.component.TypedDataComponent;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
 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.NoteBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
+import net.minecraft.world.level.storage.loot.functions.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayDeque;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Queue;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,9 +36,11 @@ public class ParallelBlockRegistry {
     // this can be converted into map of BlockType -> Queue<Integer> since we can choose values entirely server side
     private final HashMap<BlockState, Integer> availableStates;
 
+    private final HashMap<Integer, List<ItemStack>> dropMap;
+
     private boolean frozen = false;
     
-    private ParallelBlockRegistry() throws RuntimeException {
+    private ParallelBlockRegistry() throws RuntimeException, NoSuchMethodException {
         // This is a ridiculous hack to force internal blocks to register first
         Block dummy = Blocks.DIRT;
         Logger.getGlobal().log(Level.INFO, dummy.toString());
@@ -50,6 +55,7 @@ private ParallelBlockRegistry() throws RuntimeException {
 
         stateMap = new HashMap<>();
         availableStates = new HashMap<>();
+        dropMap = new HashMap<>();
 
         // TODO: Fill available states
         for (BlockState state : Blocks.NOTE_BLOCK.getStateDefinition().getPossibleStates()) {
@@ -69,7 +75,12 @@ private void addFullBlock(BlockState state) {
 
     public static ParallelBlockRegistry getInstance() {
         if (instance == null) {
-            instance = new ParallelBlockRegistry();
+            try {
+                instance = new ParallelBlockRegistry();
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+                return null;
+            }
         }
 
         return instance;
@@ -100,7 +111,18 @@ public void freeze() {
         return null;
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate) {
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, Component name, float customModelData) {
+        ItemStack stack = Items.PAPER.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_NAME, name)).build());
+
+        return registerBlock(key, block, targetBlockstate, List.of(stack));
+    }
+
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> item) {
         if (frozen) return false;
 
         if (!availableStates.containsKey(targetBlockstate)) throw new IllegalStateException("Block state is already used or does not exist");
@@ -113,6 +135,7 @@ public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, Block
             Integer stateId = availableStates.remove(targetBlockstate);
 
             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);
 
             Block.BLOCK_STATE_REGISTRY.add(blockState);
 
@@ -130,4 +153,9 @@ public static int getFirstCustomId() {
     public Integer getMappedState(int state) {
         return stateMap.get(state);
     }
+
+    @Nullable
+    public List<ItemStack> getDrops(int state) {
+        return dropMap.get(state);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class BlockPacketListener implements PacketListener {`
`34`	`34`
`35`	`35`	`public BlockPacketListener(int firstCustomId) {`
`36`	`36`	`this.firstCustomId = firstCustomId;`
`37`		`- this.defaultReplaceState = Block.BLOCK_STATE_REGISTRY.getId(Blocks.NOTE_BLOCK.defaultBlockState());;`
	`37`	`+ this.defaultReplaceState = Block.BLOCK_STATE_REGISTRY.getId(Blocks.NOTE_BLOCK.defaultBlockState());`
`38`	`38`	`this.registry = ParallelBlockRegistry.getInstance();`
`39`	`39`	`}`
`40`	`40`