Fixed #210

Author: mineLdiver

src/test/resources/data/minecraft/stationapi/tags/blocks/mineable/pickaxe.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "sltest:test_block"
+    "sltest:test_block",
+    "sltest:variation_block"
   ]
 }

station-flattening-v0/src/main/java/net/modificationstation/stationapi/api/registry/BlockRegistry.java

@@ -15,5 +15,6 @@ public final class BlockRegistry extends SimpleRegistry<Block> {
     private BlockRegistry() {
         super(KEY, Lifecycle.experimental(), true);
         RegistryAttributeHolder.get(this).addAttribute(RegistryAttribute.SYNCED);
+        nextId = 256;
     }
 }

station-flattening-v0/src/main/java/net/modificationstation/stationapi/mixin/flattening/BlockMixin.java

@@ -1,12 +1,15 @@
 package net.modificationstation.stationapi.mixin.flattening;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;
 import net.minecraft.block.Material;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.stat.Stat;
 import net.minecraft.stat.Stats;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
@@ -366,12 +369,29 @@ public ToIntFunction<BlockState> stationapi_getLuminanceProvider() {
     private int stationapi_getStateBrightness(int original) {
         return BlockBrightness.light;
     }
-    
-    @Inject(method = "afterBreak", at = @At("HEAD"), cancellable = true)
-    private void stationapi_temporalStatFix(World world, PlayerEntity player, int x, int y, int z, int meta, CallbackInfo info) {
-        if (id < Stats.MINE_BLOCK.length) return;
-        this.dropStacks(world, x, y, z, meta);
-        info.cancel();
+
+    @Redirect(
+            method = "afterBreak",
+            at = @At(
+                    value = "FIELD",
+                    target = "Lnet/minecraft/stat/Stats;MINE_BLOCK:[Lnet/minecraft/stat/Stat;",
+                    args = "array=get"
+            )
+    )
+    private Stat stationapi_tmpFixStats1(Stat[] array, int index) {
+        return index < array.length ? array[index] : null;
+    }
+
+    @WrapOperation(
+            method = "afterBreak",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/entity/player/PlayerEntity;increaseStat(Lnet/minecraft/stat/Stat;I)V"
+            )
+    )
+    private void stationapi_tmpFixStats2(PlayerEntity instance, Stat amount, int i, Operation<Void> original) {
+        if (id < Stats.MINE_BLOCK.length)
+            original.call(instance, amount, i);
     }
 
     @Override

station-registry-api-v0/src/main/java/net/modificationstation/stationapi/api/registry/SimpleRegistry.java

@@ -45,7 +45,7 @@ public class SimpleRegistry<T> implements MutableRegistry<T>, RemappableRegistry
     private Reference2ReferenceMap<T, Reference<T>> intrusiveValueToEntry;
     @Nullable
     private List<Reference<T>> cachedEntries;
-    private int nextId;
+    protected int nextId;
     private final Impl<T> wrapper;
     private Reference2IntMap<Identifier> prevIndexedEntries;
     private BiMap<Identifier, Reference<T>> prevEntries;