moved miners dream to seperate mod

new portal gun draft fixed scorched guns mixin sodium compat layer
2026-09-29 23:37:11 -05:00
1 parent 23599c4c59
commit c7cb48edfb
@@ -6,6 +6,9 @@
    "mixins":  [
                   "AbstractMinecartMixin",
                   "AbstractArrowAccessor",
+                   "PortalGunEntityCollisionMixin",
+                   "PortalGunZombieMixin",
+                   "FallingBlockEntityAccessor",
                   "AccessorFireBlock",
                   "AccessorRangedAttribute",
                   "AmericanFoodConsumeMixin",
@@ -96,6 +99,7 @@
                   "gravity.ThrowableProjectileGravityMixin",
                   "gravity.TrackedEntityAccessor",
                   "compat.biolith.MultiNoiseBiomeSourceNullGuardMixin",
+                   "compat.scguns.ScgunsProjectileEntityAccessMixin",
                   "compat.scguns.ScgunsProjectileEntityGravityMixin",
                   "compat.scguns.ScgunsArrowGravityMixin",
                   "compat.irons_spellbooks.IronsSpellbooksProjectileGravityMixin",
@@ -135,6 +139,17 @@
                   "time.GeckoLibAnimationControllerTimeDilationMixin"
               ],
    "client":  [
+                   "client.CameraBasisAccessor",
+                   "client.LevelRendererPortalViewAreaAccessor",
+                   "client.LevelRendererPortalViewAreaMixin",
+                   "client.LevelRendererPortalChunkBudgetMixin",
+                   "client.LevelRendererPortalLifecycleMixin",
+                   "client.PortalViewChunkCacheMixin",
+                   "client.PortalViewSectionSortingMixin",
+                   "client.LevelRendererPortalTargetsAccessor",
+                   "client.LevelRendererPortalSceneInvoker",
+                   "client.MinecraftMainRenderTargetAccessor",
+                   "client.PostChainTargetAccessor",
                   "client.AbstractMinecartRendererMixin",
                   "client.EntityLightProbeMixin",
                   "client.CustomBossBarMixin",
@@ -154,6 +169,9 @@
                   "client.MountedVehicleCameraMixin",
                   "client.ParalyzedMouseTurnMixin",
                   "client.LocalPlayerPortalMixin",
+                   "client.PortalGunEntityTeleportPacketMixin",
+                   "client.PortalGunZoomFovMixin",
+                   "client.LivingEntityPortalLerpAccessor",
                   "client.ScreenEffectRendererPortalMixin",
                   "client.ScreenEffectRendererFireVisualMixin",
                   "client.GlimmeringTranslucencyMixin",
@@ -0,0 +1,13 @@
+{
+  "required": false,
+  "package": "com.craisinlord.antarchy.mixins",
+  "plugin": "com.craisinlord.antarchy.mixins.AntarchyMixinPlugin",
+  "compatibilityLevel": "JAVA_21",
+  "client": [
+    "client.SodiumWorldRendererMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "minVersion": "0.8"
+}
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "Rechtsklicke mit einer Glasflasche auf eine Reverie, um sie einzufangen.",
    "tooltip.antarchy.reverie_bottle.release": "Rechtsklick, um die Reverie freizulassen.",
    "item.antarchy.gravity_gun": "Gravitationskanone",
-    "item.antarchy.miners_dream": "Traum des Bergmanns",
-    "tooltip.antarchy.miners_dream.line1": "Rechtsklick, um eine gewundene Höhle zu graben.",
-    "tooltip.antarchy.miners_dream.line2": "Lässt wertvolle Blöcke unberührt.",
-    "message.antarchy.miners_dream_disabled": "Der Traum des Bergmanns ist deaktiviert.",
-    "message.antarchy.miners_dream_busy": "Dein vorheriger Traum entfaltet sich noch.",
    "item.antarchy.diamond_minecart": "Die Diamantlore",
    "item.antarchy.cogwheel_pet": "Zahnrad-Haustier",
    "item.antarchy.fire_dragon_pet": "Feuerdrachen-Haustier",
@@ -967,4 +962,6 @@
    "subtitles.antarchy.hoverboard_mount": "Hoverboard startet",
    "subtitles.antarchy.hoverboard_dismount": "Hoverboard stoppt",
    "subtitles.antarchy.hoverboard_idle": "Hoverboard summt"
+,
+    "entity.antarchy.portal_gun_portal": "Portalgun-Portal"
 }
@@ -671,11 +671,6 @@
    "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.miners_dream":  "Miner's Dream",
-    "tooltip.antarchy.miners_dream.line1":  "Use to carve a winding cave.",
-    "tooltip.antarchy.miners_dream.line2":  "Leaves valuable blocks untouched.",
-    "message.antarchy.miners_dream_disabled":  "The Miner's Dream is disabled.",
-    "message.antarchy.miners_dream_busy":  "Your previous dream is still unfolding.",
    "item.antarchy.diamond_minecart":  "The Diamond Minecart",
    "item.antarchy.cogwheel_pet":  "Cogwheel Pet",
    "item.antarchy.fire_dragon_pet":  "Fire Dragon Pet",
@@ -844,7 +839,11 @@
    "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.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":  " ",
@@ -1247,6 +1246,9 @@
    "advancements.antarchy.duct_tape.title":  "I sawed this boat in half!",
    "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",
    "advancements.antarchy.shrink_ray_craft.description":  "Craft a Shrink Ray.",
@@ -1596,6 +1598,7 @@
    ,"guide.antarchy.entry.brutalfly.description": "An oversized Elythian butterfly. Unlike its smaller counterparts, it is incredibly aggressive once out of its cocoon."
    ,"guide.antarchy.entry.brutalfly.description2": "Like any butterfly, a Brutalfly begins in a cocoon. It is relatively safe to be near the cocoon as long as it remains undamaged."
    ,"guide.antarchy.entry.brutalfly.description3": "If the Brutalfly is on the assault, all you can do is dispose of it."
+    ,"guide.antarchy.entry.brutalfly.description4": "Brutaflies are found in Elythia's wooded areas. Look for their cocoons hanging beneath the canopy."
    ,"guide.antarchy.entry.easter_bunny.title": "Easter Bunny"
    ,"guide.antarchy.entry.easter_bunny.subtitle": "Entity record"
    ,"guide.antarchy.entry.easter_bunny.description": "The Easter Bunny lays spawn eggs for all sorts of creatures! Life is like an easter egg, you never know what you're gonna get."
@@ -1639,4 +1642,6 @@
    ,"subtitles.antarchy.hoverboard_mount": "Hoverboard starts"
    ,"subtitles.antarchy.hoverboard_dismount": "Hoverboard stops"
    ,"subtitles.antarchy.hoverboard_idle": "Hoverboard hums"
+,
+    "entity.antarchy.portal_gun_portal": "Portal Gun Portal"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "Haz clic derecho en una Reverie con una botella de cristal para guardarla.",
    "tooltip.antarchy.reverie_bottle.release": "Clic derecho para liberar a la Reverie.",
    "item.antarchy.gravity_gun": "Pistola gravitatoria",
-    "item.antarchy.miners_dream": "Sueño del minero",
-    "tooltip.antarchy.miners_dream.line1": "Clic derecho para excavar una cueva sinuosa.",
-    "tooltip.antarchy.miners_dream.line2": "Deja intactos los bloques valiosos.",
-    "message.antarchy.miners_dream_disabled": "El Sueño del minero está desactivado.",
-    "message.antarchy.miners_dream_busy": "Tu sueño anterior todavía se está desarrollando.",
    "item.antarchy.diamond_minecart": "La vagoneta de diamante",
    "item.antarchy.cogwheel_pet": "Mascota engranaje",
    "item.antarchy.fire_dragon_pet": "Mascota de dragón de fuego",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "Domestica un escarabajo hércules.",
    "advancements.antarchy.herculean_task.title": "Tarea hercúlea",
    "advancements.antarchy.herculean_task.description": "Abate a un escarabajo hércules."
+,
+    "entity.antarchy.portal_gun_portal": "Portal del arma de portales"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "Faites un clic droit sur une Reverie avec une fiole en verre pour la capturer.",
    "tooltip.antarchy.reverie_bottle.release": "Clic droit pour libérer la Reverie.",
    "item.antarchy.gravity_gun": "Canon à gravité",
-    "item.antarchy.miners_dream": "Rêve du mineur",
-    "tooltip.antarchy.miners_dream.line1": "Clic droit pour creuser une grotte sinueuse.",
-    "tooltip.antarchy.miners_dream.line2": "Laisse les blocs précieux intacts.",
-    "message.antarchy.miners_dream_disabled": "Le Rêve du mineur est désactivé.",
-    "message.antarchy.miners_dream_busy": "Votre rêve précédent est encore en train de se déployer.",
    "item.antarchy.diamond_minecart": "Le wagonnet de diamant",
    "item.antarchy.cogwheel_pet": "Familier engrenage",
    "item.antarchy.fire_dragon_pet": "Familier dragon de feu",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "Apprivoisez un scarabée Hercule.",
    "advancements.antarchy.herculean_task.title": "Travail herculéen",
    "advancements.antarchy.herculean_task.description": "Terrassez un scarabée Hercule."
+,
+    "entity.antarchy.portal_gun_portal": "Portail du pistolet à portails"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "Fai clic destro su una Reverie con una bottiglia di vetro per catturarla.",
    "tooltip.antarchy.reverie_bottle.release": "Fai clic destro per liberare la Reverie.",
    "item.antarchy.gravity_gun": "Cannone gravitazionale",
-    "item.antarchy.miners_dream": "Sogno del minatore",
-    "tooltip.antarchy.miners_dream.line1": "Fai clic destro per scavare una grotta tortuosa.",
-    "tooltip.antarchy.miners_dream.line2": "Lascia intatti i blocchi preziosi.",
-    "message.antarchy.miners_dream_disabled": "Il Sogno del minatore è disattivato.",
-    "message.antarchy.miners_dream_busy": "Il tuo sogno precedente si sta ancora dispiegando.",
    "item.antarchy.diamond_minecart": "Il carrello di diamante",
    "item.antarchy.cogwheel_pet": "Famiglio ingranaggio",
    "item.antarchy.fire_dragon_pet": "Famiglio drago di fuoco",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "Addomestica uno Scarabeo Ercole.",
    "advancements.antarchy.herculean_task.title": "Impresa erculea",
    "advancements.antarchy.herculean_task.description": "Uccidi uno Scarabeo Ercole."
+,
+    "entity.antarchy.portal_gun_portal": "Portale della Portal Gun"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "ガラス瓶を持ってレヴェリーを右クリックすると収納できます。",
    "tooltip.antarchy.reverie_bottle.release": "右クリックでレヴェリーを解放します。",
    "item.antarchy.gravity_gun": "重力銃",
-    "item.antarchy.miners_dream": "採掘者の夢",
-    "tooltip.antarchy.miners_dream.line1": "右クリックで曲がりくねった洞窟を掘ります。",
-    "tooltip.antarchy.miners_dream.line2": "貴重なブロックはそのまま残します。",
-    "message.antarchy.miners_dream_disabled": "採掘者の夢は無効になっています。",
-    "message.antarchy.miners_dream_busy": "前の夢はまだ展開中です。",
    "item.antarchy.diamond_minecart": "ダイヤモンドのトロッコ",
    "item.antarchy.cogwheel_pet": "歯車ペット",
    "item.antarchy.fire_dragon_pet": "ファイアドラゴンのペット",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "ヘラクレスオオカブトを手懐ける。",
    "advancements.antarchy.herculean_task.title": "ヘラクレス級の難題",
    "advancements.antarchy.herculean_task.description": "ヘラクレスオオカブトを討伐する。"
+,
+    "entity.antarchy.portal_gun_portal": "ポータルガンのポータル"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "유리병으로 레버리를 우클릭하여 담습니다.",
    "tooltip.antarchy.reverie_bottle.release": "우클릭하여 레버리를 풀어줍니다.",
    "item.antarchy.gravity_gun": "중력총",
-    "item.antarchy.miners_dream": "광부의 꿈",
-    "tooltip.antarchy.miners_dream.line1": "우클릭하여 구불구불한 동굴을 뚫습니다.",
-    "tooltip.antarchy.miners_dream.line2": "귀중한 블록은 건드리지 않습니다.",
-    "message.antarchy.miners_dream_disabled": "광부의 꿈이 비활성화되어 있습니다.",
-    "message.antarchy.miners_dream_busy": "이전 꿈이 아직 펼쳐지고 있습니다.",
    "item.antarchy.diamond_minecart": "다이아몬드 광산 수레",
    "item.antarchy.cogwheel_pet": "톱니바퀴 펫",
    "item.antarchy.fire_dragon_pet": "화염 드래곤 펫",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "헤라클레스장수풍뎅이를 길들이세요.",
    "advancements.antarchy.herculean_task.title": "헤라클레스의 과업",
    "advancements.antarchy.herculean_task.description": "헤라클레스장수풍뎅이를 처치하세요."
+,
+    "entity.antarchy.portal_gun_portal": "포털 건 포털"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "Clique com o botão direito em uma Reverie com um frasco de vidro para guardá-la.",
    "tooltip.antarchy.reverie_bottle.release": "Clique com o botão direito para soltar a Reverie.",
    "item.antarchy.gravity_gun": "Arma Gravitacional",
-    "item.antarchy.miners_dream": "Sonho do Minerador",
-    "tooltip.antarchy.miners_dream.line1": "Clique com o botão direito para escavar uma caverna sinuosa.",
-    "tooltip.antarchy.miners_dream.line2": "Deixa blocos valiosos intactos.",
-    "message.antarchy.miners_dream_disabled": "O Sonho do Minerador está desativado.",
-    "message.antarchy.miners_dream_busy": "Seu sonho anterior ainda está se desenrolando.",
    "item.antarchy.diamond_minecart": "O Carrinho de Diamante",
    "item.antarchy.cogwheel_pet": "Mascote de Engrenagem",
    "item.antarchy.fire_dragon_pet": "Mascote de Dragão de Fogo",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "Domestique um besouro-hércules.",
    "advancements.antarchy.herculean_task.title": "Tarefa Hercúlea",
    "advancements.antarchy.herculean_task.description": "Abata um besouro-hércules."
+,
+    "entity.antarchy.portal_gun_portal": "Portal da arma de portais"
 }
