Add block drops and Material API support

UnknownSilicon · UnknownSilicon · commit 47d7ba2d0232 · 2026-04-17T16:30:31.000-04:00
I'm so so so sorry for the Java crimes I have caused to make this work.
Spigot/Paper, please stop making Material an Enum
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelBlockData.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelBlockData.java
@@ -0,0 +1,11 @@
+package parallelmc.parallelworlds;
+
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public record ParallelBlockData(@NotNull List<ItemStack> drops, @NotNull ParticleOptions particles) {
+    // TODO: Maybe replace this so you getDrops passing in an item, similar to base game
+}
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorlds.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorlds.java
@@ -19,6 +19,7 @@ public void onEnable() {
         super.onEnable();
 
         getServer().getPluginManager().registerEvents(new BlockBreakPlaceListener(), this);
+
     }
 
 
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorldsBootstrapper.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ParallelWorldsBootstrapper.java
@@ -37,11 +37,13 @@ public void bootstrap(BootstrapContext context) {
         register(registry, "polished_sandstone", Block::new,
                 BlockBehaviour.Properties.of().mapColor(MapColor.SAND).requiresCorrectToolForDrops().strength(0.8F).sound(SoundType.STONE),
                 Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 0),
+                Blocks.SANDSTONE.defaultBlockState(),
                 Component.literal("Polished Sandstone").setStyle(Style.EMPTY));
 
         register(registry, "quicksand", QuicksandBlock::new,
                 BlockBehaviour.Properties.of().mapColor(MapColor.SAND).strength(0.25F).sound(SoundType.SAND).dynamicShape().noOcclusion().isRedstoneConductor((blockState, blockGetter, blockPos) -> false),
                 Blocks.NOTE_BLOCK.getStateDefinition().any().setValue(NoteBlock.INSTRUMENT, NoteBlockInstrument.BANJO).setValue(NoteBlock.NOTE, 1),
+                Blocks.SAND.defaultBlockState(),
                 Component.literal("Quicksand").setStyle(Style.EMPTY));
 
         registry.freeze();
@@ -52,10 +54,12 @@ public JavaPlugin createPlugin(PluginProviderContext context) {
         return PluginBootstrap.super.createPlugin(context);
     }
 
-    private static void register(ParallelBlockRegistry registry, String name, Function<BlockBehaviour.Properties, Block> factory, BlockBehaviour.Properties properties, BlockState targetBlockstate, Component itemName) {
+    private static void register(ParallelBlockRegistry registry, String name,
+                                 Function<BlockBehaviour.Properties, Block> factory, BlockBehaviour.Properties properties,
+                                 BlockState targetBlockstate, BlockState particleState, Component itemName) {
         ResourceKey<Block> blockKey = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("parallelutils", name));
         Block block = factory.apply(properties.setId(blockKey));
-        registry.registerBlock(blockKey, block, targetBlockstate, itemName);
+        registry.registerBlock(blockKey, block, targetBlockstate, particleState, itemName);
     }
 
 
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/ReflectionHelper.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/ReflectionHelper.java
@@ -1,8 +1,14 @@
 package parallelmc.parallelworlds;
 
 import org.jetbrains.annotations.Nullable;
+import sun.misc.Unsafe;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 
 public class ReflectionHelper {
 
@@ -23,4 +29,59 @@ public static <T, U> U getPrivateField(String fieldName, Class<T> clazz, T objec
             return null;
         }
     }
