Add Material API support and fix edge cases for CoreProtect

Author: UnknownSilicon

parallelworlds/src/main/java/parallelmc/parallelworlds/ReflectionHelper.java

@@ -30,6 +30,20 @@ public static <T, U> U getPrivateField(String fieldName, Class<T> clazz, T objec
         }
     }
 
+    public static <T> void setPrivateField(String fieldName, Class<T> clazz, T object, Object fieldVal) throws ClassCastException{
+        Field field;
+
+        try {
+            field = clazz.getDeclaredField(fieldName);
+
+            field.setAccessible(true);
+
+            field.set(object, fieldVal);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
     /*
     Jank Enum code from https://notes.highlysuspect.agency/blog/enum_reflection/
      */

parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockBreakPlaceListener.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;

parallelworlds/src/main/java/parallelmc/parallelworlds/events/BlockPacketListener.java

@@ -20,6 +20,7 @@
 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.Server;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import parallelmc.parallelworlds.ParallelWorldsBootstrapper;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
@@ -179,6 +180,29 @@ public void onPacketSend(PacketSendEvent event) {
             event.markForReEncode(true);
 
             //Logger.getGlobal().log(Level.WARNING, String.valueOf(packet.getBlockId()));
+        } else if (type == PacketType.Play.Server.MULTI_BLOCK_CHANGE) {
+            WrapperPlayServerMultiBlockChange packet = new WrapperPlayServerMultiBlockChange(event);
+
+            for (WrapperPlayServerMultiBlockChange.EncodedBlock block : packet.getBlocks()) {
+                int id = block.getBlockId();
+
+                Integer replace_state;
+                if (id >= firstCustomId) {
+                    replace_state = registry.getMappedState(id);
+                    if (replace_state == null) {
+                        replace_state = defaultReplaceState;
+                        Logger.getGlobal().log(Level.WARNING, "Could not find mapping for id" + id);
+                    }
+                } else if (id >= noteblockStart && id <= noteblockEnd) {
+                    replace_state = noteblockStart;
+                } else {
+                    continue;
+                }
+
+                block.setBlockId(replace_state);
+                event.markForReEncode(true);
+            }
+            
         } else if (type == PacketType.Play.Server.BLOCK_ACTION) {
             WrapperPlayServerBlockAction packet = new WrapperPlayServerBlockAction(event);
 
@@ -192,6 +216,7 @@ public void onPacketSend(PacketSendEvent event) {
                 return;
             }
 
+
             if (replace_state == null) {
                 replace_state = defaultReplaceState;
                 Logger.getGlobal().log(Level.WARNING, "Could not find mapping for id" + id);
@@ -203,7 +228,7 @@ 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 &&

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

@@ -19,6 +19,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.functions.*;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,6 +31,7 @@
 import java.util.logging.Logger;
 
 import static parallelmc.parallelworlds.ReflectionHelper.getPrivateField;
+import static parallelmc.parallelworlds.ReflectionHelper.setPrivateField;
 
 public class ParallelBlockRegistry {
 
@@ -146,6 +148,8 @@ public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, Block
             Material newMat = ReflectionHelper.makeEnum(Material.class,
                     key.identifier().getPath().toUpperCase(Locale.ROOT), nextMaterialIndex++, new Class[]{int.class}, -1);
 
+            setPrivateField("key", Material.class, newMat, new NamespacedKey(key.identifier().getNamespace(), key.identifier().getPath()));
+
             BY_NAME.put(newMat.name(), newMat);
 
         } catch (Throwable t) {