@@ -387,11 +387,6 @@
    "tooltip.antarchy.reverie_bottle.capture":  "Нажмите ПКМ стеклянной бутылочкой по грёзе, чтобы поймать её.",
    "tooltip.antarchy.reverie_bottle.release":  "Нажмите ПКМ, чтобы выпустить грёзу.",
    "item.antarchy.gravity_gun":  "Гравитационная пушка",
-    "item.antarchy.miners_dream":  "Мечта шахтёра",
-    "tooltip.antarchy.miners_dream.line1":  "Нажмите ПКМ, чтобы вырезать извилистую пещеру.",
-    "tooltip.antarchy.miners_dream.line2":  "Оставляет ценные блоки нетронутыми.",
-    "message.antarchy.miners_dream_disabled":  "Мечта шахтёра отключена.",
-    "message.antarchy.miners_dream_busy":  "Ваша предыдущая мечта всё ещё воплощается.",
    "item.antarchy.diamond_minecart":  "Алмазная вагонетка",
    "item.antarchy.cogwheel_pet":  "Шестерёнка-питомец",
    "item.antarchy.fire_dragon_pet":  "Огненный дракон-питомец",
@@ -842,4 +837,6 @@
    "advancements.antarchy.squidzooka_craft.description":  "Создайте сквидзуку.",
    "advancements.antarchy.gravity_gun_craft.title":  "Мастер притяжения",
    "advancements.antarchy.gravity_gun_craft.description":  "Создайте гравитационную пушку."
