portal gun fixes and variants

2026-10-08 13:54:21 -05:00
1 parent 2d90cb8aaf
commit 216efeb39b
@@ -7,7 +7,9 @@
                   "AbstractMinecartMixin",
                   "AbstractArrowAccessor",
                   "PortalGunEntityCollisionMixin",
+                   "PortalGunEntityInWallMixin",
                   "PortalGunPlayerMovePacketMixin",
+                   "PortalGunProjectileHitMixin",
                   "ServerGamePacketListenerTeleportAccessor",
                   "PortalGunZombieMixin",
                   "FallingBlockEntityAccessor",
@@ -71,6 +73,7 @@
                   "gravity.AbstractArrowGravityMixin",
                   "gravity.BehaviorUtilsGravityMixin",
                   "gravity.BucketItemGravityMixin",
+                   "gravity.BubbleColumnGravityMixin",
                   "gravity.ChunkMapAccessor",
                   "gravity.CrossbowItemGravityMixin",
                   "gravity.DirectionFacingMixin",
@@ -171,6 +174,7 @@
                   "client.MountedVehicleCameraMixin",
                   "client.ParalyzedMouseTurnMixin",
                   "client.LocalPlayerPortalMixin",
+                   "client.LocalPlayerPortalTransitMixin",
                   "client.PortalGunEntityTeleportPacketMixin",
                   "client.PortalGunZoomFovMixin",
                   "client.LivingEntityPortalLerpAccessor",
@@ -671,6 +671,8 @@
    "tooltip.antarchy.reverie_bottle.release":  "Right click to release the Reverie.",
    "item.antarchy.gravity_gun":  "Gravity Gun",
    "item.antarchy.portal_gun":  "Portal Gun",
+    "item.antarchy.portal_gun_atlas":  "Atlas Portal Gun",
+    "item.antarchy.portal_gun_p_body":  "P-body Portal Gun",
    "item.antarchy.diamond_minecart":  "The Diamond Minecart",
    "item.antarchy.cogwheel_pet":  "Cogwheel Pet",
    "item.antarchy.fire_dragon_pet":  "Fire Dragon Pet",
@@ -837,13 +839,14 @@
    "tooltip.antarchy.gravity_gun.secondary":  "Usage: pull in an entity or a valid block.",
    "tooltip.antarchy.gravity_gun.scroll":  "Hold Ctrl and scroll to move the held target closer or farther away.",
    "tooltip.antarchy.gravity_gun.blacklist":  "Does not affect blacklisted blocks or entities.",
-    "tooltip.antarchy.portal_gun.primary":  "Attack: fire a blue portal.",
-    "tooltip.antarchy.portal_gun.secondary":  "Use: fire an orange portal.",
-    "tooltip.antarchy.portal_gun.channel":  "Channel: %s",
-    "tooltip.antarchy.portal_gun.owner":  "Owner: %s",
+    "tooltip.antarchy.portal_gun.primary":  "Attack: fire a %s portal.",
+    "tooltip.antarchy.portal_gun.secondary":  "Use: fire a %s portal.",
+    "tooltip.antarchy.portal_gun.color.blue":  "blue",
+    "tooltip.antarchy.portal_gun.color.orange":  "orange",
+    "tooltip.antarchy.portal_gun.color.purple":  "purple",
+    "tooltip.antarchy.portal_gun.color.yellow":  "yellow",
+    "tooltip.antarchy.portal_gun.color.red":  "red",
    "tooltip.antarchy.portal_gun.reset":  "Sneak + use: fizzle your active portals.",
-    "tooltip.antarchy.portal_gun.size":  "Portal size: %1$s x %2$s",
-    "tooltip.antarchy.portal_gun.grab_strength":  "Grab strength: %s/4",
    "tooltip.antarchy.antimetal_inversion":  "Inverts entites directly below it",
    "tooltip.antarchy.diamond_minecart.forward":  "Will be implemented later.",
    "tooltip.antarchy.diamond_minecart.rails":  " ",
@@ -1250,7 +1253,6 @@
    "advancements.antarchy.duct_tape.description":  "and fixed it with the power of duct tape!",
    "key.categories.antarchy":  "Antarchy",
    "key.antarchy.portal_gun_zoom":  "Portal Gun Zoom",
