Blacklist Create entities

Fusion-Flux · Jul 9, 2023 · e1d8dc6 · e1d8dc6
1 parent d90ba60
commit e1d8dc6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/src/main/java/com/fusionflux/portalcubed/entity/PortalCubedEntities.java b/src/main/java/com/fusionflux/portalcubed/entity/PortalCubedEntities.java
@@ -134,6 +134,7 @@ PortalCubedBlocks.REFLECTION_GEL, id("textures/block/reflection_gel.png")
         .build();
 
     public static final TagKey<EntityType<?>> P1_ENTITY = TagKey.create(Registries.ENTITY_TYPE, id("p1_entity"));
+    public static final TagKey<EntityType<?>> PORTAL_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("portal_blacklist"));
 
     public static void registerEntities() {
         Registry.register(BuiltInRegistries.ENTITY_TYPE, id("portal"), PORTAL);

diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/EntityMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/EntityMixin.java
@@ -16,6 +16,7 @@
 import com.fusionflux.portalcubed.entity.CorePhysicsEntity;
 import com.fusionflux.portalcubed.entity.GelBlobEntity;
 import com.fusionflux.portalcubed.entity.Portal;
+import com.fusionflux.portalcubed.entity.PortalCubedEntities;
 import com.fusionflux.portalcubed.items.PortalCubedItems;
 import com.fusionflux.portalcubed.listeners.WentThroughPortalListener;
 import com.fusionflux.portalcubed.mechanics.CrossPortalInteraction;
@@ -181,7 +182,7 @@ public void tick(CallbackInfo ci) {
 
         Entity thiz = (Entity) (Object) this;
 
-        if (!(thiz instanceof Player) && !(thiz instanceof Portal)) {
+        if (!(thiz instanceof Player) && !(thiz instanceof Portal) && !thiz.getType().is(PortalCubedEntities.PORTAL_BLACKLIST)) {
             GeneralUtil.setupPortalShapes(thiz);
         }
 
@@ -233,12 +234,11 @@ public void tick(CallbackInfo ci) {
         prevGravDirec = GravityChangerAPI.getGravityDirection(((Entity) (Object) this));
     }
 
-
     @Inject(method = "tick", at = @At("TAIL"))
     public void tickTail(CallbackInfo ci) {
         Entity thisEntity = ((Entity) (Object) this);
 
-        if (!thisEntity.level().isClientSide() && !(thisEntity instanceof Player) && !(thisEntity instanceof Portal)) {
+        if (!thisEntity.level().isClientSide() && !(thisEntity instanceof Player) && !(thisEntity instanceof Portal) && !thisEntity.getType().is(PortalCubedEntities.PORTAL_BLACKLIST)) {
             Vec3 entityVelocity = this.getDeltaMovement();
 
 

diff --git a/src/main/resources/data/portalcubed/tags/entity_types/portal_blacklist.json b/src/main/resources/data/portalcubed/tags/entity_types/portal_blacklist.json
@@ -0,0 +1,21 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "create:stationary_contraption",
+      "required": false
+    },
+    {
+      "id": "create:gantry_contraption",
+      "required": false
+    },
+    {
+      "id": "create:carriage_contraption",
+      "required": false
+    },
+    {
+      "id": "create:super_glue",
+      "required": false
+    }
+  ]
+}