+,
+    "entity.antarchy.portal_gun_portal": "Портал портальной пушки"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "手持玻璃瓶右键雷弗里即可将其收纳。",
    "tooltip.antarchy.reverie_bottle.release": "右键释放雷弗里。",
    "item.antarchy.gravity_gun": "重力枪",
-    "item.antarchy.miners_dream": "矿工之梦",
-    "tooltip.antarchy.miners_dream.line1": "右键挖出一条蜿蜒洞穴。",
-    "tooltip.antarchy.miners_dream.line2": "不会破坏贵重方块。",
-    "message.antarchy.miners_dream_disabled": "矿工之梦已禁用。",
-    "message.antarchy.miners_dream_busy": "你之前的梦仍在展开。",
    "item.antarchy.diamond_minecart": "钻石矿车",
    "item.antarchy.cogwheel_pet": "齿轮宠物",
    "item.antarchy.fire_dragon_pet": "火龙宠物",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "驯服一只赫拉克勒斯甲虫。",
    "advancements.antarchy.herculean_task.title": "赫拉克勒斯之业",
    "advancements.antarchy.herculean_task.description": "斩杀一只赫拉克勒斯甲虫。"
+,
+    "entity.antarchy.portal_gun_portal": "传送门枪传送门"
 }
@@ -411,11 +411,6 @@
    "tooltip.antarchy.reverie_bottle.capture": "手持玻璃瓶右鍵雷弗裡即可將其收納。",
    "tooltip.antarchy.reverie_bottle.release": "右鍵釋放雷弗裡。",
    "item.antarchy.gravity_gun": "重力槍",
