add tag to define which entities cannot be invisible

also reduce duplicate code in invisibility events
juancarloscp52 · Feb 21, 2023 · a19bd36 · a19bd36
1 parent d3569ae
commit a19bd36
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 50 deletions.
diff --git a/src/main/java/me/juancarloscp52/entropy/EntropyTags.java b/src/main/java/me/juancarloscp52/entropy/EntropyTags.java
@@ -10,6 +10,7 @@
 public class EntropyTags {
     public static final TagKey<EntityType<?>> IGNORED_BY_FORCEFIELD_AND_ENTITY_MAGNET = TagKey.of(Registries.ENTITY_TYPE.getKey(), new Identifier("entropy", "ignored_by_forcefield_and_entity_magnet"));
     public static final TagKey<EntityType<?>> DO_NOT_LEVITATE = TagKey.of(Registries.ENTITY_TYPE.getKey(), new Identifier("entropy", "do_not_levitate"));
+    public static final TagKey<EntityType<?>> NOT_INVISIBLE = TagKey.of(Registries.ENTITY_TYPE.getKey(), new Identifier("entropy", "not_invisible"));
     public static final TagKey<Block> NOT_REPLACED_BY_EVENTS = TagKey.of(Registries.BLOCK.getKey(), new Identifier("entropy", "not_replaced_by_events"));
     public static final TagKey<Block> IGNORED_BY_MIDAS_TOUCH = TagKey.of(Registries.BLOCK.getKey(), new Identifier("entropy", "ignored_by_midas_touch"));
     public static final TagKey<Block> VOID_SIGHT_BREAKS = TagKey.of(Registries.BLOCK.getKey(), new Identifier("entropy", "void_sight_breaks"));

diff --git a/src/main/java/me/juancarloscp52/entropy/events/db/InvisibleEveryoneEvent.java b/src/main/java/me/juancarloscp52/entropy/events/db/InvisibleEveryoneEvent.java
@@ -8,9 +8,11 @@
 import java.util.List;
 
 import me.juancarloscp52.entropy.Entropy;
+import me.juancarloscp52.entropy.EntropyTags;
 import me.juancarloscp52.entropy.events.AbstractTimedEvent;
 import me.juancarloscp52.entropy.server.ServerEventHandler;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
@@ -31,11 +33,15 @@ public void tick() {
                 worlds.add(player.getWorld());
         for(var world : worlds)
             for(var entity : world.iterateEntities())
-                if(entity instanceof LivingEntity)
+                if(shouldBeInvisible(entity))
                     ((LivingEntity)entity).addStatusEffect(new StatusEffectInstance(StatusEffects.INVISIBILITY, 2));
         super.tick();
     }
 
+    public boolean shouldBeInvisible(Entity entity) {
+        return entity instanceof LivingEntity && !entity.getType().isIn(EntropyTags.NOT_INVISIBLE);
+    }
+
     @Override
     public void end() {
         this.hasEnded = true;
@@ -54,5 +60,5 @@ public short getDuration() {
     public String type() {
         return "invisibility";
     }
-    
+
 }
diff --git a/src/main/java/me/juancarloscp52/entropy/events/db/InvisibleHostileMobsEvent.java b/src/main/java/me/juancarloscp52/entropy/events/db/InvisibleHostileMobsEvent.java
@@ -4,56 +4,12 @@
 
 package me.juancarloscp52.entropy.events.db;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import me.juancarloscp52.entropy.Entropy;
-import me.juancarloscp52.entropy.events.AbstractTimedEvent;
-import me.juancarloscp52.entropy.server.ServerEventHandler;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.Monster;
-import net.minecraft.server.world.ServerWorld;
-
-public class InvisibleHostileMobsEvent extends AbstractTimedEvent {
-
-    @Override
-    public void init() {
-    }
-
-    @Override
-    public void tick() {
-        ServerEventHandler eventHandler = Entropy.getInstance().eventHandler;
-        List<ServerWorld> worlds = new ArrayList<>();
-        for(var player : eventHandler.getActivePlayers())
-            if(!worlds.contains(player.getWorld()))
-                worlds.add(player.getWorld());
-        for(var world : worlds)
-            for(var entity : world.iterateEntities())
-                if(entity instanceof Monster && entity instanceof LivingEntity)
-                    ((LivingEntity)entity).addStatusEffect(new StatusEffectInstance(StatusEffects.INVISIBILITY, 2));
-        super.tick();
-    }
-
-    @Override
-    public void end() {
-        this.hasEnded = true;
-    }
-
-    @Override
-    public void render(MatrixStack matrixStack, float tickdelta) {
-    }
-
-    @Override
-    public short getDuration() {
-        return Entropy.getInstance().settings.baseEventDuration;
-    }
 
+public class InvisibleHostileMobsEvent extends InvisibleEveryoneEvent {
     @Override
-    public String type() {
-        return "invisibility";
+    public boolean shouldBeInvisible(Entity entity) {
+        return entity instanceof Monster && super.shouldBeInvisible(entity);
     }
-
 }