Revert "Adjust code to auto assign blockstates based on requested type"

This reverts commit 80ffd45.

Author: UnknownSilicon

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

@@ -19,6 +19,7 @@
 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;
@@ -34,17 +35,14 @@ public void bootstrap(BootstrapContext context) {
         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),
-                ParallelBlockRegistry.BlockType.FULL_BLOCK,
+                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),
-                ParallelBlockRegistry.BlockType.FULL_BLOCK,
+                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));
 
@@ -58,10 +56,10 @@ public JavaPlugin createPlugin(PluginProviderContext context) {
 
     private static void register(ParallelBlockRegistry registry, String name,
                                  Function<BlockBehaviour.Properties, Block> factory, BlockBehaviour.Properties properties,
-                                 ParallelBlockRegistry.BlockType targetType, BlockState particleState, Component itemName) {
+                                 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, targetType, particleState, itemName);
+        registry.registerBlock(blockKey, block, targetBlockstate, particleState, itemName);
     }
 
 

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

@@ -41,8 +41,9 @@ public class ParallelBlockRegistry {
     private final WritableRegistry<Block> blockRegistry;
     private final HashMap<Integer, Integer> stateMap;
 
-    // By type of custom block, a queue of each available ID for the register functions to consume
-    private final HashMap<BlockType, Queue<Integer>> availableStates;
+    // NOTE: If the resource pack can be automatically generated and served
+    // 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, ParallelBlockData> blockDataMap;
     private final HashMap<Integer, BlockState> placeMap;
@@ -72,32 +73,20 @@ private ParallelBlockRegistry() throws RuntimeException, NoSuchMethodException {
         placeMap = new HashMap<>();
 
         // TODO: Fill available states
-        addFullBlock(Blocks.NOTE_BLOCK, BlockType.FULL_BLOCK);
-        addFullBlock(Blocks.SCULK_SENSOR, BlockType.TRANSPARENT_SLAB);
-        addFullBlock(Blocks.CALIBRATED_SCULK_SENSOR, BlockType.TRANSPARENT_SLAB);
+        addFullBlock(Blocks.NOTE_BLOCK);
+        addFullBlock(Blocks.SCULK_SENSOR);
+        addFullBlock(Blocks.CALIBRATED_SCULK_SENSOR);
 
     }
 
-    private void addFullBlock(Block block, BlockType type) {
-
-        Queue<Integer> queue;
-
-        if (!availableStates.containsKey(type)) {
-            // Create new queue if it doesn't exist, and set its initial size for a slight efficiency boost
-            queue = new ArrayDeque<>(block.getStateDefinition().getPossibleStates().size());
-            availableStates.put(type, queue);
-        } else {
-            queue = availableStates.get(type);
-        }
+    private void addFullBlock(Block block) {
 
         for (BlockState state : block.getStateDefinition().getPossibleStates()) {
             if (state.equals(block.defaultBlockState())) continue; // This is the one actually used for rendering
 
-            int stateId = Block.BLOCK_STATE_REGISTRY.getId(state);
+            if (availableStates.containsKey(state)) throw new IllegalStateException("Cannot add state that already exists");
 
-            if (queue.contains(stateId)) throw new IllegalStateException("Cannot add state that already exists");
-
-            queue.add(stateId);
+            availableStates.put(state, Block.BLOCK_STATE_REGISTRY.getId(state));
         }
     }
 
@@ -128,8 +117,7 @@ public void freeze() {
         MappedRegistry<@NotNull WritableRegistry<?>> writable_registry = (MappedRegistry<WritableRegistry<?>>) getPrivateField("WRITABLE_REGISTRY", BuiltInRegistries.class, null, WritableRegistry.class);
 
         // Search registry byValue (since byKey doesn't work for whatever reason...)
-        Map<WritableRegistry<?>, Holder.Reference<@NotNull WritableRegistry<?>>> byValue =
-                getPrivateField("byValue", MappedRegistry.class, writable_registry, Map.class);
+        Map<WritableRegistry<?>, Holder.Reference<@NotNull WritableRegistry<?>>> byValue = getPrivateField("byValue", MappedRegistry.class, writable_registry, Map.class);
 
         for (WritableRegistry i : byValue.keySet()) {
             if (String.valueOf(i.key().identifier()).equals(String.valueOf(registryKey.identifier()))) {
@@ -140,30 +128,21 @@ public void freeze() {
         return null;
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockType targetType,
-                                 BlockState particleState, 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, targetType, List.of(stack), new BlockParticleOption(ParticleTypes.BLOCK, particleState),stack);
+        return registerBlock(key, block, targetBlockstate, List.of(stack), new BlockParticleOption(ParticleTypes.BLOCK, particleState),stack);
     }
 
-    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockType targetType, List<ItemStack> drops, ParticleOptions particle, ItemStack placeBlock) {
+    public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, BlockState targetBlockstate, List<ItemStack> drops, ParticleOptions particle, ItemStack placeBlock) {
         if (frozen) return false;
 
-        Queue<Integer> blockQueue = availableStates.get(targetType);
-        if (blockQueue == null) {
-            throw new IllegalStateException("No BlockState of requested type is registered");
-        }
-
-        Integer nextState = blockQueue.poll();
-        if (nextState == null) {
-            throw new IllegalStateException("No remaining BlockState of requested type");
-        }
+        if (!availableStates.containsKey(targetBlockstate)) throw new IllegalStateException("Block state is already used or does not exist");
 
         try {
             Material newMat = ReflectionHelper.makeEnum(Material.class,
@@ -176,15 +155,17 @@ public boolean registerBlock(ResourceKey<@NotNull Block> key, Block block, Block
         } catch (Throwable t) {
             Logger.getGlobal().log(Level.SEVERE, "Unable to create new Material!");
             t.printStackTrace();
-            throw new IllegalStateException();
+
         }
 
         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
         for (BlockState blockState : registeredBlock.value().getStateDefinition().getPossibleStates()) {
 
-            stateMap.put(Block.BLOCK_STATE_REGISTRY.size(), nextState); // Map the new block state to an unused state
+            Integer stateId = availableStates.remove(targetBlockstate);
+
+            stateMap.put(Block.BLOCK_STATE_REGISTRY.size(), stateId); // Map the new block state to an unused state
             blockDataMap.put(Block.BLOCK_STATE_REGISTRY.size(), new ParallelBlockData(drops, particle));
             placeMap.put(ItemStack.hashItemAndComponents(placeBlock), blockState);
 
@@ -214,13 +195,4 @@ public ParallelBlockData getBlockData(int state) {
     public BlockState getBlockState(@NotNull ItemStack item) {
         return placeMap.get(ItemStack.hashItemAndComponents(item));
     }
-
-    public enum BlockType {
-        FULL_BLOCK,
-        TRANSPARENT_BLOCK,
-        TRANSPARENT_BLOCK_WATERLOGGED,
-        BIOME_TRANSPARENT_BLOCK,
-        TRANSPARENT_SLAB,
-
-    }
 }