-    "item.antarchy.miners_dream": "礦工之夢",
-    "tooltip.antarchy.miners_dream.line1": "右鍵挖出一條蜿蜒洞穴。",
-    "tooltip.antarchy.miners_dream.line2": "不會破壞貴重方塊。",
-    "message.antarchy.miners_dream_disabled": "礦工之夢已禁用。",
-    "message.antarchy.miners_dream_busy": "你之前的夢仍在展開。",
    "item.antarchy.diamond_minecart": "鑽石礦車",
    "item.antarchy.cogwheel_pet": "齒輪寵物",
    "item.antarchy.fire_dragon_pet": "火龍寵物",
@@ -964,4 +959,6 @@
    "advancements.antarchy.beetle_buddies.description": "馴服一隻赫拉克勒斯甲蟲。",
    "advancements.antarchy.herculean_task.title": "赫拉克勒斯之業",
    "advancements.antarchy.herculean_task.description": "斬殺一隻赫拉克勒斯甲蟲。"
+,
+    "entity.antarchy.portal_gun_portal": "傳送門槍傳送門"
 }
@@ -0,0 +1,25 @@
+Crosshair texture, portal vortex textures, and portal audio adapted from Aperture Innovations by MisterSecret312.
+Source: https://github.com/mistersecret312/ApertureInnovations
+The Aperture Innovations mod metadata declares the MIT License.
+
+MIT License
+
+Copyright (c) MisterSecret312
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "antarchy:item/miners_dream"
-  }
-}
@@ -0,0 +1,12 @@
+#version 150
+
+uniform sampler2D Sampler0;
+uniform vec4 ColorModulator;
+
+noperspective in vec2 portalUv;
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(Sampler0, portalUv);
+    fragColor = vec4(color.rgb, 1.0) * ColorModulator;
+}
@@ -0,0 +1,14 @@
+{
+  "vertex": "antarchy:portal_view",
+  "fragment": "antarchy:portal_view",
+  "samplers": [
+    { "name": "Sampler0" }
+  ],
+  "attributes": [
+    "Position",
+    "UV0"
+  ],
+  "uniforms": [
+    { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
+  ]
+}
@@ -0,0 +1,11 @@
+#version 150
+
+in vec3 Position;
+in vec2 UV0;
+
+noperspective out vec2 portalUv;
+
+void main() {
+    gl_Position = vec4(Position, 1.0);
+    portalUv = UV0;
+}
@@ -1738,13 +1738,13 @@
    "subtitle": "subtitles.antarchy.portal_gun_fire_blue",
    "sounds": [
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_blue_01"
+        "name": "antarchy:portal_aperture/portal_gun_fire_primary_1"
      },
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_blue_02"
+        "name": "antarchy:portal_aperture/portal_gun_fire_primary_2"
      },
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_blue_03"
+        "name": "antarchy:portal_aperture/portal_gun_fire_primary_3"
      }
    ]
  },