+
+    /*
+    Jank Enum code from https://notes.highlysuspect.agency/blog/enum_reflection/
+     */
+    @SafeVarargs
+    private static <T> T[] concat(Class<T> t, T[] a, T... b) {
+        T[] result = (T[]) Array.newInstance(t, a.length + b.length); //i love java
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+
+//    private static Field definalizeField(Field f) throws Throwable {
+//        f.setAccessible(true);
+//
+//        Field modifiersField = Field.class.getDeclaredField("modifiers");
+//        modifiersField.setAccessible(true);
+//        modifiersField.set(f, (f.getModifiers() | Modifier.PUBLIC) & ~(Modifier.FINAL | Modifier.PRIVATE | Modifier.PROTECTED));
+//        return f;
+//    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Enum<T>> T makeEnum(Class<T> clazz, String name, int ord, Class<?>[] argTypes, Object... argValues) throws Throwable {
+        //prepend the (String, int) arguments and find the constructor
+        argTypes = concat(Class.class, new Class<?>[]{String.class, int.class}, argTypes);
+        argValues = concat(Object.class, new Object[]{name, ord}, argValues);
+
+        //find the constructor
+        Constructor<T> cons = clazz.getDeclaredConstructor(argTypes);
+        cons.setAccessible(true);
+        MethodHandle consHandle = MethodHandles.lookup().unreflectConstructor(cons);
+
+        //instantiate the enum (!!!)
+        T result = (T) consHandle.invokeWithArguments(argValues);
+
+//        //append to Enum.$VALUES
+//        Field valuesField = definalizeField(clazz.getDeclaredField("$VALUES")); //hmm...
+//        valuesField.set(null, concat(clazz, (T[]) valuesField.get(null), result));
+
+        //fix up the caches in Class
+//        Field enumConstantsField = Class.class.getDeclaredField("enumConstants");
+//        enumConstantsField.setAccessible(true);
+//        enumConstantsField.set(clazz, null);
+//        Field enumConstantDirectoryField = Class.class.getDeclaredField("enumConstantDirectory");
+//        enumConstantDirectoryField.setAccessible(true);
+//        enumConstantDirectoryField.set(clazz, null);
+        Field uField = Unsafe.class.getDeclaredField("theUnsafe");
+        uField.setAccessible(true);
+        Unsafe unsafe = (Unsafe) uField.get(null);
+
+        unsafe.putObject(clazz, unsafe.objectFieldOffset(Class.class.getDeclaredField("enumConstants")), null);
+        unsafe.putObject(clazz, unsafe.objectFieldOffset(Class.class.getDeclaredField("enumConstantDirectory")), null);
+
+        return result;
+    }
 }
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockBreakPlaceListener.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockBreakPlaceListener.java
@@ -4,6 +4,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.GameMode;
 import org.bukkit.block.data.BlockData;