-    "key.antarchy.portal_gun_grab":  "Portal Gun Grab",
    "key.antarchy.portal_gun_reset": "Portal Gun Reset",
    "key.antarchy.brutalfly_flap":  "Brutalfly Elytra: Flap",
    "advancements.antarchy.shrink_ray_craft.title":  "Honey, I Shrunk the Mobs",
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "gui_light": "front",
+  "textures": {
+    "layer0": "antarchy:item/portal_gun/portal_gun_atlas_item"
+  }
+}
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "gui_light": "front",
+  "textures": {
+    "layer0": "antarchy:item/portal_gun/portal_gun_p_body_item"
+  }
+}
@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "pattern": [
+    "T N",
+    "TSN",
+    "TBT"
+  ],
+  "key": {
+    "T": {
+      "item": "antarchy:titanium_ingot"
+    },
+    "N": {
+      "item": "antarchy:nightmare_scale"
+    },
+    "S": {
+      "item": "minecraft:nether_star"
+    },
+    "B": {
+      "item": "antarchy:bluestone_comparator"
+    }
+  },
+  "result": {
+    "id": "antarchy:portal_gun",
+    "count": 1
+  }
+}
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "equipment",
+  "ingredients": [
+    {
+      "item": "antarchy:portal_gun"
+    },
+    {
+      "item": "minecraft:light_blue_dye"
+    },
+    {
+      "item": "minecraft:purple_dye"
+    }
+  ],
+  "result": {
+    "id": "antarchy:portal_gun_atlas",
+    "count": 1
+  }
+}
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "equipment",
+  "ingredients": [
+    {
+      "item": "antarchy:portal_gun"
+    },
+    {
+      "item": "minecraft:yellow_dye"
+    },
+    {
+      "item": "minecraft:red_dye"
+    }
+  ],
+  "result": {
+    "id": "antarchy:portal_gun_p_body",
+    "count": 1
+  }
+}
@@ -94,13 +94,13 @@
      },
      {
        "type": "antarchy:apple_cow",
-        "weight": 24,
+        "weight": 20,
        "minCount": 1,
        "maxCount": 3
      },
      {
        "type": "antarchy:golden_apple_cow",
-        "weight": 20,
+        "weight": 16,
        "minCount": 1,
        "maxCount": 3
      },
@@ -34,6 +34,10 @@
    }
  },
  "spawn_costs": {
+    "antarchy:basilisk": {
+      "energy_budget": 0.1,
+      "charge": 14.0
+    },
    "antarchy:glimmer": {
      "energy_budget": 0.1,
      "charge": 9
@@ -86,7 +90,14 @@
  ],
  "creature_spawn_probability": 0.07,
  "spawners": {
-    "monster": [],
+    "monster": [
+      {
+        "type": "antarchy:basilisk",
+        "weight": 10,
+        "minCount": 1,
+        "maxCount": 1
+      }
+    ],
    "creature": [
      {
        "type": "minecraft:frog",
@@ -93,7 +93,7 @@
    "monster": [
      {
        "type": "antarchy:basilisk",
-        "weight": 20,
+        "weight": 24,
        "minCount": 1,
        "maxCount": 1
      }
@@ -96,13 +96,13 @@
      },
      {
        "type": "antarchy:apple_cow",
-        "weight": 24,
+        "weight": 20,
        "minCount": 1,
        "maxCount": 3
      },
      {
        "type": "antarchy:golden_apple_cow",
-        "weight": 20,
+        "weight": 16,
        "minCount": 1,
        "maxCount": 3
      },
@@ -39,8 +39,8 @@
  ],
  "placement": {
    "salt": 659843583,
-    "spacing": 42,
-    "separation": 35,
+    "spacing": 37,
+    "separation": 30,
    "type": "integrated_api:advanced_random_spread"
  }
 }
@@ -49,7 +49,7 @@
    "base": 13,
    "per_level_above_first": 8
  },
-  "max_level": 10,
+  "max_level": 4,
  "min_cost": {
    "base": 5,
    "per_level_above_first": 8
@@ -54,7 +54,7 @@
    "base": 18,
    "per_level_above_first": 8
  },
-  "max_level": 10,
+  "max_level": 4,
  "min_cost": {
    "base": 10,
    "per_level_above_first": 8
@@ -37,7 +37,7 @@
    "base": 9,
    "per_level_above_first": 6
  },
-  "max_level": 10,
+  "max_level": 4,
  "min_cost": {
    "base": 3,
    "per_level_above_first": 6
@@ -33,7 +33,7 @@
    "base": 12,
    "per_level_above_first": 11
  },
-  "max_level": 10,
+  "max_level": 4,
  "min_cost": {
    "base": 1,
    "per_level_above_first": 11