@@ -1752,13 +1752,13 @@
    "subtitle": "subtitles.antarchy.portal_gun_fire_orange",
    "sounds": [
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_red_01"
+        "name": "antarchy:portal_aperture/portal_gun_fire_secondary_1"
      },
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_red_02"
+        "name": "antarchy:portal_aperture/portal_gun_fire_secondary_2"
      },
      {
-        "name": "antarchy:item/portalgun/wpn_portal_gun_fire_red_03"
+        "name": "antarchy:portal_aperture/portal_gun_fire_secondary_3"
      }
    ]
  },
@@ -1766,19 +1766,16 @@
    "subtitle": "subtitles.antarchy.portal_gun_invalid_surface",
    "sounds": [
      {
-        "name": "antarchy:item/portalgun/portal_invalid_surface_swt_01"
+        "name": "antarchy:portal_aperture/portal_invalid_surface_1"
      },
      {
-        "name": "antarchy:portal/portal_invalid_surface_01"
+        "name": "antarchy:portal_aperture/portal_invalid_surface_2"
      },
      {
-        "name": "antarchy:portal/portal_invalid_surface_02"
+        "name": "antarchy:portal_aperture/portal_invalid_surface_3"
      },
      {
-        "name": "antarchy:portal/portal_invalid_surface_03"
-      },
-      {
-        "name": "antarchy:portal/portal_invalid_surface_04"
+        "name": "antarchy:portal_aperture/portal_invalid_surface_4"
      }
    ]
  },