@@ -14,9 +15,12 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import parallelmc.parallelworlds.ParallelBlockData;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
 
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class BlockBreakPlaceListener implements Listener {
 
@@ -28,26 +32,32 @@ public BlockBreakPlaceListener() {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void handleBlockBreak(BlockBreakEvent event) {
-        if (event.getPlayer().getGameMode() == GameMode.CREATIVE) return;
         CraftBlock cb = (CraftBlock)event.getBlock();
 
         BlockState blockState = cb.getNMS();
 
         int id = Block.getId(blockState);
 
-        List<ItemStack> drops = blockRegistry.getDrops(id);
+        ParallelBlockData blockData = blockRegistry.getBlockData(id);
+
+        if (blockData == null) return;
+
+        event.setDropItems(false);
+
+        ServerLevel level = cb.getCraftWorld().getHandle();
+        BlockPos pos = cb.getPosition();
 
-        if (drops != null) {
-            // This is a registered Parallel Block
-            event.setDropItems(false); // Stop normal drops
 
-            ServerLevel level = cb.getCraftWorld().getHandle();
-            BlockPos pos = cb.getPosition();
+        if (event.getPlayer().getGameMode() == GameMode.CREATIVE) return;
+
+        // TODO: Need special cases for silk touch, etc.
 
-            for (ItemStack item : drops) {
-                Block.popResource(level, pos, item);
-            }
+        List<ItemStack> drops = blockData.drops();
+
+        for (ItemStack item : drops) {
+            Block.popResource(level, pos, item);
         }
+
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockPacketListener.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockPacketListener.java
@@ -14,6 +14,7 @@
 import com.github.retrooper.packetevents.protocol.world.chunk.palette.SingletonPalette;
 import com.github.retrooper.packetevents.util.Vector3i;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerBlockPlacement;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
 import com.github.retrooper.packetevents.wrapper.play.server.*;
 import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import net.minecraft.world.level.block.Block;
@@ -58,6 +59,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
     public void onPacketSend(PacketSendEvent event) {
 
         PacketTypeCommon type = event.getPacketType();
+
         
         if (type == PacketType.Play.Server.CHUNK_DATA || type == PacketType.Play.Server.MAP_CHUNK_BULK) {
 
@@ -201,13 +203,14 @@ public void onPacketSend(PacketSendEvent event) {
             WrapperPlayServerDeclareCommands packet = new WrapperPlayServerDeclareCommands(event);
 
             packet.getNodes();
+            
+        } else if (type != PacketType.Play.Server.ENTITY_HEAD_LOOK &&
+                type != PacketType.Play.Server.ENTITY_RELATIVE_MOVE &&
+                type != PacketType.Play.Server.ENTITY_RELATIVE_MOVE_AND_ROTATION &&
+        type != PacketType.Play.Server.ENTITY_VELOCITY &&
+        type != PacketType.Play.Server.ENTITY_POSITION_SYNC){
+            //Logger.getGlobal().log(Level.WARNING, type.getName());
         }
-//        } else if (type != PacketType.Play.Server.ENTITY_HEAD_LOOK &&
-//                type != PacketType.Play.Server.ENTITY_RELATIVE_MOVE &&
-//                type != PacketType.Play.Server.ENTITY_RELATIVE_MOVE_AND_ROTATION &&
-//        type != PacketType.Play.Server.ENTITY_VELOCITY){
-//            Logger.getGlobal().log(Level.WARNING, type.getName());
-//        }
     }
 
 
diff --git a/parallelworlds/src/main/java/parallelmc/parallelworlds/registry/ParallelBlockRegistry.java b/parallelworlds/src/main/java/parallelmc/parallelworlds/registry/ParallelBlockRegistry.java
@@ -4,6 +4,9 @@
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.component.TypedDataComponent;
+import net.minecraft.core.particles.BlockParticleOption;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
@@ -15,8 +18,12 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.functions.*;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.block.CraftBlock;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import parallelmc.parallelworlds.ParallelBlockData;
+import parallelmc.parallelworlds.ReflectionHelper;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -36,8 +43,10 @@ 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 final HashMap<Integer, ParallelBlockData> blockDataMap;
     private final HashMap<Integer, BlockState> placeMap;
+    private int nextMaterialIndex = Material.values().length;
+    private final Map<String, Material> BY_NAME;
 
     private boolean frozen = false;
     
@@ -50,13 +59,15 @@ private ParallelBlockRegistry() throws RuntimeException, NoSuchMethodException {
 
         blockRegistry = getWritableRegistry(Registries.BLOCK);
 
+        BY_NAME = getPrivateField("BY_NAME", Material.class, null, Map.class);
+
         if (blockRegistry == null) {
             throw new RuntimeException("Cannot find block registry");
         }
 
         stateMap = new HashMap<>();
         availableStates = new HashMap<>();
-        dropMap = new HashMap<>();
+        blockDataMap = new HashMap<>();
         placeMap = new HashMap<>();
 
         // TODO: Fill available states
@@ -75,7 +86,6 @@ private void addFullBlock(Block block) {
 
             availableStates.put(state, Block.BLOCK_STATE_REGISTRY.getId(state));
         }
-
     }
 
     public static ParallelBlockRegistry getInstance() {
@@ -116,22 +126,34 @@ public void freeze() {
         return null;
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, Component name) {
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, BlockState particleState, Component name) {
         ItemStack stack = Items.BARRIER.getDefaultInstance();
 
         stack.applyComponentsAndValidate(
                 DataComponentPatch.builder()
                         .set(TypedDataComponent.createUnchecked(DataComponents.ITEM_MODEL, key.identifier()))
                         .set(TypedDataComponent.createUnchecked(DataComponents.ITEM_NAME, name)).build());
 
-        return registerBlock(key, block, targetBlockstate, List.of(stack), stack);
+        return registerBlock(key, block, targetBlockstate, List.of(stack), new BlockParticleOption(ParticleTypes.BLOCK, particleState),stack);
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> item, ItemStack placeBlock) {
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> drops, ParticleOptions particle, ItemStack placeBlock) {
         if (frozen) return false;
 
         if (!availableStates.containsKey(targetBlockstate)) throw new IllegalStateException("Block state is already used or does not exist");
 
+        try {
+            Material newMat = ReflectionHelper.makeEnum(Material.class,
+                    key.identifier().getPath().toUpperCase(Locale.ROOT), nextMaterialIndex++, new Class[]{int.class}, -1);
+
+            BY_NAME.put(newMat.name(), newMat);
+
+        } catch (Throwable t) {
+            Logger.getGlobal().log(Level.SEVERE, "Unable to create new Material!");
+            t.printStackTrace();
+
+        }
+
         Holder.Reference<Block> registeredBlock = blockRegistry.register(key, block, RegistrationInfo.BUILT_IN);
 
         // TODO: This technically doesn't work since several blockstates are mapped to a single one, but it's easier for now
@@ -140,7 +162,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);
+            blockDataMap.put(Block.BLOCK_STATE_REGISTRY.size(), new ParallelBlockData(drops, particle));
             placeMap.put(ItemStack.hashItemAndComponents(placeBlock), blockState);
 
             Block.BLOCK_STATE_REGISTRY.add(blockState);
@@ -161,8 +183,8 @@ public Integer getMappedState(int state) {
     }
 
     @Nullable
-    public List<ItemStack> getDrops(int state) {
-        return dropMap.get(state);
+    public ParallelBlockData getBlockData(int state) {
+        return blockDataMap.get(state);
     }
 
     @Nullable

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public void onEnable() {`
`19`	`19`	`super.onEnable();`
`20`	`20`
`21`	`21`	`getServer().getPluginManager().registerEvents(new BlockBreakPlaceListener(), this);`
	`22`	`+`
`22`	`23`	`}`
`23`	`24`
`24`	`25`