diff --git a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java index b139b9da..4081b129 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java @@ -262,11 +262,7 @@ public final class AntarchyObjects { Supplier> hushProjectile, Supplier> toreterror, Supplier> waterBomb, - Supplier> creepingHorror, - Supplier> lurkingTerror, - Supplier> stinkBug, Supplier> cheep, - Supplier> dorrie, Supplier duplicatorLog, Supplier duplicatorSapling, Supplier ductTape, @@ -295,8 +291,6 @@ public final class AntarchyObjects { Supplier triffidGooBlock, Supplier paleNyxite, Supplier nyxiteSpike, - Supplier chitenBlock, - Supplier chitenSpike, Supplier potentNyxite, Supplier antimetal, Supplier polishedAntimetal, @@ -309,7 +303,6 @@ public final class AntarchyObjects { Supplier krakenTooth, Supplier moggles, Supplier reverieBottle, - Supplier stinkBugItem, Supplier> dread, Supplier> paralyzedEffect, Supplier> invertedEffect, @@ -321,8 +314,6 @@ public final class AntarchyObjects { Supplier pinkMilkweed, Supplier torchflowerBush, Supplier bedBugEggs, - Supplier creepingHorrorEggs, - Supplier lurkingTerrorEggs, Supplier waspNest, Supplier hushweed, Supplier squirrelNestBlock, @@ -356,11 +347,7 @@ public final class AntarchyObjects { HUSH_PROJECTILE = hushProjectile; TORETERROR = toreterror; WATER_BOMB = waterBomb; - CREEPING_HORROR = creepingHorror; - LURKING_TERROR = lurkingTerror; - STINK_BUG = stinkBug; CHEEP = cheep; - DORRIE = dorrie; DUPLICATOR_LOG = duplicatorLog; DUPLICATOR_SAPLING = duplicatorSapling; DUCT_TAPE = ductTape; @@ -389,8 +376,6 @@ public final class AntarchyObjects { TRIFFID_GOO_BLOCK = triffidGooBlock; PALE_NYXITE = paleNyxite; NYXITE_SPIKE = nyxiteSpike; - CHITEN_BLOCK = chitenBlock; - CHITEN_SPIKE = chitenSpike; POTENT_NYXITE = potentNyxite; ANTIMETAL = antimetal; POLISHED_ANTIMETAL = polishedAntimetal; @@ -403,7 +388,6 @@ public final class AntarchyObjects { KRAKEN_TOOTH = krakenTooth; MOGGLES = moggles; REVERIE_BOTTLE = reverieBottle; - STINK_BUG_ITEM = stinkBugItem; DREAD = dread; PARALYZED_EFFECT = paralyzedEffect; INVERTED_EFFECT = invertedEffect; @@ -415,8 +399,6 @@ public final class AntarchyObjects { PINK_MILKWEED = pinkMilkweed; TORCHFLOWER_BUSH = torchflowerBush; BED_BUG_EGG = bedBugEggs; - CREEPING_HORROR_EGGS = creepingHorrorEggs; - LURKING_TERROR_EGGS = lurkingTerrorEggs; WASP_NEST = waspNest; HUSHWEED = hushweed; SQUIRREL_NEST_BLOCK = squirrelNestBlock; diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/nightmare/NightmareEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/nightmare/NightmareEntity.java index cf8808fb..f613bf47 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/nightmare/NightmareEntity.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/nightmare/NightmareEntity.java @@ -80,11 +80,11 @@ public class NightmareEntity extends Monster implements GeoEntity { private static final int ANIM_TAKEOFF = 7; private static final int ANIM_FLY_DAMAGED = 8; - private static final int ATTACK_TOTAL_TICKS = 18; - private static final int ATTACK_DAMAGE_TICK = 9; - private static final int INTRO_ROAR_TICKS = 32; - private static final int COMBAT_ROAR_TICKS = 24; - private static final int DEATH_TICKS = 36; + private static final int ATTACK_TOTAL_TICKS = 20; + private static final int ATTACK_DAMAGE_TICK = 10; + private static final int INTRO_ROAR_TICKS = 30; + private static final int COMBAT_ROAR_TICKS = 30; + private static final int DEATH_TICKS = 30; private static final int TARGET_RESET_TICKS = 60; private static final int DREAD_TICKS = 160; private static final int WEAKNESS_TICKS = 100; @@ -101,14 +101,14 @@ public class NightmareEntity extends Monster implements GeoEntity { private static final double FLIGHT_DISENGAGE_RANGE_SQR = 36.0D; private static final double ROAR_RETRY_DISTANCE_SQR = 400.0D; - private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("Idle"); + private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); - private static final RawAnimation TAKEOFF_ANIM = RawAnimation.begin().thenPlay("animation").thenLoop("fly"); + private static final RawAnimation TAKEOFF_ANIM = RawAnimation.begin().thenLoop("fly"); private static final RawAnimation FLY_ANIM = RawAnimation.begin().thenLoop("fly"); - private static final RawAnimation ATTACK_ANIM = RawAnimation.begin().thenPlay("attack").thenLoop("Idle"); - private static final RawAnimation FLY_ATTACK_ANIM = RawAnimation.begin().thenPlay("fly_attack").thenLoop("fly"); - private static final RawAnimation ROAR_ANIM = RawAnimation.begin().thenPlay("roar").thenLoop("Idle"); - private static final RawAnimation DEATH_ANIM = RawAnimation.begin().thenPlayAndHold("death"); + private static final RawAnimation ATTACK_ANIM = RawAnimation.begin().thenPlay("attack").thenLoop("idle"); + private static final RawAnimation FLY_ATTACK_ANIM = RawAnimation.begin().thenPlay("attack2").thenLoop("fly"); + private static final RawAnimation ROAR_ANIM = RawAnimation.begin().thenPlay("roar").thenLoop("idle"); + private static final RawAnimation DEATH_ANIM = RawAnimation.begin().thenPlayAndHold("roar"); private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); diff --git a/common/src/main/resources/antarchy-common.mixins.json b/common/src/main/resources/antarchy-common.mixins.json index fb56a509..6daf0153 100644 --- a/common/src/main/resources/antarchy-common.mixins.json +++ b/common/src/main/resources/antarchy-common.mixins.json @@ -48,7 +48,6 @@ "multipart.EntityMultipartLifecycleMixin" ], "client": [ - "client.CavarynSkyMixin", "client.ElythiaSkyMixin", "client.ElytraModelAccessor", "client.LightningBoltRendererMixin", diff --git a/common/src/main/resources/assets/antarchy/animations/nightmare.animation.json b/common/src/main/resources/assets/antarchy/animations/nightmare.animation.json index 83198889..13782188 100644 --- a/common/src/main/resources/assets/antarchy/animations/nightmare.animation.json +++ b/common/src/main/resources/assets/antarchy/animations/nightmare.animation.json @@ -1,55 +1,33 @@ { "format_version": "1.8.0", "animations": { - "Idle": { + "idle": { "loop": true, - "animation_length": 2, + "animation_length": 4, "bones": { "head": { "rotation": { "0.0": { "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.8333": { - "post": { - "vector": [26.51036, -4.3678, 14.36222] - }, - "lerp_mode": "catmullrom" - }, - "1.4583": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "2.0": { - "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" }, "1.0": { "post": { - "vector": [37.5, 0, 0] + "vector": [10, 0, 0] }, "lerp_mode": "catmullrom" }, - "2.0": { + "3.0": { "post": { - "vector": [12.5, 0, 0] + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -59,19 +37,19 @@ "rotation": { "0.0": { "post": { - "vector": [15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [20, 0, 0] + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" }, "2.0": { "post": { - "vector": [15, 0, 0] + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -81,19 +59,25 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-15.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "1.0": { + "0.75": { "post": { - "vector": [-37.5, 0, 0] + "vector": [-17, 0, 0] }, "lerp_mode": "catmullrom" }, - "2.0": { + "2.75": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-13, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [-15.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -101,19 +85,25 @@ "position": { "0.0": { "post": { - "vector": [0, 0, 0] + "vector": [0, -1, 6] }, "lerp_mode": "catmullrom" }, "1.0": { "post": { - "vector": [0, 6, 0] + "vector": [0, -3, 6] }, "lerp_mode": "catmullrom" }, - "2.0": { + "3.0": { "post": { - "vector": [0, 0, 0] + "vector": [0, 1, 6] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [0, -1, 6] }, "lerp_mode": "catmullrom" } @@ -123,13 +113,51 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, -20, 0] + "vector": [-20, -17.5, -5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "1.5": { "post": { - "vector": [-27.5, -20, 0] + "vector": [-32.5, -17.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [-17.5, -17.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [-20, -17.5, -5] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [-0.5, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [0, -1, 0] }, "lerp_mode": "catmullrom" } @@ -139,13 +167,25 @@ "rotation": { "0.0": { "post": { - "vector": [27.5, 0, 0] + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "2.0": { + "1.5": { "post": { - "vector": [27.5, 0, 0] + "vector": [55, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [40, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -153,26 +193,26 @@ }, "L_foot": { "rotation": { - "vector": [0, 0, 0] + "vector": [-20, 0, 5] } }, "Tail": { "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.625": { - "post": { - "vector": [52.5, 0, 0] + "vector": [7.5, -15, 0] }, "lerp_mode": "catmullrom" }, "2.0": { "post": { - "vector": [20, 0, 0] + "vector": [7.5, 15, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [7.5, -15, 0] }, "lerp_mode": "catmullrom" } @@ -182,19 +222,25 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] + "vector": [-7.5, -4.69, 1.87] }, "lerp_mode": "catmullrom" }, - "1.0": { + "0.625": { "post": { - "vector": [47.5, 0, 0] + "vector": [-7.5, -12.5, 5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "2.625": { "post": { - "vector": [20, 0, 0] + "vector": [-7.5, 12.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [-7.5, -4.69, 1.87] }, "lerp_mode": "catmullrom" } @@ -204,19 +250,25 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] + "vector": [7.5, -0.83, 0.42] }, "lerp_mode": "catmullrom" }, - "1.375": { + "0.9167": { "post": { - "vector": [62.5, 0, 0] + "vector": [7.5, -10, 5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "2.9167": { "post": { - "vector": [20, 0, 0] + "vector": [7.5, 10, -5] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [7.5, -0.83, 0.42] }, "lerp_mode": "catmullrom" } @@ -226,13 +278,51 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 20, 0] + "vector": [-20, 17.5, 5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "1.5": { "post": { - "vector": [-27.5, 20, 0] + "vector": [-32.5, 17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [-17.5, 17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [-20, 17.5, 5] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [0.5, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [0, -1, 0] }, "lerp_mode": "catmullrom" } @@ -242,13 +332,25 @@ "rotation": { "0.0": { "post": { - "vector": [27.5, 0, 0] + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "2.0": { + "1.5": { "post": { - "vector": [27.5, 0, 0] + "vector": [55, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [40, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -256,60 +358,32 @@ }, "R_foot": { "rotation": { - "vector": [0, 0, 0] + "vector": [-20, 0, -5] } }, "L_Wing": { "rotation": { "0.0": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [12.5, 17.5, -5] }, "lerp_mode": "catmullrom" }, - "1.0": { + "1.25": { "post": { - "vector": [0.46156, -0.55488, -18.37854] + "vector": [12.5, 30, -5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "3.25": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [12.5, 10, -5] }, "lerp_mode": "catmullrom" }, - "0.75": { + "4.0": { "post": { - "vector": [0.74537, -21.98229, 13.2218] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0.74537, -21.98229, 13.2218] - }, - "lerp_mode": "catmullrom" - }, - "1.4167": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "2.0": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [12.5, 17.5, -5] }, "lerp_mode": "catmullrom" } @@ -319,31 +393,25 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [-17.5, -30, 27.5] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.5": { "post": { - "vector": [-6.0329, -14.68845, 34.05029] + "vector": [-17.5, -42.5, 32.5] }, "lerp_mode": "catmullrom" }, - "1.0": { + "2.5": { "post": { - "vector": [-6.0329, -14.68845, 34.05029] + "vector": [-17.5, -17.5, 22.5] }, "lerp_mode": "catmullrom" }, - "1.4583": { + "4.0": { "post": { - "vector": [-7.11718, -4.30139, 21.55449] - }, - "lerp_mode": "catmullrom" - }, - "2.0": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [-17.5, -30, 27.5] }, "lerp_mode": "catmullrom" } @@ -353,47 +421,25 @@ "rotation": { "0.0": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] + "vector": [12.5, -17.5, 5] }, "lerp_mode": "catmullrom" }, - "1.0": { + "1.25": { "post": { - "vector": [0.46156, 0.55488, 18.37854] + "vector": [12.5, -30, 5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "3.25": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [12.5, -10, 5] }, "lerp_mode": "catmullrom" }, - "0.75": { + "4.0": { "post": { - "vector": [0.74537, 21.98229, -13.2218] - }, - "lerp_mode": "catmullrom" - }, - "1.4167": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "2.0": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [12.5, -17.5, 5] }, "lerp_mode": "catmullrom" } @@ -403,41 +449,81 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [-17.5, 30, -27.5] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.5": { "post": { - "vector": [-6.0329, 14.68845, -34.05029] + "vector": [-17.5, 42.5, -32.5] }, "lerp_mode": "catmullrom" }, - "1.4583": { + "2.5": { "post": { - "vector": [-7.11718, 4.30139, -21.55449] + "vector": [-17.5, 17.5, -22.5] }, "lerp_mode": "catmullrom" }, - "2.0": { + "4.0": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [-17.5, 30, -27.5] }, "lerp_mode": "catmullrom" } } }, - "Nightmare": { + "body": { "position": { "0.0": { "post": { - "vector": [0, -0.5, -12] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "2.0": { + "1.5": { "post": { - "vector": [0, -0.5, -12] + "vector": [0, -0.75, 1.75] + }, + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": { + "vector": [0, 0, -0.5] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "jaw": { + "rotation": { + "0.0": { + "post": { + "vector": [10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": { + "vector": [10, 0, 0] }, "lerp_mode": "catmullrom" } @@ -447,47 +533,49 @@ }, "walk": { "loop": true, - "animation_length": 1.5, + "animation_length": 2, "bones": { "head": { "rotation": { "0.0": { "post": { - "vector": [22.5, 0, 0] + "vector": [15, 2.5, -5] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.375": { "post": { - "vector": [12.11233, -2.54924, 22.28582] + "vector": [5, 0, 0] }, "lerp_mode": "catmullrom" }, - "1.5": { + "0.75": { "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] + "vector": [15, -2.5, 5] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "1.0": { "post": { - "vector": [25, 0, 0] + "vector": [15, -2.5, 5] }, "lerp_mode": "catmullrom" }, - "1.5": { + "1.375": { "post": { - "vector": [12.5, 0, 0] + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [15, 2.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [15, 2.5, -5] }, "lerp_mode": "catmullrom" } @@ -496,22 +584,55 @@ "neck": { "rotation": { "0.0": { + "vector": [0, 0, 0] + }, + "0.375": { + "pre": { + "vector": [0, 7.5, 0] + }, "post": { - "vector": [15, 0, 0] + "vector": [0, 7.5, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.6667": { "post": { - "vector": [2.05239, 2.55868, -19.8423] + "vector": [-5, 3.87, 0] }, "lerp_mode": "catmullrom" }, - "1.5": { + "0.9167": { "post": { - "vector": [15, 0, 0] + "vector": [8.73, -0.63, 0] }, "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + }, + "1.375": { + "pre": { + "vector": [0, -7.5, 0] + }, + "post": { + "vector": [0, -7.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": { + "vector": [-5, -3.87, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": { + "vector": [8.73, 0.63, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "vector": [0, 0, 0] } } }, @@ -519,201 +640,313 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-2.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.0417": { + "vector": [-2.5, 0, 0] + }, + "0.125": { + "pre": { + "vector": [0.68, -2.5, 0] + }, "post": { - "vector": [-7.5, 0, 0] + "vector": [0.68, -2.5, 0] }, "lerp_mode": "catmullrom" }, - "1.5": { + "0.1667": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-0.99, -4, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": { + "vector": [-2.44, -5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [2.5, -5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [-4.79, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0417": { + "vector": [-2.5, 0, 0] + }, + "1.125": { + "pre": { + "vector": [0.68, 2.5, 0] + }, + "post": { + "vector": [0.68, 2.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": { + "vector": [-0.99, 4, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": { + "vector": [-2.44, 5, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": { + "vector": [2.5, 5, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": { + "vector": [-4.79, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-2.5, 0, 0] }, "lerp_mode": "catmullrom" } }, "position": { "0.0": { + "vector": [0, 2, 5] + }, + "0.0833": { + "vector": [0, -1, 4.5] + }, + "0.1667": { + "vector": [0, 4, 4.25] + }, + "0.25": { + "vector": [0, 1, 4.75] + }, + "0.375": { + "vector": [0, 2, 6.5] + }, + "0.5417": { + "pre": { + "vector": [0, 3.83, 9] + }, "post": { - "vector": [0, 0, 0] + "vector": [0, 3.83, 9] }, "lerp_mode": "catmullrom" }, - "0.4583": { + "0.75": { "post": { - "vector": [0, -2.97, 7] + "vector": [0, 7, 9] }, "lerp_mode": "catmullrom" }, - "0.7917": { + "0.9167": { "post": { - "vector": [0, -5, 0] + "vector": [0, 7, 7] }, "lerp_mode": "catmullrom" }, + "1.0": { + "vector": [0, 2, 5] + }, + "1.0833": { + "vector": [0, -1, 4.5] + }, + "1.1667": { + "vector": [0, 4, 4.25] + }, "1.25": { + "vector": [0, 1, 4.75] + }, + "1.375": { + "vector": [0, 2, 6.5] + }, + "1.5417": { + "pre": { + "vector": [0, 3.83, 9] + }, "post": { - "vector": [0, -1.46, 7.2] + "vector": [0, 3.83, 9] }, "lerp_mode": "catmullrom" }, - "1.5": { + "1.75": { "post": { - "vector": [0, 0, 0] + "vector": [0, 7, 9] }, "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": { + "vector": [0, 7, 7] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "vector": [0, 2, 5] } } }, "L_Tight": { "rotation": { "0.0": { + "vector": [20, -5, 0] + }, + "0.5": { + "pre": { + "vector": [15.94, -5, 0] + }, "post": { - "vector": [22.73, -1.53, -1.87] + "vector": [15.94, -5, 0] }, "lerp_mode": "catmullrom" }, - "0.75": { - "post": { - "vector": [-27.5, -2.5, 0] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [-17.5, -5, 0] }, - "1.3333": { - "post": { - "vector": [27.52563, -1.43364, -2.04831] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [22.73, -1.53, -1.87] - }, - "lerp_mode": "catmullrom" + "2.0": { + "vector": [20, -5, 0] } }, "position": { "0.0": { - "vector": [0, 8.96, 0] + "vector": [0, -3.75, 5] }, - "0.2083": { - "vector": [0, 4, 0] - }, - "0.375": { - "vector": [0, 2.46, -7] + "0.2917": { + "pre": { + "vector": [0, -1.73, 2.79] + }, + "post": { + "vector": [0, -1.73, 2.79] + }, + "lerp_mode": "catmullrom" }, "0.75": { - "vector": [0, -1, 0] + "post": { + "vector": [0, 4.96, -5.58] + }, + "lerp_mode": "catmullrom" }, - "1.125": { - "vector": [0, -2.16, 5] + "0.9167": { + "post": { + "vector": [0, 4.96, -5.58] + }, + "lerp_mode": "catmullrom" }, - "1.2917": { - "vector": [0, -2.67, 2] + "1.0": { + "vector": [0, -0.25, -6] + }, + "1.0417": { + "vector": [0, -2.14, -5.54] + }, + "1.0833": { + "vector": [0, 0.96, -5.08] + }, + "1.1667": { + "vector": [0, -0.93, -4.12] + }, + "1.25": { + "vector": [0, -0.12, -3.25] + }, + "1.375": { + "vector": [0, 0.03, -1.87] }, "1.5": { - "vector": [0, 8.96, 0] + "vector": [0, -0.33, -0.5] + }, + "1.625": { + "vector": [0, -0.93, 0.88] + }, + "1.75": { + "vector": [0, -2.04, 2.25] + }, + "1.875": { + "vector": [0, -2.64, 3.63] + }, + "2.0": { + "vector": [0, -3.75, 5] } } }, "L_leg": { "rotation": { "0.0": { + "vector": [22.5, 0, 0] + }, + "0.5": { + "pre": { + "vector": [62.5, 0, 0] + }, "post": { - "vector": [-8.01, -0.27, 1.37] + "vector": [62.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.4167": { - "post": { - "vector": [7.51392, -0.26267, 0.75154] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [7.5, 0, 0] }, - "0.75": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.4583": { - "post": { - "vector": [-7.47683, -0.25415, 1.35195] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [-8.01, -0.27, 1.37] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [0, 0, 0] - }, - "0.4167": { - "vector": [0, 0, -3] - }, - "0.75": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] + "2.0": { + "vector": [22.5, 0, 0] } } }, "L_foot": { "rotation": { "0.0": { + "vector": [-42.5, 0, 0] + }, + "0.2917": { + "pre": { + "vector": [-37.19, 0, 0] + }, "post": { - "vector": [0.72, 0.04, -0.08] + "vector": [-37.19, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.0417": { + "0.5833": { "post": { - "vector": [4.99419, 0.03493, -0.24227] + "vector": [-28.85, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.4167": { + "0.7917": { "post": { - "vector": [29.97207, 0.33518, -1.18002] + "vector": [-20.35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.75": { + "0.9167": { "post": { - "vector": [0, 0, 0] + "vector": [-20.35, 0, 0] }, "lerp_mode": "catmullrom" }, - "1.0833": { - "post": { - "vector": [-17.48784, 0.09822, 0.63249] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [10, 0, 0] }, - "1.25": { - "post": { - "vector": [-24.29925, 0.21401, 0.89555] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [0.72, 0.04, -0.08] - }, - "lerp_mode": "catmullrom" + "2.0": { + "vector": [-42.5, 0, 0] } } }, @@ -721,19 +954,19 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] + "vector": [0, -12.5, 0] }, "lerp_mode": "catmullrom" }, - "0.3333": { + "1.0": { "post": { - "vector": [37.5, 0, 0] + "vector": [0, 12.5, 0] }, "lerp_mode": "catmullrom" }, - "1.5": { + "2.0": { "post": { - "vector": [20, 0, 0] + "vector": [0, -12.5, 0] }, "lerp_mode": "catmullrom" } @@ -743,19 +976,25 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] + "vector": [0, -3.33, 0] }, "lerp_mode": "catmullrom" }, - "0.7917": { + "0.3333": { "post": { - "vector": [42.5, 0, 0] + "vector": [0, -10, 0] }, "lerp_mode": "catmullrom" }, - "1.5": { + "1.3333": { "post": { - "vector": [20, 0, 0] + "vector": [0, 10, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, -3.33, 0] }, "lerp_mode": "catmullrom" } @@ -765,19 +1004,25 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "1.0833": { + "0.5": { "post": { - "vector": [65, 0, 0] + "vector": [0, -10, 0] }, "lerp_mode": "catmullrom" }, "1.5": { "post": { - "vector": [20, 0, 0] + "vector": [0, 10, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" } @@ -786,127 +1031,143 @@ "R_Tight": { "rotation": { "0.0": { - "post": { - "vector": [-27.5, 2.5, 0] - }, - "lerp_mode": "catmullrom" + "vector": [-17.5, 5, 0] }, - "0.5833": { - "post": { - "vector": [27.52563, 1.43364, 2.04831] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [20, 5, 0] }, "1.5": { + "pre": { + "vector": [15.94, 5, 0] + }, "post": { - "vector": [-27.5, 2.5, 0] + "vector": [15.94, 5, 0] }, "lerp_mode": "catmullrom" + }, + "2.0": { + "vector": [-17.5, 5, 0] } }, "position": { "0.0": { - "vector": [0, -1, 0] + "vector": [0, -0.25, -6] + }, + "0.0417": { + "vector": [0, -2.14, -5.54] + }, + "0.0833": { + "vector": [0, 0.96, -5.08] + }, + "0.1667": { + "vector": [0, -0.93, -4.12] + }, + "0.25": { + "vector": [0, -0.12, -3.25] }, "0.375": { - "vector": [0, -2.16, 5] + "vector": [0, 0.03, -1.87] }, - "0.5417": { - "vector": [0, -2.67, 2] + "0.5": { + "vector": [0, -0.33, -0.5] + }, + "0.625": { + "vector": [0, -0.93, 0.88] }, "0.75": { - "vector": [0, 8.96, 0] + "vector": [0, -2.04, 2.25] }, - "0.9583": { - "vector": [0, 4, 0] + "0.875": { + "vector": [0, -2.64, 3.63] }, - "1.125": { - "vector": [0, 2.46, -7] + "1.0": { + "vector": [0, -3.75, 5] }, - "1.5": { - "vector": [0, -1, 0] + "1.2917": { + "pre": { + "vector": [0, -1.73, 2.79] + }, + "post": { + "vector": [0, -1.73, 2.79] + }, + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": { + "vector": [0, 4.96, -5.58] + }, + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": { + "vector": [0, 4.96, -5.58] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "vector": [0, -0.25, -6] } } }, "R_leg": { "rotation": { "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" + "vector": [7.5, 0, 0] }, - "0.7083": { - "post": { - "vector": [-7.47683, 0.25415, -1.35195] - }, - "lerp_mode": "catmullrom" - }, - "1.1667": { - "post": { - "vector": [7.51392, 0.26267, -0.75154] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [22.5, 0, 0] }, "1.5": { + "pre": { + "vector": [62.5, 0, 0] + }, "post": { - "vector": [27.5, 0, 0] + "vector": [62.5, 0, 0] }, "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] }, - "0.9167": { - "vector": [0, 0, 0] - }, - "1.1667": { - "vector": [0, 0, -3] - }, - "1.5": { - "vector": [0, 0, 0] + "2.0": { + "vector": [7.5, 0, 0] } } }, "R_foot": { "rotation": { "0.0": { + "vector": [10, 0, 0] + }, + "1.0": { + "vector": [-42.5, 0, 0] + }, + "1.2917": { + "pre": { + "vector": [-37.19, 0, 0] + }, "post": { - "vector": [0, 0, 0] + "vector": [-37.19, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.3333": { + "1.5833": { "post": { - "vector": [-17.48784, -0.09822, -0.63249] + "vector": [-28.85, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.7917": { "post": { - "vector": [-24.29925, -0.21401, -0.89555] + "vector": [-20.35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7917": { + "1.9167": { "post": { - "vector": [4.99419, -0.03493, 0.24227] + "vector": [-20.35, 0, 0] }, "lerp_mode": "catmullrom" }, - "1.1667": { - "post": { - "vector": [29.97207, -0.33518, 1.18002] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" + "2.0": { + "vector": [10, 0, 0] } } }, @@ -914,35 +1175,31 @@ "rotation": { "0.0": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [12.5, 5, -5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [10, 15, 5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [12.5, 30, -5] }, "lerp_mode": "catmullrom" }, "1.5": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [10, 15, 5] }, "lerp_mode": "catmullrom" }, - "0.75": { + "2.0": { "post": { - "vector": [0.86484, -13.40888, -17.38498] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [12.5, 5, -5] }, "lerp_mode": "catmullrom" } @@ -952,19 +1209,43 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [-1.88, -21.88, 21.26] }, "lerp_mode": "catmullrom" }, - "1.1667": { + "0.2083": { "post": { - "vector": [-8.93842, -7.56235, 18.72187] + "vector": [0, -20, 17.5] }, "lerp_mode": "catmullrom" }, - "1.5": { + "0.7083": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [-5, -25, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, -20, 21.67] + }, + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": { + "vector": [0, -20, 17.5] + }, + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": { + "vector": [-5, -25, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [-1.88, -21.88, 21.26] }, "lerp_mode": "catmullrom" } @@ -974,35 +1255,31 @@ "rotation": { "0.0": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] + "vector": [12.5, -30, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [10, -15, -5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [12.5, -5, 5] }, "lerp_mode": "catmullrom" }, "1.5": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [10, -15, -5] }, "lerp_mode": "catmullrom" }, - "0.75": { + "2.0": { "post": { - "vector": [0.86484, 13.40888, 17.38498] - }, - "lerp_mode": "catmullrom" - }, - "1.5": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [12.5, -30, 5] }, "lerp_mode": "catmullrom" } @@ -1012,35 +1289,71 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 20, -21.67] }, "lerp_mode": "catmullrom" }, - "1.1667": { + "0.2083": { "post": { - "vector": [-8.93842, 7.56235, -18.72187] + "vector": [0, 20, -17.5] }, "lerp_mode": "catmullrom" }, - "1.5": { + "0.7083": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [-5, 25, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": { + "vector": [0, 20, -17.5] + }, + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": { + "vector": [-5, 25, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [0, 20, -21.67] }, "lerp_mode": "catmullrom" } } }, - "Nightmare": { - "position": { + "jaw": { + "rotation": { "0.0": { "post": { - "vector": [0, -0.5, -12] + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [20, 0, 0] }, "lerp_mode": "catmullrom" }, "1.5": { "post": { - "vector": [0, -0.5, -12] + "vector": [10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": { + "vector": [20, 0, 0] }, "lerp_mode": "catmullrom" } @@ -1050,186 +1363,9 @@ }, "fly": { "loop": true, - "animation_length": 0.5, + "animation_length": 1, "bones": { "head": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [30.91957, -11.60656, -25.46723] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [31.67477, -7.67669, -1.77087] - }, - "0.5": { - "vector": [0, 0, 0] - } - } - }, - "neck": { - "rotation": { - "0.0": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [30.22742, -9.21817, 10.86011] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "torso": { - "rotation": { - "0.0": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [82.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_foot": { - "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [117.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail": { - "rotation": { - "0.0": { - "vector": [12.5, 0, 0] - }, - "0.5": { - "vector": [12.5, 0, 0] - } - } - }, - "Tail2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail3": { "rotation": { "0.0": { "post": { @@ -1243,312 +1379,13 @@ }, "lerp_mode": "catmullrom" }, - "0.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { + "0.5417": { "post": { "vector": [-5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [82.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_foot": { - "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [117.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-9.14537, 13.83447, -66.78912] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-6.26261, -12.2403, 54.06134] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-9.14537, 13.83447, -66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, 3.17814, -14.63362] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-11.14442, -15.99543, 50.01072] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.32406, 3.17814, -14.63362] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-1.62155, 6.14718, -24.27788] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-10.3696, -11.36311, 31.32523] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-0.45513, -4.44338, 16.94234] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-1.62155, 6.14718, -24.27788] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-9.14537, -13.83447, 66.78912] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-6.26261, 12.2403, -54.06134] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-9.14537, -13.83447, 66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-11.14442, 15.99543, -50.01072] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-1.62155, -6.14718, 24.27788] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-10.3696, 11.36311, -31.32523] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-0.45513, 4.44338, -16.94234] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-1.62155, -6.14718, 24.27788] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Nightmare": { - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [0, 27, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - } - } - }, - "fly_attack": { - "animation_length": 0.75, - "bones": { - "head": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [42.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [73.33739, -3.83835, -0.88544] - }, - "lerp_mode": "catmullrom" - }, - "0.3333": { - "post": { - "vector": [73.33739, -3.83835, -0.88544] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-2.91489, -1.67928, -0.38738] - }, - "lerp_mode": "catmullrom" - }, - "0.625": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { + "1.0": { "post": { "vector": [0, 0, 0] }, @@ -1560,77 +1397,31 @@ "rotation": { "0.0": { "post": { - "vector": [7.5, 0, 0] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.2083": { "post": { - "vector": [-13.32374, -7.77783, 9.16322] + "vector": [10, 0, -2.5] }, "lerp_mode": "catmullrom" }, - "0.25": { + "0.4583": { "post": { - "vector": [7.26308, -7.90227, 9.30983] + "vector": [9.31, -4.68, 2.04] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.6667": { "post": { - "vector": [13.25635, -7.84783, 9.24569] + "vector": [20, -7.5, 5] }, "lerp_mode": "catmullrom" }, - "0.3333": { + "1.0": { "post": { - "vector": [-3.32374, -7.77783, 9.16322] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [36.67626, -7.77783, 9.16322] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "torso": { - "rotation": { - "0.0": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-36.25, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.625": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-15, 0, 0] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" } @@ -1640,93 +1431,77 @@ "rotation": { "0.0": { "post": { - "vector": [-37.5, 0, 0] + "vector": [-18.06, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.1667": { + "0.0833": { "post": { - "vector": [-5, 0, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.3333": { "post": { - "vector": [-37.5, 0, 0] + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [-25, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-18.06, 0, 0] }, "lerp_mode": "catmullrom" } + }, + "position": { + "vector": [0, -1, -3] } }, "L_leg": { "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [82.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-25.46, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } + "vector": [47.5, 0, 0] } }, "L_foot": { "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [117.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [42.78, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } + "vector": [122.5, 0, 0] } }, "Tail": { "rotation": { "0.0": { - "vector": [12.5, 0, 0] + "vector": [15, 0, 0] }, - "0.4167": { - "vector": [-7.5, 0, 0] + "0.1667": { + "pre": { + "vector": [-30, 0, 0] + }, + "post": { + "vector": [-30, 0, 0] + }, + "lerp_mode": "catmullrom" }, - "0.625": { - "vector": [12.5, 0, 0] + "0.375": { + "vector": [-22.86, 0, 0] }, - "0.75": { - "vector": [12.5, 0, 0] + "0.7083": { + "pre": { + "vector": [27.5, 0, 0] + }, + "post": { + "vector": [27.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [15, 0, 0] } } }, @@ -1734,31 +1509,31 @@ "rotation": { "0.0": { "post": { - "vector": [0, 0, 0] + "vector": [25, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.1667": { "post": { - "vector": [22.5, 0, 0] + "vector": [-25, 0, 0] }, "lerp_mode": "catmullrom" }, "0.4167": { "post": { - "vector": [-22.16, 0, 0] + "vector": [-30, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.625": { + "0.7917": { "post": { - "vector": [0, 0, 0] + "vector": [27.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.75": { + "1.0": { "post": { - "vector": [0, 0, 0] + "vector": [25, 0, 0] }, "lerp_mode": "catmullrom" } @@ -1768,31 +1543,37 @@ "rotation": { "0.0": { "post": { - "vector": [0, 0, 0] + "vector": [20, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.0833": { "post": { - "vector": [43.75, 0, 0] + "vector": [22.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.4167": { + "0.2083": { "post": { - "vector": [-41.98, 0, 0] + "vector": [-37.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.625": { + "0.5417": { "post": { - "vector": [0, 0, 0] + "vector": [-45, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.75": { + "0.8333": { "post": { - "vector": [0, 0, 0] + "vector": [5.58, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [20, 0, 0] }, "lerp_mode": "catmullrom" } @@ -1802,119 +1583,72 @@ "rotation": { "0.0": { "post": { - "vector": [-37.5, 0, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.1667": { + "0.25": { "post": { - "vector": [-5, 0, 0] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.75": { "post": { - "vector": [-37.5, 0, 0] + "vector": [-25, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" } + }, + "position": { + "vector": [0, -1, -3] } }, "R_leg": { "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [82.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-25.46, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } + "vector": [47.5, 0, 0] } }, "R_foot": { "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [117.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [42.78, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } + "vector": [122.5, 0, 0] } }, "L_Wing": { "rotation": { "0.0": { "post": { - "vector": [-9.14537, 13.83447, -66.78912] + "vector": [-22.5, 20, -40] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.1667": { "post": { - "vector": [-6.26261, -12.2403, 54.06134] + "vector": [-30, 40, 32.5] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.4167": { "post": { - "vector": [-9.14537, 13.83447, -66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, 3.17814, -14.63362] + "vector": [25, 27.5, 32.5] }, "lerp_mode": "catmullrom" }, - "0.25": { + "0.75": { "post": { - "vector": [-11.14442, -15.99543, 50.01072] + "vector": [0, 0, -57.5] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.0": { "post": { - "vector": [-0.32406, 3.17814, -14.63362] + "vector": [-22.5, 20, -40] }, "lerp_mode": "catmullrom" } @@ -1924,25 +1658,31 @@ "rotation": { "0.0": { "post": { - "vector": [-1.62155, 6.14718, -24.27788] + "vector": [0, 0, -22.5] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [22.5, -30, -40] }, "lerp_mode": "catmullrom" }, "0.25": { "post": { - "vector": [-10.3696, -11.36311, 31.32523] + "vector": [0, -45, 40] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.5417": { "post": { - "vector": [-0.45513, -4.44338, 16.94234] + "vector": [-2.67, -13.15, 55.66] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.0": { "post": { - "vector": [-1.62155, 6.14718, -24.27788] + "vector": [0, 0, -22.5] }, "lerp_mode": "catmullrom" } @@ -1952,47 +1692,31 @@ "rotation": { "0.0": { "post": { - "vector": [-9.14537, -13.83447, 66.78912] + "vector": [-22.5, -20, 40] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.1667": { "post": { - "vector": [-6.26261, 12.2403, -54.06134] + "vector": [-30, -40, -32.5] }, "lerp_mode": "catmullrom" }, - "0.625": { + "0.4167": { "post": { - "vector": [-9.14537, -13.83447, 66.78912] + "vector": [25, -27.5, -32.5] }, "lerp_mode": "catmullrom" }, "0.75": { "post": { - "vector": [-9.14537, -13.83447, 66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] + "vector": [0, 0, 57.5] }, "lerp_mode": "catmullrom" }, - "0.25": { + "1.0": { "post": { - "vector": [-11.14442, 15.99543, -50.01072] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] + "vector": [-22.5, -20, 40] }, "lerp_mode": "catmullrom" } @@ -2002,49 +1726,64 @@ "rotation": { "0.0": { "post": { - "vector": [-1.62155, -6.14718, 24.27788] + "vector": [0, 0, 22.5] + }, + "lerp_mode": "catmullrom" + }, + "0.0833": { + "post": { + "vector": [22.5, 30, 40] }, "lerp_mode": "catmullrom" }, "0.25": { "post": { - "vector": [-10.3696, 11.36311, -31.32523] + "vector": [0, 45, -40] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.5417": { "post": { - "vector": [-0.45513, 4.44338, -16.94234] + "vector": [-2.67, 13.15, -55.66] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.0": { "post": { - "vector": [-1.62155, -6.14718, 24.27788] + "vector": [0, 0, 22.5] }, "lerp_mode": "catmullrom" } } }, - "Nightmare": { + "body": { "rotation": { "0.0": { + "vector": [0, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [10, 0, 2.5] + }, "post": { - "vector": [0, 0, 0] + "vector": [10, 0, 2.5] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.4167": { "post": { - "vector": [-25, 0, 0] + "vector": [2.5, 5, -2.5] }, "lerp_mode": "catmullrom" }, - "0.75": { + "0.7083": { "post": { - "vector": [0, 0, 0] + "vector": [-7.5, 5, -5] }, "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] } }, "position": { @@ -2054,114 +1793,96 @@ }, "lerp_mode": "catmullrom" }, - "0.25": { + "0.2083": { "post": { - "vector": [0, 27, 39] + "vector": [0, 14, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.4167": { + "post": { + "vector": [0, 11.68, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, -7, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { "post": { "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" } } + }, + "jaw": { + "rotation": { + "0.0": { + "post": { + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [15, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [27.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } } } }, "attack": { - "animation_length": 0.7083, + "animation_length": 1, "bones": { "head": { "rotation": { "0.0": { - "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [45.43287, -10.12741, -3.50843] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [45.43287, -10.12741, -3.50843] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { "post": { "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.3333": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [27.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { "post": { "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" } } }, @@ -2169,43 +1890,43 @@ "rotation": { "0.0": { "post": { - "vector": [15, 0, 0] + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.2083": { "post": { - "vector": [-7.42695, 10.50227, 2.12085] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-7.42695, 10.50227, 2.12085] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, 0, 0] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5": { "post": { - "vector": [0, 0, 0] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [0, 0, 0] + "vector": [30, 0, 0] }, "lerp_mode": "catmullrom" }, "0.7083": { "post": { - "vector": [15, 0, 0] + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [10.78, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2215,17 +1936,29 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-15.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.125": { - "vector": [-49.49054, 12.19908, 22.62113] - }, - "0.2917": { - "vector": [-49.49054, 12.19908, 22.62113] + "0.2083": { + "post": { + "vector": [-28, 0, 10] + }, + "lerp_mode": "catmullrom" }, "0.375": { + "post": { + "vector": [-37.01, 0, 16.84] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "vector": [-33, 0, 15] + }, + "0.6667": { + "vector": [-5, 0, 0] + }, + "0.7083": { "pre": { "vector": [2.5, 0, 0] }, @@ -2234,21 +1967,15 @@ }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.8333": { "post": { - "vector": [2.5, 0, 0] + "vector": [-10.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "1.0": { "post": { - "vector": [2.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [-27.5, 0, 0] + "vector": [-15.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2256,29 +1983,546 @@ "position": { "0.0": { "post": { - "vector": [0, 0, 0] + "vector": [0, -1, 6] + }, + "lerp_mode": "catmullrom" + } + } + }, + "L_Tight": { + "rotation": { + "0.0": { + "post": { + "vector": [-20, -17.5, -5] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "L_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [42.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "L_foot": { + "rotation": { + "vector": [-20, 0, 5] + } + }, + "Tail": { + "rotation": { + "0.0": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [7.5, -25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [7.5, -25, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [7.5, 7.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Tail2": { + "rotation": { + "0.0": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": { + "vector": [-7.5, -4.26, 0] }, "lerp_mode": "catmullrom" }, "0.375": { "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 0] + "vector": [-7.5, -21.89, 0] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [0, 0, 0] + "vector": [-7.5, -20, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [-7.5, 10, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "Tail3": { + "rotation": { + "0.0": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": { + "vector": [7.5, -6.9, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [7.5, -20, 0] }, "lerp_mode": "catmullrom" }, "0.7083": { + "post": { + "vector": [7.5, -18.28, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [7.5, 15, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_Tight": { + "rotation": { + "0.0": { + "post": { + "vector": [-20, 17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [-1.25, 17.5, 11.25] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [-17.5, 17.5, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [-20, 17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [-20, 17.5, 5] + }, + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [2.25, 0.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [3, 4, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "vector": [0, -4, 0] + }, + "0.7083": { + "vector": [0, 0, 0] + }, + "0.7917": { + "vector": [0, -2, 0] + }, + "0.9167": { + "pre": { + "vector": [0, -1, 0] + }, + "post": { + "vector": [0, -1, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_leg": { + "rotation": { + "0.0": { + "post": { + "vector": [42.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": { + "vector": [60, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [60, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [42.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_foot": { + "rotation": { + "vector": [-20, 0, -5] + } + }, + "L_Wing": { + "rotation": { + "0.0": { + "post": { + "vector": [12.5, 17.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [12.5, 30, -25] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [12.5, 17.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": { + "vector": [12.5, 7.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [12.5, 13.88, -3.19] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [12.5, 17.5, -5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "L_Wing3": { + "rotation": { + "0.0": { + "post": { + "vector": [-17.5, -30, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-17.5, -10, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [0, 0, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [-12.66, -23.37, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-17.5, -30, 27.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_Wing": { + "rotation": { + "0.0": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [12.5, -30, 25] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": { + "vector": [12.5, -7.5, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [12.5, -13.88, 3.19] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_Wing3": { + "rotation": { + "0.0": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [-17.5, 10, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [0, 0, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [-12.66, 23.37, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "jaw": { + "rotation": { + "0.0": { + "post": { + "vector": [10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [32.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [62.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [10, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + } + } + }, + "attack2": { + "animation_length": 1, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": { + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [-22.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": { + "vector": [30, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": { + "vector": [-10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": { + "vector": [-10, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { "post": { "vector": [0, 0, 0] }, @@ -2290,65 +2534,111 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, -20, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.2917": { "post": { - "vector": [-27.5, -20, 0] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.5417": { "post": { - "vector": [-27.5, -20, 0] + "vector": [-32.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.6667": { "post": { - "vector": [-27.5, -20, 0] + "vector": [35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.8333": { "post": { - "vector": [-27.5, -20, 0] + "vector": [37.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" } + }, + "position": { + "vector": [0, -1, -3] } }, "L_leg": { "rotation": { "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" + "vector": [47.5, 0, 0] }, - "0.375": { + "0.2083": { + "pre": { + "vector": [45, 0, 0] + }, "post": { - "vector": [27.5, 0, 0] + "vector": [45, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5": { "post": { - "vector": [27.5, 0, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.6667": { "post": { - "vector": [27.5, 0, 0] + "vector": [-27.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.8333": { "post": { - "vector": [27.5, 0, 0] + "vector": [26.56, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [47.5, 0, 0] + } + } + }, + "L_foot": { + "rotation": { + "0.0": { + "vector": [122.5, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [94.12, 0, 0] + }, + "post": { + "vector": [94.12, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": { + "vector": [122.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2357,46 +2647,37 @@ "Tail": { "rotation": { "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" + "vector": [15, 0, 0] }, "0.125": { + "pre": { + "vector": [-27.5, 0, 0] + }, "post": { - "vector": [45, 0, 0] + "vector": [-27.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.2917": { "post": { - "vector": [45, 0, 0] + "vector": [-37.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.5417": { "post": { - "vector": [52.5, 0, 0] + "vector": [15, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.6667": { "post": { - "vector": [52.5, 0, 0] + "vector": [-52.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { - "post": { - "vector": [52.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" + "1.0": { + "vector": [15, 0, 0] } } }, @@ -2404,43 +2685,31 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [45, 0, 0] + "vector": [25, 0, 0] }, "lerp_mode": "catmullrom" }, "0.2917": { "post": { - "vector": [45, 0, 0] + "vector": [-22.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.5417": { "post": { - "vector": [42.5, 0, 0] + "vector": [15, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.75": { "post": { - "vector": [42.5, 0, 0] + "vector": [-32.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "1.0": { "post": { - "vector": [42.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [20, 0, 0] + "vector": [25, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2454,37 +2723,25 @@ }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.3333": { "post": { - "vector": [42.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [42.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [34.53376, 2.8411, 2.79232] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [34.53376, 2.8411, 2.79232] + "vector": [-32.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [34.53376, 2.8411, 2.79232] + "vector": [35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.75": { + "post": { + "vector": [-25, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { "post": { "vector": [20, 0, 0] }, @@ -2496,106 +2753,111 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-100.23633, 18.08026, 3.01914] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.2917": { "post": { - "vector": [-100.23633, 18.08026, 3.01914] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.5417": { "post": { - "vector": [-27.5, 20, 0] + "vector": [-32.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.6667": { "post": { - "vector": [-27.5, 20, 0] + "vector": [35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.8333": { "post": { - "vector": [-27.5, 20, 0] + "vector": [37.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "1.0": { "post": { - "vector": [-27.5, 20, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" } }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, -15] - }, - "0.5": { - "vector": [0, 0, -15] - }, - "0.5833": { - "vector": [0, 0, -15] - }, - "0.7083": { - "vector": [0, 0, 0] - } + "vector": [0, -1, -3] } }, "R_leg": { "rotation": { "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" + "vector": [47.5, 0, 0] }, - "0.125": { - "post": { - "vector": [99.0905, -12.17944, -17.7626] + "0.2083": { + "pre": { + "vector": [45, 0, 0] }, - "lerp_mode": "catmullrom" - }, - "0.2917": { "post": { - "vector": [99.0905, -12.17944, -17.7626] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [27.5, 0, 0] + "vector": [45, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5": { "post": { - "vector": [27.5, 0, 0] + "vector": [-12.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.6667": { "post": { - "vector": [27.5, 0, 0] + "vector": [-27.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.8333": { "post": { - "vector": [27.5, 0, 0] + "vector": [26.56, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [47.5, 0, 0] + } + } + }, + "R_foot": { + "rotation": { + "0.0": { + "vector": [122.5, 0, 0] + }, + "0.1667": { + "pre": { + "vector": [94.12, 0, 0] + }, + "post": { + "vector": [94.12, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": { + "vector": [17.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [-2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": { + "vector": [122.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2605,77 +2867,43 @@ "rotation": { "0.0": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [-22.5, 20, -40] }, "lerp_mode": "catmullrom" }, "0.125": { "post": { - "vector": [-13.82228, 44.83543, -44.99542] + "vector": [40, 37.5, 42.5] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.3333": { "post": { - "vector": [-13.82228, 44.83543, -44.99542] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [-72.5, -22.5, -27.5] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [-72.5, -47.5, -42.5] }, "lerp_mode": "catmullrom" }, "0.7083": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [-17.5, 35, 25] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.8333": { "post": { - "vector": [0, -17.5, 7.5] + "vector": [-17.5, 35, 25] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.0": { "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [0, -17.5, 7.5] + "vector": [-22.5, 20, -40] }, "lerp_mode": "catmullrom" } @@ -2685,43 +2913,55 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [0, 0, -22.5] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.0833": { "post": { - "vector": [14.89149, -9.29798, -43.71777] + "vector": [0, 0, -60] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.2083": { "post": { - "vector": [14.89149, -9.29798, -43.71777] + "vector": [0, 0, 35] }, "lerp_mode": "catmullrom" }, "0.375": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.5417": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [0, 0, -27.5] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.6667": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [0, 0, -50] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.75": { "post": { - "vector": [-6.15491, -16.41371, 35.88852] + "vector": [0, 0, 30] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [0, 0, 23.75] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, -22.5] }, "lerp_mode": "catmullrom" } @@ -2731,77 +2971,43 @@ "rotation": { "0.0": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] + "vector": [-22.5, -20, 40] }, "lerp_mode": "catmullrom" }, "0.125": { "post": { - "vector": [-4.13909, -5.53882, 43.52165] + "vector": [40, -37.5, -42.5] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.3333": { "post": { - "vector": [-4.13909, -5.53882, 43.52165] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] + "vector": [-72.5, 22.5, 27.5] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] + "vector": [-72.5, 47.5, 42.5] }, "lerp_mode": "catmullrom" }, "0.7083": { "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [-17.5, -35, -25] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.8333": { "post": { - "vector": [0, 17.5, -7.5] + "vector": [-17.5, -35, -25] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.0": { "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.7083": { - "post": { - "vector": [0, 17.5, -7.5] + "vector": [-22.5, -20, 40] }, "lerp_mode": "catmullrom" } @@ -2811,77 +3017,182 @@ "rotation": { "0.0": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 0, 22.5] }, "lerp_mode": "catmullrom" }, - "0.125": { + "0.0833": { "post": { - "vector": [14.14884, 8.83506, 43.517] + "vector": [0, 0, 60] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.2083": { "post": { - "vector": [14.14884, 8.83506, 43.517] + "vector": [0, 0, -35] }, "lerp_mode": "catmullrom" }, "0.375": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.5417": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 0, 27.5] }, "lerp_mode": "catmullrom" }, - "0.5833": { + "0.6667": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 0, 50] }, "lerp_mode": "catmullrom" }, - "0.7083": { + "0.75": { "post": { - "vector": [-6.15491, 16.41371, -35.88852] + "vector": [0, 0, -30] + }, + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": { + "vector": [0, 0, -23.75] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 22.5] }, "lerp_mode": "catmullrom" } } }, - "Nightmare": { - "position": { + "body": { + "rotation": { "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "pre": { + "vector": [-5, 0, 0] + }, "post": { - "vector": [0, -0.5, -12] + "vector": [-5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { + "0.3333": { "post": { - "vector": [0, -0.5, -12] + "vector": [5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.5417": { "post": { - "vector": [0, -0.5, -12] - }, - "lerp_mode": "catmullrom" - }, - "0.5833": { - "post": { - "vector": [0, -0.5, -12] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.7083": { "post": { - "vector": [0, -0.5, -12] + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": { + "vector": [0, 25, 14] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [0, 17, 21] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [0, -5, -41] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": { + "vector": [0, 1.75, -23.95] + }, + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": { + "vector": [0, 4.44, -5.56] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "jaw": { + "rotation": { + "0.0": { + "post": { + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [60, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": { + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": { + "vector": [20, 0, 0] }, "lerp_mode": "catmullrom" } @@ -2890,801 +3201,83 @@ } }, "roar": { - "animation_length": 1, + "animation_length": 1.5, "bones": { "head": { "rotation": { "0.0": { "post": { - "vector": [22.5, 0, 0] + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": { + "vector": [-5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [-20, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": { + "vector": [-12.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": { + "vector": [-7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": { + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" }, "0.125": { "post": { - "vector": [-27.5, 0, 0] + "vector": [27.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.2917": { + "0.3333": { "post": { - "vector": [-27.5, 0, 0] + "vector": [15, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.375": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.375": { - "vector": [0, 0, 0] - }, - "0.4167": { - "vector": [1, 0, 0] - }, - "0.4583": { - "vector": [-1, 0, 0] - }, "0.5": { - "vector": [3, 0, 0] - }, - "0.5417": { - "vector": [1, 0, 0] - }, - "0.5833": { - "vector": [5, 0, 0] - }, - "0.625": { - "vector": [2, 0, 0] - }, - "0.6667": { - "vector": [5, 0, 0] - }, - "0.7083": { - "vector": [2, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - } - } - }, - "jaw": { - "rotation": { - "0.0": { "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [62.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [62.5, 0, 0] + "vector": [-2.5, 0, 0] }, "lerp_mode": "catmullrom" }, "1.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "neck": { - "rotation": { - "0.0": { - "post": { - "vector": [15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [15, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "torso": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-60, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [50, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail2": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail3": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-5.17693, 27.57777, -50.51577] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-5.17693, 27.57777, -50.51577] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [6.88003, -16.1299, -15.97603] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [6.88003, -16.1299, -15.97603] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [11.45696, -13.31791, -26.34198] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [11.45696, -13.31791, -26.34198] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-5.17693, -27.57777, 50.51577] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [-5.17693, -27.57777, 50.51577] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [6.88003, 16.1299, 15.97603] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [6.88003, 16.1299, 15.97603] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [11.45696, 13.31791, 26.34198] - }, - "lerp_mode": "catmullrom" - }, - "0.2917": { - "post": { - "vector": [11.45696, 13.31791, 26.34198] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Nightmare": { - "position": { - "0.0": { - "post": { - "vector": [0, -0.5, -12] - }, - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": { - "vector": [0, -0.5, -12] - }, - "lerp_mode": "catmullrom" - }, - "0.75": { - "post": { - "vector": [0, -0.5, -12] - }, - "lerp_mode": "catmullrom" - }, - "1.0": { - "post": { - "vector": [0, -0.5, -12] - }, - "lerp_mode": "catmullrom" - } - } - } - } - }, - "death": { - "animation_length": 1, - "bones": { - "head": { - "rotation": { - "0.0": { - "post": { - "vector": [22.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-55, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [7.15656, 2.24944, -17.35932] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [45, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4583": { - "post": { - "vector": [43.931, 4.14085, 0.75952] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [10, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "neck": { - "rotation": { - "0.0": { - "post": { - "vector": [15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-40, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { "post": { "vector": [2.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5417": { + "1.5": { "post": { - "vector": [22.01816, 4.75113, -11.57518] + "vector": [12.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -3694,24 +3287,51 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 0, 0] + "vector": [-15.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.1667": { - "vector": [-90, 0, 0] + "0.3333": { + "post": { + "vector": [-25.5, 0, 0] + }, + "lerp_mode": "catmullrom" }, - "0.4167": { - "vector": [-65, 0, 0] + "0.4583": { + "post": { + "vector": [2.5, 0, 0] + }, + "lerp_mode": "catmullrom" }, - "0.5417": { - "vector": [0, 0, 0] + "0.6667": { + "post": { + "vector": [7.5, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": { + "vector": [1.71, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": { + "vector": [-11.46, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [-15.5, 0, 0] + }, + "lerp_mode": "catmullrom" } }, "position": { "0.0": { "post": { - "vector": [0, 0, 0] + "vector": [0, -1, 6] }, "lerp_mode": "catmullrom" } @@ -3721,25 +3341,15 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, -20, 0] + "vector": [-20, -17.5, -5] }, "lerp_mode": "catmullrom" - }, - "0.1667": { + } + }, + "position": { + "0.0": { "post": { - "vector": [-27.5, -37.5, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-27.5, -37.5, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [55.06424, 30.58184, -17.91705] + "vector": [0, -1, 0] }, "lerp_mode": "catmullrom" } @@ -3749,35 +3359,22 @@ "rotation": { "0.0": { "post": { - "vector": [27.5, 0, 0] + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" } } }, + "L_foot": { + "rotation": { + "vector": [-20, 0, 5] + } + }, "Tail": { "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [37.5, 0, -52.5] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-25, 0, 0] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -3787,25 +3384,7 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [36.39498, -17.72091, -24.60981] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [32.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [0, 0, 0] + "vector": [-7.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -3815,25 +3394,7 @@ "rotation": { "0.0": { "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [53.55239, -54.46865, -30.64234] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [17.5, 0, 0] + "vector": [7.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -3843,25 +3404,15 @@ "rotation": { "0.0": { "post": { - "vector": [-27.5, 20, 0] + "vector": [-20, 17.5, 5] }, "lerp_mode": "catmullrom" - }, - "0.1667": { + } + }, + "position": { + "0.0": { "post": { - "vector": [-80, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [-80, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [44.19476, -22.13991, 4.11405] + "vector": [0, -1, 0] }, "lerp_mode": "catmullrom" } @@ -3871,19 +3422,7 @@ "rotation": { "0.0": { "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [62.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [62.5, 0, 0] + "vector": [42.5, 0, 0] }, "lerp_mode": "catmullrom" } @@ -3891,202 +3430,162 @@ }, "R_foot": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1667": { - "vector": [40, 0, 0] - }, - "0.4167": { - "vector": [40, 0, 0] - } + "vector": [-20, 0, -5] } }, "L_Wing": { "rotation": { "0.0": { "post": { - "vector": [-2.56152, 6.42053, -28.46504] + "vector": [12.5, 17.5, -5] }, "lerp_mode": "catmullrom" }, - "0.5417": { + "0.375": { "post": { - "vector": [-2.56152, 6.42053, 16.53496] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [16.24074, -6.60796, -60.94387] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [2.14498, 17.78381, 79.71688] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-5.14352, -8.08642, 3.86612] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [16.63598, -5.01987, 94.75926] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-2.83416, 4.94206, -18.16209] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-2.56152, -6.42053, -16.53496] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [16.24074, 6.60796, 60.94387] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [2.14498, -17.78381, -79.71688] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-5.14352, 8.08642, -3.86612] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.4167": { - "post": { - "vector": [16.63598, 5.01987, -94.75926] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [-2.83416, -4.94206, 18.16209] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Nightmare": { - "rotation": { - "vector": [0, 0, 0] - }, - "position": { - "0.0": { - "post": { - "vector": [0, -0.5, -6] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [0, -0.5, -2] - }, - "lerp_mode": "catmullrom" - }, - "0.5417": { - "post": { - "vector": [0, -10.5, -21] + "vector": [12.5, 37.5, -5] }, "lerp_mode": "catmullrom" }, "0.5833": { "post": { - "vector": [0, -8.5, -21] + "vector": [12.5, -12.5, 17.5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [12.5, -17.5, 17.5] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [12.5, 17.5, -5] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [12.5, 17.5, -5] }, "lerp_mode": "catmullrom" } } - } - } - }, - "animation": { - "animation_length": 0.5, - "bones": { - "head": { + }, + "L_Wing3": { "rotation": { "0.0": { "post": { - "vector": [22.5, 0, 0] + "vector": [-17.5, -30, 27.5] }, "lerp_mode": "catmullrom" }, - "0.2083": { + "0.4583": { "post": { - "vector": [-22.5, 0, 0] + "vector": [-17.5, -30, 27.5] }, "lerp_mode": "catmullrom" }, - "0.5": { + "0.7083": { "post": { - "vector": [12.5, 0, 0] + "vector": [-12.5, -55, 22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": { + "vector": [-17.5, -30, 27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [-17.5, -30, 27.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_Wing": { + "rotation": { + "0.0": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": { + "vector": [12.5, -37.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": { + "vector": [12.5, 12.5, -17.5] + }, + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": { + "vector": [12.5, 17.5, -17.5] + }, + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [12.5, -17.5, 5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "R_Wing3": { + "rotation": { + "0.0": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": { + "vector": [-12.5, 55, -22.5] + }, + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": { + "vector": [-17.5, 30, -27.5] + }, + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "position": { + "0.0": { + "post": { + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" } @@ -4096,729 +3595,43 @@ "rotation": { "0.0": { "post": { - "vector": [12.5, 0, 0] + "vector": [10, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.2083": { + "0.25": { "post": { - "vector": [12.5, 0, 0] + "vector": [0, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": { + "vector": [0, 0, 0] }, "lerp_mode": "catmullrom" }, "0.5": { - "vector": [0, 0, 0] - } - } - }, - "neck": { - "rotation": { - "0.0": { "post": { - "vector": [15, 0, 0] + "vector": [37.5, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.2083": { + "0.75": { + "post": { + "vector": [26.09, 0, 0] + }, + "lerp_mode": "catmullrom" + }, + "1.0": { "post": { "vector": [35, 0, 0] }, "lerp_mode": "catmullrom" }, - "0.5": { + "1.5": { "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "torso": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-10, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [0, -7, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-27.5, -20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_foot": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [107.5, 0, 0] - } - } - }, - "Tail": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "vector": [12.5, 0, 0] - } - } - }, - "Tail2": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail3": { - "rotation": { - "0.0": { - "post": { - "vector": [20, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-30, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-27.5, 20, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-81.70645, 12.0174, -16.10644] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, -6, 0] - } - } - }, - "R_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [74.49779, -14.33405, 13.84936] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_foot": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2083": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [107.5, 0, 0] - } - } - }, - "L_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-2.56152, 6.42053, -28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-1.52852, -0.31071, 11.0296] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-9.14537, 13.83447, -66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [0, -17.5, 7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.32406, 3.17814, -14.63362] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, -16.41371, 35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [14.89149, -9.29798, -43.71777] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-1.62155, 6.14718, -24.27788] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-2.56152, -6.42053, 28.46504] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [-1.52852, 0.31071, -11.0296] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-9.14537, -13.83447, 66.78912] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [0, 17.5, -7.5] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-6.15491, 16.41371, -35.88852] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [14.89149, 9.29798, 43.71777] - }, - "lerp_mode": "catmullrom" - }, - "0.5": { - "post": { - "vector": [-1.62155, -6.14718, 24.27788] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Nightmare": { - "position": { - "0.0": { - "vector": [0, -0.5, -12] - }, - "0.2083": { - "vector": [0, -0.5, -12] - }, - "0.5": { - "vector": [0, 19, 0] - } - } - } - } - }, - "fly_damaged": { - "loop": true, - "animation_length": 0.25, - "bones": { - "head": { - "rotation": { - "0.0": { - "post": { - "vector": [12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "jaw": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [50.83739, -3.83835, -0.88544] - }, - "0.25": { - "vector": [31.67477, -7.67669, -1.77087] - } - } - }, - "neck": { - "rotation": { - "0.0": { - "post": { - "vector": [7.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [45.61055, -7.34558, 8.65398] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [30.22742, -9.21817, 10.86011] - }, - "lerp_mode": "catmullrom" - } - } - }, - "torso": { - "rotation": { - "0.0": { - "post": { - "vector": [-15, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-43.75, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-27.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_foot": { - "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail": { - "rotation": { - "0.0": { - "vector": [12.5, 0, 0] - }, - "0.125": { - "vector": [-20, 0, 0] - } - } - }, - "Tail2": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-42.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-20, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Tail3": { - "rotation": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-26.25, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-12.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Tight": { - "rotation": { - "0.0": { - "post": { - "vector": [-37.5, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.1667": { - "post": { - "vector": [-5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_leg": { - "rotation": { - "0.0": { - "post": { - "vector": [60, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_foot": { - "rotation": { - "0.0": { - "post": { - "vector": [107.5, 0, 0] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-9.14537, 13.83447, -66.78912] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-6.26261, -12.2403, 54.06134] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, 3.17814, -14.63362] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-11.14442, -15.99543, 50.01072] - }, - "lerp_mode": "catmullrom" - } - } - }, - "L_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-1.62155, 6.14718, -24.27788] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-10.3696, -11.36311, 31.32523] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing": { - "rotation": { - "0.0": { - "post": { - "vector": [-9.14537, -13.83447, 66.78912] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [-6.26261, 12.2403, -54.06134] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing2": { - "rotation": { - "0.0": { - "post": { - "vector": [-0.32406, -3.17814, 14.63362] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-11.14442, 15.99543, -50.01072] - }, - "lerp_mode": "catmullrom" - } - } - }, - "R_Wing3": { - "rotation": { - "0.0": { - "post": { - "vector": [-1.62155, -6.14718, 24.27788] - }, - "lerp_mode": "catmullrom" - }, - "0.25": { - "post": { - "vector": [-10.3696, 11.36311, -31.32523] - }, - "lerp_mode": "catmullrom" - } - } - }, - "Nightmare": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.125": { - "vector": [-32.5, 0, 0] - } - }, - "position": { - "0.0": { - "post": { - "vector": [0, 0, 0] - }, - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": { - "vector": [0, 16.85, 34] - }, - "lerp_mode": "catmullrom" - }, - "0.2083": { - "post": { - "vector": [0, 27, 0] + "vector": [10, 0, 0] }, "lerp_mode": "catmullrom" } diff --git a/common/src/main/resources/assets/antarchy/geo/nightmare.geo.json b/common/src/main/resources/assets/antarchy/geo/nightmare.geo.json index b2b50762..f724110b 100644 --- a/common/src/main/resources/assets/antarchy/geo/nightmare.geo.json +++ b/common/src/main/resources/assets/antarchy/geo/nightmare.geo.json @@ -4,23 +4,28 @@ { "description": { "identifier": "geometry.unknown", - "texture_width": 128, - "texture_height": 512, - "visible_bounds_width": 15, + "texture_width": 256, + "texture_height": 256, + "visible_bounds_width": 17, "visible_bounds_height": 4.5, "visible_bounds_offset": [0, 1.75, 0] }, "bones": [ { "name": "Nightmare", - "pivot": [0, 19.5, 15] + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "Nightmare", + "pivot": [0, 17.5, 15] }, { "name": "R_Tight", - "parent": "Nightmare", + "parent": "body", "pivot": [-11, 21.25, 18.25], "cubes": [ - {"origin": [-15, 9, 10], "size": [8, 20, 13], "uv": [0, 179], "mirror": true} + {"origin": [-15, 9, 10], "size": [8, 20, 13], "uv": [0, 128], "mirror": true} ] }, { @@ -28,7 +33,7 @@ "parent": "R_Tight", "pivot": [-11, 12, 19.5], "cubes": [ - {"origin": [-14, 2, 16.5], "size": [6, 10, 6], "uv": [58, 135], "mirror": true} + {"origin": [-14, 2, 16.5], "size": [6, 10, 6], "uv": [52, 77], "mirror": true} ] }, { @@ -36,17 +41,17 @@ "parent": "R_leg", "pivot": [-11, 1, 19.5], "cubes": [ - {"origin": [-15, 0, 12.5], "size": [8, 2, 10], "uv": [52, 97], "mirror": true}, - {"origin": [-8.5, 0, 5.5], "size": [0, 4, 7], "uv": [31, 80], "mirror": true}, - {"origin": [-13.5, 0, 5.5], "size": [0, 4, 7], "uv": [31, 80], "mirror": true} + {"origin": [-15, 0, 12.5], "size": [8, 2, 10], "uv": [51, 0], "mirror": true}, + {"origin": [-8.5, 0, 5.5], "size": [0, 4, 7], "uv": [0, -7], "mirror": true}, + {"origin": [-13.5, 0, 5.5], "size": [0, 4, 7], "uv": [0, -7], "mirror": true} ] }, { "name": "L_Tight", - "parent": "Nightmare", + "parent": "body", "pivot": [11, 21.25, 18.25], "cubes": [ - {"origin": [7, 9, 10], "size": [8, 20, 13], "uv": [0, 179]} + {"origin": [7, 9, 10], "size": [8, 20, 13], "uv": [0, 128]} ] }, { @@ -54,7 +59,7 @@ "parent": "L_Tight", "pivot": [11, 12, 19.5], "cubes": [ - {"origin": [8, 2, 16.5], "size": [6, 10, 6], "uv": [58, 135]} + {"origin": [8, 2, 16.5], "size": [6, 10, 6], "uv": [52, 77]} ] }, { @@ -62,17 +67,17 @@ "parent": "L_leg", "pivot": [11, 1, 19.5], "cubes": [ - {"origin": [7, 0, 12.5], "size": [8, 2, 10], "uv": [52, 97]}, - {"origin": [8.5, 0, 5.5], "size": [0, 4, 7], "uv": [31, 80]}, - {"origin": [13.5, 0, 5.5], "size": [0, 4, 7], "uv": [31, 80]} + {"origin": [7, 0, 12.5], "size": [8, 2, 10], "uv": [51, 0]}, + {"origin": [8.5, 0, 5.5], "size": [0, 4, 7], "uv": [0, -7]}, + {"origin": [13.5, 0, 5.5], "size": [0, 4, 7], "uv": [0, -7]} ] }, { "name": "torso", - "parent": "Nightmare", + "parent": "body", "pivot": [0, 19.5, 15], "cubes": [ - {"origin": [-7, 6, -9], "size": [14, 27, 24], "uv": [5, 128]} + {"origin": [-7, 6, -9], "size": [14, 27, 24], "uv": [0, 77]} ] }, { @@ -80,7 +85,7 @@ "parent": "torso", "pivot": [0, 32, 13.08333], "cubes": [ - {"origin": [-5, 24, 13], "size": [10, 13, 22], "uv": [42, 179]} + {"origin": [-5, 24, 13], "size": [10, 13, 22], "uv": [54, 106]} ] }, { @@ -88,7 +93,7 @@ "parent": "Tail", "pivot": [0, 32.75, 35], "cubes": [ - {"origin": [-4, 27, 35], "size": [8, 10, 21], "uv": [70, 93]} + {"origin": [-4, 27, 35], "size": [8, 10, 21], "uv": [68, 28]} ] }, { @@ -96,8 +101,8 @@ "parent": "Tail2", "pivot": [0, 33.5, 56], "cubes": [ - {"origin": [0, 30, 66], "size": [0, 14, 20], "uv": [82, 199]}, - {"origin": [-3, 30, 56], "size": [6, 7, 21], "uv": [70, 19]} + {"origin": [0, 32, 66], "size": [0, 14, 20], "uv": [88, 40]}, + {"origin": [-3, 30, 56], "size": [6, 7, 21], "uv": [70, 0]} ] }, { @@ -105,50 +110,36 @@ "parent": "torso", "pivot": [0, 22.5, -8], "cubes": [ - {"origin": [-9, 13, -24], "size": [18, 19, 16], "uv": [0, 93]} + {"origin": [-9, 13, -24], "size": [18, 19, 16], "uv": [0, 42]} ] }, { "name": "head", "parent": "neck", - "pivot": [0, 21.3125, -20.875], + "pivot": [0, 26.3125, -22.875], "cubes": [ - {"origin": [-8, 17, -37], "size": [16, 9, 16], "uv": [0, 0]}, - {"origin": [-6.75, 14.75, -31], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [-6.75, 14.75, -34], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [-6.75, 14.75, -37], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [-4.75, 14.75, -38.5], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [-3.5, 14.75, -40.5], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [-1.5, 14.75, -40.5], "size": [0, 3, 2], "uv": [11, 10]}, - {"origin": [1.5, 14.75, -40.5], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [3.5, 14.75, -40.5], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [6.75, 14.75, -31], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [6.75, 14.75, -34], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [6.75, 14.75, -37], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [4.75, 14.75, -38.5], "size": [0, 3, 2], "uv": [11, 10], "mirror": true}, - {"origin": [8, 21, -34], "size": [9, 4, 13], "uv": [64, 0]}, - {"origin": [15, 21, -37], "size": [5, 5, 16], "uv": [42, 41]}, - {"origin": [-17, 21, -34], "size": [9, 4, 13], "uv": [64, 0], "mirror": true}, - {"origin": [-20, 21, -37], "size": [5, 5, 16], "uv": [42, 41], "mirror": true}, - {"origin": [0, 26, -37], "size": [0, 15, 12], "uv": [4, 66]}, - {"origin": [-5, 17, -41], "size": [10, 9, 4], "uv": [76, 62]}, - {"origin": [-1.5, 15, -45], "size": [3, 11, 4], "uv": [76, 75]} + {"origin": [-5, 13.075, -34], "size": [0, 9, 11], "uv": [42, 130]}, + {"origin": [5, 13.075, -34], "size": [0, 9, 11], "uv": [42, 130], "mirror": true}, + {"origin": [-8, 22, -42], "size": [16, 5, 19], "uv": [0, 0]}, + {"origin": [0, 27, -42], "size": [0, 13, 9], "uv": [0, 75]}, + {"origin": [0, 27, -52], "size": [0, 4, 9], "uv": [0, 70]}, + {"origin": [-15, 24, -36], "size": [9, 4, 12], "uv": [0, 202]}, + {"origin": [6, 24, -36], "size": [9, 4, 12], "uv": [0, 202], "mirror": true}, + {"origin": [-6, 18, -54], "size": [12, 5, 12], "inflate": 0.1, "uv": [68, 179]}, + {"origin": [-6, 21, -54], "size": [12, 6, 12], "uv": [0, 24]}, + {"origin": [-3, 27, -55], "size": [6, 6, 0], "uv": [53, 51]} ] }, { "name": "jaw", "parent": "head", - "pivot": [0, 17, -21], + "pivot": [0, 20, -23], "cubes": [ - {"origin": [-6, 13, -33], "size": [12, 4, 12], "uv": [0, 25]}, - {"origin": [-5, 17, -33], "size": [0, 2, 12], "uv": [26, 30]}, - {"origin": [-3.5, 17, -39], "size": [0, 2, 6], "uv": [32, 36]}, - {"origin": [-3.5, 17, -38.5], "size": [7, 2, 0], "uv": [26, 44], "mirror": true}, - {"origin": [3.5, 17, -39], "size": [0, 2, 6], "uv": [32, 36], "mirror": true}, - {"origin": [5, 17, -33], "size": [0, 2, 12], "uv": [26, 30], "mirror": true}, - {"origin": [-9, 13, -27], "size": [3, 7, 6], "inflate": 0.1, "uv": [48, 0]}, - {"origin": [6, 13, -27], "size": [3, 7, 6], "inflate": 0.1, "uv": [48, 0], "mirror": true}, - {"origin": [-5, 13, -39], "size": [10, 4, 6], "uv": [48, 25]} + {"origin": [-10, 11, -37], "size": [20, 9, 14], "inflate": 0.1, "uv": [0, 179]}, + {"origin": [-5, 16.075, -53], "size": [10, 4, 16], "uv": [48, 141]}, + {"origin": [-4, 20.075, -53], "size": [0, 4, 16], "uv": [30, 186]}, + {"origin": [-4, 20.075, -52], "size": [8, 4, 0], "uv": [30, 206], "mirror": true}, + {"origin": [4, 20.075, -53], "size": [0, 4, 16], "uv": [30, 186], "mirror": true} ] }, { @@ -156,8 +147,7 @@ "parent": "torso", "pivot": [5.83333, 28, -1.66667], "cubes": [ - {"origin": [5, 23, -5], "size": [11, 9, 9], "uv": [82, 133]}, - {"origin": [2, 28, 4], "size": [14, 0, 23], "uv": [77, 158]} + {"origin": [5, 23, -5], "size": [11, 9, 9], "uv": [76, 75]} ] }, { @@ -165,8 +155,11 @@ "parent": "L_Wing", "pivot": [16, 28.25, -2.25], "cubes": [ - {"origin": [16, 26, -5], "size": [43, 4, 7], "uv": [0, 238]}, - {"origin": [16, 28, 2], "size": [43, 0, 25], "uv": [-25, 265]} + {"origin": [16, 26, -5], "size": [43, 4, 7], "uv": [0, 161]}, + {"origin": [55, 30, 2], "size": [4, 0, 50], "uv": [70, 128]}, + {"origin": [55, 28.75, 2], "size": [4, 0, 50], "uv": [70, 128]}, + {"origin": [-3, 29, 2], "size": [10, 0, 41], "uv": [87, 128]}, + {"origin": [7, 29, 2], "size": [52, 0, 44], "uv": [80, 0]} ] }, { @@ -174,8 +167,8 @@ "parent": "L_Wing2", "pivot": [59, 28.5, -3], "cubes": [ - {"origin": [59, 27, -5], "size": [43, 3, 4], "uv": [0, 255]}, - {"origin": [59, 28, -1], "size": [49, 0, 28], "uv": [-28, 292]} + {"origin": [59, 27, -5], "size": [43, 3, 4], "uv": [0, 172]}, + {"origin": [59, 29, -5], "size": [69, 0, 51], "uv": [66, 74]} ] }, { @@ -183,8 +176,7 @@ "parent": "torso", "pivot": [-5.83333, 28, -1.66667], "cubes": [ - {"origin": [-16, 23, -5], "size": [11, 9, 9], "uv": [82, 133], "mirror": true}, - {"origin": [-16, 28, 4], "size": [14, 0, 23], "uv": [77, 158], "mirror": true} + {"origin": [-16, 23, -5], "size": [11, 9, 9], "uv": [76, 75], "mirror": true} ] }, { @@ -192,8 +184,11 @@ "parent": "R_Wing", "pivot": [-16, 28.25, -2.25], "cubes": [ - {"origin": [-59, 26, -5], "size": [43, 4, 7], "uv": [0, 238], "mirror": true}, - {"origin": [-59, 28, 2], "size": [43, 0, 25], "uv": [-25, 265], "mirror": true} + {"origin": [-59, 26, -5], "size": [43, 4, 7], "uv": [0, 161], "mirror": true}, + {"origin": [-59, 30, 2], "size": [4, 0, 50], "uv": [70, 128], "mirror": true}, + {"origin": [-59, 28.75, 2], "size": [4, 0, 50], "uv": [70, 128], "mirror": true}, + {"origin": [-59, 29, 2], "size": [52, 0, 44], "uv": [80, 0], "mirror": true}, + {"origin": [-7, 29, 2], "size": [10, 0, 41], "uv": [87, 128], "mirror": true} ] }, { @@ -201,8 +196,8 @@ "parent": "R_Wing2", "pivot": [-59, 28.5, -3], "cubes": [ - {"origin": [-102, 27, -5], "size": [43, 3, 4], "uv": [0, 255], "mirror": true}, - {"origin": [-108, 28, -1], "size": [49, 0, 28], "uv": [-28, 292], "mirror": true} + {"origin": [-128, 29, -5], "size": [69, 0, 51], "uv": [66, 74], "mirror": true}, + {"origin": [-102, 27, -5], "size": [43, 3, 4], "uv": [0, 172], "mirror": true} ] } ] diff --git a/common/src/main/resources/assets/antarchy/lang/en_us.json b/common/src/main/resources/assets/antarchy/lang/en_us.json index a023eacb..501bbb10 100644 --- a/common/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common/src/main/resources/assets/antarchy/lang/en_us.json @@ -177,6 +177,8 @@ "item.antarchy.big_bertha": "Big Bertha", "item.antarchy.wasp_nest": "Wasp Nest", "item.antarchy.stink_bug": "Stink Bug", + "item.antarchy.creeping_horror_egg": "Creeping Horror Egg", + "item.antarchy.lurking_terror_egg": "Lurking Terror Egg", "item.antarchy.stink_bug_spawn_egg": "Stink Bug Spawn Egg", "item.antarchy.wasp_spawn_egg": "Wasp Spawn Egg", "item.antarchy.bomber_spawn_egg": "Bomber Spawn Egg", diff --git a/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png b/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png index 9f4fb0b4..e8030976 100644 Binary files a/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png and b/common/src/main/resources/assets/antarchy/textures/entity/nightmare.png differ diff --git a/common/src/main/resources/data/antarchy/dimension/cavaryn.json b/common/src/main/resources/data/antarchy/dimension/cavaryn.json deleted file mode 100644 index 5a96e0a7..00000000 --- a/common/src/main/resources/data/antarchy/dimension/cavaryn.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "antarchy:cavaryn", - "generator": { - "type": "minecraft:noise", - "settings": "antarchy:cavaryn", - "biome_source": { - "type": "minecraft:multi_noise", - "biomes": [ - { - "parameters": { - "temperature": [-1.0, 1.0], - "humidity": [-1.0, 1.0], - "continentalness": [-1.0, 1.0], - "erosion": [-1.0, 1.0], - "weirdness": [-1.0, 1.0], - "depth": [-2.0, -0.1], - "offset": 0.0 - }, - "biome": "antarchy:cavaryn" - }, - { - "parameters": { - "temperature": [-1.0, 1.0], - "humidity": [-1.0, 1.0], - "continentalness": [-1.0, 1.0], - "erosion": [-1.0, 1.0], - "weirdness": [-1.0, 1.0], - "depth": [-0.1, 2.0], - "offset": 0.0 - }, - "biome": "antarchy:brooding_tunnels" - } - ] - } - } -} diff --git a/common/src/main/resources/data/antarchy/dimension_type/cavaryn.json b/common/src/main/resources/data/antarchy/dimension_type/cavaryn.json deleted file mode 100644 index 5aed0ffe..00000000 --- a/common/src/main/resources/data/antarchy/dimension_type/cavaryn.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "ultrawarm": true, - "natural": false, - "coordinate_scale": 64.0, - "bed_works": false, - "respawn_anchor_works": false, - "min_y": 0, - "height": 208, - "logical_height": 192, - "infiniburn": "#minecraft:infiniburn_overworld", - "effects": "minecraft:overworld", - "ambient_light": 0.015, - "piglin_safe": false, - "has_raids": false, - "monster_spawn_light_level": 0, - "monster_spawn_block_light_limit": 0, - "has_skylight": false, - "has_ceiling": true, - "fixed_time": 18000 -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json deleted file mode 100644 index dfba2794..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_lichen.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_lichen" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_lichen" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json deleted file mode 100644 index a8bfc055..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_moss_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_moss_block" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json b/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json deleted file mode 100644 index 7e68cad1..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/amber_moss_carpet.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:amber_moss_carpet" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/amber_moss_carpet" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json b/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json deleted file mode 100644 index 32eb33c8..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/bile_vein.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:bile_vein" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/bile_vein" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json b/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json deleted file mode 100644 index 127d6661..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/broodstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:broodstone" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/broodstone" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json b/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json deleted file mode 100644 index c53e8175..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/chiten_block" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json b/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json deleted file mode 100644 index b1d9fae3..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/chiten_spike.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten_spike" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json deleted file mode 100644 index 836c069c..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/turtle_egg" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_eggs.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_eggs.json deleted file mode 100644 index ee8223b7..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_eggs.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:block","pools":[]} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json deleted file mode 100644 index e1abf289..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creepvine.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:creepvine" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/creepvine" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json deleted file mode 100644 index 8f78d48b..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/turtle_egg" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_eggs.json b/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_eggs.json deleted file mode 100644 index ee8223b7..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_eggs.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"minecraft:block","pools":[]} diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json b/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json deleted file mode 100644 index fd82e19e..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/myrmite.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:myrmite" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "antarchy:blocks/myrmite" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json b/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json deleted file mode 100644 index 6f31cc60..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/creeping_horror" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json deleted file mode 100644 index d206ce93..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:jumpy_bug_leg", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ] -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json b/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json deleted file mode 100644 index 48b83cfa..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/lurking_terror" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json deleted file mode 100644 index bed1a754..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/spit_bug.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:chiten", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - } - }, - { - "function": "minecraft:enchanted_count_increase", - "enchantment": "minecraft:looting", - "count": { - "type": "minecraft:uniform", - "min": 0.0, - "max": 1.0 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:killed_by_player" - } - ] - } - ], - "random_sequence": "antarchy:entities/spit_bug" -} diff --git a/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json b/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json deleted file mode 100644 index a392269a..00000000 --- a/common/src/main/resources/data/antarchy/loot_table/entities/stink_bug.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "name": "antarchy:stink_bug" - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 1.0 - } - } - ] - } - ], - "random_sequence": "antarchy:entities/stink_bug" -} diff --git a/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json b/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json deleted file mode 100644 index 3f0c3b5d..00000000 --- a/common/src/main/resources/data/antarchy/recipe/amber_moss_carpet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "antarchy:amber_moss_block" - } - }, - "pattern": [ - "#", - "#" - ], - "result": { - "count": 3, - "id": "antarchy:amber_moss_carpet" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json b/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json deleted file mode 100644 index 9f10eac7..00000000 --- a/common/src/main/resources/data/antarchy/recipe/bone_meal_from_chiten.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "antarchy:chiten" - } - ], - "result": { - "count": 1, - "id": "minecraft:bone_meal" - } -} diff --git a/common/src/main/resources/data/antarchy/recipe/chiten_block.json b/common/src/main/resources/data/antarchy/recipe/chiten_block.json deleted file mode 100644 index b035961a..00000000 --- a/common/src/main/resources/data/antarchy/recipe/chiten_block.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "antarchy:chiten" - } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "count": 1, - "id": "antarchy:chiten_block" - } -} diff --git a/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json b/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json deleted file mode 100644 index 7c1185df..00000000 --- a/common/src/main/resources/data/antarchy/tags/block/amber_moss_replaceable.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "#minecraft:moss_replaceable", - "antarchy:myrmite", - "antarchy:broodstone", - "antarchy:amber_moss_block" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/block/hercules_beetle_charge_immune_blocks.json b/common/src/main/resources/data/antarchy/tags/block/hercules_beetle_charge_immune_blocks.json deleted file mode 100644 index 5234c475..00000000 --- a/common/src/main/resources/data/antarchy/tags/block/hercules_beetle_charge_immune_blocks.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:bedrock", - "minecraft:obsidian", - "minecraft:crying_obsidian", - "minecraft:barrier", - "minecraft:command_block", - "minecraft:chain_command_block", - "minecraft:repeating_command_block", - "minecraft:structure_block", - "minecraft:jigsaw", - "minecraft:structure_void", - "minecraft:end_portal_frame", - "minecraft:end_portal", - "minecraft:end_gateway" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/block/termite_foods.json b/common/src/main/resources/data/antarchy/tags/block/termite_foods.json deleted file mode 100644 index 54c986bb..00000000 --- a/common/src/main/resources/data/antarchy/tags/block/termite_foods.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:planks", - "#minecraft:logs", - "#minecraft:wooden_slabs", - "#minecraft:wooden_stairs", - "#minecraft:wooden_doors", - "#minecraft:wooden_trapdoors", - "#minecraft:wooden_fences", - "#minecraft:wooden_pressure_plates", - "#minecraft:wooden_buttons" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json b/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json deleted file mode 100644 index 0f2f4352..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/hercules_beetle_food.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:glow_berries" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json b/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json deleted file mode 100644 index 90f5f079..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_activation_items.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:stick" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json b/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json deleted file mode 100644 index d280b15e..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_breeding_foods.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:logs", - "#minecraft:planks", - "#minecraft:wooden_slabs", - "#minecraft:wooden_stairs", - "#minecraft:wooden_fences", - "#minecraft:fence_gates", - "#minecraft:wooden_doors", - "#minecraft:wooden_trapdoors", - "#minecraft:wooden_pressure_plates", - "#minecraft:wooden_buttons", - "minecraft:stick", - "minecraft:bowl", - "minecraft:ladder", - "minecraft:crafting_table", - "minecraft:chest", - "minecraft:barrel" - ] -} diff --git a/common/src/main/resources/data/antarchy/tags/item/termite_foods.json b/common/src/main/resources/data/antarchy/tags/item/termite_foods.json deleted file mode 100644 index 5d341ba2..00000000 --- a/common/src/main/resources/data/antarchy/tags/item/termite_foods.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} diff --git a/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json b/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json deleted file mode 100644 index e9bd598e..00000000 --- a/common/src/main/resources/data/antarchy/tags/worldgen/biome/is_cavaryn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "antarchy:cavaryn", - "antarchy:brooding_tunnels" - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json b/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json index 1cb3d871..04cceaf5 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json @@ -36,29 +36,12 @@ [], [], [], - [ - "antarchy:cavaryn_bile_veins", - "antarchy:brooding_tunnels_creepvine" - ], - [ - "antarchy:cavaryn_bile_cysts" - ] + [], + [] ], "creature_spawn_probability": 0.06, "spawners": { "monster": [ - { - "type": "antarchy:jumpy_bug", - "weight": 95, - "minCount": 1, - "maxCount": 3 - }, - { - "type": "antarchy:spit_bug", - "weight": 95, - "minCount": 2, - "maxCount": 5 - } ], "creature": [ ], diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json b/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json deleted file mode 100644 index 4c7e0c44..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/biome/cavaryn.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "has_precipitation": false, - "temperature": 0.45, - "downfall": 0.0, - "effects": { - "fog_color": 983040, - "water_color": 327680, - "water_fog_color": 0, - "sky_color": 524288, - "grass_color": 4211262, - "foliage_color": 4211262, - "mood_sound": { - "sound": "minecraft:ambient.cave", - "tick_delay": 1200000, - "block_search_extent": 8, - "offset": 2.0 - }, - "particle": { - "probability": 0.002, - "options": { - "type": "antarchy:orange_ash" - } - } - }, - "spawn_costs": { - "antarchy:hercules_beetle": { - "energy_budget": 0.1, - "charge": 15 - } - }, - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [], - [], - [], - [], - [], - [], - [], - [ - "antarchy:cavaryn_bile_veins", - "antarchy:cavaryn_bile_cysts", - "antarchy:cavaryn_chiten_spikes", - "antarchy:cavaryn_terror_egg_patch", - "antarchy:cavaryn_wall_amber_moss", - "antarchy:cavaryn_creepvine" - ], - [ - ] - ], - "creature_spawn_probability": 0.06, - "spawners": { - "monster": [ - { - "type": "antarchy:creeping_horror", - "weight": 95, - "minCount": 2, - "maxCount": 5 - }, - { - "type": "antarchy:lurking_terror", - "weight": 95, - "minCount": 2, - "maxCount": 5 - }, - { - "type": "antarchy:hercules_beetle", - "weight": 5, - "minCount": 1, - "maxCount": 1 - } - ], - "creature": [ - { - "type": "antarchy:stink_bug", - "weight": 10, - "minCount": 1, - "maxCount": 3 - } - ], - "ambient": [ - ], - "axolotls": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json b/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json index 55655a56..cfa7f932 100644 --- a/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json +++ b/common/src/main/resources/data/antarchy/worldgen/biome/sparse_ouranwood_forest.json @@ -62,8 +62,7 @@ [ "antarchy:ouranwood_trees_sparse", "antarchy:elythia_forest_flora", - "antarchy:elythia_brown_ant_nests", - "antarchy:termite_nest" + "antarchy:elythia_brown_ant_nests" ], [] ], diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json deleted file mode 100644 index 0ba3323d..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_patch_bonemeal.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:vegetation_patch", - "config": { - "depth": 1, - "extra_bottom_block_chance": 0.0, - "extra_edge_column_chance": 0.75, - "ground_state": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:amber_moss_block" - } - }, - "replaceable": "#antarchy:amber_moss_replaceable", - "surface": "floor", - "vegetation_chance": 0.6, - "vegetation_feature": { - "feature": "antarchy:amber_moss_vegetation", - "placement": [] - }, - "vertical_range": 5, - "xz_radius": { - "type": "minecraft:uniform", - "max_inclusive": 2, - "min_inclusive": 1 - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json deleted file mode 100644 index f99e9268..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/amber_moss_vegetation.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:amber_moss_carpet", - "Properties": { - "bottom": "true", - "east": "none", - "north": "none", - "south": "none", - "west": "none" - } - } - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json deleted file mode 100644 index 1616e268..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_cysts.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_bile_cysts", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json deleted file mode 100644 index 6a2a5e5d..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_bile_veins.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_bile_veins", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json deleted file mode 100644 index cb963a90..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_chiten_spikes.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "antarchy:cavaryn_chiten_spikes", - "config": { - "floor_to_ceiling_search_range": 10, - "radius": 4, - "max_column_height": 5, - "height_deviation": 1, - "chance_of_column_at_max_distance_from_center": 0.3, - "max_distance_from_center_affecting_chance_of_column": 4, - "max_distance_from_center_affecting_height_bias": 4, - "max_height_difference": 1, - "large_variant_chance": 0.35, - "large_variant_extra_radius": 3, - "large_variant_extra_height": 4, - "large_variant_extra_height_deviation": 2, - "large_variant_surface_spike_multiplier": 2.5 - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json deleted file mode 100644 index 13d7a210..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_creepvine.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_creepvine", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json deleted file mode 100644 index 76039ff0..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_terror_egg_patch.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_terror_egg_patch", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json deleted file mode 100644 index f06cc5d9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/cavaryn_wall_amber_moss.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:cavaryn_wall_amber_moss", - "config": {} -} diff --git a/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json b/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json deleted file mode 100644 index f777d3bb..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/configured_feature/termite_nest.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "antarchy:termite_nest", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "antarchy:termite_nest", - "Properties": { - "facing": "north" - } - } - } - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json b/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json deleted file mode 100644 index 02ada1e9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_custom.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "type": "minecraft:add", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:cache_2d", - "argument": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:weird_scaled_sampler", - "input": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_modulator", - "xz_scale": 0.25, - "y_scale": 0.15 - }, - "noise": "antarchy:cavaryn", - "rarity_value_mapper": "type_2" - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 0.123, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": -0.86, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.25, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_thickness", - "xz_scale": 1.2, - "y_scale": 1.5 - } - } - } - } - } - }, - "argument2": { - "type": "minecraft:cube", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": 0, - "argument2": { - "type": "minecraft:mul", - "argument1": 10, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_elevation", - "xz_scale": 0.8, - "y_scale": 0.4 - } - } - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_y": 252, - "to_y": 8, - "from_value": 10, - "to_value": -10 - } - } - }, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": -0.86, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.25, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_thickness", - "xz_scale": 1.2, - "y_scale": 1.5 - } - } - } - } - } - } - }, - "max": 2.0, - "min": -2.0 - } - }, - "argument2": { - "type": "minecraft:cache_all_in_cell", - "argument": "antarchy:cavaryn_noise_cave" - } - }, - "argument2": -0.05 -} diff --git a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_noise_cave.json b/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_noise_cave.json deleted file mode 100644 index 5ce470a6..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/density_function/cavaryn_noise_cave.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "type": "minecraft:add", - "argument1": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 232, - "to_y": 20, - "from_value": 1.45, - "to_value": 0.12 - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:noise", - "noise": "minecraft:noodle_thickness", - "xz_scale": 1, - "y_scale": 7.5 - }, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:weird_scaled_sampler", - "rarity_value_mapper": "type_1", - "noise": "minecraft:patch", - "input": { - "type": "minecraft:interpolated", - "argument": 1 - } - }, - "argument2": { - "type": "minecraft:cube", - "argument": 0.5 - } - } - } - } - }, - "argument2": 0.3 -} diff --git a/common/src/main/resources/data/antarchy/worldgen/noise/cavaryn.json b/common/src/main/resources/data/antarchy/worldgen/noise/cavaryn.json deleted file mode 100644 index 76e945fc..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/noise/cavaryn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "firstOctave": -7, - "amplitudes": [ - 0.95, - 0.95 - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json b/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json deleted file mode 100644 index 22fbb2c6..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/noise_settings/cavaryn.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "sea_level": 32, - "disable_mob_generation": false, - "aquifers_enabled": true, - "ore_veins_enabled": false, - "legacy_random_source": false, - "default_block": { - "Name": "antarchy:myrmite" - }, - "default_fluid": { - "Name": "antarchy:bile", - "Properties": { - "level": "0" - } - }, - "noise": { - "min_y": 0, - "height": 208, - "size_horizontal": 1, - "size_vertical": 2 - }, - "noise_router": { - "barrier": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_barrier", - "xz_scale": 1, - "y_scale": 0.5 - }, - "fluid_level_floodedness": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_floodedness", - "xz_scale": 1, - "y_scale": 0.67 - }, - "fluid_level_spread": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_spread", - "xz_scale": 1, - "y_scale": 0.7142857142857143 - }, - "lava": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_lava", - "xz_scale": 1, - "y_scale": 1 - }, - "temperature": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "vegetation": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "continents": "minecraft:overworld/continents", - "erosion": "minecraft:overworld/erosion", - "depth": "minecraft:overworld/depth", - "ridges": "minecraft:overworld/ridges", - "initial_density_without_jaggedness": 0, - "final_density": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 0, - "to_y": 12, - "from_value": 4, - "to_value": -0.5 - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_y": 196, - "to_y": 207, - "from_value": -0.5, - "to_value": 4 - } - }, - "argument2": { - "type": "minecraft:min", - "argument1": "minecraft:overworld/caves/noodle", - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": 4, - "max_exclusive": 204, - "when_in_range": "antarchy:cavaryn_custom", - "when_out_of_range": 2 - } - } - }, - "vein_toggle": 0, - "vein_ridged": 0, - "vein_gap": 0 - }, - "spawn_target": [ - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -1, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - -1, - 1 - ], - "depth": 0, - "offset": 0 - } - ], - "surface_rule": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "absolute": 5 - }, - "surface_depth_multiplier": 0 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "below_top": 5 - }, - "surface_depth_multiplier": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": ["antarchy:brooding_tunnels"] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:broodstone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "add_stone_depth": false, - "anchor": { - "absolute": 40 - }, - "surface_depth_multiplier": 0 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:myrmite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "antarchy:myrmite" - } - } - ] - } -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json deleted file mode 100644 index 61470bd2..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/brooding_tunnels_creepvine.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_creepvine", - "placement": [ - { - "type": "minecraft:count", - "count": 22 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json deleted file mode 100644 index 702f99a5..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_amber_moss_patch.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:amber_moss_patch_bonemeal", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json deleted file mode 100644 index ff189ab4..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_cysts.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_bile_cysts", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json deleted file mode 100644 index b18f9af9..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_bile_veins.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_bile_veins", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json deleted file mode 100644 index f4e08187..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_chiten_spikes.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_chiten_spikes", - "placement": [ - { - "type": "minecraft:count", - "count": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json deleted file mode 100644 index f81d4998..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_creepvine.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_creepvine", - "placement": [ - { - "type": "minecraft:count", - "count": 18 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json deleted file mode 100644 index 01c6693b..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_terror_egg_patch.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_terror_egg_patch", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 8 - }, - "max_inclusive": { - "below_top": 16 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json deleted file mode 100644 index d7c131c3..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/cavaryn_wall_amber_moss.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "antarchy:cavaryn_wall_amber_moss", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "min_inclusive": { - "above_bottom": 12 - }, - "max_inclusive": { - "below_top": 12 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json b/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json deleted file mode 100644 index 70a93fad..00000000 --- a/common/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "antarchy:termite_nest", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 88 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/common/src/main/resources/data/c/tags/block/stones.json b/common/src/main/resources/data/c/tags/block/stones.json index 3da0bc9b..83c265b0 100644 --- a/common/src/main/resources/data/c/tags/block/stones.json +++ b/common/src/main/resources/data/c/tags/block/stones.json @@ -1,5 +1,4 @@ { "values": [ - "antarchy:broodstone" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json index 38a803c8..74dab668 100644 --- a/common/src/main/resources/data/minecraft/tags/block/climbable.json +++ b/common/src/main/resources/data/minecraft/tags/block/climbable.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:vine", - "antarchy:creepvine" + "minecraft:vine" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/dirt.json b/common/src/main/resources/data/minecraft/tags/block/dirt.json index 62508263..26f30b50 100644 --- a/common/src/main/resources/data/minecraft/tags/block/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/block/dirt.json @@ -3,7 +3,6 @@ "values": [ "antarchy:infested_rooted_dirt", "antarchy:infested_coarse_dirt", - "antarchy:umbral_moss_block", - "antarchy:amber_moss_block" + "antarchy:umbral_moss_block" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json index 9c31b536..f12957c0 100644 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json +++ b/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json @@ -3,8 +3,6 @@ "values": [ "antarchy:ouranwood_leaves", "antarchy:umbral_moss_block", - "antarchy:umbral_moss_carpet", - "antarchy:amber_moss_block", - "antarchy:amber_moss_carpet" + "antarchy:umbral_moss_carpet" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index 9c5a8624..22851f51 100644 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -36,11 +36,6 @@ "antarchy:nyxite_brick_stairs", "antarchy:nyxite_brick_slab", "antarchy:nyxite_brick_wall", - "antarchy:myrmite", - "antarchy:broodstone", - "antarchy:bile_vein", - "antarchy:chiten_block", - "antarchy:chiten_spike", "antarchy:shellstone", "antarchy:polished_shellstone", "antarchy:shellstone_bricks", diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json index 33cea4cb..6f19d46e 100644 --- a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -18,8 +18,6 @@ "antarchy:polished_shellstone_wall", "antarchy:shellstone_brick_stairs", "antarchy:shellstone_brick_slab", - "antarchy:shellstone_brick_wall", - "antarchy:chiten_block", - "antarchy:bile_vein" + "antarchy:shellstone_brick_wall" ] } diff --git a/common/src/main/resources/data/minecraft/tags/block/vines.json b/common/src/main/resources/data/minecraft/tags/block/vines.json index 38a803c8..74dab668 100644 --- a/common/src/main/resources/data/minecraft/tags/block/vines.json +++ b/common/src/main/resources/data/minecraft/tags/block/vines.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:vine", - "antarchy:creepvine" + "minecraft:vine" ] } diff --git a/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json b/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json index 520257ad..8f044944 100644 --- a/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json +++ b/common/src/main/resources/data/minecraft/tags/entity_type/arthropod.json @@ -8,12 +8,6 @@ "antarchy:brutalfly", "antarchy:bed_bug", "antarchy:mantis", - "antarchy:jumpy_bug", - "antarchy:spit_bug", - "antarchy:stink_bug", - "antarchy:hercules_beetle", - "antarchy:creeping_horror", - "antarchy:lurking_terror", "antarchy:scorpion", "antarchy:emperor_scorpion" ] diff --git a/common/src/main/resources/data/minecraft/tags/item/dirt.json b/common/src/main/resources/data/minecraft/tags/item/dirt.json index 62508263..26f30b50 100644 --- a/common/src/main/resources/data/minecraft/tags/item/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/item/dirt.json @@ -3,7 +3,6 @@ "values": [ "antarchy:infested_rooted_dirt", "antarchy:infested_coarse_dirt", - "antarchy:umbral_moss_block", - "antarchy:amber_moss_block" + "antarchy:umbral_moss_block" ] } diff --git a/common/src/main/resources/data/minecraft/tags/item/vines.json b/common/src/main/resources/data/minecraft/tags/item/vines.json index 38a803c8..74dab668 100644 --- a/common/src/main/resources/data/minecraft/tags/item/vines.json +++ b/common/src/main/resources/data/minecraft/tags/item/vines.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:vine", - "antarchy:creepvine" + "minecraft:vine" ] } diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java index dbb19dd4..f87867f2 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java @@ -2369,7 +2369,6 @@ public final class AntarchyFabricContent { CREATIVE_MODE_TABS.register(); // Wire common-module accessors after all registrations are complete. - AntarchyObjects.setHerculesBeetle(() -> HERCULES_BEETLE.get()); AntarchySoundEvents.bind( SQUIDZOOKA_FIRE, @@ -2521,11 +2520,7 @@ public final class AntarchyFabricContent { HUSH_PROJECTILE, TORETERROR, WATER_BOMB, - CREEPING_HORROR, - LURKING_TERROR, - STINK_BUG, CHEEP, - DORRIE, () -> DUPLICATOR_LOG.get(), () -> DUPLICATOR_SAPLING.get(), () -> DUCT_TAPE.get(), @@ -2554,8 +2549,6 @@ public final class AntarchyFabricContent { () -> TRIFFID_GOO_BLOCK.get(), () -> PALE_NYXITE.get(), () -> NYXITE_SPIKE.get(), - () -> CHITEN_BLOCK.get(), - () -> CHITEN_SPIKE.get(), () -> POTENT_NYXITE.get(), () -> ANTIMETAL.get(), () -> POLISHED_ANTIMETAL.get(), @@ -2568,7 +2561,6 @@ public final class AntarchyFabricContent { KRAKEN_TOOTH, () -> MOGGLES.get(), () -> REVERIE_BOTTLE.get(), - () -> STINK_BUG_ITEM.get(), () -> mobEffectHolder(DREAD), () -> mobEffectHolder(PARALYZED), () -> mobEffectHolder(INVERTED), @@ -2580,8 +2572,6 @@ public final class AntarchyFabricContent { () -> PINK_MILKWEED.get(), () -> TORCHFLOWER_BUSH.get(), () -> BED_BUG_EGG.get(), - () -> CREEPING_HORROR_EGG.get(), - () -> LURKING_TERROR_EGG.get(), () -> WASP_NEST.get(), () -> HUSHWEED.get(), () -> OURANWOOD_SQUIRREL_NEST.get(), diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java index a7834edb..e0b8a073 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java @@ -198,11 +198,7 @@ public class AntarchyNeoforge { AntarchyNeoforgeEntites.HUSH_PROJECTILE, AntarchyNeoforgeEntites.TORETERROR, AntarchyNeoforgeEntites.WATER_BOMB, - AntarchyNeoforgeEntites.CREEPING_HORROR, - AntarchyNeoforgeEntites.LURKING_TERROR, - AntarchyNeoforgeEntites.STINK_BUG, AntarchyNeoforgeEntites.CHEEP, - AntarchyNeoforgeEntites.DORRIE, () -> AntarchyNeoforgeBlocks.DUPLICATOR_LOG.get(), () -> AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(), () -> AntarchyNeoforgeBlocks.DUCT_TAPE.get(), @@ -231,8 +227,6 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), () -> AntarchyNeoforgeBlocks.PALE_NYXITE.get(), () -> AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), - () -> AntarchyNeoforgeBlocks.CHITEN_BLOCK.get(), - () -> AntarchyNeoforgeBlocks.CHITEN_SPIKE.get(), () -> AntarchyNeoforgeBlocks.POTENT_NYXITE.get(), () -> AntarchyNeoforgeBlocks.ANTIMETAL.get(), () -> AntarchyNeoforgeBlocks.POLISHED_ANTIMETAL.get(), @@ -245,7 +239,6 @@ public class AntarchyNeoforge { AntarchyNeoforgeItems.KRAKEN_TOOTH, () -> AntarchyNeoforgeItems.MOGGLES.get(), () -> AntarchyNeoforgeItems.REVERIE_BOTTLE.get(), - () -> AntarchyNeoforgeItems.STINK_BUG.get(), () -> AntarchyNeoforgeMisc.DREAD, () -> AntarchyNeoforgeMisc.PARALYZED, () -> AntarchyNeoforgeMisc.INVERTED, @@ -257,8 +250,6 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), () -> AntarchyNeoforgeBlocks.TORCHFLOWER_BUSH.get(), () -> AntarchyNeoforgeBlocks.BED_BUG_EGG.get(), - () -> AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG.get(), - () -> AntarchyNeoforgeBlocks.LURKING_TERROR_EGG.get(), () -> AntarchyNeoforgeBlocks.WASP_NEST.get(), () -> AntarchyNeoforgeBlocks.HUSHWEED.get(), () -> AntarchyNeoforgeBlocks.OURANWOOD_SQUIRREL_NEST.get(), @@ -273,7 +264,6 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeMisc.BLOODGLASS_MAX_HEARTS, () -> AntarchyNeoforgeMisc.BLOODGLASS_WARD ); - AntarchyObjects.setHerculesBeetle(AntarchyNeoforgeEntites.HERCULES_BEETLE); AntarchyObjects.setOctopusBomb(AntarchyNeoforgeEntites.OCTOPUS_BOMB); } diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java index 2cbcdc08..9b34f695 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java @@ -91,7 +91,6 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.RED_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BROWN_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.RAINBOW_ANT.get(), context -> withParalyzedGeoLayer(new AntRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.TERMITE.get(), context -> withParalyzedGeoLayer(new TermiteRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MOLEWORM.get(), context -> withParalyzedGeoLayer(new MolewormRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MANTIS.get(), context -> withParalyzedGeoLayer(new MantisRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MOLEVORE.get(), context -> withParalyzedGeoLayer(new MolevoreRenderer(context))); @@ -110,11 +109,8 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.NIGHTMARE.get(), context -> withParalyzedGeoLayer(new NightmareRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.LUCID.get(), context -> withParalyzedGeoLayer(new LucidRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BED_BUG.get(), context -> withParalyzedGeoLayer(new BedBugRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.STINK_BUG.get(), context -> withParalyzedGeoLayer(new StinkBugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.WASP.get(), context -> withParalyzedGeoLayer(new WaspRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BOMBER.get(), context -> withParalyzedGeoLayer(new BomberRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.JUMPY_BUG.get(), context -> withParalyzedGeoLayer(new JumpyBugRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG.get(), context -> withParalyzedGeoLayer(new SpitBugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BASILISK.get(), context -> withParalyzedGeoLayer(new BasiliskRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.SHRINK_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.GROWTH_RAY_PROJECTILE.get(), SizeRayProjectileRenderer::new); @@ -122,17 +118,12 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.LUCID_PEARL_PROJECTILE.get(), ThrownItemRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.HUSH_PROJECTILE.get(), HushProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.BRUTALFLY_ORB.get(), BrutalflyOrbRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG_PROJECTILE.get(), SpitBugProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.UPWARD_FALLING_BLOCK.get(), com.craisinlord.antarchy.content.client.renderer.UpwardFallingBlockRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.SCORPION.get(), context -> withParalyzedGeoLayer(new ScorpionRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), context -> withParalyzedGeoLayer(new EmperorScorpionRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.WATER_BOMB.get(), WaterBombRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), CreepingHorrorRenderer::new); - event.registerEntityRenderer(AntarchyNeoforgeEntites.LURKING_TERROR.get(), LurkingTerrorRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.CHEEP.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.CheepRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.DORRIE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.DorrieRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.HERCULES_BEETLE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.HerculesBeetleRenderer(context))); } @SubscribeEvent @@ -424,12 +415,7 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CORNEA_STALK.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIMETAL_SCAFFOLDING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.AMBER_LICHEN.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.BILE_VEIN.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CREEPVINE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CHITEN_SPIKE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.SMALL_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.MEDIUM_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.LARGE_BLOOD_CRYSTAL_BUD.get(), RenderType.cutout()); diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java index 4db16c61..25409080 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java @@ -1113,9 +1113,6 @@ public final class AntarchyNeoForgeEvents { ); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.UMBRAL_MOSS_BLOCK.get().asItem(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.AMBER_MOSS_BLOCK.get().asItem(), 0.65f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET.get().asItem(), 0.3f); - ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.CREEPVINE.get().asItem(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.HUSHWEED.get().asItem(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.CORNEA_EAR.get(), 0.65f); }); diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java index dc087556..abcaec3a 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java @@ -174,33 +174,15 @@ public final class AntarchyNeoforgeBlocks { () -> new Block(nyxiteProperties())); public static final DeferredBlock NYXITE_SPIKE = BLOCKS.register("nyxite_spike", () -> new NyxiteSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); - public static final DeferredBlock CHITEN_SPIKE = BLOCKS.register("chiten_spike", - () -> new ChitenSpikeBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POINTED_DRIPSTONE))); public static final DeferredBlock POTENT_NYXITE = BLOCKS.register("potent_nyxite", () -> new PotentNyxiteBlock( AntarchyNeoforgeItems::potentNyxiteBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK).lightLevel(state -> 3) )); - public static final DeferredBlock MYRMITE = BLOCKS.register("myrmite", - () -> new Block(nyxiteProperties())); - public static final DeferredBlock BROODSTONE = BLOCKS.register("broodstone", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.DEEPSLATE).requiresCorrectToolForDrops())); - public static final DeferredBlock CHITEN_BLOCK = BLOCKS.register("chiten_block", - () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.BONE_BLOCK).requiresCorrectToolForDrops())); public static final DeferredBlock UMBRAL_MOSS_BLOCK = BLOCKS.register("umbral_moss_block", () -> new UmbralMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); public static final DeferredBlock UMBRAL_MOSS_CARPET = BLOCKS.register("umbral_moss_carpet", () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_MOSS_BLOCK = BLOCKS.register("amber_moss_block", - () -> new AmberMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); - public static final DeferredBlock AMBER_MOSS_CARPET = BLOCKS.register("amber_moss_carpet", - () -> new UmbralMossCarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET).noOcclusion())); - public static final DeferredBlock AMBER_LICHEN = BLOCKS.register("amber_lichen", - () -> new GlowLichenBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.GLOW_LICHEN).lightLevel(state -> 4))); - public static final DeferredBlock BILE_VEIN = BLOCKS.register("bile_vein", - () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERRACK))); - public static final DeferredBlock CREEPVINE = BLOCKS.register("creepvine", - () -> new VineBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.VINE))); public static final DeferredBlock DREAM_TORCH = BLOCKS.register("dream_torch", () -> new DreamTorchBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SOUL_TORCH))); public static final DeferredBlock DREAM_WALL_TORCH = BLOCKS.register("dream_wall_torch", @@ -221,10 +203,6 @@ public final class AntarchyNeoforgeBlocks { .noOcclusion() .noCollission() .replaceable())); - public static final DeferredBlock CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg", - () -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); - public static final DeferredBlock LURKING_TERROR_EGG = BLOCKS.register("lurking_terror_egg", - () -> new LurkingTerrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock WASP_NEST = BLOCKS.register("wasp_nest", () -> new WaspNestBlock(AntarchyNeoforgeItems::waspNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.BEE_NEST))); public static final DeferredBlock OURANWOOD_SQUIRREL_NEST = BLOCKS.register("ouranwood_squirrel_nest", @@ -251,8 +229,6 @@ public final class AntarchyNeoforgeBlocks { () -> new AntNestBlock(AntarchyNeoforgeEntites.BROWN_ANT, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock RAINBOW_ANT_NEST = BLOCKS.register("rainbow_ant_nest", () -> new AntNestBlock(AntarchyNeoforgeEntites.RAINBOW_ANT, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); - public static final DeferredBlock TERMITE_NEST = BLOCKS.register("termite_nest", - () -> new AntNestBlock(AntarchyNeoforgeEntites.TERMITE, AntarchyNeoforgeItems::antNestBlockEntityType, BlockBehaviour.Properties.ofFullCopy(Blocks.DIRT).noLootTable())); public static final DeferredBlock URANIUM_ORE = BLOCKS.register("uranium_ore", () -> createOre(Blocks.EMERALD_ORE, 4, 8)); public static final DeferredBlock DEEPSLATE_URANIUM_ORE = BLOCKS.register("deepslate_uranium_ore", @@ -363,8 +339,7 @@ public final class AntarchyNeoforgeBlocks { AntNestBlockEntity::new, RED_ANT_NEST.get(), BROWN_ANT_NEST.get(), - RAINBOW_ANT_NEST.get(), - TERMITE_NEST.get() + RAINBOW_ANT_NEST.get() ).build(null)); public static final DeferredHolder, BlockEntityType> DREAM_CAMPFIRE_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("dream_campfire", () -> BlockEntityType.Builder.of( diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java index 98f4fcba..eac7847f 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeCreativeModeTabs.java @@ -57,7 +57,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.RED_ANT_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.BROWN_ANT_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.RAINBOW_ANT_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.TERMITE_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MOLEWORM_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MANTIS_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MOLEVORE_SPAWN_EGG.get()); @@ -68,9 +67,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.DR_TRAYAURUS_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.WASP_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.BOMBER_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.JUMPY_BUG_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.SPIT_BUG_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.STINK_BUG_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.CLOUD_SHARK_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.KRAKEN_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.MISSILE_SQUID_SPAWN_EGG.get()); @@ -82,8 +78,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.BASILISK_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.EMPEROR_SCORPION_SPAWN_EGG.get()); event.accept(AntarchyNeoforgeItems.TORETERROR_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.CREEPING_HORROR_SPAWN_EGG.get()); - event.accept(AntarchyNeoforgeItems.LURKING_TERROR_SPAWN_EGG.get()); } if (event.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) { @@ -95,8 +89,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.PINK_MILKWEED_ITEM.get()); event.accept(AntarchyNeoforgeItems.TORCHFLOWER_BUSH_ITEM.get()); event.accept(AntarchyNeoforgeItems.HUSHWEED_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_LICHEN_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CREEPVINE_ITEM.get()); event.accept(AntarchyNeoforgeItems.INFESTED_ROOTED_DIRT_ITEM.get()); event.accept(AntarchyNeoforgeItems.INFESTED_COARSE_DIRT_ITEM.get()); event.accept(AntarchyNeoforgeItems.TRIFFID_GOO_BLOCK_ITEM.get()); @@ -107,7 +99,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.RED_ANT_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.BROWN_ANT_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.RAINBOW_ANT_NEST_ITEM.get()); - event.accept(AntarchyNeoforgeItems.TERMITE_NEST_ITEM.get()); event.accept(AntarchyNeoforgeItems.URANIUM_ORE_ITEM.get()); event.accept(AntarchyNeoforgeItems.DEEPSLATE_URANIUM_ORE_ITEM.get()); event.accept(AntarchyNeoforgeItems.TITANIUM_ORE_ITEM.get()); @@ -117,7 +108,6 @@ public class AntarchyNeoforgeCreativeModeTabs { if (event.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) { event.insertAfter(new ItemStack(Items.SHEARS), new ItemStack(AntarchyNeoforgeItems.DUCT_TAPE_ITEM.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); event.insertAfter(new ItemStack(Items.MINECART), new ItemStack(AntarchyNeoforgeItems.DIAMOND_MINECART_ITEM.get()), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - event.accept(AntarchyNeoforgeItems.BILE_BUCKET.get()); event.accept(AntarchyNeoforgeItems.ICHOR_BUCKET.get()); event.accept(AntarchyNeoforgeItems.ANTIWATER_BUCKET.get()); event.accept(AntarchyNeoforgeItems.CLOUD_BUCKET.get()); @@ -150,7 +140,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.MANTIS_CLAW.get()); event.accept(AntarchyNeoforgeItems.KING_SCALE.get()); event.accept(AntarchyNeoforgeItems.QUEEN_SCALE.get()); - event.accept(AntarchyNeoforgeItems.CHITEN.get()); event.accept(AntarchyNeoforgeItems.STINK_BUG.get()); event.accept(AntarchyNeoforgeItems.BRUTALFLY_WING.get()); event.accept(AntarchyNeoforgeItems.PRIMORDIAL_SCUTE.get()); @@ -245,13 +234,6 @@ public class AntarchyNeoforgeCreativeModeTabs { event.accept(AntarchyNeoforgeItems.SMALL_BLOOD_CRYSTAL_BUD_ITEM.get()); event.accept(AntarchyNeoforgeItems.MEDIUM_BLOOD_CRYSTAL_BUD_ITEM.get()); event.accept(AntarchyNeoforgeItems.LARGE_BLOOD_CRYSTAL_BUD_ITEM.get()); - event.accept(AntarchyNeoforgeItems.MYRMITE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.BROODSTONE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.BILE_VEIN_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CHITEN_BLOCK_ITEM.get()); - event.accept(AntarchyNeoforgeItems.CHITEN_SPIKE_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_MOSS_BLOCK_ITEM.get()); - event.accept(AntarchyNeoforgeItems.AMBER_MOSS_CARPET_ITEM.get()); event.accept(AntarchyNeoforgeItems.URANIUM_BLOCK_ITEM.get()); event.accept(AntarchyNeoforgeItems.RAW_URANIUM_BLOCK_ITEM.get()); event.accept(AntarchyNeoforgeItems.CUT_URANIUM_ITEM.get()); diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java index bd7aa921..785db3e5 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java @@ -81,8 +81,6 @@ public final class AntarchyNeoforgeEntites { () -> buildAntType(BrownAntEntity::new, MobCategory.CREATURE, "brown_ant")); public static final DeferredHolder, EntityType> RAINBOW_ANT = ENTITY_TYPES.register("rainbow_ant", () -> buildAntType(RainbowAntEntity::new, MobCategory.CREATURE, "rainbow_ant")); - public static final DeferredHolder, EntityType> TERMITE = ENTITY_TYPES.register("termite", - () -> buildAntType(TermiteEntity::new, MobCategory.CREATURE, "termite")); public static final DeferredHolder, EntityType> MOLEWORM = ENTITY_TYPES.register("moleworm", () -> EntityType.Builder.of(MolewormEntity::new, MobCategory.MONSTER) .sized(0.4F, 0.3F) @@ -120,11 +118,6 @@ public final class AntarchyNeoforgeEntites { .sized(1.15F, 0.8F) .clientTrackingRange(8) .build("bed_bug")); - public static final DeferredHolder, EntityType> STINK_BUG = ENTITY_TYPES.register("stink_bug", - () -> EntityType.Builder.of(StinkBugEntity::new, MobCategory.CREATURE) - .sized(0.35F, 0.2F) - .clientTrackingRange(8) - .build("stink_bug")); public static final DeferredHolder, EntityType> WASP = ENTITY_TYPES.register("wasp", () -> EntityType.Builder.of(WaspEntity::new, MobCategory.MONSTER) .sized(0.8625F, 1.365F) @@ -135,22 +128,6 @@ public final class AntarchyNeoforgeEntites { .sized(0.55F, 0.75F) .clientTrackingRange(8) .build("bomber")); - public static final DeferredHolder, EntityType> JUMPY_BUG = ENTITY_TYPES.register("jumpy_bug", - () -> EntityType.Builder.of(JumpyBugEntity::new, MobCategory.MONSTER) - .sized(3.0F, 3.0F) - .clientTrackingRange(8) - .build("jumpy_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG = ENTITY_TYPES.register("spit_bug", - () -> EntityType.Builder.of(SpitBugEntity::new, MobCategory.MONSTER) - .sized(2.5F, 3.0F) - .clientTrackingRange(10) - .build("spit_bug")); - public static final DeferredHolder, EntityType> SPIT_BUG_PROJECTILE = ENTITY_TYPES.register("spit_bug_projectile", - () -> EntityType.Builder.of(SpitBugProjectileEntity::new, MobCategory.MISC) - .sized(0.5F, 0.5F) - .clientTrackingRange(8) - .updateInterval(1) - .build("spit_bug_projectile")); public static final DeferredHolder, EntityType> SHRINK_RAY_PROJECTILE = ENTITY_TYPES.register("shrink_ray_projectile", () -> EntityType.Builder.of(SizeRayProjectileEntity::createShrink, MobCategory.MISC) .sized(0.5F, 0.5F) @@ -292,31 +269,11 @@ public final class AntarchyNeoforgeEntites { .clientTrackingRange(8) .updateInterval(1) .build("water_bomb")); - public static final DeferredHolder, EntityType> CREEPING_HORROR = ENTITY_TYPES.register("creeping_horror", - () -> EntityType.Builder.of(CreepingHorrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("creeping_horror")); - public static final DeferredHolder, EntityType> LURKING_TERROR = ENTITY_TYPES.register("lurking_terror", - () -> EntityType.Builder.of(LurkingTerrorEntity::new, MobCategory.MONSTER) - .sized(1.3F, 1.5F) - .clientTrackingRange(10) - .build("lurking_terror")); public static final DeferredHolder, EntityType> CHEEP = ENTITY_TYPES.register("cheep", () -> EntityType.Builder.of(CheepEntity::new, MobCategory.WATER_AMBIENT) .sized(1.0F, 1.2F) .clientTrackingRange(8) .build("cheep")); - public static final DeferredHolder, EntityType> DORRIE = ENTITY_TYPES.register("dorrie", - () -> EntityType.Builder.of(DorrieEntity::new, MobCategory.WATER_CREATURE) - .sized(2.4F, 2.0F) - .clientTrackingRange(10) - .build("dorrie")); - public static final DeferredHolder, EntityType> HERCULES_BEETLE = ENTITY_TYPES.register("hercules_beetle", - () -> EntityType.Builder.of(HerculesBeetleEntity::new, MobCategory.MONSTER) - .sized(3.0F, 4.0F) - .clientTrackingRange(12) - .build("hercules_beetle")); public static final DeferredHolder, EntityType> UPWARD_FALLING_BLOCK = ENTITY_TYPES.register("upward_falling_block", () -> EntityType.Builder.of( UpwardFallingBlockEntity::new, MobCategory.MISC) diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java index e83eccc3..98801d39 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java @@ -47,11 +47,8 @@ public class AntarchyNeoforgeEntityAttributes { event.put(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), OctopusBombEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.NIGHTMARE.get(), NightmareEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BED_BUG.get(), BedBugEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.STINK_BUG.get(), StinkBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.WASP.get(), WaspEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BOMBER.get(), BomberEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.JUMPY_BUG.get(), JumpyBugEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpitBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MANTIS.get(), MantisEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.TRIFFID.get(), TriffidEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.LUCID.get(), LucidEntity.createAttributes().build()); @@ -59,8 +56,6 @@ public class AntarchyNeoforgeEntityAttributes { event.put(AntarchyNeoforgeEntites.BASILISK.get(), BasiliskEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), CreepingHorrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.LURKING_TERROR.get(), LurkingTerrorEntity.createAttributes().build()); AttributeSupplier redAntAttributes = buildAntAttributes(AntarchySettings.redAntHealth(), AntarchySettings.redAntMovementSpeed(), AntarchySettings.redAntAttackDamage()).build(); AttributeSupplier brownAntAttributes = buildAntAttributes(AntarchySettings.brownAntHealth(), AntarchySettings.brownAntMovementSpeed(), AntarchySettings.brownAntAttackDamage()).build(); @@ -69,12 +64,9 @@ public class AntarchyNeoforgeEntityAttributes { event.put(AntarchyNeoforgeEntites.RED_ANT.get(), redAntAttributes); event.put(AntarchyNeoforgeEntites.BROWN_ANT.get(), brownAntAttributes); event.put(AntarchyNeoforgeEntites.RAINBOW_ANT.get(), rainbowAntAttributes); - event.put(AntarchyNeoforgeEntites.TERMITE.get(), termiteAttributes); event.put(AntarchyNeoforgeEntites.MOLEWORM.get(), MolewormEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MOLEVORE.get(), MolevoreEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.CHEEP.get(), com.craisinlord.antarchy.content.entity.CheepEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.DORRIE.get(), com.craisinlord.antarchy.content.entity.DorrieEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.HERCULES_BEETLE.get(), com.craisinlord.antarchy.content.entity.HerculesBeetleEntity.createAttributes().build()); } private static AttributeSupplier.Builder buildAntAttributes(double health, double speed, double attackDamage) { diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java index 17559a02..a3440af4 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java @@ -173,7 +173,6 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem RED_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.RED_ANT_NEST); public static final DeferredItem BROWN_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BROWN_ANT_NEST); public static final DeferredItem RAINBOW_ANT_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.RAINBOW_ANT_NEST); - public static final DeferredItem TERMITE_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.TERMITE_NEST); public static final DeferredItem URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.URANIUM_ORE); public static final DeferredItem DEEPSLATE_URANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DEEPSLATE_URANIUM_ORE); public static final DeferredItem TITANIUM_ORE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.TITANIUM_ORE); @@ -229,12 +228,9 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem INFESTED_ROOTED_DIRT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.INFESTED_ROOTED_DIRT); public static final DeferredItem INFESTED_COARSE_DIRT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.INFESTED_COARSE_DIRT); public static final DeferredItem NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE); - public static final DeferredItem MYRMITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.MYRMITE); - public static final DeferredItem BROODSTONE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BROODSTONE); public static final DeferredItem POLISHED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_NYXITE); public static final DeferredItem CHISELED_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHISELED_NYXITE); public static final DeferredItem NYXITE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_BRICKS); - public static final DeferredItem CHITEN_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHITEN_BLOCK); public static final DeferredItem NYXITE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_STAIRS); public static final DeferredItem NYXITE_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_SLAB); public static final DeferredItem NYXITE_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_WALL); @@ -266,22 +262,14 @@ public final class AntarchyNeoforgeItems { () -> new com.craisinlord.antarchy.content.item.TriffidGooBlockItem(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), new Item.Properties())); public static final DeferredItem PALE_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PALE_NYXITE); public static final DeferredItem NYXITE_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_SPIKE); - public static final DeferredItem CHITEN_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHITEN_SPIKE); public static final DeferredItem POTENT_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POTENT_NYXITE); public static final DeferredItem UMBRAL_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UMBRAL_MOSS_BLOCK); public static final DeferredItem UMBRAL_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UMBRAL_MOSS_CARPET); - public static final DeferredItem AMBER_MOSS_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_MOSS_BLOCK); - public static final DeferredItem AMBER_MOSS_CARPET_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_MOSS_CARPET); - public static final DeferredItem AMBER_LICHEN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.AMBER_LICHEN); - public static final DeferredItem BILE_VEIN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BILE_VEIN); - public static final DeferredItem CREEPVINE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CREEPVINE); public static final DeferredItem DREAM_TORCH_ITEM = ITEMS.register("dream_torch", () -> new StandingAndWallBlockItem(AntarchyNeoforgeBlocks.DREAM_TORCH.get(), AntarchyNeoforgeBlocks.DREAM_WALL_TORCH.get(), new Item.Properties(), net.minecraft.core.Direction.UP)); public static final DeferredItem DREAM_LANTERN_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DREAM_LANTERN); public static final DeferredItem DREAM_CAMPFIRE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DREAM_CAMPFIRE); public static final DeferredItem BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BED_BUG_EGG); - public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG); - public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.LURKING_TERROR_EGG); public static final DeferredItem WASP_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.WASP_NEST); public static final DeferredItem HUSHWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.HUSHWEED); public static final DeferredItem BILE_BUCKET = ITEMS.register("bile_bucket", @@ -323,9 +311,10 @@ public final class AntarchyNeoforgeItems { () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); public static final DeferredItem QUEEN_SCALE = ITEMS.register("queen_scale", () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); - public static final DeferredItem CHITEN = ITEMS.registerSimpleItem("chiten", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem STINK_BUG = ITEMS.registerSimpleItem("stink_bug", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BUG_LEG = ITEMS.registerSimpleItem("jumpy_bug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem STINK_BUG = ITEMS.register("stink_bug", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem JUMPY_BUG_LEG = ITEMS.register("jumpy_bug_leg", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem JUMPY_BOOTS = ITEMS.register("jumpy_boots", () -> new JumpyBootsItem(JUMPY_BOOTS_ARMOR_MATERIAL, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)))); public static final DeferredItem BRUTALFLY_WING = ITEMS.registerSimpleItem("brutalfly_wing", new Item.Properties().rarity(Rarity.UNCOMMON)); @@ -507,8 +496,6 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.BROWN_ANT, 0x6A4320, 0x26160A, new Item.Properties())); public static final DeferredItem RAINBOW_ANT_SPAWN_EGG = ITEMS.register("rainbow_ant_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.RAINBOW_ANT, 0x56D4F0, 0xF66DBB, new Item.Properties())); - public static final DeferredItem TERMITE_SPAWN_EGG = ITEMS.register("termite_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TERMITE, 0xD4B96A, 0xFF6B1A, new Item.Properties())); public static final DeferredItem MOLEWORM_SPAWN_EGG = ITEMS.register("moleworm_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MOLEWORM, 0xB8B8B8, 0x8A623A, new Item.Properties())); public static final DeferredItem MANTIS_SPAWN_EGG = ITEMS.register("mantis_spawn_egg", @@ -529,12 +516,6 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.WASP, 0x111111, 0xF1D800, new Item.Properties())); public static final DeferredItem BOMBER_SPAWN_EGG = ITEMS.register("bomber_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.BOMBER, 0x7A7A7A, 0xB32020, new Item.Properties())); - public static final DeferredItem JUMPY_BUG_SPAWN_EGG = ITEMS.register("jumpy_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.JUMPY_BUG, 0x0A1636, 0x8A3E00, new Item.Properties())); - public static final DeferredItem SPIT_BUG_SPAWN_EGG = ITEMS.register("spit_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.SPIT_BUG, 0x6B4A2B, 0x7ED957, new Item.Properties())); - public static final DeferredItem STINK_BUG_SPAWN_EGG = ITEMS.register("stink_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.STINK_BUG, 0x111111, 0xFF7A00, new Item.Properties())); public static final DeferredItem CLOUD_SHARK_SPAWN_EGG = ITEMS.register("cloud_shark_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CLOUD_SHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); public static final DeferredItem KRAKEN_SPAWN_EGG = ITEMS.register("kraken_spawn_egg", @@ -574,16 +555,12 @@ public final class AntarchyNeoforgeItems { () -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).fireResistant())); public static final DeferredItem TORETERROR_SPAWN_EGG = ITEMS.register("toreterror_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TORETERROR, 0x90EE90, 0x5C4033, new Item.Properties().rarity(Rarity.EPIC))); - public static final DeferredItem CREEPING_HORROR_SPAWN_EGG = ITEMS.register("creeping_horror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CREEPING_HORROR, 0x6B3A1F, 0x6B0000, new Item.Properties())); - public static final DeferredItem LURKING_TERROR_SPAWN_EGG = ITEMS.register("lurking_terror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.LURKING_TERROR, 0x2D5A1B, 0x8B0000, new Item.Properties())); public static final DeferredItem CHEEP_SPAWN_EGG = ITEMS.register("cheep_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CHEEP, 0xAA22FF, 0x22FF44, new Item.Properties())); - public static final DeferredItem DORRIE_SPAWN_EGG = ITEMS.register("dorrie_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.DORRIE, 0x1B91B3, 0xC0E8FF, new Item.Properties())); - public static final DeferredItem HERCULES_BEETLE_SPAWN_EGG = ITEMS.register("hercules_beetle_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.HERCULES_BEETLE, 0x6B1F2A, 0xD4AF37, new Item.Properties().rarity(Rarity.RARE))); + public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.register("creeping_horror_egg", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); + public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.register("lurking_terror_egg", + () -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE))); private AntarchyNeoforgeItems() {} diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java index eae7bec6..75ee6cf2 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java @@ -191,8 +191,6 @@ public final class AntarchyNeoforgeMisc { () -> new BrownAntNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, RainbowAntNestFeature> RAINBOW_ANT_NEST_FEATURE = FEATURES.register("rainbow_ant_nest", () -> new RainbowAntNestFeature(SimpleBlockConfiguration.CODEC)); - public static final DeferredHolder, TermiteNestFeature> TERMITE_NEST_FEATURE = FEATURES.register("termite_nest", - () -> new TermiteNestFeature(SimpleBlockConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_LARGE_TREE = FEATURES.register("ouranwood_large_tree", () -> new OuranwoodTreeFeature(OuranwoodTreeConfiguration.CODEC)); public static final DeferredHolder, OuranwoodTreeFeature> OURANWOOD_YOUNG_TREE = FEATURES.register("ouranwood_young_tree", @@ -247,16 +245,6 @@ public final class AntarchyNeoforgeMisc { () -> new ThoraxisSpikeFeature(ThoraxisSpikeConfiguration.CODEC)); public static final DeferredHolder, NyxiteSpikeFeature> NYXITE_SPIKES = FEATURES.register("nyxite_spikes", () -> new NyxiteSpikeFeature(NyxiteSpikeConfiguration.CODEC)); - public static final DeferredHolder, ChitenSpikeFeature> CAVARYN_CHITEN_SPIKES = FEATURES.register("cavaryn_chiten_spikes", - () -> new ChitenSpikeFeature(ChitenSpikeConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileVeinFeature> CAVARYN_BILE_VEINS = FEATURES.register("cavaryn_bile_veins", - () -> new CavarynBileVeinFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynBileCystFeature> CAVARYN_BILE_CYSTS = FEATURES.register("cavaryn_bile_cysts", - () -> new CavarynBileCystFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynCreepvineFeature> CAVARYN_CREEPVINE = FEATURES.register("cavaryn_creepvine", - () -> new CavarynCreepvineFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynWallAmberMossFeature> CAVARYN_WALL_AMBER_MOSS = FEATURES.register("cavaryn_wall_amber_moss", - () -> new CavarynWallAmberMossFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, AntiwaterSpringsFeature> ANTIWATER_SPRINGS = FEATURES.register("antiwater_springs", () -> new AntiwaterSpringsFeature(AntiwaterSpringsConfiguration.CODEC)); public static final DeferredHolder, PotentNyxiteFeature> POTENT_NYXITE_FEATURE = FEATURES.register("potent_nyxite", @@ -269,8 +257,6 @@ public final class AntarchyNeoforgeMisc { () -> new BedBugNestFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, BedBugSurfaceClusterFeature> BED_BUG_SURFACE_CLUSTER = FEATURES.register("bed_bug_surface_cluster", () -> new BedBugSurfaceClusterFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, CavarynEggPatchFeature> CAVARYN_TERROR_EGG_PATCH = FEATURES.register("cavaryn_terror_egg_patch", - () -> new CavarynEggPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, ThoraxisAntiwaterPoolFeature> THORAXIS_ANTIWATER_POOL = FEATURES.register("thoraxis_antiwater_pool", () -> new ThoraxisAntiwaterPoolFeature(ThoraxisAntiwaterPoolConfiguration.CODEC)); public static final DeferredHolder, LucidAntiwaterPoolFeature> LUCID_ANTIWATER_POOL = FEATURES.register("lucid_antiwater_pool", @@ -303,14 +289,6 @@ public final class AntarchyNeoforgeMisc { ATTRIBUTES.register(modEventBus); } - static BaseFlowingFluid.Properties bileProperties() { - return new BaseFlowingFluid.Properties(BILE_TYPE, BILE, FLOWING_BILE) - .bucket(() -> AntarchyNeoforgeItems.BILE_BUCKET.get()) - .block(() -> AntarchyNeoforgeBlocks.BILE_BLOCK.get()) - .slopeFindDistance(4) - .levelDecreasePerBlock(1) - .tickRate(5); - } static BaseFlowingFluid.Properties ichorProperties() { return new BaseFlowingFluid.Properties(ICHOR_TYPE, ICHOR, FLOWING_ICHOR) @@ -321,6 +299,15 @@ public final class AntarchyNeoforgeMisc { .tickRate(5); } + static BaseFlowingFluid.Properties bileProperties() { + return new BaseFlowingFluid.Properties(BILE_TYPE, BILE, FLOWING_BILE) + .bucket(() -> AntarchyNeoforgeItems.BILE_BUCKET.get()) + .block(() -> AntarchyNeoforgeBlocks.BILE_BLOCK.get()) + .slopeFindDistance(4) + .levelDecreasePerBlock(1) + .tickRate(5); + } + static BaseFlowingFluid.Properties antiwaterProperties() { return new BaseFlowingFluid.Properties(ANTIWATER_TYPE, ANTIWATER, FLOWING_ANTIWATER) .bucket(() -> AntarchyNeoforgeItems.ANTIWATER_BUCKET.get()) diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java index fbb6a581..0fdbce19 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java @@ -34,8 +34,6 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.CLOUD_SHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CloudSharkEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.WASP.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, WaspEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BOMBER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BomberEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.JUMPY_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JumpyBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpitBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.KRAKEN.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, KrakenEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MISSILE_SQUID.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MissileSquidEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, OctopusBombEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); @@ -44,14 +42,10 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.MANTIS.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MantisEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MOLEVORE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MolevoreEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BED_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BedBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.STINK_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StinkBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.LUCID.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LucidEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EmperorScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CreepingHorrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LurkingTerrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.CHEEP.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, AbstractFish::checkSurfaceWaterAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); } } diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json index 684bd2ee..45283482 100644 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json +++ b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/ant_nests_in_forests.json @@ -3,8 +3,7 @@ "biomes": "#antarchy:overworld_ant_nest_spawn_biomes", "features": [ "antarchy:brown_ant_nest", - "antarchy:rainbow_ant_nest", - "antarchy:termite_nest" + "antarchy:rainbow_ant_nest" ], "step": "vegetal_decoration" } diff --git a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json b/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json deleted file mode 100644 index 206947e6..00000000 --- a/neoforge/src/main/resources/data/antarchy/neoforge/biome_modifier/remove_glow_lichen_from_cavaryn.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "neoforge:remove_features", - "biomes": "#antarchy:is_cavaryn", - "features": [ - "minecraft:glow_lichen" - ], - "step": "vegetal_decoration" -}