blacklist block and entity type tag

badasintended · Feb 7, 2021 · a0d24d3 · a0d24d3
1 parent b2998ee
commit a0d24d3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java
@@ -9,6 +9,10 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.fabric.api.tag.TagRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityType;
+import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -27,6 +31,9 @@ public class Waila implements ModInitializer {
             .create()
         );
 
+    public static final Tag<Block> BLOCK_BLACKLIST = TagRegistry.block(new Identifier(MODID, "blacklist"));
+    public static final Tag<EntityType<?>> ENTITY_BLACKLIST = TagRegistry.entityType(new Identifier(MODID, "blacklist"));
+
     @Override
     public void onInitialize() {
         NetworkHandler.init();

diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java
@@ -87,6 +87,12 @@ public void tickClient() {
             if (target != null && target.getType() == HitResult.Type.BLOCK) {
                 DataAccessor accessor = DataAccessor.INSTANCE;
                 accessor.set(world, player, target);
+
+                if (accessor.block.isIn(Waila.BLOCK_BLACKLIST)) {
+                    tooltip = null;
+                    return;
+                }
+
                 ItemStack targetStack = RayTracing.INSTANCE.getTargetStack(); // Here we get either the proper stack or the override
                 accessor.stack = targetStack;
 
@@ -101,6 +107,11 @@ public void tickClient() {
                 DataAccessor accessor = DataAccessor.INSTANCE;
                 accessor.set(world, player, target);
 
+                if (accessor.entity.getType().isIn(Waila.ENTITY_BLACKLIST)) {
+                    tooltip = null;
+                    return;
+                }
+
                 Entity targetEnt = RayTracing.INSTANCE.getTargetEntity(); // This need to be replaced by the override check.
 
                 if (targetEnt != null) {

diff --git a/src/main/resources/data/waila/tags/blocks/blacklist.json b/src/main/resources/data/waila/tags/blocks/blacklist.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values" : [
+    "minecraft:barrier",
+    "minecraft:structure_void"
+  ]
+}
diff --git a/src/main/resources/data/waila/tags/entity_types/blacklist.json b/src/main/resources/data/waila/tags/entity_types/blacklist.json
@@ -0,0 +1,5 @@
+{
+  "replace": false,
+  "values" : [
+  ]
+}