@@ -1786,7 +1783,7 @@
    "subtitle": "subtitles.antarchy.portal_open_blue",
    "sounds": [
      {
-        "name": "antarchy:portal/portal_open_blue_01"
+        "name": "antarchy:portal_aperture/portal_open_primary_1"
      }
    ]
  },
@@ -1794,7 +1791,10 @@
    "subtitle": "subtitles.antarchy.portal_open_orange",
    "sounds": [
      {
-        "name": "antarchy:portal/portal_open_red_01"
+        "name": "antarchy:portal_aperture/portal_open_secondary_1"
+      },
+      {
+        "name": "antarchy:portal_aperture/portal_open_secondary_2"
      }
    ]
  },
@@ -1802,10 +1802,10 @@
    "subtitle": "subtitles.antarchy.portal_fizzle",
    "sounds": [
      {
-        "name": "antarchy:portal/portal_fizzle_01"
+        "name": "antarchy:portal_aperture/portal_fizzle_1"
      },
      {
-        "name": "antarchy:portal/portal_fizzle_02"
+        "name": "antarchy:portal_aperture/portal_fizzle_2"
      }
    ]
  },
@@ -1813,13 +1813,13 @@
    "subtitle": "subtitles.antarchy.portal_enter",
    "sounds": [
      {
-        "name": "antarchy:portal/portal_enter_01"
+        "name": "antarchy:portal_aperture/portal_enter_1"
      },
      {
-        "name": "antarchy:portal/portal_enter_02"
+        "name": "antarchy:portal_aperture/portal_enter_2"
      },
      {
-        "name": "antarchy:portal/portal_enter_03"
+        "name": "antarchy:portal_aperture/portal_enter_3"
      }
    ]
  },
@@ -1827,10 +1827,13 @@
    "subtitle": "subtitles.antarchy.portal_exit",
    "sounds": [
      {
-        "name": "antarchy:portal/portal_exit_01"
+        "name": "antarchy:portal_aperture/portal_enter_1"
      },
      {
-        "name": "antarchy:portal/portal_exit_02"
+        "name": "antarchy:portal_aperture/portal_enter_2"
+      },
+      {
+        "name": "antarchy:portal_aperture/portal_enter_3"
      }
    ]
  },
@@ -1838,7 +1841,7 @@
    "subtitle": "subtitles.antarchy.portal_ambient",
    "sounds": [
      {
-        "name": "antarchy:portal/wpn_portal_ambient_lp_01"
+        "name": "antarchy:portal_aperture/portal_ambient"
      }
    ]
  },
@@ -3,9 +3,11 @@
  "category": "elythia",
  "title": "guide.antarchy.entry.brutalfly.title",
  "subtitle": "guide.antarchy.entry.brutalfly.subtitle",
