Add polished sandstone and simplify registering

Author: UnknownSilicon

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

@@ -6,20 +6,24 @@
 import net.minecraft.core.*;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 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.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import org.bukkit.plugin.java.JavaPlugin;
 import parallelmc.parallelworlds.blocks.QuicksandBlock;
 import parallelmc.parallelworlds.blocks.TestBlock;
 import parallelmc.parallelworlds.registry.ParallelBlockRegistry;
 
+import java.util.function.Function;
+
 
 public class ParallelWorldsBootstrapper implements PluginBootstrap {
 
@@ -28,11 +32,17 @@ public void bootstrap(BootstrapContext context) {
 
         ParallelBlockRegistry registry = ParallelBlockRegistry.getInstance();
 
-        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"));
+        if (registry == null) throw new RuntimeException("ParallelBlockRegistry is null!");
+
+        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),
+                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),
+                Component.literal("Quicksand").setStyle(Style.EMPTY));
 
         registry.freeze();
     }
@@ -42,6 +52,11 @@ 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) {
+        ResourceKey<Block> blockKey = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("parallelutils", name));
+        Block block = factory.apply(properties.setId(blockKey));
+        registry.registerBlock(blockKey, block, targetBlockstate, itemName);
+    }
 
 
 }

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

@@ -5,6 +5,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.GameMode;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -27,6 +28,7 @@ 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();

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

@@ -62,6 +62,7 @@ private ParallelBlockRegistry() throws RuntimeException, NoSuchMethodException {
         // TODO: Fill available states
         addFullBlock(Blocks.NOTE_BLOCK);
         addFullBlock(Blocks.SCULK_SENSOR);
+        addFullBlock(Blocks.CALIBRATED_SCULK_SENSOR);
 
     }