First version of tool items update

mineLdiver · mineLdiver · commit c36d9a496416 · 2024-05-02T18:11:58.000+05:00
diff --git a/src/test/java/net/modificationstation/sltest/block/Blocks.java b/src/test/java/net/modificationstation/sltest/block/Blocks.java
@@ -16,7 +16,7 @@
 
 public enum Blocks {
 
-    TEST_BLOCK("test_block", "testBlock", id -> new TemplateBlock(id, Material.CLAY).setHardness(1)),
+    TEST_BLOCK("test_block", "testBlock", id -> new TemplateBlock(id, Material.STONE).setHardness(1)),
     TEST_ANIMATED_BLOCK("test_animated_block", "testAnimatedBlock", id -> new ModdedMetaBlock(id, Material.NETHER_PORTAL)),
     CUSTOM_MODEL_BLOCK("farlands_block", "farlands_block", id -> new ModdedModelBlock(id, Material.SOIL).setHardness(1)),
     FREEZER("freezer", "freezer", id -> new BlockFreezer(id).setHardness(2.5F).setSoundGroup(TemplateBlock.DEFAULT_SOUND_GROUP)),
diff --git a/src/test/java/net/modificationstation/sltest/item/ItemListener.java b/src/test/java/net/modificationstation/sltest/item/ItemListener.java
@@ -7,8 +7,10 @@
 import net.modificationstation.sltest.block.VariationBlock;
 import net.modificationstation.stationapi.api.event.registry.ItemRegistryEvent;
 import net.modificationstation.stationapi.api.item.tool.ToolMaterialFactory;
+import net.modificationstation.stationapi.api.registry.BlockRegistry;
 import net.modificationstation.stationapi.api.registry.ItemRegistry;
 import net.modificationstation.stationapi.api.registry.Registry;
+import net.modificationstation.stationapi.api.tag.TagKey;
 import net.modificationstation.stationapi.api.template.item.BlockStateItem;
 
 import static net.modificationstation.sltest.SLTest.NAMESPACE;
@@ -18,7 +20,7 @@ public class ItemListener {
     @EventListener
     public void registerItems(ItemRegistryEvent event) {
         testItem = new ModdedItem(NAMESPACE.id("test_item")).setTranslationKey(NAMESPACE, "testItem"); //8475
-        testMaterial = ToolMaterialFactory.create("testMaterial", 3, Integer.MAX_VALUE, Float.MAX_VALUE, Integer.MAX_VALUE - 2);
+        testMaterial = ToolMaterialFactory.create("testMaterial", 3, Integer.MAX_VALUE, Float.MAX_VALUE, Integer.MAX_VALUE - 2).miningLevelTag(TagKey.of(BlockRegistry.KEY, NAMESPACE.id("needs_tool_level_modded")));
         testPickaxe = new ModdedPickaxeItem(NAMESPACE.id("test_pickaxe"), testMaterial).setTranslationKey(NAMESPACE, "testPickaxe"); //8476
         testNBTItem = new NBTItem(NAMESPACE.id("nbt_item")).setTranslationKey(NAMESPACE, "nbt_item"); //8477
         testModelItem = new ModelItem(NAMESPACE.id("model_item")).setMaxCount(1).setTranslationKey(NAMESPACE, "idkSomething");
diff --git a/src/test/resources/data/minecraft/stationapi/tags/blocks/mineable/pickaxe.json b/src/test/resources/data/minecraft/stationapi/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "sltest:test_block"
+  ]
+}
diff --git a/src/test/resources/data/minecraft/stationapi/tags/blocks/needs_iron_tool.json b/src/test/resources/data/minecraft/stationapi/tags/blocks/needs_iron_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "#sltest:needs_tool_level_modded"
+  ]
+}
diff --git a/src/test/resources/data/sltest/stationapi/tags/blocks/needs_tool_level_modded.json b/src/test/resources/data/sltest/stationapi/tags/blocks/needs_tool_level_modded.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#needs_stone_tool",
+    "sltest:test_block"
+  ]
+}
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationHoeItem.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationHoeItem.java
@@ -7,7 +7,6 @@
 import net.modificationstation.stationapi.api.util.Util;
 
 public interface StationHoeItem extends ToolLevel {
-
     @Override
     default void setEffectiveBlocks(TagKey<Block> effectiveBlocks) {
         Util.assertImpl();
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationShearsItem.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationShearsItem.java
@@ -7,7 +7,6 @@
 import net.modificationstation.stationapi.api.util.Util;
 
 public interface StationShearsItem extends ToolLevel {
-
     @Override
     default void setEffectiveBlocks(TagKey<Block> effectiveBlocks) {
         Util.assertImpl();
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationSwordItem.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationSwordItem.java
@@ -7,7 +7,6 @@
 import net.modificationstation.stationapi.api.util.Util;
 
 public interface StationSwordItem extends ToolLevel {
-
     @Override
     default void setEffectiveBlocks(TagKey<Block> effectiveBlocks) {
         Util.assertImpl();
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationToolItem.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationToolItem.java
@@ -7,7 +7,6 @@
 import net.modificationstation.stationapi.api.util.Util;
 
 public interface StationToolItem extends ToolLevel {
-
     @Override
     default void setEffectiveBlocks(TagKey<Block> effectiveBlocks) {
         Util.assertImpl();
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationToolMaterial.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/StationToolMaterial.java
@@ -1,48 +1,16 @@
 package net.modificationstation.stationapi.api.item.tool;
 
-import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
-import it.unimi.dsi.fastutil.objects.ReferenceSet;
 import net.minecraft.block.Block;
 import net.minecraft.item.ToolMaterial;
-import net.modificationstation.stationapi.api.block.BlockState;
-import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.tag.TagKey;
 import net.modificationstation.stationapi.api.util.Util;
 
-import java.util.function.BiPredicate;
-import java.util.function.Predicate;
-
 public interface StationToolMaterial {
-
-    ReferenceSet<TagKey<Block>> ALL_TOOL_MATERIAL_TAGS = new ReferenceOpenHashSet<>();
-
-    default ToolMaterial inheritsFrom(ToolMaterial... toolMaterials) {
+    default ToolMaterial miningLevelTag(TagKey<Block> tag) {
         return Util.assertImpl();
     }
 
-    default ToolMaterial requiredBlockTag(Identifier tag) {
+    default TagKey<Block> getMiningLevelTag() {
         return Util.assertImpl();
     }
-
-    default ReferenceSet<ToolMaterial> getParentMaterials() {
-        return Util.assertImpl();
-    }
-
-    default TagKey<Block> getRequiredBlockTag() {
-        return Util.assertImpl();
-    }
-
-    default boolean matches(BlockState state) {
-        return ALL_TOOL_MATERIAL_TAGS.stream().noneMatch(state::isIn) || matches0(state);
-    }
-
-    private boolean matches0(BlockState state) {
-        TagKey<Block> tag = getRequiredBlockTag();
-        if (tag != null) {
-            if (state.isIn(tag)) return true;
-            BiPredicate<ToolMaterial, BlockState> matches0 = StationToolMaterial::matches0;
-            Predicate<ToolMaterial> matchesThis = t -> matches0.test(t, state);
-            return getParentMaterials().stream().anyMatch(matchesThis);
-        } else return false;
-    }
 }
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/ToolLevel.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/ToolLevel.java
@@ -6,7 +6,6 @@
 import net.modificationstation.stationapi.api.tag.TagKey;
 
 public interface ToolLevel {
-
     void setEffectiveBlocks(TagKey<Block> effectiveBlocks);
 
     TagKey<Block> getEffectiveBlocks(ItemStack stack);
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/ToolMaterialFactory.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/ToolMaterialFactory.java
@@ -4,7 +4,6 @@
 import net.modificationstation.stationapi.api.factory.EnumFactory;
 
 public class ToolMaterialFactory {
-
     public static ToolMaterial create(String materialName, int miningLevel, int durability, float miningSpeed, int attackDamage) {
         return EnumFactory.addEnum(
                 ToolMaterial.class, materialName,
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/impl/item/HijackShearsImplV1.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/impl/item/HijackShearsImplV1.java
@@ -7,7 +7,6 @@
 
 @EventListener(phase = StationAPI.INTERNAL_PHASE)
 public class HijackShearsImplV1 {
-
     //TODO: Make this match anything that has shear tool properties. Not sure how to go around this at the moment.
     @EventListener
     private static void hijackShearsEvent(ShearsOverrideEvent event) {
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/impl/item/ToolEffectivenessImplV1.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/impl/item/ToolEffectivenessImplV1.java
@@ -3,6 +3,7 @@
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ToolMaterial;
 import net.modificationstation.stationapi.api.StationAPI;
 import net.modificationstation.stationapi.api.block.BlockState;
 import net.modificationstation.stationapi.api.event.item.IsItemSuitableForStateEvent;
@@ -17,6 +18,7 @@
 import net.modificationstation.stationapi.api.util.Namespace;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -25,7 +27,6 @@
 @Entrypoint(eventBus = @EventBusPolicy(registerInstance = false))
 @EventListener(phase = StationAPI.INTERNAL_PHASE)
 public class ToolEffectivenessImplV1 {
-
     public static final List<Identifier> VANILLA_TOOLS = new ArrayList<>();
 
     @EventListener(priority = LOW)
@@ -55,15 +56,36 @@ private static void getItems(ItemRegistryEvent event) {
 
     @EventListener
     private static void isEffective(IsItemSuitableForStateEvent event) {
-        event.suitable = event.suitable || isSuitable(event.itemStack, event.state);
+        // Disable custom tool logic if both the block and the tool are vanilla
+        // This is done to preserve the vanilla mining speeds
+        if (VANILLA_TOOLS.contains(ItemRegistry.INSTANCE.getId(event.itemStack.getItem()))
+                && Objects.requireNonNull(BlockRegistry.INSTANCE.getId(event.state.getBlock())).namespace == Namespace.MINECRAFT) return;
+
+        event.suitable = isSuitable(event.itemStack, event.state);
     }
 
     @EventListener
     private static void getStrength(ItemMiningSpeedMultiplierOnStateEvent event) {
-        if (!(VANILLA_TOOLS.contains(ItemRegistry.INSTANCE.getId(event.itemStack.getItem())) && Objects.requireNonNull(BlockRegistry.INSTANCE.getId(event.state.getBlock())).namespace == Namespace.MINECRAFT) && isSuitable(event.itemStack, event.state)) event.miningSpeedMultiplier = ((ToolLevel) event.itemStack.getItem()).getMaterial(event.itemStack).getMiningSpeedMultiplier();
+        // Disable custom tool logic if both the block and the tool are vanilla
+        // This is done to preserve the vanilla mining speeds
+        if (VANILLA_TOOLS.contains(ItemRegistry.INSTANCE.getId(event.itemStack.getItem()))
+                && Objects.requireNonNull(BlockRegistry.INSTANCE.getId(event.state.getBlock())).namespace == Namespace.MINECRAFT) return;
+
+        if (!isSuitable(event.itemStack, event.state)) return;
+
+        event.miningSpeedMultiplier = ((ToolLevel) event.itemStack.getItem()).getMaterial(event.itemStack).getMiningSpeedMultiplier();
     }
 
     private static boolean isSuitable(ItemStack item, BlockState state) {
-        return item.getItem() instanceof ToolLevel toolLevel && state.isIn(toolLevel.getEffectiveBlocks(item)) && toolLevel.getMaterial(item).matches(state);
+        return item.getItem() instanceof ToolLevel toolLevel
+                && state.isIn(toolLevel.getEffectiveBlocks(item))
+                &&
+                (
+                        state.isIn(toolLevel.getMaterial(item).getMiningLevelTag())
+                                || Arrays
+                                .stream(ToolMaterial.values())
+                                .filter(toolMaterial -> toolMaterial.getMiningLevelTag() != null)
+                                .noneMatch(toolMaterial -> state.isIn(toolMaterial.getMiningLevelTag()))
+                );
     }
 }
diff --git a/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/mixin/tools/ToolMaterialMixin.java b/station-tools-api-v1/src/main/java/net/modificationstation/stationapi/mixin/tools/ToolMaterialMixin.java
@@ -1,64 +1,27 @@
 package net.modificationstation.stationapi.mixin.tools;
 
-import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
-import it.unimi.dsi.fastutil.objects.ReferenceSet;
-import it.unimi.dsi.fastutil.objects.ReferenceSets;
 import net.minecraft.block.Block;
 import net.minecraft.item.ToolMaterial;
 import net.modificationstation.stationapi.api.item.tool.StationToolMaterial;
-import net.modificationstation.stationapi.api.registry.BlockRegistry;
 import net.modificationstation.stationapi.api.tag.TagKey;
-import net.modificationstation.stationapi.api.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Collections;
 
 @Mixin(ToolMaterial.class)
 class ToolMaterialMixin implements StationToolMaterial {
     @Unique
-    private TagKey<Block> stationapi_requiredBlockTag;
-    @Unique
-    private ReferenceSet<ToolMaterial> stationapi_parentMaterials;
-    @Unique
-    private ReferenceSet<ToolMaterial> stationapi_parentMaterialsView;
-
-    @Inject(
-            method = "<init>(Ljava/lang/String;IIIFI)V",
-            at = @At("RETURN")
-    )
-    private void stationapi_init(String i, int j, int k, int f, float l, int par6, CallbackInfo ci) {
-        stationapi_parentMaterials = new ReferenceOpenHashSet<>();
-        stationapi_parentMaterialsView = ReferenceSets.unmodifiable(stationapi_parentMaterials);
-    }
-
-    @Override
-    @Unique
-    public ToolMaterial inheritsFrom(ToolMaterial... toolMaterials) {
-        Collections.addAll(stationapi_parentMaterials, toolMaterials);
-        return ToolMaterial.class.cast(this);
-    }
+    private TagKey<Block> stationapi_miningLevelTag;
 
     @Override
     @Unique
-    public ToolMaterial requiredBlockTag(Identifier tag) {
-        ALL_TOOL_MATERIAL_TAGS.remove(stationapi_requiredBlockTag);
-        ALL_TOOL_MATERIAL_TAGS.add(stationapi_requiredBlockTag = TagKey.of(BlockRegistry.INSTANCE.getKey(), tag));
+    public ToolMaterial miningLevelTag(TagKey<Block> tag) {
+        stationapi_miningLevelTag = tag;
         return ToolMaterial.class.cast(this);
     }
 
     @Override
     @Unique
-    public ReferenceSet<ToolMaterial> getParentMaterials() {
-        return stationapi_parentMaterialsView;
-    }
-
-    @Override
-    @Unique
-    public TagKey<Block> getRequiredBlockTag() {
-        return stationapi_requiredBlockTag;
+    public TagKey<Block> getMiningLevelTag() {
+        return stationapi_miningLevelTag;
     }
 }
diff --git a/station-vanilla-fix-v0/src/main/java/net/modificationstation/stationapi/impl/vanillafix/item/tool/VanillaToolFixImpl.java b/station-vanilla-fix-v0/src/main/java/net/modificationstation/stationapi/impl/vanillafix/item/tool/VanillaToolFixImpl.java
@@ -6,6 +6,8 @@
 import net.modificationstation.stationapi.api.event.registry.ItemRegistryEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
 import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
+import net.modificationstation.stationapi.api.registry.BlockRegistry;
+import net.modificationstation.stationapi.api.tag.TagKey;
 
 import static net.modificationstation.stationapi.api.util.Identifier.of;
 
@@ -17,11 +19,8 @@ private static void fixToolMaterials(ItemRegistryEvent event) {
         ToolMaterial stone = ToolMaterial.STONE;
         ToolMaterial iron = ToolMaterial.IRON;
         ToolMaterial diamond = ToolMaterial.DIAMOND;
-        stone.inheritsFrom(ToolMaterial.WOOD, ToolMaterial.GOLD);
-        stone.requiredBlockTag(of("needs_stone_tool"));
-        iron.inheritsFrom(ToolMaterial.STONE);
-        iron.requiredBlockTag(of("needs_iron_tool"));
-        diamond.inheritsFrom(ToolMaterial.IRON);
-        diamond.requiredBlockTag(of("needs_diamond_tool"));
+        stone.miningLevelTag(TagKey.of(BlockRegistry.KEY, of("needs_stone_tool")));
+        iron.miningLevelTag(TagKey.of(BlockRegistry.KEY, of("needs_iron_tool")));
+        diamond.miningLevelTag(TagKey.of(BlockRegistry.KEY, of("needs_diamond_tool")));
     }
 }
diff --git a/station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/needs_diamond_tool.json b/station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/needs_diamond_tool.json
@@ -1,5 +1,6 @@
 {
   "values": [
+    "#needs_iron_tool",
     "obsidian"
   ]
 }
diff --git a/station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/needs_iron_tool.json b/station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/needs_iron_tool.json
@@ -1,5 +1,6 @@
 {
   "values": [
+    "#needs_stone_tool",
     "diamond_block",
     "diamond_ore",
     "gold_block",

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "values": [
 +    "sltest:test_block"
 +  ]
 +}