-  "description": ["guide.antarchy.entry.brutalfly.description", "guide.antarchy.entry.brutalfly.description2", "guide.antarchy.entry.brutalfly.description3"],
+  "description": ["guide.antarchy.entry.brutalfly.description", "guide.antarchy.entry.brutalfly.description2", "guide.antarchy.entry.brutalfly.description3", "guide.antarchy.entry.brutalfly.description4"],
  "entity": "antarchy:brutalfly",
  "cover_entity": "antarchy:brutalfly",
+  "locator": "antarchy:brutalfly",
+  "dimension": "antarchy:elythia",
  "rotation": 45,
  "render_scale": 0.6
 }
@@ -127,7 +127,7 @@
        {
          "type": "minecraft:item",
          "name": "antarchy:blood_gods_blade",
-          "weight": 1
+          "weight": 2
        },
        {
          "type": "minecraft:item",
@@ -33,4 +33,4 @@
    "id": "antarchy:big_bertha_blade",
    "count": 1
  }
-}
+}
@@ -27,4 +27,4 @@
    "id": "antarchy:big_bertha_handle",
    "count": 1
  }
-}
+}
@@ -36,4 +36,4 @@
    "id": "antarchy:big_bertha_hilt",
    "count": 1
  }
-}
+}
@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "category": "misc",
-  "pattern": [
-    "GGG",
-    "RDR",
-    "TTT"
-  ],
-  "key": {
-    "G": { "item": "antarchy:flytrap_goo" },
-    "R": { "item": "minecraft:redstone_block" },
-    "D": { "item": "minecraft:diamond_pickaxe" },
-    "T": { "item": "minecraft:tnt" }
-  },
-  "result": {
-    "id": "antarchy:miners_dream",
-    "count": 1
-  }
-}
@@ -1,36 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "#minecraft:base_stone_overworld",
-    "#minecraft:base_stone_nether",
-    "minecraft:stone",
-    "minecraft:deepslate",
-    "minecraft:granite",
-    "minecraft:diorite",
-    "minecraft:andesite",
-    "minecraft:tuff",
-    "minecraft:calcite",
-    "minecraft:netherrack",
-    "minecraft:blackstone",
-    "minecraft:basalt",
-    "minecraft:smooth_basalt",
-    "minecraft:end_stone",
-    "minecraft:dirt",
-    "minecraft:coarse_dirt",
-    "minecraft:rooted_dirt",
-    "minecraft:podzol",
-    "minecraft:mycelium",
-    "minecraft:gravel",
-    "minecraft:sand",
-    "minecraft:red_sand",
-    "minecraft:sandstone",
-    "minecraft:red_sandstone",
-    "minecraft:clay",
-    "minecraft:soul_sand",
-    "minecraft:soul_soil",
-    "antarchy:nyxite",
-    "antarchy:pale_nyxite",
-    "antarchy:dream_sand",
-    "antarchy:dream_sandstone"
-  ]
-}
@@ -25,4 +25,4 @@
    "antarchy:hercules_horn",
    "antarchy:flytrap_goo"
  ]
-}
+}
@@ -0,0 +1,39 @@
+{
+  "attributes": {
+    "attack_range": 3.0,
+    "category": "sword",
+    "attacks": [
+      {
+        "hitbox": "HORIZONTAL_PLANE",
+        "damage_multiplier": 1,
+        "angle": 120,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_slash_horizontal_right",
+        "swing_sound": {
+          "id": "bettercombat:sword_slash"
+        }
+      },
+      {
+        "hitbox": "HORIZONTAL_PLANE",
+        "damage_multiplier": 1,
+        "angle": 120,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_slash_horizontal_left",
+        "swing_sound": {
+          "id": "bettercombat:sword_slash"
+        }
+      },
+      {
+        "hitbox": "FORWARD_BOX",
+        "damage_multiplier": 1.4,
+        "angle": 0,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_stab",
+        "swing_sound": {
+          "id": "bettercombat:sword_slash",
+          "pitch": 1.2
+        }
+      }
+    ]
+  }
+}