From 7dd1c66dccbcb9c17587e40caed0581c4a1a71c3 Mon Sep 17 00:00:00 2001 From: May P Date: Sat, 14 Feb 2026 20:01:45 +0200 Subject: [PATCH] changed/removed terra originum shti --- .../java/com/smithy/faithful/Faithful.java | 23 ++ .../client/FaithfulOriginsClient.java} | 4 +- .../client/TerraKeybinds.java | 2 +- .../items/IconItems.java | 11 +- .../smithy/faithful/mixin/EntityMixin.java | 27 ++ .../mixin/IcarusHelperMixin.java | 5 +- .../mixin/PowderSnowBlockMixin.java | 4 +- .../mixin/client/IcarusClientMixin.java | 5 +- .../power/CanStandOnPowderSnow.java | 2 +- .../power/PreventBlockSlowness.java | 2 +- .../power/WingsPower.java | 12 +- .../registry/ModPowers.java | 14 +- .../util/CodecHelper.java | 2 +- .../util/CustomDataTypes.java | 2 +- .../util/OptionalBool.java | 2 +- .../util/TerraHelper.java | 2 +- .../smithy/terraoriginum/TerraOriginum.java | 45 --- .../terraoriginum/blocks/CottonCropBlock.java | 49 --- .../smithy/terraoriginum/blocks/Crucifix.java | 22 -- .../terraoriginum/blocks/CrucifixClass.java | 28 -- .../terraoriginum/client/LayerRenderer.java | 17 - .../client/armour/GhostlyArmourModel.java | 23 -- .../client/armour/GhostlyArmourRenderer.java | 16 - .../customMaterials/RobesMaterial.java | 89 ------ .../LightProtectionEnchantment.java | 39 --- .../enchantment/SunProtectionEnchantment.java | 39 --- .../terraoriginum/items/CottonItems.java | 19 -- .../terraoriginum/items/GhostlyArmour.java | 108 ------- .../items/GhostlyArmourItems.java | 37 --- .../terraoriginum/items/GhostlyItems.java | 24 -- .../smithy/terraoriginum/items/SunTotem.java | 17 - .../smithy/terraoriginum/items/Umbrella.java | 26 -- .../terraoriginum/items/UmbrellaDyeTest.java | 12 - .../terraoriginum/mixin/EntityMixin.java | 52 ---- .../mixin/PlayerConditionsMixin.java | 35 --- .../mixin/PlayerEntityMixin.java | 73 ----- .../registry/ModEnchantments.java | 27 -- .../util/LootTableModifiers.java | 30 -- .../lang/en_us.json | 0 .../shaders/post/sobel.json | 0 .../item/armor/ghost_armour.animation.json | 127 -------- .../blockstates/cotton_crop_block.json | 29 -- .../terraoriginum/blockstates/crucifix.json | 5 - .../geo/item/armor/ghost_armour.geo.json | 135 -------- .../models/block/cotton_crop_stage0.json | 7 - .../models/block/cotton_crop_stage1.json | 7 - .../models/block/cotton_crop_stage2.json | 7 - .../models/block/cotton_crop_stage3.json | 7 - .../models/block/cotton_crop_stage4.json | 7 - .../models/block/cotton_crop_stage5.json | 7 - .../terraoriginum/models/block/crucifix.json | 53 ---- .../models/item/cotton_ball.json | 6 - .../models/item/cotton_seeds.json | 6 - .../terraoriginum/models/item/crucifix.json | 3 - .../models/item/ghostly_boots.json | 6 - .../models/item/ghostly_chestplate.json | 6 - .../models/item/ghostly_cloth.json | 6 - .../models/item/ghostly_helmet.json | 6 - .../models/item/ghostly_leggings.json | 6 - .../terraoriginum/models/item/mync_eye.json | 6 - .../terraoriginum/models/item/spirit.json | 6 - .../terraoriginum/models/item/sun_totem.json | 6 - .../terraoriginum/models/item/tiny.json | 6 - .../terraoriginum/models/item/umbrella.json | 292 ------------------ .../textures/block/crop_cotton_0.png | Bin 449 -> 0 bytes .../textures/block/crop_cotton_1.png | Bin 474 -> 0 bytes .../textures/block/crop_cotton_2.png | Bin 508 -> 0 bytes .../textures/block/crop_cotton_3.png | Bin 562 -> 0 bytes .../textures/block/crop_cotton_4.png | Bin 577 -> 0 bytes .../textures/block/crop_cotton_5.png | Bin 589 -> 0 bytes .../terraoriginum/textures/block/crucifix.png | Bin 486 -> 0 bytes .../textures/block/crucifix2.png | Bin 246 -> 0 bytes .../textures/gui/ability_bar.png | Bin 3688 -> 0 bytes .../terraoriginum/textures/gui/nothing.png | Bin 1589 -> 0 bytes .../textures/item/armor/ghost_armour.png | Bin 3814 -> 0 bytes .../textures/item/cotton_ball.png | Bin 614 -> 0 bytes .../textures/item/cotton_seeds.png | Bin 200 -> 0 bytes .../textures/item/ghostly_boots.png | Bin 265 -> 0 bytes .../textures/item/ghostly_chestplate.png | Bin 365 -> 0 bytes .../textures/item/ghostly_cloth.png | Bin 373 -> 0 bytes .../textures/item/ghostly_helmet.png | Bin 521 -> 0 bytes .../textures/item/ghostly_leggings.png | Bin 336 -> 0 bytes .../terraoriginum/textures/item/mync_eye.png | Bin 172 -> 0 bytes .../terraoriginum/textures/item/spirit.png | Bin 1104 -> 0 bytes .../terraoriginum/textures/item/sun_totem.png | Bin 440 -> 0 bytes .../terraoriginum/textures/item/tiny.png | Bin 90 -> 0 bytes .../terraoriginum/textures/item/umbrella.png | Bin 12394 -> 0 bytes .../textures/item/umbrellaoverlay.png | Bin 638 -> 0 bytes .../textures/models/armor/robes_layer_1.png | Bin 1589 -> 0 bytes .../textures/models/armor/robes_layer_2.png | Bin 1589 -> 0 bytes .../origins/muckunde.json | 0 .../powers/wings.json | 0 .../tags/blocks/bees.json | 0 .../tags/blocks/hexblade_unphaseable.json | 0 .../tags/blocks/hot_blocks.json | 0 .../tags/blocks/mushrooms.json | 0 .../tags/blocks/myceliums.json | 0 .../tags/blocks/nature.json | 0 .../tags/blocks/non_solid.json | 0 .../tags/blocks/ocean_monument.json | 0 .../tags/blocks/path_blocks.json | 0 .../tags/blocks/stone_types.json | 0 .../tags/blocks/unphasable.json | 0 .../tags/blocks/valuores.json | 0 .../tags/blocks/wool.json | 0 .../tags/entity_types/hostiles.json | 0 .../tags/entity_types/innocent.json | 0 .../tags/entity_types/nomercy.json | 0 .../tags/entity_types/unholy.json | 0 .../tags/items/blades.json | 0 .../tags/items/boots.json | 0 .../tags/items/break.json | 0 .../tags/items/chestplate.json | 0 .../tags/items/giweapons.json | 0 .../tags/items/helmet.json | 0 .../tags/items/leggings.json | 0 .../tags/items/unobtainable.json | 0 .../tags/items/weapons.json | 0 .../data/origins/origin_layers/origin.json | 23 +- .../terraoriginum/damage_type/boiling.json | 5 - .../damage_type/burn_in_sun.json | 5 - .../damage_type/lack_of_ectoplasm.json | 5 - .../damage_type/lack_of_sun.json | 5 - .../terraoriginum/damage_type/last_stand.json | 5 - .../loot_tables/blocks/cotton_crop_block.json | 68 ---- .../data/terraoriginum/origins/angel.json | 8 - .../data/terraoriginum/origins/blight.json | 15 - .../data/terraoriginum/origins/demon.json | 21 -- .../data/terraoriginum/origins/dominion.json | 0 .../data/terraoriginum/origins/fairy.json | 17 - .../data/terraoriginum/origins/florian.json | 22 -- .../terraoriginum/origins/immortal_human.json | 9 - .../data/terraoriginum/origins/kitsune.json | 32 -- .../data/terraoriginum/origins/lato.json | 23 -- .../data/terraoriginum/origins/merfolk.json | 18 -- .../data/terraoriginum/origins/monarch.json | 19 -- .../data/terraoriginum/origins/munch.json | 22 -- .../data/terraoriginum/origins/mync.json | 25 -- .../data/terraoriginum/origins/serpenta.json | 21 -- .../data/terraoriginum/origins/shade.json | 20 -- .../data/terraoriginum/origins/spirit.json | 16 - .../data/terraoriginum/origins/sylt.json | 18 -- .../data/terraoriginum/origins/wraith.json | 23 -- .../data/terraoriginum/origins/yulde.json | 24 -- .../powers/angel-powers/angel_wings.json | 0 .../powers/angel-powers/divine_grace.json | 42 --- .../powers/angel-powers/lesser_heal_ray.json | 39 --- .../blight-powers/bane_of_agriculture.json | 26 -- .../powers/blight-powers/blighted_feet.json | 40 --- .../powers/blight-powers/dead_cells.json | 8 - .../powers/blight-powers/florivory.json | 277 ----------------- .../powers/blight-powers/foul_flesh.json | 10 - .../powers/blight-powers/foul_skin.json | 6 - .../powers/blight-powers/nether_spawn.json | 5 - .../powers/blight-powers/noregen.json | 4 - .../powers/demon-powers/extra_health.json | 9 - .../demon-powers/self_transfiguration1.json | 15 - .../demon-powers/self_transfiguration2.json | 45 --- .../demon-powers/self_transfiguration3.json | 27 -- .../powers/demon-powers/stained.json | 6 - .../dominion-powers/greater_heal_ray.json | 0 .../powers/dominion-powers/larger.json | 0 .../dominion-powers/suppression_of_power.json | 0 .../data/terraoriginum/powers/ectotest.json | 21 -- .../powers/fairy-powers/fragile.json | 8 - .../powers/fairy-powers/nimble.json | 23 -- .../powers/fairy-powers/pollenation.json | 26 -- .../powers/fairy-powers/smallheight.json | 8 - .../fairy-powers/smallhitboxheight.json | 9 - .../powers/fairy-powers/smallhitboxwidth.json | 9 - .../powers/fairy-powers/smallwidth.json | 9 - .../powers/fairy-powers/yummyhoney.json | 20 -- .../powers/florian-powers/absorbing.json | 26 -- .../powers/florian-powers/aura_of_growth.json | 26 -- .../powers/florian-powers/bonemeal.json | 22 -- .../powers/florian-powers/compost.json | 87 ------ .../powers/florian-powers/five_hearts.json | 9 - .../powers/florian-powers/flammable.json | 11 - .../powers/florian-powers/green_fingered.json | 7 - .../powers/florian-powers/passivemobs.json | 21 -- .../powers/florian-powers/photosynthesis.json | 87 ------ .../powers/florian-powers/pocket_sand.json | 37 --- .../powers/florian-powers/small.json | 8 - .../powers/florian-powers/small_hitbox.json | 9 - .../powers/florian-powers/small_width.json | 9 - .../florian-powers/small_width_hitbox.json | 9 - .../powers/florian-powers/weak.json | 17 - .../immortal_human-powers/immortal.json | 30 -- .../immortal_human-powers/pathetic.json | 14 - .../powers/kitsune-powers/armor.json | 27 -- .../powers/kitsune-powers/diet.json | 36 --- .../powers/kitsune-powers/fox_eyes.json | 10 - .../powers/kitsune-powers/fox_pouch.json | 8 - .../kitsune-powers/fox_pouch_sound.json | 22 -- .../powers/kitsune-powers/fragilefox.json | 10 - .../powers/kitsune-powers/hungy.json | 7 - .../powers/kitsune-powers/invisibility.json | 9 - .../powers/kitsune-powers/monch.json | 22 -- .../powers/kitsune-powers/paws.json | 7 - .../powers/kitsune-powers/paws_shield.json | 10 - .../powers/kitsune-powers/phantomize.json | 9 - .../powers/kitsune-powers/phase_fix.json | 24 -- .../powers/kitsune-powers/phasing.json | 18 -- .../powers/kitsune-powers/phasing_jump.json | 12 - .../powers/kitsune-powers/pounce.json | 41 --- .../kitsune-powers/pounce_aerialdamage.json | 54 ---- .../powers/kitsune-powers/pounce_falling.json | 9 - .../powers/kitsune-powers/run.json | 17 - .../powers/kitsune-powers/smolman.json | 25 -- .../powers/kitsune-powers/speed.json | 11 - .../powers/kitsune-powers/startbox.json | 17 - .../powers/kitsune-powers/yum.json | 21 -- .../powers/kitsune-powers/yummy_berries.json | 21 -- .../powers/kitsune-powers/zberry_no_hurt.json | 8 - .../powers/lato-powers/lato_blooded.json | 9 - .../powers/lato-powers/long_arms.json | 19 -- .../powers/lato-powers/natural_armor.json | 9 - .../powers/lato-powers/perfect_vision.json | 6 - .../powers/lato-powers/rage.json | 25 -- .../powers/lato-powers/rage_addition.json | 26 -- .../powers/lato-powers/strong.json | 13 - .../powers/lato-powers/sun_damage.json | 37 --- .../powers/lato-powers/tailwind.json | 9 - .../powers/lato-powers/tall.json | 8 - .../powers/lato-powers/tall_hitbox.json | 9 - .../powers/lato-powers/tall_width.json | 9 - .../powers/lato-powers/tall_width_hitbox.json | 9 - .../powers/lato-powers/teleport.json | 53 ---- .../powers/lato-powers/twelve_hearts.json | 8 - .../powers/merfolk-powers/hydration.json | 11 - .../powers/merfolk-powers/hydrodiff.json | 79 ----- .../merfolk-powers/lackofhydrodamage.json | 24 -- .../powers/merfolk-powers/waterbreathing.json | 12 - .../powers/merfolk-powers/webbedfeet.json | 14 - .../powers/merfolk-powers/webbedfeet2.json | 12 - .../powers/merfolk-powers/wethands.json | 12 - .../monarch-powers/hydropetrification.json | 29 -- .../monarch-powers/hyperefficient_blood.json | 10 - .../monarch-powers/instant_transmission.json | 66 ---- .../monarch-powers/lackofsundamage.json | 24 -- .../powers/monarch-powers/nuclear_rush.json | 55 ---- .../powers/monarch-powers/nyctophobia.json | 51 --- .../powers/monarch-powers/shining.json | 6 - .../powers/monarch-powers/solar_energy.json | 11 - .../powers/monarch-powers/sun_fueled.json | 13 - .../powers/monarch-powers/super_dash.json | 44 --- .../powers/monarch-powers/totem_fueled.json | 24 -- .../powers/muckunde-powers/hydrophobic.json | 3 - .../powers/muckunde-powers/likesoil1.json | 9 - .../powers/muckunde-powers/likesoil2.json | 51 --- .../powers/muckunde-powers/toughskin.json | 8 - .../powers/muckunde-powers/yummybeets.json | 19 -- .../powers/munch-powers/better_health.json | 7 - .../powers/munch-powers/climbing.json | 79 ----- .../powers/munch-powers/little_health.json | 8 - .../powers/munch-powers/mounting.json | 56 ---- .../powers/munch-powers/nimble.json | 37 --- .../powers/munch-powers/quiet.json | 7 - .../powers/munch-powers/short_arms.json | 8 - .../powers/munch-powers/speedy_bastard.json | 22 -- .../powers/munch-powers/tiny.json | 8 - .../powers/munch-powers/tiny_appetite.json | 8 - .../powers/munch-powers/tiny_motion.json | 8 - .../powers/munch-powers/tiny_width.json | 9 - .../powers/mync-powers/mync_blind.json | 34 -- .../powers/mync-powers/mync_echolocate.json | 94 ------ .../mync-powers/mync_natural_armour.json | 9 - .../powers/mync-powers/mync_rage.json | 25 -- .../mync-powers/mync_rage_addition.json | 26 -- .../powers/mync-powers/mync_strong.json | 13 - .../powers/mync-powers/mync_tailwind.json | 9 - .../powers/mync-powers/mync_vision.json | 5 - .../powers/serpenta-powers/boilingshot.json | 45 --- .../powers/serpenta-powers/scales.json | 8 - .../powers/shade-powers/invisibility1.json | 15 - .../powers/shade-powers/invisibility2.json | 10 - .../powers/shade-powers/invisibility3.json | 27 -- .../powers/spirit-powers/ectodiff.json | 140 --------- .../powers/spirit-powers/ectoplasm.json | 11 - .../powers/spirit-powers/lackofectodmg.json | 24 -- .../powers/spirit-powers/nightvis.json | 4 - .../powers/spirit-powers/phasing1.json | 15 - .../powers/spirit-powers/phasing2.json | 26 -- .../powers/spirit-powers/phasing3.json | 27 -- .../powers/spirit-powers/pure_ghost.json | 0 .../powers/spirit-powers/skin.json | 5 - .../powers/spirit-powers/undead.json | 4 - .../powers/wraith-powers/charred.json | 7 - .../powers/wraith-powers/soaring1.json | 15 - .../powers/wraith-powers/soaring2.json | 9 - .../powers/wraith-powers/soaring3.json | 27 -- .../powers/wraith-powers/torment1.json | 15 - .../powers/wraith-powers/torment2.json | 45 --- .../powers/wraith-powers/torment3.json | 27 -- .../powers/yulde-powers/last_stand-death.json | 20 -- .../yulde-powers/last_stand-effects.json | 26 -- .../powers/yulde-powers/last_stand.json | 25 -- .../terraoriginum/recipes/ghostly_boots.json | 20 -- .../recipes/ghostly_chestplate.json | 20 -- .../terraoriginum/recipes/ghostly_cloth.json | 20 -- .../terraoriginum/recipes/ghostly_helmet.json | 20 -- .../recipes/ghostly_leggings.json | 20 -- .../data/terraoriginum/recipes/sun_totem.json | 26 -- .../data/terraoriginum/recipes/umbrella.json | 23 -- src/main/resources/fabric.mod.json | 15 +- ...terra.mixins.json => faithful.mixins.json} | 4 +- 306 files changed, 97 insertions(+), 5699 deletions(-) create mode 100644 src/main/java/com/smithy/faithful/Faithful.java rename src/main/java/com/smithy/{terraoriginum/client/TerraOriginumClient.java => faithful/client/FaithfulOriginsClient.java} (51%) rename src/main/java/com/smithy/{terraoriginum => faithful}/client/TerraKeybinds.java (95%) rename src/main/java/com/smithy/{terraoriginum => faithful}/items/IconItems.java (59%) create mode 100644 src/main/java/com/smithy/faithful/mixin/EntityMixin.java rename src/main/java/com/smithy/{terraoriginum => faithful}/mixin/IcarusHelperMixin.java (95%) rename src/main/java/com/smithy/{terraoriginum => faithful}/mixin/PowderSnowBlockMixin.java (89%) rename src/main/java/com/smithy/{terraoriginum => faithful}/mixin/client/IcarusClientMixin.java (89%) rename src/main/java/com/smithy/{terraoriginum => faithful}/power/CanStandOnPowderSnow.java (87%) rename src/main/java/com/smithy/{terraoriginum => faithful}/power/PreventBlockSlowness.java (87%) rename src/main/java/com/smithy/{terraoriginum => faithful}/power/WingsPower.java (94%) rename src/main/java/com/smithy/{terraoriginum => faithful}/registry/ModPowers.java (58%) rename src/main/java/com/smithy/{terraoriginum => faithful}/util/CodecHelper.java (91%) rename src/main/java/com/smithy/{terraoriginum => faithful}/util/CustomDataTypes.java (98%) rename src/main/java/com/smithy/{terraoriginum => faithful}/util/OptionalBool.java (96%) rename src/main/java/com/smithy/{terraoriginum => faithful}/util/TerraHelper.java (79%) delete mode 100644 src/main/java/com/smithy/terraoriginum/TerraOriginum.java delete mode 100644 src/main/java/com/smithy/terraoriginum/blocks/CottonCropBlock.java delete mode 100644 src/main/java/com/smithy/terraoriginum/blocks/Crucifix.java delete mode 100644 src/main/java/com/smithy/terraoriginum/blocks/CrucifixClass.java delete mode 100644 src/main/java/com/smithy/terraoriginum/client/LayerRenderer.java delete mode 100644 src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourModel.java delete mode 100644 src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourRenderer.java delete mode 100644 src/main/java/com/smithy/terraoriginum/customMaterials/RobesMaterial.java delete mode 100644 src/main/java/com/smithy/terraoriginum/enchantment/LightProtectionEnchantment.java delete mode 100644 src/main/java/com/smithy/terraoriginum/enchantment/SunProtectionEnchantment.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/CottonItems.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/GhostlyArmour.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/GhostlyArmourItems.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/GhostlyItems.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/SunTotem.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/Umbrella.java delete mode 100644 src/main/java/com/smithy/terraoriginum/items/UmbrellaDyeTest.java delete mode 100644 src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java delete mode 100644 src/main/java/com/smithy/terraoriginum/mixin/PlayerConditionsMixin.java delete mode 100644 src/main/java/com/smithy/terraoriginum/mixin/PlayerEntityMixin.java delete mode 100644 src/main/java/com/smithy/terraoriginum/registry/ModEnchantments.java delete mode 100644 src/main/java/com/smithy/terraoriginum/util/LootTableModifiers.java rename src/main/resources/assets/{terraoriginum => faithful}/lang/en_us.json (100%) rename src/main/resources/assets/{terraoriginum => faithful}/shaders/post/sobel.json (100%) delete mode 100644 src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json delete mode 100644 src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json delete mode 100644 src/main/resources/assets/terraoriginum/blockstates/crucifix.json delete mode 100644 src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json delete mode 100644 src/main/resources/assets/terraoriginum/models/block/crucifix.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/cotton_ball.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/crucifix.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/mync_eye.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/spirit.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/sun_totem.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/tiny.json delete mode 100644 src/main/resources/assets/terraoriginum/models/item/umbrella.json delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_4.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crucifix.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/crucifix2.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/gui/ability_bar.png delete mode 100755 src/main/resources/assets/terraoriginum/textures/gui/nothing.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/cotton_seeds.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_leggings.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/mync_eye.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/spirit.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/sun_totem.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/tiny.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/umbrella.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/item/umbrellaoverlay.png delete mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png delete mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png rename src/main/resources/data/{terraoriginum => faithful}/origins/muckunde.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/powers/wings.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/bees.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/hexblade_unphaseable.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/hot_blocks.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/mushrooms.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/myceliums.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/nature.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/non_solid.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/ocean_monument.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/path_blocks.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/stone_types.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/unphasable.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/valuores.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/blocks/wool.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/entity_types/hostiles.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/entity_types/innocent.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/entity_types/nomercy.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/entity_types/unholy.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/blades.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/boots.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/break.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/chestplate.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/giweapons.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/helmet.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/leggings.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/unobtainable.json (100%) rename src/main/resources/data/{terraoriginum => faithful}/tags/items/weapons.json (100%) delete mode 100644 src/main/resources/data/terraoriginum/damage_type/boiling.json delete mode 100644 src/main/resources/data/terraoriginum/damage_type/burn_in_sun.json delete mode 100644 src/main/resources/data/terraoriginum/damage_type/lack_of_ectoplasm.json delete mode 100644 src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json delete mode 100644 src/main/resources/data/terraoriginum/damage_type/last_stand.json delete mode 100644 src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json delete mode 100644 src/main/resources/data/terraoriginum/origins/angel.json delete mode 100644 src/main/resources/data/terraoriginum/origins/blight.json delete mode 100644 src/main/resources/data/terraoriginum/origins/demon.json delete mode 100644 src/main/resources/data/terraoriginum/origins/dominion.json delete mode 100644 src/main/resources/data/terraoriginum/origins/fairy.json delete mode 100644 src/main/resources/data/terraoriginum/origins/florian.json delete mode 100644 src/main/resources/data/terraoriginum/origins/immortal_human.json delete mode 100644 src/main/resources/data/terraoriginum/origins/kitsune.json delete mode 100755 src/main/resources/data/terraoriginum/origins/lato.json delete mode 100644 src/main/resources/data/terraoriginum/origins/merfolk.json delete mode 100644 src/main/resources/data/terraoriginum/origins/monarch.json delete mode 100644 src/main/resources/data/terraoriginum/origins/munch.json delete mode 100644 src/main/resources/data/terraoriginum/origins/mync.json delete mode 100644 src/main/resources/data/terraoriginum/origins/serpenta.json delete mode 100644 src/main/resources/data/terraoriginum/origins/shade.json delete mode 100644 src/main/resources/data/terraoriginum/origins/spirit.json delete mode 100644 src/main/resources/data/terraoriginum/origins/sylt.json delete mode 100644 src/main/resources/data/terraoriginum/origins/wraith.json delete mode 100755 src/main/resources/data/terraoriginum/origins/yulde.json delete mode 100644 src/main/resources/data/terraoriginum/powers/angel-powers/angel_wings.json delete mode 100644 src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json delete mode 100644 src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json delete mode 100644 src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json delete mode 100644 src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json delete mode 100644 src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration3.json delete mode 100644 src/main/resources/data/terraoriginum/powers/demon-powers/stained.json delete mode 100644 src/main/resources/data/terraoriginum/powers/dominion-powers/greater_heal_ray.json delete mode 100644 src/main/resources/data/terraoriginum/powers/dominion-powers/larger.json delete mode 100644 src/main/resources/data/terraoriginum/powers/dominion-powers/suppression_of_power.json delete mode 100644 src/main/resources/data/terraoriginum/powers/ectotest.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json delete mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/absorbing.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/aura_of_growth.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/bonemeal.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/compost.json delete mode 100755 src/main/resources/data/terraoriginum/powers/florian-powers/five_hearts.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/flammable.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/green_fingered.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/photosynthesis.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/pocket_sand.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/small.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/small_hitbox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/small_width.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/small_width_hitbox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/florian-powers/weak.json delete mode 100644 src/main/resources/data/terraoriginum/powers/immortal_human-powers/immortal.json delete mode 100644 src/main/resources/data/terraoriginum/powers/immortal_human-powers/pathetic.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json delete mode 100644 src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json delete mode 100755 src/main/resources/data/terraoriginum/powers/lato-powers/lato_blooded.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/long_arms.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/natural_armor.json delete mode 100755 src/main/resources/data/terraoriginum/powers/lato-powers/perfect_vision.json delete mode 100755 src/main/resources/data/terraoriginum/powers/lato-powers/rage.json delete mode 100755 src/main/resources/data/terraoriginum/powers/lato-powers/rage_addition.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/strong.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/tailwind.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/tall.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/tall_hitbox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/tall_width.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/tall_width_hitbox.json delete mode 100644 src/main/resources/data/terraoriginum/powers/lato-powers/teleport.json delete mode 100755 src/main/resources/data/terraoriginum/powers/lato-powers/twelve_hearts.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json delete mode 100644 src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json delete mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json delete mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json delete mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/better_health.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/climbing.json delete mode 100755 src/main/resources/data/terraoriginum/powers/munch-powers/little_health.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/mounting.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/nimble.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/quiet.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/short_arms.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/speedy_bastard.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_appetite.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_motion.json delete mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_width.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_blind.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_echolocate.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_natural_armour.json delete mode 100755 src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage.json delete mode 100755 src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage_addition.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_strong.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_tailwind.json delete mode 100644 src/main/resources/data/terraoriginum/powers/mync-powers/mync_vision.json delete mode 100644 src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json delete mode 100644 src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json delete mode 100644 src/main/resources/data/terraoriginum/powers/shade-powers/invisibility1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/shade-powers/invisibility2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/shade-powers/invisibility3.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/ectoplasm.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/nightvis.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/phasing1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/phasing2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/phasing3.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/pure_ghost.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/skin.json delete mode 100644 src/main/resources/data/terraoriginum/powers/spirit-powers/undead.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json delete mode 100644 src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json delete mode 100644 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json delete mode 100755 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json delete mode 100755 src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_boots.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_chestplate.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_helmet.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_leggings.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/sun_totem.json delete mode 100644 src/main/resources/data/terraoriginum/recipes/umbrella.json rename src/main/resources/{terra.mixins.json => faithful.mixins.json} (72%) diff --git a/src/main/java/com/smithy/faithful/Faithful.java b/src/main/java/com/smithy/faithful/Faithful.java new file mode 100644 index 0000000..4ac23a2 --- /dev/null +++ b/src/main/java/com/smithy/faithful/Faithful.java @@ -0,0 +1,23 @@ +package com.smithy.faithful; + +import net.fabricmc.api.ModInitializer; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.smithy.faithful.items.*; +import com.smithy.faithful.registry.ModPowers; + +public class Faithful implements ModInitializer { + public static final String MOD_ID = "faithful"; + + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + + @Override + public void onInitialize() { + IconItems.register(); + ModPowers.register(); + + LOGGER.info("man this Origins is " + MOD_ID); + } +} diff --git a/src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java b/src/main/java/com/smithy/faithful/client/FaithfulOriginsClient.java similarity index 51% rename from src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java rename to src/main/java/com/smithy/faithful/client/FaithfulOriginsClient.java index 58764a9..8722137 100644 --- a/src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java +++ b/src/main/java/com/smithy/faithful/client/FaithfulOriginsClient.java @@ -1,8 +1,8 @@ -package com.smithy.terraoriginum.client; +package com.smithy.faithful.client; import net.fabricmc.api.ClientModInitializer; -public class TerraOriginumClient implements ClientModInitializer { +public class FaithfulOriginsClient implements ClientModInitializer { @Override diff --git a/src/main/java/com/smithy/terraoriginum/client/TerraKeybinds.java b/src/main/java/com/smithy/faithful/client/TerraKeybinds.java similarity index 95% rename from src/main/java/com/smithy/terraoriginum/client/TerraKeybinds.java rename to src/main/java/com/smithy/faithful/client/TerraKeybinds.java index e1539d6..66e2b5d 100644 --- a/src/main/java/com/smithy/terraoriginum/client/TerraKeybinds.java +++ b/src/main/java/com/smithy/faithful/client/TerraKeybinds.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.client; +package com.smithy.faithful.client; import io.github.apace100.apoli.ApoliClient; import net.fabricmc.api.ClientModInitializer; diff --git a/src/main/java/com/smithy/terraoriginum/items/IconItems.java b/src/main/java/com/smithy/faithful/items/IconItems.java similarity index 59% rename from src/main/java/com/smithy/terraoriginum/items/IconItems.java rename to src/main/java/com/smithy/faithful/items/IconItems.java index 7fa7eac..295f07c 100644 --- a/src/main/java/com/smithy/terraoriginum/items/IconItems.java +++ b/src/main/java/com/smithy/faithful/items/IconItems.java @@ -1,6 +1,7 @@ -package com.smithy.terraoriginum.items; +package com.smithy.faithful.items; + +import com.smithy.faithful.Faithful; -import com.smithy.terraoriginum.TerraOriginum; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; @@ -14,9 +15,9 @@ public class IconItems { public static final Item TINY = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "mync_eye"), MYNC_EYE); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "spirit"), SPIRIT); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "tiny"), TINY); + Registry.register(Registries.ITEM, new Identifier(Faithful.MOD_ID, "mync_eye"), MYNC_EYE); + Registry.register(Registries.ITEM, new Identifier(Faithful.MOD_ID, "spirit"), SPIRIT); + Registry.register(Registries.ITEM, new Identifier(Faithful.MOD_ID, "tiny"), TINY); } } diff --git a/src/main/java/com/smithy/faithful/mixin/EntityMixin.java b/src/main/java/com/smithy/faithful/mixin/EntityMixin.java new file mode 100644 index 0000000..763616f --- /dev/null +++ b/src/main/java/com/smithy/faithful/mixin/EntityMixin.java @@ -0,0 +1,27 @@ +package com.smithy.faithful.mixin; + +import io.github.apace100.apoli.component.PowerHolderComponent; +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.Vec3d; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.smithy.faithful.power.PreventBlockSlowness; + +@Mixin(Entity.class) +public abstract class EntityMixin { + + @Inject(method = "slowMovement", at = @At("HEAD"), cancellable = true) + private void terraoriginum$preventBlockSlowness(BlockState state, Vec3d multiplier, CallbackInfo ci) { + for (PreventBlockSlowness power : PowerHolderComponent.getPowers((Entity) (Object) this, PreventBlockSlowness.class)) { + if (power.isActive()) { + ci.cancel(); + return; + } + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/mixin/IcarusHelperMixin.java b/src/main/java/com/smithy/faithful/mixin/IcarusHelperMixin.java similarity index 95% rename from src/main/java/com/smithy/terraoriginum/mixin/IcarusHelperMixin.java rename to src/main/java/com/smithy/faithful/mixin/IcarusHelperMixin.java index 102d5d7..49466e8 100644 --- a/src/main/java/com/smithy/terraoriginum/mixin/IcarusHelperMixin.java +++ b/src/main/java/com/smithy/faithful/mixin/IcarusHelperMixin.java @@ -1,9 +1,10 @@ -package com.smithy.terraoriginum.mixin; +package com.smithy.faithful.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.smithy.terraoriginum.power.WingsPower; +import com.smithy.faithful.power.WingsPower; + import dev.cammiescorner.icarus.api.IcarusPlayerValues; import dev.cammiescorner.icarus.util.IcarusHelper; import io.github.apace100.apoli.component.PowerHolderComponent; diff --git a/src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java b/src/main/java/com/smithy/faithful/mixin/PowderSnowBlockMixin.java similarity index 89% rename from src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java rename to src/main/java/com/smithy/faithful/mixin/PowderSnowBlockMixin.java index ccdb415..fef341d 100644 --- a/src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java +++ b/src/main/java/com/smithy/faithful/mixin/PowderSnowBlockMixin.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.mixin; +package com.smithy.faithful.mixin; import io.github.apace100.apoli.component.PowerHolderComponent; import net.minecraft.block.PowderSnowBlock; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.smithy.terraoriginum.power.CanStandOnPowderSnow; +import com.smithy.faithful.power.CanStandOnPowderSnow; @Mixin(PowderSnowBlock.class) public class PowderSnowBlockMixin { diff --git a/src/main/java/com/smithy/terraoriginum/mixin/client/IcarusClientMixin.java b/src/main/java/com/smithy/faithful/mixin/client/IcarusClientMixin.java similarity index 89% rename from src/main/java/com/smithy/terraoriginum/mixin/client/IcarusClientMixin.java rename to src/main/java/com/smithy/faithful/mixin/client/IcarusClientMixin.java index 312fc8f..0118546 100644 --- a/src/main/java/com/smithy/terraoriginum/mixin/client/IcarusClientMixin.java +++ b/src/main/java/com/smithy/faithful/mixin/client/IcarusClientMixin.java @@ -1,7 +1,8 @@ -package com.smithy.terraoriginum.mixin.client; +package com.smithy.faithful.mixin.client; import com.llamalad7.mixinextras.injector.ModifyReturnValue; -import com.smithy.terraoriginum.power.WingsPower; +import com.smithy.faithful.power.WingsPower; + import dev.cammiescorner.icarus.client.IcarusClient; import io.github.apace100.apoli.component.PowerHolderComponent; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/smithy/terraoriginum/power/CanStandOnPowderSnow.java b/src/main/java/com/smithy/faithful/power/CanStandOnPowderSnow.java similarity index 87% rename from src/main/java/com/smithy/terraoriginum/power/CanStandOnPowderSnow.java rename to src/main/java/com/smithy/faithful/power/CanStandOnPowderSnow.java index a7a8532..68cbf25 100644 --- a/src/main/java/com/smithy/terraoriginum/power/CanStandOnPowderSnow.java +++ b/src/main/java/com/smithy/faithful/power/CanStandOnPowderSnow.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.power; +package com.smithy.faithful.power; import io.github.apace100.apoli.power.Power; import io.github.apace100.apoli.power.PowerType; diff --git a/src/main/java/com/smithy/terraoriginum/power/PreventBlockSlowness.java b/src/main/java/com/smithy/faithful/power/PreventBlockSlowness.java similarity index 87% rename from src/main/java/com/smithy/terraoriginum/power/PreventBlockSlowness.java rename to src/main/java/com/smithy/faithful/power/PreventBlockSlowness.java index f97af59..cac3c50 100644 --- a/src/main/java/com/smithy/terraoriginum/power/PreventBlockSlowness.java +++ b/src/main/java/com/smithy/faithful/power/PreventBlockSlowness.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.power; +package com.smithy.faithful.power; import io.github.apace100.apoli.power.Power; import io.github.apace100.apoli.power.PowerType; diff --git a/src/main/java/com/smithy/terraoriginum/power/WingsPower.java b/src/main/java/com/smithy/faithful/power/WingsPower.java similarity index 94% rename from src/main/java/com/smithy/terraoriginum/power/WingsPower.java rename to src/main/java/com/smithy/faithful/power/WingsPower.java index 3d0f50b..0ca6692 100644 --- a/src/main/java/com/smithy/terraoriginum/power/WingsPower.java +++ b/src/main/java/com/smithy/faithful/power/WingsPower.java @@ -1,8 +1,4 @@ -package com.smithy.terraoriginum.power; - -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.util.CustomDataTypes; -import com.smithy.terraoriginum.util.OptionalBool; +package com.smithy.faithful.power; import dev.cammiescorner.icarus.api.IcarusPlayerValues; import dev.cammiescorner.icarus.util.ServerPlayerFallbackValues; @@ -17,9 +13,13 @@ import net.minecraft.item.ItemStack; import java.util.OptionalDouble; import java.util.OptionalInt; +import com.smithy.faithful.Faithful; +import com.smithy.faithful.util.CustomDataTypes; +import com.smithy.faithful.util.OptionalBool; + public class WingsPower extends Power implements IcarusPlayerValues { - public static final Identifier POWER_TYPE_ID = new Identifier(TerraOriginum.MOD_ID, "wings"); + public static final Identifier POWER_TYPE_ID = new Identifier(Faithful.MOD_ID, "wings"); private final ItemStack wingsType; private final OptionalBool armorSlows; diff --git a/src/main/java/com/smithy/terraoriginum/registry/ModPowers.java b/src/main/java/com/smithy/faithful/registry/ModPowers.java similarity index 58% rename from src/main/java/com/smithy/terraoriginum/registry/ModPowers.java rename to src/main/java/com/smithy/faithful/registry/ModPowers.java index 2185822..84392bd 100644 --- a/src/main/java/com/smithy/terraoriginum/registry/ModPowers.java +++ b/src/main/java/com/smithy/faithful/registry/ModPowers.java @@ -1,9 +1,9 @@ -package com.smithy.terraoriginum.registry; +package com.smithy.faithful.registry; -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.power.CanStandOnPowderSnow; -import com.smithy.terraoriginum.power.PreventBlockSlowness; -import com.smithy.terraoriginum.power.WingsPower; +import com.smithy.faithful.Faithful; +import com.smithy.faithful.power.CanStandOnPowderSnow; +import com.smithy.faithful.power.PreventBlockSlowness; +import com.smithy.faithful.power.WingsPower; import io.github.apace100.apoli.power.factory.PowerFactory; import io.github.apace100.apoli.registry.ApoliRegistries; @@ -13,8 +13,8 @@ import net.minecraft.util.Identifier; public class ModPowers { - public static final PowerFactory CAN_WALK_ON_POWDER_SNOW = new PowerFactory<>( new Identifier(TerraOriginum.MOD_ID, "can_walk_on_powder_snow"), new SerializableData(), data -> (type, entity) -> new CanStandOnPowderSnow(type, entity)).allowCondition(); - public static final PowerFactory PREVENT_BLOCK_SLOWNESS = new PowerFactory<>(new Identifier(TerraOriginum.MOD_ID, "prevent_block_slowness"), new SerializableData(), data -> (type, entity) -> new PreventBlockSlowness(type, entity)).allowCondition(); + public static final PowerFactory CAN_WALK_ON_POWDER_SNOW = new PowerFactory<>( new Identifier(Faithful.MOD_ID, "can_walk_on_powder_snow"), new SerializableData(), data -> (type, entity) -> new CanStandOnPowderSnow(type, entity)).allowCondition(); + public static final PowerFactory PREVENT_BLOCK_SLOWNESS = new PowerFactory<>(new Identifier(Faithful.MOD_ID, "prevent_block_slowness"), new SerializableData(), data -> (type, entity) -> new PreventBlockSlowness(type, entity)).allowCondition(); public static final PowerFactory WINGS_POWER = WingsPower.createFactory().allowCondition(); diff --git a/src/main/java/com/smithy/terraoriginum/util/CodecHelper.java b/src/main/java/com/smithy/faithful/util/CodecHelper.java similarity index 91% rename from src/main/java/com/smithy/terraoriginum/util/CodecHelper.java rename to src/main/java/com/smithy/faithful/util/CodecHelper.java index 22f8941..b85bfbd 100644 --- a/src/main/java/com/smithy/terraoriginum/util/CodecHelper.java +++ b/src/main/java/com/smithy/faithful/util/CodecHelper.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.util; +package com.smithy.faithful.util; import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; diff --git a/src/main/java/com/smithy/terraoriginum/util/CustomDataTypes.java b/src/main/java/com/smithy/faithful/util/CustomDataTypes.java similarity index 98% rename from src/main/java/com/smithy/terraoriginum/util/CustomDataTypes.java rename to src/main/java/com/smithy/faithful/util/CustomDataTypes.java index a858d8d..d664979 100644 --- a/src/main/java/com/smithy/terraoriginum/util/CustomDataTypes.java +++ b/src/main/java/com/smithy/faithful/util/CustomDataTypes.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.util; +package com.smithy.faithful.util; import com.google.gson.JsonParseException; import com.mojang.serialization.JsonOps; import io.github.apace100.calio.data.SerializableDataType; diff --git a/src/main/java/com/smithy/terraoriginum/util/OptionalBool.java b/src/main/java/com/smithy/faithful/util/OptionalBool.java similarity index 96% rename from src/main/java/com/smithy/terraoriginum/util/OptionalBool.java rename to src/main/java/com/smithy/faithful/util/OptionalBool.java index 95676f6..0376b1f 100644 --- a/src/main/java/com/smithy/terraoriginum/util/OptionalBool.java +++ b/src/main/java/com/smithy/faithful/util/OptionalBool.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.util; +package com.smithy.faithful.util; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/com/smithy/terraoriginum/util/TerraHelper.java b/src/main/java/com/smithy/faithful/util/TerraHelper.java similarity index 79% rename from src/main/java/com/smithy/terraoriginum/util/TerraHelper.java rename to src/main/java/com/smithy/faithful/util/TerraHelper.java index 0c7e8c4..594f0f2 100644 --- a/src/main/java/com/smithy/terraoriginum/util/TerraHelper.java +++ b/src/main/java/com/smithy/faithful/util/TerraHelper.java @@ -1,4 +1,4 @@ -package com.smithy.terraoriginum.util; +package com.smithy.faithful.util; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java deleted file mode 100644 index 8ff4bb4..0000000 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.smithy.terraoriginum; - -import com.smithy.terraoriginum.blocks.CottonCropBlock; -import com.smithy.terraoriginum.blocks.Crucifix; -import com.smithy.terraoriginum.items.*; -import com.smithy.terraoriginum.registry.ModEnchantments; -import com.smithy.terraoriginum.registry.ModPowers; -import com.smithy.terraoriginum.util.LootTableModifiers; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -// import net.minecraft.item.ItemGroups; -import net.minecraft.item.ItemGroups; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class TerraOriginum implements ModInitializer { - public static final String MOD_ID = "terraoriginum"; - - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); - - @Override - public void onInitialize() { - Umbrella.registerItems(); - IconItems.register(); - ModEnchantments.register(); - Crucifix.register(); - CottonCropBlock.register(); - CottonItems.register(); - SunTotem.register(); - GhostlyItems.register(); - GhostlyArmourItems.register(); - ModPowers.register(); - - LootTableModifiers.modifyLootTables(); - - ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(Umbrella.UMBRELLA)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(SunTotem.SUN_TOTEM)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register((content) -> content.add(Crucifix.CRUCIFIX)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register((content) -> content.add(CottonItems.COTTON_SEEDS)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register((content) -> content.add(CottonItems.COTTON_BALL)); - LOGGER.info("man this Origins is " + MOD_ID); - } -} diff --git a/src/main/java/com/smithy/terraoriginum/blocks/CottonCropBlock.java b/src/main/java/com/smithy/terraoriginum/blocks/CottonCropBlock.java deleted file mode 100644 index 2122c46..0000000 --- a/src/main/java/com/smithy/terraoriginum/blocks/CottonCropBlock.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.smithy.terraoriginum.blocks; - -import com.smithy.terraoriginum.items.CottonItems; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.CropBlock; -import net.minecraft.block.ShapeContext; -import net.minecraft.item.ItemConvertible; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.world.BlockView; - -public class CottonCropBlock extends CropBlock{ - - private static final VoxelShape[] AGE_TO_SHAPE = new VoxelShape[]{Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 2.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 3.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 4.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 5.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 6.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 7.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 8.0D, 16.0D), - Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 9.0D, 16.0D) - }; - - public CottonCropBlock(AbstractBlock.Settings settings) { - super(settings); - } - - public ItemConvertible getSeedsItem() { - return CottonItems.COTTON_SEEDS; - } - - public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())]; - } - - public static final CropBlock COTTON_CROP_BLOCK = new CropBlock(AbstractBlock.Settings.create().nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)); - - public static void register() { - Registry.register(Registries.BLOCK, new Identifier("terraoriginum", "cotton_crop_block"), COTTON_CROP_BLOCK); - } - - -} diff --git a/src/main/java/com/smithy/terraoriginum/blocks/Crucifix.java b/src/main/java/com/smithy/terraoriginum/blocks/Crucifix.java deleted file mode 100644 index 926d49e..0000000 --- a/src/main/java/com/smithy/terraoriginum/blocks/Crucifix.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.smithy.terraoriginum.blocks; - -import com.smithy.terraoriginum.TerraOriginum; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -public class Crucifix { - - public static final Block CRUCIFIX = new CrucifixClass(FabricBlockSettings.create().strength(5.5f, 4.8f).requiresTool()); - - public static void register() { - // Registry.register(Registries.BLOCK, new Identifier(TerraOriginum.MOD_ID, "crucifix"), new BlockItem(CRUCIFIX, new FabricItemSettings())); - // Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "crucifix"), CRUCIFIX); - Registry.register(Registries.BLOCK, new Identifier(TerraOriginum.MOD_ID, "crucifix"), CRUCIFIX); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "crucifix"), new BlockItem(CRUCIFIX, new Item.Settings())); - } -} diff --git a/src/main/java/com/smithy/terraoriginum/blocks/CrucifixClass.java b/src/main/java/com/smithy/terraoriginum/blocks/CrucifixClass.java deleted file mode 100644 index 92798de..0000000 --- a/src/main/java/com/smithy/terraoriginum/blocks/CrucifixClass.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.smithy.terraoriginum.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.ShapeContext; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; -import net.minecraft.world.BlockView; - -public class CrucifixClass extends Block { - - public CrucifixClass(Settings properties) { - super(properties); - } - - @Override - public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - VoxelShape shape = VoxelShapes.empty(); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0, 0.375, 0.5625, 0.75, 0.5625)); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.5625, 0.375, 0.375, 0.75, 0.5625, 0.5625)); - shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.375, 0.375, 0.375, 0.5625, 0.5625)); - - return shape; - } - - -} diff --git a/src/main/java/com/smithy/terraoriginum/client/LayerRenderer.java b/src/main/java/com/smithy/terraoriginum/client/LayerRenderer.java deleted file mode 100644 index cd6c2b3..0000000 --- a/src/main/java/com/smithy/terraoriginum/client/LayerRenderer.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.smithy.terraoriginum.client; - -import com.smithy.terraoriginum.blocks.CottonCropBlock; -import com.smithy.terraoriginum.items.Umbrella; -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.minecraft.client.render.RenderLayer; - -public class LayerRenderer implements ClientModInitializer { - - @Override - public void onInitializeClient() { - Umbrella.registerRenderLayers(); - BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), CottonCropBlock.COTTON_CROP_BLOCK); - } - -} diff --git a/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourModel.java b/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourModel.java deleted file mode 100644 index 1c1cef1..0000000 --- a/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.smithy.terraoriginum.client.armour; - -import com.smithy.terraoriginum.items.GhostlyArmour; -import net.minecraft.util.Identifier; -import software.bernie.geckolib.model.GeoModel; - -public class GhostlyArmourModel extends GeoModel { - - @Override - public Identifier getModelResource(GhostlyArmour animatable) { - return new Identifier("terraoriginum", "geo/ghostly_armour.geo.json"); - } - - @Override - public Identifier getTextureResource(GhostlyArmour animatable) { - return new Identifier("terraoriginum", "textures/models/armor/ghost_armour_model_texture"); - } - - @Override - public Identifier getAnimationResource(GhostlyArmour animatable) { - return null; - } -} diff --git a/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourRenderer.java b/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourRenderer.java deleted file mode 100644 index bb702da..0000000 --- a/src/main/java/com/smithy/terraoriginum/client/armour/GhostlyArmourRenderer.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.smithy.terraoriginum.client.armour; - -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.items.GhostlyArmour; -import net.minecraft.util.Identifier; -import software.bernie.geckolib.GeckoLib; -import software.bernie.geckolib.model.DefaultedItemGeoModel; -import software.bernie.geckolib.renderer.GeoArmorRenderer; - -public class GhostlyArmourRenderer extends GeoArmorRenderer { - - public GhostlyArmourRenderer() { - super(new DefaultedItemGeoModel<>(new Identifier(TerraOriginum.MOD_ID, "armor/ghost_armour"))); - } - -} diff --git a/src/main/java/com/smithy/terraoriginum/customMaterials/RobesMaterial.java b/src/main/java/com/smithy/terraoriginum/customMaterials/RobesMaterial.java deleted file mode 100644 index ac45871..0000000 --- a/src/main/java/com/smithy/terraoriginum/customMaterials/RobesMaterial.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.smithy.terraoriginum.customMaterials; - -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.recipe.Ingredient; -import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; - -import java.util.function.Supplier; - -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.items.CottonItems; - -public enum RobesMaterial implements ArmorMaterial { - ROBES("robes", 42, new int[] { 4, 9, 7, 4 }, 19, - SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 5, 0.1f, () -> Ingredient.ofItems(CottonItems.COTTON_BALL)); - - private final String name; - private final int durabilityMultiplier; - private final int[] protectionAmounts; - private final int enchantability; - private final SoundEvent equipSound; - private final float toughness; - private final float knockbackResistance; - private final Supplier repairIngredient; - - private static final int[] BASE_DURABILITY = { 11, 16, 15, 13 }; - - RobesMaterial( - String name, - int durabilityMultiplier, - int[] protectionAmounts, - int enchantability, - SoundEvent equipSound, - float toughness, - float knockbackResistance, - Supplier repairIngredient - ) { - - this.name = name; - this.durabilityMultiplier = durabilityMultiplier; - this.protectionAmounts = protectionAmounts; - this.enchantability = enchantability; - this.equipSound = equipSound; - this.toughness = toughness; - this.knockbackResistance = knockbackResistance; - this.repairIngredient = repairIngredient; - } - - @Override - public int getDurability(ArmorItem.Type type) { - return BASE_DURABILITY[type.ordinal()] * this.durabilityMultiplier; - } - - @Override - public int getProtection(ArmorItem.Type type) { - return protectionAmounts[type.ordinal()]; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public SoundEvent getEquipSound() { - return this.equipSound; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } - - @Override - public String getName() { - return TerraOriginum.MOD_ID + ":" + this.name; - } - - @Override - public float getToughness() { - return this.toughness; - } - - @Override - public float getKnockbackResistance() { - return this.knockbackResistance; - } -} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/enchantment/LightProtectionEnchantment.java b/src/main/java/com/smithy/terraoriginum/enchantment/LightProtectionEnchantment.java deleted file mode 100644 index 1be3552..0000000 --- a/src/main/java/com/smithy/terraoriginum/enchantment/LightProtectionEnchantment.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.smithy.terraoriginum.enchantment; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.enchantment.ProtectionEnchantment; -import net.minecraft.entity.EquipmentSlot; - -public class LightProtectionEnchantment extends Enchantment{ - - public LightProtectionEnchantment(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { - super(weight, type, slotTypes); - } - - public int getMinPower(int level) { - return 8 + level * 5; - } - - public int getMaxPower(int level) { - return this.getMinPower(level) + 8; - } - - public boolean isTreasure() { - return true; - } - - public int getMaxLevel() { - return 1; - } - - @Override - protected boolean canAccept(Enchantment other) { - if(other == this || ((other instanceof ProtectionEnchantment && !(((ProtectionEnchantment)other).protectionType == ProtectionEnchantment.Type.ALL)))) { - return false; - } - return super.canAccept(other); - } - - -} diff --git a/src/main/java/com/smithy/terraoriginum/enchantment/SunProtectionEnchantment.java b/src/main/java/com/smithy/terraoriginum/enchantment/SunProtectionEnchantment.java deleted file mode 100644 index 80d6055..0000000 --- a/src/main/java/com/smithy/terraoriginum/enchantment/SunProtectionEnchantment.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.smithy.terraoriginum.enchantment; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.enchantment.ProtectionEnchantment; -import net.minecraft.entity.EquipmentSlot; - -public class SunProtectionEnchantment extends Enchantment { - - public SunProtectionEnchantment(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { - super(weight, type, slotTypes); - } - - public int getMinPower(int level) { - return 8 + level * 5; - } - - public int getMaxPower(int level) { - return this.getMinPower(level) + 8; - } - - public boolean isTreasure() { - return true; - } - - public int getMaxLevel() { - return 4; - } - - @Override - protected boolean canAccept(Enchantment other) { - if(other == this || ((other instanceof ProtectionEnchantment && !(((ProtectionEnchantment)other).protectionType == ProtectionEnchantment.Type.ALL)))) { - return true; // true because its somehow incompatible with every other protection, except protection - } - return super.canAccept(other); - } - - -} diff --git a/src/main/java/com/smithy/terraoriginum/items/CottonItems.java b/src/main/java/com/smithy/terraoriginum/items/CottonItems.java deleted file mode 100644 index 770d003..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/CottonItems.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.smithy.terraoriginum.items; - -import com.smithy.terraoriginum.blocks.CottonCropBlock; -import net.minecraft.item.AliasedBlockItem; -import net.minecraft.item.Item; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -public class CottonItems { - - public static final Item COTTON_SEEDS = new AliasedBlockItem(CottonCropBlock.COTTON_CROP_BLOCK, new Item.Settings()); - public static final Item COTTON_BALL = new Item(new Item.Settings()); - - public static void register() { - Registry.register(Registries.ITEM, new Identifier("terraoriginum", "cotton_seeds"), COTTON_SEEDS); - Registry.register(Registries.ITEM, new Identifier("terraoriginum", "cotton_ball"), COTTON_BALL); - } -} diff --git a/src/main/java/com/smithy/terraoriginum/items/GhostlyArmour.java b/src/main/java/com/smithy/terraoriginum/items/GhostlyArmour.java deleted file mode 100644 index 532d866..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/GhostlyArmour.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.smithy.terraoriginum.items; - -import com.smithy.terraoriginum.client.armour.GhostlyArmourRenderer; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import net.minecraft.client.render.entity.model.BipedEntityModel; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.decoration.ArmorStandEntity; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import software.bernie.example.client.renderer.armor.GeckoArmorRenderer; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.animatable.client.RenderProvider; -import software.bernie.geckolib.constant.DataTickets; -import software.bernie.geckolib.constant.DefaultAnimations; -import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; -import software.bernie.geckolib.core.animation.AnimatableManager; -import software.bernie.geckolib.core.animation.AnimationController; -import software.bernie.geckolib.core.object.PlayState; -import software.bernie.geckolib.renderer.GeoArmorRenderer; -import software.bernie.geckolib.util.GeckoLibUtil; - -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Supplier; - -public class GhostlyArmour extends ArmorItem implements GeoItem { - - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - private final Supplier renderProvider = GeoItem.makeRenderer(this); - - public GhostlyArmour(ArmorMaterial armorMaterial, ArmorItem.Type type, Settings properties) { - super(armorMaterial, type, properties); - } - - // Create our armor model/renderer for Fabric and return it - @Override - public void createRenderer(Consumer consumer) { - consumer.accept(new RenderProvider() { - private GeoArmorRenderer renderer; - - @Override - public BipedEntityModel getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, BipedEntityModel original) { - if (this.renderer == null) - this.renderer = new GhostlyArmourRenderer(); - - // This prepares our GeoArmorRenderer for the current render frame. - // These parameters may be null however, so we don't do anything further with them - this.renderer.prepForRender(livingEntity, itemStack, equipmentSlot, original); - - return this.renderer; - } - }); - } - - @Override - public Supplier getRenderProvider() { - return this.renderProvider; - } - - // Let's add our animation controller - @Override - public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { - controllers.add(new AnimationController<>(this, 20, state -> { - // Apply our generic idle animation. - // Whether it plays or not is decided down below - - // Let's gather some data from the state to use below - // This is the entity that is currently wearing/holding the item - Entity entity = state.getData(DataTickets.ENTITY); - - // We'll just have ArmorStands always animate, so we can return here - if (entity instanceof ArmorStandEntity) - return PlayState.CONTINUE; - - // For this example, we only want the animation to play if the entity is wearing all pieces of the armor - // Let's collect the armor pieces the entity is currently wearing - Set wornArmor = new ObjectOpenHashSet<>(); - - for (ItemStack stack : entity.getArmorItems()) { - // We can stop immediately if any of the slots are empty - if (stack.isEmpty()) - return PlayState.STOP; - - wornArmor.add(stack.getItem()); - } - - // Check each of the pieces match our set - boolean isFullSet = wornArmor.containsAll(ObjectArrayList.of( - GhostlyArmourItems.GHOSTLY_BOOTS, - GhostlyArmourItems.GHOSTLY_LEGGING, - GhostlyArmourItems.GHOSTLY_CHESTPLATE, - GhostlyArmourItems.GHOSTLY_HELMET)); - - // Play the animation if the full set is being worn, otherwise stop - return isFullSet ? PlayState.CONTINUE : PlayState.STOP; - })); - } - - @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return this.cache; - } -} diff --git a/src/main/java/com/smithy/terraoriginum/items/GhostlyArmourItems.java b/src/main/java/com/smithy/terraoriginum/items/GhostlyArmourItems.java deleted file mode 100644 index c337bd2..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/GhostlyArmourItems.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.smithy.terraoriginum.items; - -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.customMaterials.RobesMaterial; - -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroups; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; -import net.minecraft.util.Rarity; - -public class GhostlyArmourItems { - - public static final Item GHOSTLY_HELMET = new GhostlyArmour(RobesMaterial.ROBES, ArmorItem.Type.HELMET, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item GHOSTLY_CHESTPLATE = new GhostlyArmour(RobesMaterial.ROBES, ArmorItem.Type.CHESTPLATE, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item GHOSTLY_LEGGING = new GhostlyArmour(RobesMaterial.ROBES, ArmorItem.Type.LEGGINGS, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item GHOSTLY_BOOTS = new GhostlyArmour(RobesMaterial.ROBES, ArmorItem.Type.BOOTS, new FabricItemSettings().rarity(Rarity.EPIC)); - - public static void register() { - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_helmet"), GHOSTLY_HELMET); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_chestplate"), GHOSTLY_CHESTPLATE); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_leggings"), GHOSTLY_LEGGING); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_boots"), GHOSTLY_BOOTS); - - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_HELMET)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_CHESTPLATE)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_LEGGING)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_BOOTS)); - } - - - -} diff --git a/src/main/java/com/smithy/terraoriginum/items/GhostlyItems.java b/src/main/java/com/smithy/terraoriginum/items/GhostlyItems.java deleted file mode 100644 index 5dd55d8..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/GhostlyItems.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.smithy.terraoriginum.items; - -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroups; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -public class GhostlyItems { - - public static final Item GHOSTLY_CLOTH = new Item(new FabricItemSettings()); - - public static void register() { - - Registry.register(Registries.ITEM, new Identifier("terraoriginum", "ghostly_cloth"), GHOSTLY_CLOTH); - - ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register((content) -> content.add(GHOSTLY_CLOTH)); - - } - - -} diff --git a/src/main/java/com/smithy/terraoriginum/items/SunTotem.java b/src/main/java/com/smithy/terraoriginum/items/SunTotem.java deleted file mode 100644 index 38ded2a..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/SunTotem.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.smithy.terraoriginum.items; - -import com.smithy.terraoriginum.TerraOriginum; -import net.minecraft.item.Item; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; -import net.minecraft.util.Rarity; - -public class SunTotem { - - public static final Item SUN_TOTEM = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); - - public static void register() { - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "sun_totem"), SUN_TOTEM); - } -} diff --git a/src/main/java/com/smithy/terraoriginum/items/Umbrella.java b/src/main/java/com/smithy/terraoriginum/items/Umbrella.java deleted file mode 100644 index 785b58f..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/Umbrella.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.smithy.terraoriginum.items; - -import com.smithy.terraoriginum.TerraOriginum; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.minecraft.item.DyeableItem; -import net.minecraft.util.Identifier; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; - -public class Umbrella { - public static final UmbrellaDyeTest UMBRELLA = new UmbrellaDyeTest(new FabricItemSettings().maxCount(1).maxDamage(1200)); - - - public static void registerItems() { - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "umbrella"), UMBRELLA); - - } - - @Environment(EnvType.CLIENT) - public static void registerRenderLayers() { - ColorProviderRegistry.ITEM.register((stack, tintIndex) -> (tintIndex > 0) ? -1 : ((DyeableItem) stack.getItem()).getColor(stack), UMBRELLA); - } -} diff --git a/src/main/java/com/smithy/terraoriginum/items/UmbrellaDyeTest.java b/src/main/java/com/smithy/terraoriginum/items/UmbrellaDyeTest.java deleted file mode 100644 index ca81d97..0000000 --- a/src/main/java/com/smithy/terraoriginum/items/UmbrellaDyeTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.smithy.terraoriginum.items; - -import net.minecraft.item.DyeableItem; -import net.minecraft.item.Item; - -public class UmbrellaDyeTest extends Item implements DyeableItem { - - public UmbrellaDyeTest(Settings settings) { - super(settings); - } - -} diff --git a/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java b/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java deleted file mode 100644 index 02e6dda..0000000 --- a/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.smithy.terraoriginum.mixin; - -import com.smithy.terraoriginum.items.Umbrella; -import com.smithy.terraoriginum.power.PreventBlockSlowness; - -import io.github.apace100.apoli.component.PowerHolderComponent; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Entity.class) -public abstract class EntityMixin { - - - @Shadow World world; - - @Shadow abstract BlockPos getBlockPos(); - - @Shadow abstract Box getBoundingBox(); - - @Shadow abstract Iterable getHandItems(); - - @Inject(method = "isBeingRainedOn", at = @At("HEAD"), cancellable = true) - private void isBeingRainedOn(CallbackInfoReturnable cir) { - Iterable hands = this.getHandItems(); - for (ItemStack stack : hands) { - if (stack.getItem() == Umbrella.UMBRELLA) - cir.setReturnValue(false); - } - } - - @Inject(method = "slowMovement", at = @At("HEAD"), cancellable = true) - private void terraoriginum$preventBlockSlowness(BlockState state, Vec3d multiplier, CallbackInfo ci) { - for (PreventBlockSlowness power : PowerHolderComponent.getPowers((Entity) (Object) this, PreventBlockSlowness.class)) { - if (power.isActive()) { - ci.cancel(); - return; - } - } - } - -} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/mixin/PlayerConditionsMixin.java b/src/main/java/com/smithy/terraoriginum/mixin/PlayerConditionsMixin.java deleted file mode 100644 index 04a5910..0000000 --- a/src/main/java/com/smithy/terraoriginum/mixin/PlayerConditionsMixin.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.smithy.terraoriginum.mixin; - -import io.github.apace100.apoli.power.factory.condition.EntityConditions; -import io.github.apace100.calio.data.SerializableData; -import com.smithy.terraoriginum.items.Umbrella; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(EntityConditions.class) -public class PlayerConditionsMixin { - - @Inject(method = { "lambda$register$10" }, at = { @At("HEAD") }, cancellable = true) - private static void sunDamagePrevention(SerializableData.Instance data, Entity player, CallbackInfoReturnable cir) { - for (ItemStack stack : player.getHandItems()) { - if (stack.getItem().equals(Umbrella.UMBRELLA) && stack.getDamage() < stack.getMaxDamage() - 1) { - cir.setReturnValue(false); - } - } - } - - @Inject(method = { "lambda$register$11" }, at = { @At("HEAD") }, cancellable = true) - private static void umbrellaRainedOn(SerializableData.Instance data, Entity player, CallbackInfoReturnable cir) { - for (ItemStack stack : player.getHandItems()) { - if (stack.getItem().equals(Umbrella.UMBRELLA) && stack.getDamage() < stack.getMaxDamage() - 1) { - cir.setReturnValue(false); - } - } - } - - -} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/mixin/PlayerEntityMixin.java b/src/main/java/com/smithy/terraoriginum/mixin/PlayerEntityMixin.java deleted file mode 100644 index 8897bce..0000000 --- a/src/main/java/com/smithy/terraoriginum/mixin/PlayerEntityMixin.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.smithy.terraoriginum.mixin; - -import io.github.apace100.apoli.mixin.EntityAccessor; -import com.smithy.terraoriginum.items.Umbrella; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(PlayerEntity.class) -public abstract class PlayerEntityMixin extends Entity { - @Shadow - public abstract ItemStack getEquippedStack(EquipmentSlot slot); - - @Shadow - public abstract Iterable getHandItems(); - - @Shadow - public abstract PlayerInventory getInventory(); - - protected PlayerEntityMixin(EntityType entityType, World world) { - super(entityType, world); - } - - @Inject(method = "tick", at = @At("HEAD"), cancellable = true) - private void tick(CallbackInfo ci) { - boolean isBeingRainedOn = ((EntityAccessor) this).callIsBeingRainedOn(); - - if (isBeingRainedOn && this.age % 10 == 0) { - for (ItemStack stack : this.getHandItems()) { - if (stack.getItem().equals(Umbrella.UMBRELLA) && stack.getDamage() < stack.getMaxDamage() - 1) { - // Set damage instead of calling stack.damage, otherwise an animation is - // triggered for each damage tick. - stack.setDamage(stack.getDamage() + 1); - } - } - } else if (!isBeingRainedOn && this.age % 20 == 0) { - ItemStack offHand = this.getEquippedStack(EquipmentSlot.OFFHAND); - boolean isHot = getWorld().getBiome(this.getBlockPos()).value().isCold(this.getBlockPos()); - - // Repair off-hand umbrella. - this.repairStack(offHand, isHot, true); - - // Repair any umbrellas in the player's inventory. - for (int i = 0; i < 36; i++) { - this.repairStack(this.getInventory().getStack(i), isHot, this.getInventory().selectedSlot == i); - } - } - } - - private void repairStack(ItemStack stack, boolean isHot, boolean isExposed) { - if (stack.getItem().equals(Umbrella.UMBRELLA) && stack.isDamaged()) { - stack.setDamage(stack.getDamage() - 1); - if (isHot) { - // Umbrellas dry faster in hot climates. - stack.setDamage(stack.getDamage() - 1); - } - if (isExposed) { - // Umbrellas dry faster if they're exposed (not tucked away in inventory). - stack.setDamage(stack.getDamage() - 1); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/registry/ModEnchantments.java b/src/main/java/com/smithy/terraoriginum/registry/ModEnchantments.java deleted file mode 100644 index 4ed4b90..0000000 --- a/src/main/java/com/smithy/terraoriginum/registry/ModEnchantments.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.smithy.terraoriginum.registry; - -import com.smithy.terraoriginum.TerraOriginum; -import com.smithy.terraoriginum.enchantment.LightProtectionEnchantment; -import com.smithy.terraoriginum.enchantment.SunProtectionEnchantment; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.registry.Registries; -import net.minecraft.util.Identifier; -import net.minecraft.registry.Registry; - -public class ModEnchantments { - - public static final Enchantment SUN_PROTECTION = new SunProtectionEnchantment(Enchantment.Rarity.RARE, EnchantmentTarget.ARMOR, new EquipmentSlot[]{EquipmentSlot.HEAD, EquipmentSlot.CHEST, EquipmentSlot.LEGS, EquipmentSlot.FEET}); - public static final Enchantment LIGHT_PROTECTION = new LightProtectionEnchantment(Enchantment.Rarity.RARE, EnchantmentTarget.ARMOR_CHEST, new EquipmentSlot[]{EquipmentSlot.CHEST}); - - public static void register() { - register("sun_protection", SUN_PROTECTION); - register("light_protection", LIGHT_PROTECTION); - } - - private static Enchantment register(String path, Enchantment enchantment) { - Registry.register(Registries.ENCHANTMENT, new Identifier(TerraOriginum.MOD_ID, path), enchantment); - return enchantment; - } -} diff --git a/src/main/java/com/smithy/terraoriginum/util/LootTableModifiers.java b/src/main/java/com/smithy/terraoriginum/util/LootTableModifiers.java deleted file mode 100644 index 72df4ca..0000000 --- a/src/main/java/com/smithy/terraoriginum/util/LootTableModifiers.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.smithy.terraoriginum.util; - -import com.smithy.terraoriginum.items.CottonItems; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.condition.RandomChanceLootCondition; -import net.minecraft.loot.entry.ItemEntry; -import net.minecraft.loot.function.SetCountLootFunction; -import net.minecraft.loot.provider.number.ConstantLootNumberProvider; -import net.minecraft.loot.provider.number.UniformLootNumberProvider; -import net.minecraft.util.Identifier; - -public class LootTableModifiers { - private static final Identifier GRASS_ID = - new Identifier("minecraft", "blocks/grass"); - - public static void modifyLootTables() { - LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { - if(GRASS_ID.equals(id)) { - LootPool.Builder poolBuilder = LootPool.builder() - .rolls(ConstantLootNumberProvider.create(1)) - .conditionally(RandomChanceLootCondition.builder(0.08f)) - .with(ItemEntry.builder(CottonItems.COTTON_SEEDS)) - .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 1.0f)).build()); - - tableBuilder.pool(poolBuilder.build()); - } - }); - } -} diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/faithful/lang/en_us.json similarity index 100% rename from src/main/resources/assets/terraoriginum/lang/en_us.json rename to src/main/resources/assets/faithful/lang/en_us.json diff --git a/src/main/resources/assets/terraoriginum/shaders/post/sobel.json b/src/main/resources/assets/faithful/shaders/post/sobel.json similarity index 100% rename from src/main/resources/assets/terraoriginum/shaders/post/sobel.json rename to src/main/resources/assets/faithful/shaders/post/sobel.json diff --git a/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json b/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json deleted file mode 100644 index 1ec2009..0000000 --- a/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "walk": { - "loop": "hold_on_last_frame", - "animation_length": 0.25, - "bones": { - "torsoEnd": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [20, 0, 0], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [0, -2, -3], - "easing": "linear" - } - } - }, - "bandanaEnd": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [20, 0, 0], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [0, -2, 1], - "easing": "linear" - } - } - } - } - }, - "sprint": { - "loop": "hold_on_last_frame", - "animation_length": 0.25, - "bones": { - "bandanaEnd": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [55, 0, 0], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [0, -4, 4], - "easing": "linear" - } - } - }, - "torsoEnd": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [50, 0, 0], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "0.25": { - "vector": [0, -6, -5], - "easing": "linear" - } - } - } - } - }, - "idle": { - "animation_length": 3, - "bones": { - "bandanaEnd": { - "rotation": { - "0.0": { - "vector": [0, 0, 0], - "easing": "linear" - }, - "1.5": { - "vector": [2.5, 0, 0], - "easing": "linear" - }, - "3.0": { - "vector": [0, 0, 0], - "easing": "linear" - } - } - } - } - } - }, - "geckolib_format_version": 2 -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json deleted file mode 100644 index 90fad72..0000000 --- a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "terraoriginum:block/cotton_crop_stage0" - }, - "age=1": { - "model": "terraoriginum:block/cotton_crop_stage1" - }, - "age=2": { - "model": "terraoriginum:block/cotton_crop_stage1" - }, - "age=3": { - "model": "terraoriginum:block/cotton_crop_stage2" - }, - "age=4": { - "model": "terraoriginum:block/cotton_crop_stage3" - }, - "age=5": { - "model": "terraoriginum:block/cotton_crop_stage3" - }, - "age=6": { - "model": "terraoriginum:block/cotton_crop_stage4" - }, - "age=7": { - "model": "terraoriginum:block/cotton_crop_stage5" - } - } - } - diff --git a/src/main/resources/assets/terraoriginum/blockstates/crucifix.json b/src/main/resources/assets/terraoriginum/blockstates/crucifix.json deleted file mode 100644 index 5cfb790..0000000 --- a/src/main/resources/assets/terraoriginum/blockstates/crucifix.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "terraoriginum:block/crucifix" } - } - } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json b/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json deleted file mode 100644 index 6577653..0000000 --- a/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.ghost_armour", - "texture_width": 128, - "texture_height": 128, - "visible_bounds_width": 3, - "visible_bounds_height": 3.5, - "visible_bounds_offset": [0, 1.25, 0] - }, - "bones": [ - { - "name": "bipedHead", - "pivot": [0, 24, 0] - }, - { - "name": "armorHead", - "parent": "bipedHead", - "pivot": [0, 24, 0], - "cubes": [ - {"origin": [-5, 24, -5], "size": [10, 9, 10], "uv": [0, 16]}, - {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [32, 35]} - ] - }, - { - "name": "bandana", - "parent": "armorHead", - "pivot": [0, 24, 0], - "cubes": [ - {"origin": [-6, 23, -6], "size": [12, 4, 12], "uv": [0, 0]} - ] - }, - { - "name": "bandanaEnd", - "parent": "armorHead", - "pivot": [0, 24, 0], - "cubes": [ - {"origin": [-4, 15, 6], "size": [3, 11, 0], "pivot": [-3, 24, 7], "rotation": [7.5, 0, 0], "uv": [72, 0]} - ] - }, - { - "name": "bipedBody", - "pivot": [0, 24, 0] - }, - { - "name": "armorBody", - "parent": "bipedBody", - "pivot": [0, 24, 0] - }, - { - "name": "torso", - "parent": "armorBody", - "pivot": [0, 24, 0], - "cubes": [ - {"origin": [-4, 12, -3], "size": [8, 12, 6], "uv": [40, 16]} - ] - }, - { - "name": "torsoEnd", - "parent": "armorBody", - "pivot": [0, 24, 0], - "cubes": [ - {"origin": [1, 7, 3], "size": [2, 10, 0], "pivot": [2, 15, 2], "rotation": [5, 0, 0], "uv": [76, 65]} - ] - }, - { - "name": "bipedRightArm", - "pivot": [-4, 22, 0] - }, - { - "name": "armorRightArm", - "parent": "bipedRightArm", - "pivot": [-4, 22, 0], - "cubes": [ - {"origin": [-9, 12, -3], "size": [5, 13, 6], "uv": [0, 51]} - ] - }, - { - "name": "bipedLeftArm", - "pivot": [4, 22, 0] - }, - { - "name": "armorLeftArm", - "parent": "bipedLeftArm", - "pivot": [4, 22, 0], - "cubes": [ - {"origin": [4, 12, -3], "size": [5, 13, 6], "uv": [22, 51]} - ] - }, - { - "name": "bipedLeftLeg", - "pivot": [2, 12, 0] - }, - { - "name": "armorLeftLeg", - "parent": "bipedLeftLeg", - "pivot": [2, 12, 0], - "cubes": [ - {"origin": [0, 4, -3], "size": [5, 9, 6], "uv": [44, 51]} - ] - }, - { - "name": "armorLeftBoot", - "parent": "bipedLeftLeg", - "pivot": [2, 12, 0], - "cubes": [ - {"origin": [0, 0, -3], "size": [5, 4, 6], "uv": [0, 70]} - ] - }, - { - "name": "bipedRightLeg", - "pivot": [-2, 12, 0] - }, - { - "name": "armorRightLeg", - "parent": "bipedRightLeg", - "pivot": [-2, 12, 0], - "cubes": [ - {"origin": [-5, 4, -3], "size": [5, 9, 6], "uv": [64, 34]} - ] - }, - { - "name": "armorRightBoot", - "parent": "bipedRightLeg", - "pivot": [-2, 12, 0], - "cubes": [ - {"origin": [-5, 0, -3], "size": [5, 4, 6], "uv": [22, 70]} - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json deleted file mode 100644 index 63325ea..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_0" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json deleted file mode 100644 index e8df0e0..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_1" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json deleted file mode 100644 index 7c2af95..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_2" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json deleted file mode 100644 index 5a0ab03..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_3" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json deleted file mode 100644 index 5063029..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_4" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json deleted file mode 100644 index 744e9ad..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "terraoriginum:block/crop_cotton_5" - } - } - diff --git a/src/main/resources/assets/terraoriginum/models/block/crucifix.json b/src/main/resources/assets/terraoriginum/models/block/crucifix.json deleted file mode 100644 index e46610a..0000000 --- a/src/main/resources/assets/terraoriginum/models/block/crucifix.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/cube_all", - "textures": { - "0": "terraoriginum:block/crucifix", - "1": "terraoriginum:block/crucifix2", - "particle": "terraoriginum:block/crucifix" - }, - "elements": [ - { - "from": [6, 0, 6], - "to": [9, 12, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 0, 7]}, - "faces": { - "north": {"uv": [2, 2, 5, 14], "texture": "#0"}, - "east": {"uv": [-1, 2, 2, 14], "texture": "#0"}, - "south": {"uv": [8, 2, 11, 14], "texture": "#0"}, - "west": {"uv": [5, 2, 8, 14], "texture": "#0"}, - "up": {"uv": [5, 2, 2, -1], "texture": "#0"}, - "down": {"uv": [8, -1, 5, 2], "texture": "#0"} - } - }, - { - "from": [9, 6, 6], - "to": [12, 9, 9], - "faces": { - "north": {"uv": [2, 2, 5, 5], "texture": "#1"}, - "east": {"uv": [-1, 2, 2, 5], "texture": "#1"}, - "south": {"uv": [8, 2, 11, 5], "texture": "#1"}, - "west": {"uv": [5, 2, 8, 5], "texture": "#1"}, - "up": {"uv": [5, 2, 2, -1], "texture": "#1"}, - "down": {"uv": [8, -1, 5, 2], "texture": "#1"} - } - }, - { - "from": [3, 6, 6], - "to": [6, 9, 9], - "faces": { - "north": {"uv": [2, 2, 5, 5], "texture": "#1"}, - "east": {"uv": [-1, 2, 2, 5], "texture": "#1"}, - "south": {"uv": [8, 2, 11, 5], "texture": "#1"}, - "west": {"uv": [5, 2, 8, 5], "texture": "#1"}, - "up": {"uv": [5, 2, 2, -1], "texture": "#1"}, - "down": {"uv": [8, -1, 5, 2], "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 6, 1] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json b/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json deleted file mode 100644 index 608bf74..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/cotton_ball" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json b/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json deleted file mode 100644 index efc5834..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/cotton_seeds" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/crucifix.json b/src/main/resources/assets/terraoriginum/models/item/crucifix.json deleted file mode 100644 index 8ab7d78..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/crucifix.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "terraoriginum:block/crucifix" - } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json deleted file mode 100644 index aa74e93..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/ghostly_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json deleted file mode 100644 index 16f0829..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/ghostly_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json deleted file mode 100644 index 2936806..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/ghostly_cloth" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json deleted file mode 100644 index 72f0f55..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/ghostly_helmet" - } - } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json deleted file mode 100644 index 83dd1be..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/ghostly_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/mync_eye.json b/src/main/resources/assets/terraoriginum/models/item/mync_eye.json deleted file mode 100644 index 5f31c4b..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/mync_eye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/mync_eye" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/spirit.json b/src/main/resources/assets/terraoriginum/models/item/spirit.json deleted file mode 100644 index 5f693e2..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/spirit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/spirit" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/sun_totem.json b/src/main/resources/assets/terraoriginum/models/item/sun_totem.json deleted file mode 100644 index b804745..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/sun_totem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/sun_totem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/tiny.json b/src/main/resources/assets/terraoriginum/models/item/tiny.json deleted file mode 100644 index 345332c..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/tiny.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "terraoriginum:item/tiny" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/umbrella.json b/src/main/resources/assets/terraoriginum/models/item/umbrella.json deleted file mode 100644 index 59bdf60..0000000 --- a/src/main/resources/assets/terraoriginum/models/item/umbrella.json +++ /dev/null @@ -1,292 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [128, 128], - "textures": { - "layer0": "terraoriginum:item/umbrella", - "layer1": "terraoriginum:item/umbrellaoverlay" - }, - "elements": [ - { - "from": [-7.25, 26.5, -7.25], - "to": [23.25, 27.5, -6.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 34.5, 3.75]}, - "faces": { - "north": {"uv": [3.25, 0.125, 6.25, 0.25], "texture": "#layer1", "tintindex": 1}, - "east": {"uv": [3.125, 0.125, 3.25, 0.25], "texture": "#layer1", "tintindex": 1}, - "south": {"uv": [6.375, 0.125, 9.375, 0.25], "texture": "#layer1", "tintindex": 1}, - "west": {"uv": [6.25, 0.125, 6.375, 0.25], "texture": "#layer1", "tintindex": 1}, - "up": {"uv": [6.25, 0.125, 3.25, 0], "texture": "#layer1", "tintindex": 1}, - "down": {"uv": [9.25, 0, 6.25, 0.125], "texture": "#layer1", "tintindex": 1} - } - }, - { - "from": [-7.25, 26.5, -6.25], - "to": [-6.25, 27.5, 22.25], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 34.5, 4.75]}, - "faces": { - "north": {"uv": [2.75, 5.75, 2.875, 5.875], "texture": "#layer1", "tintindex": 1}, - "east": {"uv": [0, 5.75, 2.75, 5.875], "texture": "#layer1", "tintindex": 1}, - "south": {"uv": [5.625, 5.75, 5.75, 5.875], "texture": "#layer1", "tintindex": 1}, - "west": {"uv": [2.875, 5.75, 5.625, 5.875], "texture": "#layer1", "tintindex": 1}, - "up": {"uv": [2.875, 5.75, 2.75, 3], "texture": "#layer1", "tintindex": 1}, - "down": {"uv": [3, 3, 2.875, 5.75], "texture": "#layer1", "tintindex": 1} - } - }, - { - "from": [-7.25, 26.5, 22.25], - "to": [23.25, 27.5, 23.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 34.5, 27.25]}, - "faces": { - "north": {"uv": [3.25, 3.25, 6.25, 3.375], "texture": "#layer1", "tintindex": 1}, - "east": {"uv": [3.125, 3.25, 3.25, 3.375], "texture": "#layer1", "tintindex": 1}, - "south": {"uv": [6.375, 3.25, 9.375, 3.375], "texture": "#layer1", "tintindex": 1}, - "west": {"uv": [6.25, 3.25, 6.375, 3.375], "texture": "#layer1", "tintindex": 1}, - "up": {"uv": [6.25, 3.25, 3.25, 3.125], "texture": "#layer1", "tintindex": 1}, - "down": {"uv": [9.25, 3.125, 6.25, 3.25], "texture": "#layer1", "tintindex": 1} - } - }, - { - "from": [22.25, 26.5, -6.25], - "to": [23.25, 27.5, 22.25], - "rotation": {"angle": 0, "axis": "y", "origin": [27.25, 34.5, 4.75]}, - "faces": { - "north": {"uv": [2.75, 2.75, 2.875, 2.875], "texture": "#layer1", "tintindex": 1}, - "east": {"uv": [0, 2.75, 2.75, 2.875], "texture": "#layer1", "tintindex": 1}, - "south": {"uv": [5.625, 2.75, 5.75, 2.875], "texture": "#layer1", "tintindex": 1}, - "west": {"uv": [2.875, 2.75, 5.625, 2.875], "texture": "#layer1", "tintindex": 1}, - "up": {"uv": [2.875, 2.75, 2.75, 0], "texture": "#layer1", "tintindex": 1}, - "down": {"uv": [3, 0, 2.875, 2.75], "texture": "#layer1", "tintindex": 1} - } - }, - { - "from": [7.5, -7, 7.5], - "to": [8.5, 30.5, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 8, 15.5]}, - "faces": { - "north": {"uv": [5.875, 6, 6, 9.75], "texture": "#layer1", "tintindex": 1}, - "east": {"uv": [5.75, 6, 5.875, 9.75], "texture": "#layer1", "tintindex": 1}, - "south": {"uv": [6.125, 6, 6.25, 9.75], "texture": "#layer1", "tintindex": 1}, - "west": {"uv": [6, 6, 6.125, 9.75], "texture": "#layer1", "tintindex": 1}, - "up": {"uv": [6, 6, 5.875, 5.875], "texture": "#layer1", "tintindex": 1}, - "down": {"uv": [6.125, 5.875, 6, 6], "texture": "#layer1", "tintindex": 1} - } - }, - { - "from": [-7.25, 27.5, -7.25], - "to": [23.25, 28.5, -3.75], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 4.5, 3.75]}, - "faces": { - "north": {"uv": [3.25, 0.25, 6.25, 0.375], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 0.25, 3.25, 0.375], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [6.5, 0.25, 9.5, 0.375], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [6.25, 0.25, 6.5, 0.375], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [6.25, 0.25, 3.25, 0], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [9.25, 0, 6.25, 0.25], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-7.25, 27.5, 19.75], - "to": [23.25, 28.5, 23.25], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 4.5, 25.75]}, - "faces": { - "north": {"uv": [3.25, 0.25, 6.25, 0.375], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 0.25, 3.25, 0.375], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [6.5, 0.25, 9.5, 0.375], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [6.25, 0.25, 6.5, 0.375], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [6.25, 0.25, 3.25, 0], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [9.25, 0, 6.25, 0.25], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [19.75, 27.5, -3.75], - "to": [23.25, 28.5, 19.75], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 4.5, 23.25]}, - "faces": { - "north": {"uv": [2.375, 2.375, 2.625, 2.5], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [0, 2.375, 2.375, 2.5], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [5, 2.375, 5.25, 2.5], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [2.625, 2.375, 5, 2.5], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [2.625, 2.375, 2.375, 0], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [2.875, 0, 2.625, 2.375], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-7.25, 27.5, -3.775], - "to": [-3.75, 28.5, 19.775], - "rotation": {"angle": 0, "axis": "y", "origin": [-18.25, 4.5, 23.25]}, - "faces": { - "north": {"uv": [2.375, 2.375, 2.625, 2.5], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [0, 2.375, 2.375, 2.5], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [5, 2.375, 5.25, 2.5], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [2.625, 2.375, 5, 2.5], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [2.625, 2.375, 2.375, 0], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [2.875, 0, 2.625, 2.375], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-4.25, 28.425, 16.75], - "to": [20.25, 29.5, 20.25], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 5.5, 3.75]}, - "faces": { - "north": {"uv": [3.25, 0.75, 5.75, 0.875], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 0.75, 3.25, 0.875], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [6, 0.75, 8.5, 0.875], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [5.75, 0.75, 6, 0.875], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [5.75, 0.75, 3.25, 0.5], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [8.25, 0.5, 5.75, 0.75], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-4.25, 28.425, -0.775], - "to": [-0.75, 29.5, 16.8], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 5.5, -11.75]}, - "faces": { - "north": {"uv": [1.875, 6.375, 2.125, 6.5], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [0, 6.375, 1.875, 6.5], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [4, 6.375, 4.25, 6.5], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [2.125, 6.375, 4, 6.5], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [2.125, 6.375, 1.875, 4.5], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [2.375, 4.5, 2.125, 6.375], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [16.75, 28.425, -0.8], - "to": [20.25, 29.5, 16.8], - "rotation": {"angle": 0, "axis": "y", "origin": [21.75, 5.5, -11.75]}, - "faces": { - "north": {"uv": [1.875, 6.375, 2.125, 6.5], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [0, 6.375, 1.875, 6.5], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [4, 6.375, 4.25, 6.5], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [2.125, 6.375, 4, 6.5], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [2.125, 6.375, 1.875, 4.5], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [2.375, 4.5, 2.125, 6.375], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-4.25, 28.425, -4.25], - "to": [20.25, 29.5, -0.75], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 5.5, 3.75]}, - "faces": { - "north": {"uv": [3.25, 0.75, 5.75, 0.875], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 0.75, 3.25, 0.875], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [6, 0.75, 8.5, 0.875], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [5.75, 0.75, 6, 0.875], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [5.75, 0.75, 3.25, 0.5], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [8.25, 0.5, 5.75, 0.75], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [-1.25, 29.425, -1.25], - "to": [2.25, 30.5, 17.25], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 6.5, 3.75]}, - "faces": { - "north": {"uv": [6.125, 6.125, 6.375, 6.25], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [4.125, 6.125, 6.125, 6.25], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [8.375, 6.125, 8.625, 6.25], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [6.375, 6.125, 8.375, 6.25], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [6.375, 6.125, 6.125, 4.125], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [6.625, 4.125, 6.375, 6.125], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [13.75, 29.425, -1.25], - "to": [17.25, 30.5, 17.25], - "rotation": {"angle": 0, "axis": "y", "origin": [17.75, 6.5, 3.75]}, - "faces": { - "north": {"uv": [6.125, 6.125, 6.375, 6.25], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [4.125, 6.125, 6.125, 6.25], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [8.375, 6.125, 8.625, 6.25], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [6.375, 6.125, 8.375, 6.25], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [6.375, 6.125, 6.125, 4.125], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [6.625, 4.125, 6.375, 6.125], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [2.2, 29.425, 13.75], - "to": [13.8, 30.5, 17.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15.25, 6.5, 3.75]}, - "faces": { - "north": {"uv": [3.25, 1.25, 4.625, 1.375], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 1.25, 3.25, 1.375], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [4.875, 1.25, 6.25, 1.375], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [4.625, 1.25, 4.875, 1.375], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [4.625, 1.25, 3.25, 1], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [6, 1, 4.625, 1.25], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [2.225, 29.425, -1.25], - "to": [13.775, 30.5, 2.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15.25, 6.5, -10.25]}, - "faces": { - "north": {"uv": [3.25, 1.25, 4.625, 1.375], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [3, 1.25, 3.25, 1.375], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [4.875, 1.25, 6.25, 1.375], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [4.625, 1.25, 4.875, 1.375], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [4.625, 1.25, 3.25, 1], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [6, 1, 4.625, 1.25], "texture": "#layer0", "tintindex": 0} - } - }, - { - "from": [0.75, 30.425, 0.75], - "to": [15.25, 31.5, 15.25], - "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 7.5, 3.75]}, - "faces": { - "north": {"uv": [1.5, 4.125, 3, 4.25], "texture": "#layer0", "tintindex": 0}, - "east": {"uv": [0, 4.125, 1.5, 4.25], "texture": "#layer0", "tintindex": 0}, - "south": {"uv": [4.5, 4.125, 6, 4.25], "texture": "#layer0", "tintindex": 0}, - "west": {"uv": [3, 4.125, 4.5, 4.25], "texture": "#layer0", "tintindex": 0}, - "up": {"uv": [3, 4.125, 1.5, 2.625], "texture": "#layer0", "tintindex": 0}, - "down": {"uv": [4.5, 2.625, 3, 4.125], "texture": "#layer0", "tintindex": 0} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [68, 0, 0], - "translation": [0, 2.25, 7.5] - }, - "thirdperson_lefthand": { - "rotation": [71.25, 0, 0] - }, - "firstperson_righthand": { - "translation": [0, -3.25, 4.75], - "scale": [1.44, 1.44, 1.44] - }, - "firstperson_lefthand": { - "translation": [0, -3.25, 4.75], - "scale": [1.44, 1.44, 1.44] - }, - "ground": { - "rotation": [45, 0, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [0, 0, 45], - "translation": [3.25, -2.75, -1.25], - "scale": [0.45, 0.45, 0.45] - }, - "head": { - "scale": [1.7, 1, 1.7] - }, - "fixed": { - "rotation": [0, 0, -45], - "translation": [-3, -3, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "handle", - "origin": [15.5, 8, 15.5], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "umbrella", - "origin": [8, 8, 8], - "color": 0, - "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png deleted file mode 100644 index 9e07042259d67d2f6c021371f923f3bfb95a66a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?C}QgA;uvCaIypgtb#cOv z=0$mJ{}p_;J$u5{_W$6@6bYtFEQc)PV*YD>YHHWxPGxI}DiknbV8}EV-fO>J4QM5U zNQrAiiDPJphkp=*Z(>ezeon4JP-aeQrRm2+UZA`xNIoU8B-JXpC>2OC7#SFu=o%R7 z8d`=Jm|7W{TA3JY8yHv_7^ux*HAB&mo1c=IR*73f_`$thKn)sj8%i>BQ;SOya|>|m zVYo6U6sSiKq{qk8+0`%DmBHCr*C|rhM9*NizJ&@<(hMXS>>nEB?8=Z)Qc_TCrLUi! zS&~tjq?eqZtDg(;Wf91e`lWfL#i=Q}C8-r9rA4X5{7=ni0Zm}=boFyt=akR{0NX2r APXGV_ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png deleted file mode 100644 index f0b4befc7f3162a822ce6fa39c680e9eb3795372..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?DB|bo;uvCaIypgtb#Vhn zz?HKf44UBaSEkg`Utqe`AOpLV+46F zPsvQH#H}Ix;NC8v1`W6kC7HRY#U+Wk1-SJvT$vLJ)FTMeKE+F;OwmH6sc>X zXRuq}LIo&k29gZ+4-Im5WymNgDJZtm*H6zZ$tX?IOU}>L&xQE12;@oq(!A2*)D+#4 b)QXbQqSRvkr{=SOCNOxq`njxgN@xNAxD1f9 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png deleted file mode 100644 index bd629d030714027e87edba7fb44188b3fbf4e3df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?C{p0*;uvCaIypgtbql-e zU7r6F4NuORtS#}6eYw#eeLj&t{+resoZWfv&XL^=OBman*IN8b-?8!FPnF;HM?1gT zyEaZwIPMk2ut=M2=Yj+M{U*;3JISPQ+>B$8WZGnTp{MoB4tKVFZaV)py;>J!s4QV) z*zXu1SCd-F3bb3K#5JPCF*L-(KZwCMF()}cCs!dTGbgpu^kX6~P+k=zpORRTYL#4+ z3Zxi}42(>44UBaSEkg`Utqe`AOpLV+46FPsvQH#H}Ix;NC8v1`W6k zC7HRY#U+Wk1-SJvT$vLJ)FTMeKE+F;OwmH6sc>XXRuq}LIo&k29gZ+4-Im5 zWymNgDJZtm*H6zZ$tX?IOU}>L&xQE12;@oq(!A2*)D+#4)QXbQqSRvkr{=SOCNOxq L`njxgN@xNAKMJ6t diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png deleted file mode 100644 index 2c2d6f936173cbdfb4848b0feb8dc24f7cc3ca8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?D6-7c#WBRRIHUSfkSmqA5a=}d&Yz&?a24^OCSj+8Tn;_A_pZvIl z^^BOnxo=NevNgUucQ@>Lae#aK!(a2?o#MLgaiQ$X0p?7%Z8H-R7PVWQkUkNoEWxJm zAosv0d9ekZ-vpi?KEjdJc9Ut7WQ!wPL&l^a)hY#{wJbF#@$qza^$T`oaCX*piqtjHGuW+fp#qdN14#z^ zhXy&jGGvsL6ck(O>!)XyWRxc9CFker=R$m01oEVQX|H(?D6-Yl#WBRRIwmUf4UHRp3=RNq_FY7JzrDi3=1{}PX+Cs zEsq`m~YG}NnaQ4N$1Jc?j z+79et6jp!1D)GTAfl-^~p-Xkg=fory)5AH8H+c>zFgut8zGS#7t-!m$!Ns3lMe@&bm&K zx+Z!CyY($pfRbh)$zcD`AZJ&GjFOUqVk>?9^vsfs(j>j){9OH9h%bvkp42bRD=kh< d(Je`>C@C#UE#`k}J_~39gQu&X%Q~loCIFw|yQ=^I diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png deleted file mode 100644 index 6033edf03457f72991a4d8fa862d520c58a4c93d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?D00x##WBRnswR3&cRxZ6hMhBr2 zT}p2&9P{94ra8pGJ7zeNE2X_WLPwD@x+8A zCw`YjbNlA-C$v?(+BjjEB+G=kTwXRJPrU*j2nI1T*gpP{^!Sd^L!f6wN?apK9797q z{DT;L6LXUDb8;1eGILTZO+O~`0_9af@+pZWsaDBFsX&Us$iT=%*T7iU&@#lp)XLD* z%EVaPz`)ADKy41I8H$G7{FKbJO57U45AN*(YS4h&P?DLOT3nKtTYy^+!<9LqKs|yW zJwBe!u71I;49?EFPLaAMdIr1oEmVM#W+2I6|Ii?3SB8v|l7eC@ef{*zl8n+Mz2y8{ r{alDIi$I>#FU>10PEFA*Nv$X;ElMrse`-DpXaa+$tDnm{r-UW|ZZE+W diff --git a/src/main/resources/assets/terraoriginum/textures/block/crucifix.png b/src/main/resources/assets/terraoriginum/textures/block/crucifix.png deleted file mode 100644 index 4a2e748094e2cf595019981107ea5603c4573f1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)woO3wm==+}Kaw+^G^Id#?esVk>2_bMkp9vvw zI-P!-1wh{3-t_hL6@U-|>-CzpZCNZ9hzQ&5HaxU1}P=Fu45PmLkBQLx|d z>HD7R^-2f#Zb2jI~J)>=Xcs46*UQc9$hP*wWAf4qede*VHR45XC!u5-?a2q`5lmkT2DBS@pF zTrL;A-EQ3PcYwz>=iKA0tEw7ju-R-l91i51nayU*=W{+jKB()OrfJyic3PIDJUu;) c8vK8K0m#bJ1E~v&nE(I)07*qoM6N<$g6R&}qW}N^ diff --git a/src/main/resources/assets/terraoriginum/textures/block/crucifix2.png b/src/main/resources/assets/terraoriginum/textures/block/crucifix2.png deleted file mode 100644 index 91dc57daafb4c2da8a46efc24a2c54f9e1e39d9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf%;%YI$A6&e%tujZQShtSV_p0Q>|+EmgvmqPWxZ#u%8p0w`*PSa~Vz5 zHCsD46j_cHir8&fzd?uF(Cu68af#-w(*zDJ*JHT!eXrc{gQc-oO3zl#J0kJ%p0Tg+ zDzDqyIy(3cC*0F3I5)A_&Ba5r@V>c{(`6G8*T(O1p|#aV*S+rQFgS0V8o4QVc35bs s^>eP|o@G;1p8K5p`FigD{qo-!{uTO`3#?oF4(MjfR7J}yS_w+UrEv>YL37bXv0_kR zh|5gZQkP<;D%*}EyPdd9Sk)Az;u6$twyA0ma#`*CyMOMV-hbZDbDsCS&-XdcIp33i z5$C0&ZK4eTfR6Xq9{vCT?jZip*oPQRTXX~U{c(JZsc4IB9C=)op##mrV)9p6mYC%|t^Tv?l@U7u{m?iw#t`kRl zzEsK-w#BxZ))$6HXF)~}uAWt*$={y3VW<>M~K92}1Zmgv|j_)PN zmuDEz%?t&F)&SHhCPkecrx8AdKJYuKTd7`&Qbr}a@=l4l*CcUDt;#e5PrGfpfUe*f zf@Bq@TL)}rZBlM)FvvB+qx@d$x9fHCk%Q2e%W-)vgPDKfAA#xtBXlerh6UoY)+uXx zSl}7}iN64Vzs*W$(dnF@udYh#ZUtUfC=Z@LZ2+XbBF($$>kFy73a4&Jz=wCAOz&#*Ma6+#r|BU0zwSstYO-4pc@;#ZS5eZF5TJO>#<vk^D43Majx?F|kbA$w#lYbCqePpQBXE%Q5($)9n%r zj~l_^g>c6NBt8BB^J?3Ndfg9bj7U%Cuno-2%r3Q$&#RQXQH>Z38jUtb_m)U-{F0Iq zGM;%Kbse`nElHcpk)%l?p0~m)visNN0hqe7V)l#f1o26Yk}_vrEzHictk|>~#_0^D z(vp%o6jbK0_Z3-Hm{2S8{qhKz9PKu`)jU4cofsyUwFI@Z%AC+NSARVWs-e_A;A^YS z>*EjFVEmNZw`KA#^CSxSM)Jz@2B({E@OVzrF{a_Lx?@G;ew`5Un86=|o(I`3lpoo5 z#A5N{--KQ`KKo3O+l206Sp7~0u8MsPgF;|p$&f{he! z+Uu0&C~QG1#rUE(axK~nuy=zJ3dKL*3BeN3;Wycxx~me(^rb4)o7ZmsvKHtLw!f%`%$+P-M7@Ogqw#L z6$O627gPlLyp@d?06v_u{Qj7xiz`HPcD?g;Ir149s>gS*9oSxZDr;1wG_vw61hwW< zj|Pgaw)xVL(%GGb1@*T4>H1*#S;4>`^k0I`xsOgT`~mg0of;LsA(M|G997lya)4~D zA2Z@18e?j{Aitw2`{S%1y!Y^1ig?dWJ#oaf@}zoqT1u2;`cYLqH`}cREi4p^7vQ zwVSyLuOQGRnT9i!MI$0XrGxR-2;#MaX1GiixxV6u60W^;v(tmQNj)HKm2nx94vb-q zw<2!3)3~vj(wFxAQcuJ?brZ+)(e`u*?;r4cJfoQEWc7|{unHKX?$CHJkaYISXQ@d3 zQT~yjSW&T>M=0{!B}Oj5X@yK(no*sCgs1~d{c*)1`m+Y%)pPxRV71QTneb}Bc&rqv zhxG|PQkBi0KSl?R>PClZKy1A0H-9bUEvP@`2pT9$?Yxs3@~FQyC)-eRVznW~$cx&u z4aZ$8-F_t(cE*da_bG( zwErEXNAkU}^F~RA`4X!@DCbcBDtW{j`Vgu|XQ4-t;huC$zz1mIKW}9L)pQah4(4h9 z`G-G)HCV*1J->uJLlwjYet-^b>!CO;Bmk}VH5hHx+=KAL!BwOBvqs-WV&i{kB6`x{ zjMh_zL+)4~0F0sd>p%jb!H^Ef+ki|EbKu2C4g2EvE5F}1`vbf0HXrSJ-zxW))c<+Is&vCh16?YU Rz&v2@czfbJ9=L~R{}=5f$t?f? diff --git a/src/main/resources/assets/terraoriginum/textures/gui/nothing.png b/src/main/resources/assets/terraoriginum/textures/gui/nothing.png deleted file mode 100755 index d42a75f9421f2497a2a4fcd0bd9ded02fa133127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- diff --git a/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png b/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png deleted file mode 100644 index 4fce6dbd46da16fa4ee7e5609e04f55e82dc4093..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3814 zcmb`K`#aN*`^R51W@-?K%iC#ls@^S%rIzECoM+Cb(6k8UdFp4`9a>pT4xx#U@Bi?dS^<)1UqoWHEFEH#vh51{phz08$*&37?8M#z8s$^WKMS}{j z?*0j{*cAUb?=r*1wc7b}Lx6XD^XT2b1|+8w3JPS@_JrXeB@&60H$v<{Y-S`UKzsAr zs!}d553Q}UhKP$|UHu+>j-WVbQ~*h)QUE3m8$pwu0yX~R##IhF^oip-v}B^$2~em_ zNFqk$mc@RrulI7gcj|4wzk+_e{J24CJ$rR^FUPwyBZ|ZB+Or`v63&gLc=Luf`>AjN z%)Ds{dYkIcp3UD}I4@CLk_Ak>3wV2Z$q!fghhb72?+Q-me-9L2{CZaa!C1DXNV zL0ev9!;`PpV~mlbp!>sHf+C>Yp&cu0vg_Q46Xg-kR-n{bknkqtl>G{scyHKA7pxT< za|V5Ouc^PKURj$M^v!X2tdAj2m+6NcpvLpV1;_=56y`&mnaWRrQu&Rl?T%@j;rdi4 zd5~^CwDftf-o5Jf^y|n)SS~YJ)}m>v=2H9Uy(;dYg)jh!n1%0#Shc{tQ6Tpe7sBp> zS-_a}&DIPK=KHU9gjB61Z>Cd<5I9vXYmj8Z#0VlEI8Z%=;rImfKVn)kI85#M4V44l zOHju@=#AJ_X{wO$p=WH(GoMNg-Zl3w^#0ujwm@qr>H?q-G$yFt`{wwH^|Hgo%?}qw zA)0=IStiL3;4>cJTJ+A9RdlIcmm9dA2Uy?kg;S_0^!LEpt9nF-W-+TmJ^1v8vnL+3r4M?(g+@T_}tAvZH2c$Mpk;9=&UPec8Lp zHPa~4$?|ylVw%@o>G8<}wWF^)JOq%;TL4*FLCOM_Cm;YS6~~x}*QQPtTF+UiUsEyH1yM`>! zQw2!^(j?xR!Nkg_v9<2cM+c9|U1a^K zz$nwA`L4|rh4qiSrt$mNjlUtgEz9^@MRvfLx90iW*Gx4MHKesQ&}EZd%KI~psGrYM zZ%-Ty4i7)cyn|SssElbp!@SZ!@!Aze?3|cZTe$du%!GB0`=6mxgAz(BwGL=ikv=;lmUA(r&f2+IdaP{h-nXJf!mcio9g* zeJCoN59p|b3FlM5Rb*YCk`WPSM$eDWd7aHC``qq4^x91%`0>Pwaanc@@6H}Yff9T= zB#`WQ2pv?MYft-dC+IN<24Yi8DPL3vJxnT8g5wVM{WuHBz5E*nwuT38TSk118`6?< zakPRmeL+!S5AHP!*3eZ%OBgM`BzCvvQW^Y))@y-xq_^iEjT*l!T~CA>-N;b8?rZuu z82i2&R!RuS0;bDaC&_V0p+HM);%Eekpg~2Z5fv3;Ffu%gZou38P5SxZEnf(YdzFtsVoN1XGIDE~;xe+hU<{tqcGUX46v zSR;4s-Zlc1p{72L86kS`=Bz&E{EDs`y3cz0P{$$5+zj*@FW#awzgWn^eJHb|LxJVx zWrpt;^M_5T?YQoCaR>DF^z9#s9yd78cNDS+}YL!Fb zW~sfNV`FXUXYi!hDzsk$LLjCg#yQTRPFi331>H2Nxxdm5ZZNaOMl! zGbOb(G*cC@Pbyp>hjm0-Aacrj8YI!b0B^g##q`pKx$1NF4MM?iLxjpdbC2fySPHn zMvVFWT+L2qlMgw|?TrMH@2LFn3rN?P@OC*p;xQ-hi%%R<{fe{<>*lBfX#QW2B~&v0 zlIgg>boWg|w=(@kiO*mArfnhEZFagP* zqQFe#rd$Fv`p?GYHILsLW4QBH8|#w3G&-(EeAF&D46ul3oT+M(jzb!f+zmXj`-&EE zFVpp(g*}{aA^z81n)@-WQfKEw7BT0K=Qb)?-}~5CO!(ryPMHSXv41Ois_ERiSZ$2% zbnyG1_xDS+tfUtG>JIR5C=l8h&hwiH|Bs@f88b2D_VuW=AG_DL<+oTZ>rk39RjJrV z2h#A2z{TDQl9)45Ry?f9Ni(TM8GY1W9cLi>=pe@6S#eHJ31U9`6X$ioU2;v`zMK$5`y5C~@E|$i50$>+Afw~8 zPbGq@xKAffB;49WFL`Q1~{_saTV>aoS#yeVK)p3uc;?Okb$uFL>kcM0r&4E`gm8)-7 z%3Ez~?|EQmUznW>J0u@_MNKorRpQmpDLwozCv@Ud8bNv+L0syN-ZM*1|Lxx20nVCr z%QnAce^!-9sQ$47VUb#r-Z{0L9w~A+oL2kFs`u|#qi=p1R|EBJXM0;TM2dQ}{$kzj zU^h51t6du3t{!8AkFD0R*Gwlt-X}d?WH&@7g{yP?<2wz)MY&G26PgCZMZSPjW?h2< zu1Ns4oe%z|M)?X_zwnmOk0xnvAT5sZUk<%U$H! z3zB7$^6vh(a6Lu;G&TM?{!&Lg7L+Wsz7`t&gESZFM=9=&ObQeS9pTOHrF(BYiq{Zp zHJn|k#ktKce{=L@j!(T-o z7`Q;HP!&TWS|sT23L z15y;ybuOHmt05$5!#mjj(pr#M$=B65s_z4?AZx``(<*K|YLYmjL-JX97= z9(HJJGe1iQ{L~p=g)|8rLFMnw!N~!>I(`tv4|#{rWxXy5cIM{FJ`d-r zsSBZ8509lwrS>j9W(2r9y3%xjp_WgV^@5G$PDWQU(2_cdwJy;>Z!fe+rd~{(PTbTg z@RW2AE;f1@;%_@QYch+Otq-EbDjS{eB88;5E>3u-YUQ1hN(GxuU(T~o%f$}o$2hj! zxcV8p?6rj`DYwcZZo^acQpQa(Q1=mIxRZ5gj0A5y6H@Z!E;wV9}Fpdlrq zQ&79yvB@p+Z;<0xTjOUKl%@=)JS+RxD;wPH{O4tF9p}DBYWKXBbe_i92`P4QjB#!8 zB=cTA#W~h9s@(Def? zA7W2<>pAp)kPnnp=(sY=fd46F*ktM5M!7M!Z0lFwU~MwJV_dywc02p(zBiaBcX4QlGg%DW`7chpf*=oA;R_l}&8F62;H9;w+BJ z-d3tRJ$CVOYfVIZXJ?uF)OAms)kb$W_&ed=Bl(&^sjm^2+Amsdb{Z_+)E;e*v|JE* z_lOxEFYI3B%19~Y2L%PKcC5M#1`fQf;*Y%L@p%6=Ibr((j*=d-HYRQ~bexBP;iMcRL7#T1w z3p0H_aTY0n z;LD)-+PCwGQJT>^I`bnfZ+>~^uQjwkkP0O`m3b%r#XZRWTfp;J!w1lM2j{~I(FL1o zF`x}nY;JB22@fyW{5&-^?+476(W5d}9~Kl8RB>5zVdg-{-MgyKN7QddZ>=D4mw9%{ z7n+y%0y`hF;`mMbj7<+7-9>24v@Wq3Q|H(?D00iw#WBR<^w~*@d@Tk7 zu9h-VjforA995`pl*(CuAZ~&B3r2$&hIXgq^v@n`C9cxfa>^!g=Dz&@`FVNQqx{2B z+O_w+uiGxojo!)2V$!!*=d{xC!Z|y0Z+kM`TzjhFal?^n{q>orRvR9RX^`k?5@=fU zdRCYr&tcW-```JMIG$CCJ)aX2s(SO4VFaf|^Bl8RyZnSTH2ioyGMM{kJ)4-<+-=DC z$uy9`@sdZ#1?@D&NZZ8omj5Tqz2Nx}!tgVQ_vV|($*Gag(itaLXlZS1^Uzl3J;VC9 z&h(Uhzj@jk@1m7Fye>drij=rUlsJZlc=!h~_$KBg=jY@q1ZC!=R+@fH1HPJKJt#6?Mlr#fL z2K$EwIlD4sl#~<{Tj}ekXO?7?Cg~;T=j!J|d|3qYq<(2$X>n?bZb@oINoi4PG5=HZ RSwIsQJYD@<);T3K0RYtd(MA9O diff --git a/src/main/resources/assets/terraoriginum/textures/item/cotton_seeds.png b/src/main/resources/assets/terraoriginum/textures/item/cotton_seeds.png deleted file mode 100644 index b492beea3bfaccc87972525a4d5eb6cacd30a443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`{hlt4Ar}70DGLM)f>z8=oFJv3 zbK=MUx4-{OtUIjMca{6n9-aU5>;5%|^4%3!({&_5^56bny|y(DZOu$_X^f8PO(uW- z{_THww7))KtHNPNlQT?n*fbbS?HH<6PW)%#Rd`b0#3nG=pUqC6f#J>jP(gJwIc1>J7(8A5T-G@yGywp~&q%cZ diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png deleted file mode 100644 index 2ee33881deca0d18f9e620eca6218bb8b22d47ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9E8FF=^FDVbFUD7f3x z#WBRf|LtT)uEPofuKU$m!g7U$m|E}sPs)9%mdzQtqBKZCYR-kyh3l?Ve!ig3^gmGL z!uQ%+-L9)LIj0@4-Ka5P$!8nq*Fxf~Ed7s9gfHB=Rm^MUAziLFPq|)nJrrPCRG4J4 z$l>Z&wso`Eu0H$`Yrx}t>G?a}WhZzI?iA#)?*m+BxFwU>$Fq7k_SwDXCHYXIXyM9S>;%DyxOnX|6j4@{<7B)Pcixo^ag{c LtDnm{r-UW|tXOJ8 diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png deleted file mode 100644 index 281b7fbd325a7719e0b53d1cebe75e823705bfbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0cSP)AWO>$iKI6?O+_oV(V#|KJvMU!6_vvrAUlXwrvxG(ARaH`a%ejb9SEsOmG~BifB#K zsF2pSt|nA9I)@Z1O%JI!A+8oTF*{c=)UBD z{suS;B=PK%zys~*cy50H%%MP`XQf_2z=rkDzs`}Jf6JEFRRYff)f0RJaF<=J%iKP)m)-bxEm11u?)iy zb+ADwzGmYwf=;Mw;qC&7smj!{%P?8c?bSI4=iJ@KF@wNr%$QMyqBvV(tBnK^LSP&3 zG>9es z6lGolw_)-r{Rs5Cu5UTN!%I=HKe`dXrV!JNaOidG4uS#Q*102Rz&aD`H-f@!mShQF zjR1;zUovKf3~(oabR~dUDA+otj^k9Yf8(GM$8_S~p0fhx z&Vbk%@a*j9=i8GwX5w`Gt21C%h~v7`x5*h84^_gX%JTg2NpQzjFx3v8`bdnk^c-q& z6y!&|fS(&NJp&T~e&PLR!9!RH?xYkfMZ8|ES&C{uelP9>g$2f{G;LM)zjweg6y6)~ z&jS3?cqy#4K@=}y?(k4mdnc&emb{Lq=C7q&#`(UK|1H1=IQ<{cH31I09=t3FR`X!S zAJNc>aa7~^R!mdx{k~c2OEzY}+Ohrd{mlYg>&R#7+WEZc@7(?X@x%uKxPILb00000 LNkvXXu0mjf+u!g} diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_leggings.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_leggings.png deleted file mode 100644 index db0c8dcb0232af05c5a6edaa21bb1d9883245a6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8gvP)Nd%5tk2ygoFx#awR}42*mGz_$Uz1e)sO(9%Mbt z*bD$_E&_`80r5*9UJ1n9KFdD0?6V_=!%#Hh3%LGguVj(dJA3d--mZA{=R$7 z2y`7gOb*2WpoG=GFP|CzfBQNYhabN)aq)npc(ED)6pZ`-^T)sczkW7gGk}qU(~6Ok zi-B20+#Dv49tL_qiPu2qf5m3N{~zC_{{H-N>D}A6TX7k{29)@XGm01(zA*g%e-B?2 ivH-(D3XcK9Q3?Q>07wYUM?6sg00007!|6uO2~Xa(ua~%C7oQ>^B$QO~F?yO~Xj~8Dk`6(Y%1?iI*>pdy=h+i&6|0y#}ygRkj_$A(=hYXySvsq@-~RNSPISeXJjnU V7OdfBngz6;!PC{xWt~$(69BVoJ#qj5 diff --git a/src/main/resources/assets/terraoriginum/textures/item/spirit.png b/src/main/resources/assets/terraoriginum/textures/item/spirit.png deleted file mode 100644 index 1ba29e590c5a390d7b33013ba4a88f30107a9382..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1104 zcmV-W1h4yvP)l)OoVBr=pTBq>9A zAa620$ip?p{?6L$-MQ{L*Ktew_RHOO@3q(ex7S{4?<2quH{pl%;r|7QkB=u9JufdW z7#kb2dLz~>B*n$W(9zLBPw(R50zyMWv1^Sl^^3~O%SnHKKiu8j$)-(CP7X{=Onezc z6?IEX3rR^yf$;F~Pjj}WrUnKE22}Y~O`DvYOs1x$;Qs#JB7mc#BRoAlL0?}VG&MD; zf>2{bFziemMdTXJv$^i>ZZH@Osy3(^Kq@L12?oF*qN1YU;Naj>|J=Y}Xd*5yu5f#M z3vF#}biA{(lL&$Um6er12%%BH{|*ig^p`a@hyNKsbaXWA?d@@+uC6Xxw$IPc(Ae0> z$9YGu|3z9`|A3Q|6AxWvWF%QzTcctqLMPt)4-XG?jDesqvq8J7t1HOJ$bkL*eWAL# znp9O)fsc<5EH5uZdV0Dt04~ObOG`@v13)MicD7p-ltzI?1IN)8?bv1*fU~nRoJ!G2M0|O)8tQDS{fN29|w&_14g3} zv|6pK_rD+0?nwm;PLU4C?S1tUOnr}_&3?Xc6Y%GeK z(cnN)Q4z_^%mkfI#}|LLV}#HMzqvgjUHr{Jh@G7sh>3}jy%S^yhlhs=CSXrbk75q6 zFiYWtcL)Z6b7C3NWR}*xG`xy86_!p}SsD2G`6-_D#|f>rnGYF_Ewl_16BB7kD><ALIdYZ}3Y zg#|MRlK~W;n4AQs_s=dnJ3GEB>9#*Y;BG4_D$s=c69LHK;UVCAfVZKmtEcxAr}70DGLM)f>z8=yu#3S n(SSj1(Zv#nbtA^=3NXZOxuqP@p^(n7nclyNNsPS+R2LAmSG$7|2( z<%V0dAs)(hvo{}XvNW+%md*;1Ior}@D!Q#49UVP?*k^Kfyvwv-%=3x2e)6HR&}5^5 z7E=H}yUi2d=^yfX8R_EU(o9bi^A`sBOKh=d&bPA6DbeYx0l_z()_h7!U(`e*u$dyh z5woH{>e^k+_Jpn1NQsB%)J~>`73&;u>yPNy>K9J2?w>!_UyT2!-lrr~IdU(h5E0KD z6?PsuP_uBT%%~8Gm9q&KCV8!M=?QdoqL=2Q)(H3Y5F4EuMVfF2A z4$;!H5ZV5{&SJc@U)XFNVs2Q>NnEK^sALPB&(a3?5v$wlvt3%|^&| zu~rpLpGbZ&SYlMEquYapH}NAEOnqkB51{dO-j*Y_7-Ez#q_*?vkgtfxBs5$+(RS%~ zO(2g;wxu^=Hc-(vzQXy2u>+WH6OBjbI}y==XfQ2#8`w|)O5%O0&0$CFY5 zliOI@77g(w<>!1fWo`tlHfgwwg5dS;HR}xnkGS4Y(ZCQ(vcfC{ZAr?-9kTa8xTUZZ#z};+au>|N zUb6~%fd}D=)3YHrRYg#edWJO)E%SPVA{8@qY|!ee==1ZG`(QFYhTE_j$=3X6_S;Nn zjEcuYEaq5x`A`nm4odJaEyP9Cad$hy_|fm)TYAqncI7$=PLrVWwO3FAuV{UJ{-ovQ*UWjg3*Ul@!U@Q@>W4=V8uw8 zrDMdlSJ#Wlpd)nLe6Cy~o@S~Cn4ty;57bTn$awwXu{j38;uXyt$-pdqgkzs#lcR?) z3RsvMR@S#wh-4HbKZg51zL6NXL#L^U+WsO4i|+Y(`76c)7yv(tTk+)jLVqkpxorsU zL@bp^{aWV=$o7uBcnys4uCMO-fpghS&~#>r%H?xZGQzBOoV~>QNkiaybhfhIgg&XB zKB{%JrSO*a(cd^7)#8O(`K^& zwSR6~mE#~cH5-x<^3USV-A3!OEIGDr)6DCiAC1khGQEJ=$Ixy3I85L6%-LOiIub)4 zeT^YnJnMKdywX4$jHX})i|67kiBT=@jhL@?%VQ#B`U~`@I*pjayX3JqxB9%`cp%Ko zL)4Jbik;eW-gwSQtO-#95v_ROsO=FR&yocpw-(++hc8m8)aHgawln5g z1M)Hd;EI|w40`5#G_TX1-fhl}D}Tesh8Bu%fvo4`jK&k^UT?05QC0*yq!Gb#VnuEO zyY(zAIvl0Z!oot1g4`SJV9zw>wU|1Wq~Qxz6D;P~-LQAskt;_y2Y$0+Q?Qv<*+l+} zGYUA=sxvrE3GL*u9#}=DAN#AbD{vcl@+cM;v@Gb91k1u-#eC@*4k-Bn+E+Kqz z!9Q_CXDQmr3S(%&xzU~7Z28R5)0`Cp{=Q;spO;d)BZ!!is-?3%LPy5^!CBWZ5Q;b7 z!OYKGvF~vCTXCFnBOAXpncGwu;6oj$fR#@#v)lW}~2J9a3c ze$nTaHBJ1EBX1Qwx)sIC^Y|7|NL@Rbyle};RcKZNsbakK%!cC5Ap|ucQ&_b)wAsz~Jw{k7fxwIQM`5eS-^o2)k`F<+r}OIg$2#e@bG0t_qjMy~DgV zQGk%^L)E|redds?c$ThWjLo3n7OjDMIUo!uqaa)NM%&-yq$wH09g zotriYBf8hdAovPN@l>QdW8m|z&M1H|ux%X_eEUm0Bl<`Nw$T;ns{Uhx3m%v zZFyAL@Z@dlam$5r-mTiJ!QR$}i9YJ$*EDifd4$})vlq-2x?eP=U zVDA-k?YdxQloZwa)NkQ|b;XhDyM#L%k`l=}BdOf%>nRFS7|LHeKjlEN^(94mQWt0) zbxiU!qK$%6bTgNWpbZ53{Y;|wkSxY(uZGBDV|M7C7c;rOy|$~=79#(i7ySZm4b(3V zJ)Q}fQ3(amYTZ9Wqx~kDV<#nfROu<)WV?c*N@PlUdUv4@eTbieA2gQ=p^=j256CNp z)WEd?`%Uzq*n1@rA=H3X(4gc2b6ZKdJfpxKOqsLRaTNDAG_UPz89y&nZKNfM%r{j} z4B3PBnW%6C+pYqWe4G!#Q&T6m&$D2lNaeZAtOBoH3{ z2tE3YiDwM2fmL5oZi!$g>?I(0K@&_#W9kN0ODYb=wAT|< z8C5-3A_o5?3Dj6DTBV>f_nNuw%clib+rDyJB`8MU%iD6mbVZaIf(={_dGXR5oBi^T zIC@*6P`&vL6;NPN2$O=V))f6%_%q5#hm~YcMT2N@Y~il;>JMq3xCXgWhB49qr_iM1 zp(itZu|$$9p;^q7M!aIz=KsGXN(p=sC3#u6fg9NJHkW_`2KRg$O$PtsQD;!~BbT1dJU^R)J5m?j$F^p7l z!DwLqy*bqbl*yA55K0EVHg0ZWSmz?xceYCse%O-b)9pd3IWQ8C>Se)|d`Vb<?ar*Ic)?QH!|+`JjDg?eZ`d^Ro`luAAd~Y!OZ%?^Gp0$m@HMx z%JyxRB+i&Yw)hHt$!0G@hzs=IB>|#rwU!^8Vxb`^-was;>D7i}J1FEgw$fc7iPEj` z5fnolh{olCGvakX?U=D$Kv%Y_S%A)%ytU!%~1~4c(mxJQ45)}E9E@(3c zywfO@^k4p!MwO5$CRl^H(fH(B1WWR#75@HT4H;dml7Oh}g3yCCN~M9%0v{aQiC3(G z+1U4PbK{6`GZFYHL7=b7gcU{GEv_yLKG*(SvzCmK;n6$NY9LZfRLACMVURVe4P}C# zU*oiWs~e8cSlMr4w3m5bM=1(QKfehZl`uDQUjg)p<6v#3B(CuR?i4;IKhdn&{bJC= z7Im?~N2mA`-1&j}GOzfvKD8#^D#gN&OD`H|d3kxJ7n7*t%=#%-2lIT_tM{&^dxGf3 z#hzIFS1-5;G0Ds&{OeQKOk+V9N2lurtM-qeN0WGI^Zf(ltfXz=>(cn$cql;!l`$m6 z$Tsk)9~^y^8#_^?3kHqX<+?M*!X#biD3}@8@CP*pGH2pG^o8p4p zRsay1MUcT?TWb9kO-V^1{X9AAzz*B4lmgrr>tZ&r< zNp2FN>y+$;Mf2&}0iL-e8yg#!wl&(3^`XsfqL|&3fGa@?1IL8C8a&3gf#=h0k;=Ll ze96Zx2shC3*V{k&>?3l(qr{ryjFL|!zm-NUq=^cZ9DVU{l|y0fxn1>cv<5;K2P*%J zYIuo;P0hb#`@ANKo2bRvjwEE~A(r8F87V$cj!00f!`>2Kw)jFoMV8wb6aK9o)ANo2`_UmRaz~S-h zMBO|Gppm;YTzXHp#CA611r1X6%$f;O$p9acDWw=f#13MhbwK$6S>W-=oa2O&qa^ZI zEAIEs(X;rTZ_pTcus5 zo3uXS87H;Ie}_R@DN+8FE-2^IZD-#v3>hQGbr{OR4x8phDmRRxL8oJg?{rIMec6uB z#r7buXF!`OiS6^t{vP$Io}yEEACCzNn9|vY7t=Sm64qycEZVvvM=X`q?jSez$MdZw zdvt-vLu1Z92fCb zelmSESqTK$E)z0aim5J$Q6<(lyYYT7^~rUR_98Sjh2idgpkI;F^=!O_Szw3MMpwhP z+i>XAQK>UKP?pXIJmU3$s}| zuLK!-D@QG)%&~YdwjCRT(DraOHOGT|ei5wq` z`4&>7vYJ}mZ)RsEju<6m*;93*-GrFmZepSNkCbYwJa3X9(% zad32OY^)CEm75^O-R8RJqW)CX;yc?#qwV|Ed9UY2`66H1LT_U3Tf#kTMCdV_N}eVr zpI77ZUJ_q-mmM8REuO7KT|6&wGHuw~Q&}v|ysscSK}5V$WvqBl_NhF-p5KzBrPsbn zgRTS)2Q0}uL1#k+6aZT!;69b*S1-Mnfel*3WuMv&Bqkv@OvflSVRuoHi`+mG^Xcx} z7rH=<^G;DuiUPr;N7#*YgwL4AAXrT~m{*P0VsjPUSyHLRQ#TZ{xHFtg(yWShyti!h zlbe#>zC5OY(Oogsom{1MOqtRjMY{|8Zi-!U4-PF*RGjVtacFMS>BZt& z!_Nt>=XN7HKD|(lLY3Gqca96De*b+GX!=Gu4TTba9Gl!9Ds#^@=$8O-qMSYNnU?e+Q{GF zzK7Ybq&oF0%6lAdxprcZ!(tj`+pFJA^z9%KY=L{(jO7j}D>SPG7;u=nE7fc}`M!*K zA#p*r?w#7JN{vuZw3Z^YY+r)pxj+r)dlhowms}e=2~WR()ZoFwUJ@OrSYnQEgJ>6= z5a33tDqN9P)!CezB#$??YExUmcU^%nE<9r2f$`JgPI1FfMlO)VTNDOaX|YDT6iM{l zXnB>0yqyV~iRb6}Wn;WA#(|js%Zhfu{gzY~_mcyY;KTnFjaD@rB_?J|kxOXZ3!Fnq#`s=gbc4tap#i2zFfM3OWw{YVHQTCsgftfhT(o8XO7`X`xp7 zq>4u>SpLSHi2(+g2S_IkgJ@D@>%#8$a-jFDM9$I*Mj*l{gAlk7zuw1|TrZ}dzTB6-$`7>ED?nb4(Uma&b^0;E9kg_4f&`0CQRYX zH4qAXjCcl#m4hobf`F&9Ij|7s;v!Xm^P%JQQ-rQpgV5Po|2eAbbstte=2 zDBfuY%nqGNbdhjOma?A;@aL?d4u32bYQeHWwh|C*#StCi7V9MoJtFCv;@W4s$SnWP zSx3owCN^>nm}+c@JxL?6gTWc$($(;uCUREBy-SXU{|}^=oD_iupuKn6CH+*RbL-TE~k%X7QILq(l(3|I3 z#Qi~1ZKs3^##CVy#e2}eWuo{Dejs769}jweTXw;Di3{#C1ydiR!~6PAMf^yltCT+Z z%ctaz+MJ;9c}Evq+l7nfxPH#Rwx^7|ukSoYSc7||ix_$OSk78J*zY#ebPq6Zxh3wU zG`(%{MgPl4AhC&^NecK+QvELKoq6HU6p;<-Ie~7e20|%j?WI$1P>(=JYpbsk}TUJ%BMTjSBHYU*n=;!=Kxj}9(X>Ac11;QN=-d6xgY{y(RV@mCnbryBv-3_W`r$1ZSi~? z!ps}MpVO-MH@qG3Kvx4^EU@3n1f^v9?mkhmBESV@9EBA2=u~FS#$W|ZpYfetpruqs zu>*F0rPprxhvuD;Mwv_|N2$zr%uK6T7L&in_Rv1WQc)2^?oW%`ylWM>7vLyoF<3n9 zDE~m$W_5lorEVVWZYY)tJa3}$h{<|4?bZ9rqkW6kLwO!@crjh@_ zq@MdI?*pp#7@OfSh$$2(5dEsyr3A;dj$^*Le7}4pbiA$nr}ZsxI5gagTotP)$I9hT zH5OXy99IE5HX_&x*og)d{F%dX!cJ{P3!Vam;q>5dN#Br6t^t#s%{IZmN1Z$T^vl|H zK&u)@1P|TKVWnf(!H!^$Gwg)}d~ZYYM^ijv%YYPMqNnEG`c@m0!=IhA$-c>vu)X3W z_}kANteKQfWOJ`80ecQf)YPQR#F8--_6$87Ya#PQ4#eDN6%F5nlfbWnao*(QWPJ8U z5xrn(^7A<*G{F>8pxa`f?*%lH`W(jVr+*s6p$QG9_JY*U;({1JASJ4T*&giGO!AuK z3JlR_iDel4aCUi3ed5w$6Q0~H4^4tF>c@OW@ZrjS>fj||-eQ`N)ZP44ZTU>2P6us_ zhA!s4iAczI(FKA)WUoX1MTrUEO^y#j9v8Ym@e z+lfP)X(aItsjTcs>nK$?JfG|G#Wvc80sA#dVAe|vce^6lZRA5?(9_4wbK*xcz4u29 zvW=zDvKM%%_x3N>k%xevF6@5npr(dMY4)FSxuF@emsl8$+@yan8f-bh3aNzn8)(q7 z4cw3l7T8x5=w>S2EieXFxYB~7;U!pnjxPKzTDC9eKkuV%GBm-^*~ zZfoWEM)TxH5{s89?*HYNTzvEcWGR`n{>eC-rG&yxNDDY(f@%_TtuY7*y0}uTlv4v6 z-BNC)iw;I({Zc;_T01(P`vJ`TS1H9xFvS-wP^%+=g|V33bjtzQd%!--Tye`Dnbf*2 zYO6}eWvIMl-Dsc@(r3ijYTPrHGu9v$39MucrT>0E;-F!O1Zzjdtta=*B3q@%4<`=O zXZxwbGJhC<0{hq|-Atg!Y@&)^{EV7|%7?3%>&Sh#ka2{ZC`*)1#!H=#rhn?5NMb|m zbOCL4_pqpdZhHz2kYbQuVY|?89Vmqd9OIn2z-tcRuG2uporJIDL)X&DBuSL6Ml5zn zGYIpEL1#U`XkdzRlez_!@?`GpooVdsk3r8IZfO1kXK`3mO`2`7;>sR z3z7w@erte#M59_B2&S!?IebcuifM0#!<}^qyc7q9=}07K3F)__`4H*+`4$K3PL1`Y}E&P+*>zxR^OmQip2 zS22pj;7!XWianwUXIzXeTu0+azfN#QMn)<A4H z4<3HfVv%O44!}ElGs2MjT$=%sZ_7c+#X^3w0b%wsD_$K0_KGGZU`^;bl%@jxxmV&( z?@{AGsm68W{xL|5GY{50t2yXcd!*LeJ_nMEC7ZwtK(|;}hY-fcu5K>^9DR?C zhJ<4Ap8KIj^8#)IO&xjAEOx*fO81?8bmm-*GB9yJ?R*m?t1rV1mY9OxF&zT#!-IC? zex?S>Aky`kEW}+I34%-r9Pk=q9X7LB;pt7OQtsSUNunRJkTkuL)R8CGugbDa&;@mD z9fS-aAod#s2#)|qH{oIAYnw31pcu5&h_2<4^`PP9e~7>5US5aVPZ#+f39Lm)%81Va%9Sgj(0aDP!lb~%(I zV`Xmf@!y6$H+3mNW+sVCIN&T6#f#Z^MyC_cCKED_rJ`Z8$2SaPzwX1Kf+B}gJ5k1I zNemoDw2}tKRKO6(2{epjf8p_lwXB>0P+TwhTYwNF&{h%pYA5K3lRIF82$WzzjH-DH zL*`DSg3}!aTVFqa{+vopeYH*%ZmK4K%MTZ5*4m#n{>HAP6WO&p^!b>e6E@m#nnrg5- zCMKGNhqn9&UVc@k!U5f$=3whEvfD@b!L7bN2d5s@6&z8skWZgRFYo z(G}={^^Vloi=-(VxxV@}U(1`{;Th$>kJCVMoRXw$Y~gk{(aaj`=zB^ocEXPNTBa1$No2 zZNeYiZUPf-CWW{)3a* zO#6c-D+63z=SYJ|c#cJ(a|2r-xaaD%c}xW1of{D!s8< zKemV`(gPa%CyHOmD8n7?ASX-jSgidS47;-S?nTK4$@hVwU*_9!=R` z8swL^bwp0#BzKG2Z@2t$PqSh@BsInLIa}d*@6`NEWhOl}V6>BAgKjN{2XQ4{Cw1X3 z7(^P21y1KAV&Qi{qNaJcdfoEl6 z?UFYk?Rv8OB)04)13&kX3vlcMKfr=tm!IFa{%(-(5%N7{zGKLDQ2kzIzSqX@WZ^q| k`c5am^XvcL8jg7q;D{WZ6fSOr|3d)w*g5Ym*+n_~KV$-@?f?J) diff --git a/src/main/resources/assets/terraoriginum/textures/item/umbrellaoverlay.png b/src/main/resources/assets/terraoriginum/textures/item/umbrellaoverlay.png deleted file mode 100644 index cba67bd031363d5930586a41819138ebdc56242f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{1kFE{-7;ac}P)%o28#IsP$3vr3ag>4!{Q z4QIdIvg7+&#OFH;IDS|pw$|^2g9dA<+3a`qb@TbB3Up;qq`%W5?KNB?`#U7omd(6Pr=a}9``sTGS=YVGKR2ls4dX#pZ_d*&JcrfbR{Sbun;;Zl93+49T&yPk?? zj)`It)7;N;=MU$@PL8&z{0n~ONlKWxGV};L?9gN?;59gB>R@3EVs8-7iMh$JhrK{5 z_zc56UKw+sqS;Cerw{J9#3=FOX$*6Vw!Fh^)-x=Rz1S~&XP(7)Y%1>p{$0F^r>Dd- r<#0r%b#*)BvoQkG12zzFB=5Vl-m?`FO{s^Uf)seV`njxgN@xNAtpWS+ diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png deleted file mode 100755 index d42a75f9421f2497a2a4fcd0bd9ded02fa133127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png deleted file mode 100755 index d42a75f9421f2497a2a4fcd0bd9ded02fa133127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- diff --git a/src/main/resources/data/terraoriginum/origins/muckunde.json b/src/main/resources/data/faithful/origins/muckunde.json similarity index 100% rename from src/main/resources/data/terraoriginum/origins/muckunde.json rename to src/main/resources/data/faithful/origins/muckunde.json diff --git a/src/main/resources/data/terraoriginum/powers/wings.json b/src/main/resources/data/faithful/powers/wings.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/wings.json rename to src/main/resources/data/faithful/powers/wings.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/bees.json b/src/main/resources/data/faithful/tags/blocks/bees.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/bees.json rename to src/main/resources/data/faithful/tags/blocks/bees.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/hexblade_unphaseable.json b/src/main/resources/data/faithful/tags/blocks/hexblade_unphaseable.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/hexblade_unphaseable.json rename to src/main/resources/data/faithful/tags/blocks/hexblade_unphaseable.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/hot_blocks.json b/src/main/resources/data/faithful/tags/blocks/hot_blocks.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/hot_blocks.json rename to src/main/resources/data/faithful/tags/blocks/hot_blocks.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/mushrooms.json b/src/main/resources/data/faithful/tags/blocks/mushrooms.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/mushrooms.json rename to src/main/resources/data/faithful/tags/blocks/mushrooms.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/myceliums.json b/src/main/resources/data/faithful/tags/blocks/myceliums.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/myceliums.json rename to src/main/resources/data/faithful/tags/blocks/myceliums.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/nature.json b/src/main/resources/data/faithful/tags/blocks/nature.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/nature.json rename to src/main/resources/data/faithful/tags/blocks/nature.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/non_solid.json b/src/main/resources/data/faithful/tags/blocks/non_solid.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/non_solid.json rename to src/main/resources/data/faithful/tags/blocks/non_solid.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/ocean_monument.json b/src/main/resources/data/faithful/tags/blocks/ocean_monument.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/ocean_monument.json rename to src/main/resources/data/faithful/tags/blocks/ocean_monument.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/path_blocks.json b/src/main/resources/data/faithful/tags/blocks/path_blocks.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/path_blocks.json rename to src/main/resources/data/faithful/tags/blocks/path_blocks.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/stone_types.json b/src/main/resources/data/faithful/tags/blocks/stone_types.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/stone_types.json rename to src/main/resources/data/faithful/tags/blocks/stone_types.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/unphasable.json b/src/main/resources/data/faithful/tags/blocks/unphasable.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/unphasable.json rename to src/main/resources/data/faithful/tags/blocks/unphasable.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/valuores.json b/src/main/resources/data/faithful/tags/blocks/valuores.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/valuores.json rename to src/main/resources/data/faithful/tags/blocks/valuores.json diff --git a/src/main/resources/data/terraoriginum/tags/blocks/wool.json b/src/main/resources/data/faithful/tags/blocks/wool.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/blocks/wool.json rename to src/main/resources/data/faithful/tags/blocks/wool.json diff --git a/src/main/resources/data/terraoriginum/tags/entity_types/hostiles.json b/src/main/resources/data/faithful/tags/entity_types/hostiles.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/entity_types/hostiles.json rename to src/main/resources/data/faithful/tags/entity_types/hostiles.json diff --git a/src/main/resources/data/terraoriginum/tags/entity_types/innocent.json b/src/main/resources/data/faithful/tags/entity_types/innocent.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/entity_types/innocent.json rename to src/main/resources/data/faithful/tags/entity_types/innocent.json diff --git a/src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json b/src/main/resources/data/faithful/tags/entity_types/nomercy.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json rename to src/main/resources/data/faithful/tags/entity_types/nomercy.json diff --git a/src/main/resources/data/terraoriginum/tags/entity_types/unholy.json b/src/main/resources/data/faithful/tags/entity_types/unholy.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/entity_types/unholy.json rename to src/main/resources/data/faithful/tags/entity_types/unholy.json diff --git a/src/main/resources/data/terraoriginum/tags/items/blades.json b/src/main/resources/data/faithful/tags/items/blades.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/blades.json rename to src/main/resources/data/faithful/tags/items/blades.json diff --git a/src/main/resources/data/terraoriginum/tags/items/boots.json b/src/main/resources/data/faithful/tags/items/boots.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/boots.json rename to src/main/resources/data/faithful/tags/items/boots.json diff --git a/src/main/resources/data/terraoriginum/tags/items/break.json b/src/main/resources/data/faithful/tags/items/break.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/break.json rename to src/main/resources/data/faithful/tags/items/break.json diff --git a/src/main/resources/data/terraoriginum/tags/items/chestplate.json b/src/main/resources/data/faithful/tags/items/chestplate.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/chestplate.json rename to src/main/resources/data/faithful/tags/items/chestplate.json diff --git a/src/main/resources/data/terraoriginum/tags/items/giweapons.json b/src/main/resources/data/faithful/tags/items/giweapons.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/giweapons.json rename to src/main/resources/data/faithful/tags/items/giweapons.json diff --git a/src/main/resources/data/terraoriginum/tags/items/helmet.json b/src/main/resources/data/faithful/tags/items/helmet.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/helmet.json rename to src/main/resources/data/faithful/tags/items/helmet.json diff --git a/src/main/resources/data/terraoriginum/tags/items/leggings.json b/src/main/resources/data/faithful/tags/items/leggings.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/leggings.json rename to src/main/resources/data/faithful/tags/items/leggings.json diff --git a/src/main/resources/data/terraoriginum/tags/items/unobtainable.json b/src/main/resources/data/faithful/tags/items/unobtainable.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/unobtainable.json rename to src/main/resources/data/faithful/tags/items/unobtainable.json diff --git a/src/main/resources/data/terraoriginum/tags/items/weapons.json b/src/main/resources/data/faithful/tags/items/weapons.json similarity index 100% rename from src/main/resources/data/terraoriginum/tags/items/weapons.json rename to src/main/resources/data/faithful/tags/items/weapons.json diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json index db96363..d312259 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -1,24 +1,7 @@ { "replace": false, "origins": [ - "terraoriginum:lato", - "terraoriginum:mync", - "terraoriginum:yulde", - "terraoriginum:monarch", - "terraoriginum:spirit", - "terraoriginum:shade", - "terraoriginum:wraith", - "terraoriginum:demon", - "terraoriginum:merfolk", - "terraoriginum:serpenta", - "terraoriginum:kitsune", - "terraoriginum:florian", - "terraoriginum:fairy", - "terraoriginum:muckunde", - "terraoriginum:blight", - "terraoriginum:munch", - "terraoriginum:angel", - "terraoriginum:sylt", + "faithful:sth", { "condition": { "type": "origins:equipped_item", @@ -26,12 +9,12 @@ "item_condition": { "type": "origins:ingredient", "ingredient": { - "tag": "terraoriginum:unobtainable" + "tag": "faithful:unobtainable" } } }, "origins": [ - "terraoriginum:immortal_human" + "faithful:sthelse" ] } diff --git a/src/main/resources/data/terraoriginum/damage_type/boiling.json b/src/main/resources/data/terraoriginum/damage_type/boiling.json deleted file mode 100644 index 930b5b8..0000000 --- a/src/main/resources/data/terraoriginum/damage_type/boiling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "exhaustion": 0.1, - "message_id": "boiling", - "scaling": "never" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/damage_type/burn_in_sun.json b/src/main/resources/data/terraoriginum/damage_type/burn_in_sun.json deleted file mode 100644 index 485f0bc..0000000 --- a/src/main/resources/data/terraoriginum/damage_type/burn_in_sun.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "exhaustion": 0.1, - "message_id": "burn_in_sun", - "scaling": "never" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/damage_type/lack_of_ectoplasm.json b/src/main/resources/data/terraoriginum/damage_type/lack_of_ectoplasm.json deleted file mode 100644 index 975b62f..0000000 --- a/src/main/resources/data/terraoriginum/damage_type/lack_of_ectoplasm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "exhaustion": 0.1, - "message_id": "lack_of_ectoplasm", - "scaling": "never" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json b/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json deleted file mode 100644 index 5d32957..0000000 --- a/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "exhaustion": 0.1, - "message_id": "lack_of_sun", - "scaling": "never" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/damage_type/last_stand.json b/src/main/resources/data/terraoriginum/damage_type/last_stand.json deleted file mode 100644 index 321aca1..0000000 --- a/src/main/resources/data/terraoriginum/damage_type/last_stand.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "exhaustion": 0.1, - "message_id": "last_stand", - "scaling": "never" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json b/src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json deleted file mode 100644 index 5923d3c..0000000 --- a/src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 3, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "terraoriginum:cotton_ball", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "terraoriginum:cotton_crop_block", - "properties": { - "age": "7" - } - } - ] - }, - { - "type": "minecraft:item", - "name": "terraoriginum:cotton_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "name": "terraoriginum:cotton_seeds", - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:binomial_with_bonus_count", - "parameters": { - "extra": 3, - "probability": 0.5714286 - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "terraoriginum:cotton_crop_block", - "properties": { - "age": "7" - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/angel.json b/src/main/resources/data/terraoriginum/origins/angel.json deleted file mode 100644 index 52087b5..0000000 --- a/src/main/resources/data/terraoriginum/origins/angel.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "powers": [ - "terraoriginum:angel-powers/divine_grace" - ], - "icon": "minecraft:rotten_flesh", - "order": 1011, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/blight.json b/src/main/resources/data/terraoriginum/origins/blight.json deleted file mode 100644 index 6a4681e..0000000 --- a/src/main/resources/data/terraoriginum/origins/blight.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "powers": [ - "terraoriginum:blight-powers/nether_spawn", - "terraoriginum:blight-powers/bane_of_agriculture", - "terraoriginum:blight-powers/florivory", - "terraoriginum:blight-powers/blighted_feet", - "terraoriginum:blight-powers/foul_flesh", - "terraoriginum:blight-powers/dead_cells", - "terraoriginum:blight-powers/foul_skin", - "terraoriginum:blight-powers/noregen" - ], - "icon": "minecraft:rotten_flesh", - "order": 1010, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/demon.json b/src/main/resources/data/terraoriginum/origins/demon.json deleted file mode 100644 index ea89847..0000000 --- a/src/main/resources/data/terraoriginum/origins/demon.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "powers": [ - "terraoriginum:demon-powers/self_transfiguration1", - "terraoriginum:demon-powers/self_transfiguration2", - "terraoriginum:demon-powers/self_transfiguration3", - "terraoriginum:demon-powers/stained", - "terraoriginum:demon-powers/extra_health", - "terraoriginum:spirit-powers/phasing1", - "terraoriginum:spirit-powers/phasing2", - "terraoriginum:spirit-powers/phasing3", - "terraoriginum:spirit-powers/ectoplasm", - "terraoriginum:spirit-powers/ectodiff", - "terraoriginum:spirit-powers/lackofectodmg", - "terraoriginum:spirit-powers/undead", - "terraoriginum:spirit-powers/nightvis", - "terraoriginum:ectotest" - ], - "icon": "minecraft:bone", - "order": 1002, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/dominion.json b/src/main/resources/data/terraoriginum/origins/dominion.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/origins/fairy.json b/src/main/resources/data/terraoriginum/origins/fairy.json deleted file mode 100644 index 5cfb9ce..0000000 --- a/src/main/resources/data/terraoriginum/origins/fairy.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "powers": [ - "terraoriginum:fairy-powers/smallheight", - "terraoriginum:fairy-powers/smallwidth", - "terraoriginum:fairy-powers/smallhitboxheight", - "terraoriginum:fairy-powers/smallhitboxwidth", - "terraoriginum:fairy-powers/fragile", - "terraoriginum:fairy-powers/yummyhoney", - "terraoriginum:fairy-powers/nimble", - "terraoriginum:fairy-powers/pollenation", - "origins:elytra", - "origins:launch_into_air" - ], - "icon": "minecraft:amethyst_cluster", - "order": 1007, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/florian.json b/src/main/resources/data/terraoriginum/origins/florian.json deleted file mode 100644 index 7d507a7..0000000 --- a/src/main/resources/data/terraoriginum/origins/florian.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "powers": [ - "terraoriginum:florian-powers/green_fingered", - "terraoriginum:florian-powers/small", - "terraoriginum:florian-powers/small_width", - "terraoriginum:florian-powers/small_hitbox", - "terraoriginum:florian-powers/small_width_hitbox", - "terraoriginum:florian-powers/flammable", - "terraoriginum:florian-powers/photosynthesis", - "terraoriginum:florian-powers/absorbing", - "terraoriginum:florian-powers/compost", - "terraoriginum:florian-powers/bonemeal", - "terraoriginum:florian-powers/aura_of_growth", - "terraoriginum:florian-powers/pocket_sand", - "terraoriginum:florian-powers/weak", - "terraoriginum:florian-powers/five_hearts", - "terraoriginum:florian-powers/passivemobs" - ], - "icon": "minecraft:rose_bush", - "order": 1000, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/immortal_human.json b/src/main/resources/data/terraoriginum/origins/immortal_human.json deleted file mode 100644 index e8dd057..0000000 --- a/src/main/resources/data/terraoriginum/origins/immortal_human.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "powers": [ - "terraoriginum:immortal_human-powers/immortal", - "terraoriginum:immortal_human-powers/pathetic" - ], - "icon": "minecraft:air", - "order": 1000, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/kitsune.json b/src/main/resources/data/terraoriginum/origins/kitsune.json deleted file mode 100644 index 0b934a7..0000000 --- a/src/main/resources/data/terraoriginum/origins/kitsune.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "powers": [ - "terraoriginum:kitsune-powers/pounce", - "terraoriginum:kitsune-powers/pounce_aerialdamage", - "terraoriginum:kitsune-powers/pounce_falling", - "terraoriginum:kitsune-powers/phantomize", - "terraoriginum:kitsune-powers/phasing", - "terraoriginum:kitsune-powers/phasing_jump", - "terraoriginum:kitsune-powers/invisibility", - "terraoriginum:kitsune-powers/fox_pouch", - "terraoriginum:kitsune-powers/fox_pouch_sound", - "terraoriginum:kitsune-powers/run", - "origins:fall_immunity", - "terraoriginum:kitsune-powers/speed", - "terraoriginum:kitsune-powers/fragilefox", - "terraoriginum:kitsune-powers/smolman", - "terraoriginum:kitsune-powers/yummy_berries", - "terraoriginum:kitsune-powers/zberry_no_hurt", - "terraoriginum:kitsune-powers/armor", - "terraoriginum:kitsune-powers/paws", - "terraoriginum:kitsune-powers/phase_fix", - "terraoriginum:kitsune-powers/paws_shield", - "terraoriginum:kitsune-powers/hungy", - "terraoriginum:kitsune-powers/fox_eyes", - "terraoriginum:kitsune-powers/monch", - "terraoriginum:kitsune-powers/yum", - "terraoriginum:kitsune-powers/startbox" - ], - "icon": "minecraft:sweet_berries", - "order": 1006, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/lato.json b/src/main/resources/data/terraoriginum/origins/lato.json deleted file mode 100755 index a8679db..0000000 --- a/src/main/resources/data/terraoriginum/origins/lato.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "powers": [ - "terraoriginum:lato-powers/lato_blooded", - "terraoriginum:lato-powers/twelve_hearts", - "terraoriginum:lato-powers/natural_armor", - "terraoriginum:lato-powers/tailwind", - "terraoriginum:lato-powers/rage", - "terraoriginum:lato-powers/rage_addition", - "terraoriginum:lato-powers/perfect_vision", - "terraoriginum:lato-powers/sun_damage", - "terraoriginum:lato-powers/teleport", - "terraoriginum:lato-powers/strong", - "terraoriginum:lato-powers/long_arms", - "terraoriginum:lato-powers/tall", - "terraoriginum:lato-powers/tall_hitbox", - "terraoriginum:lato-powers/tall_width", - "terraoriginum:lato-powers/tall_width_hitbox" - ], - "icon": "netherite_axe", - "order": 998, - "impact": 3 - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/merfolk.json b/src/main/resources/data/terraoriginum/origins/merfolk.json deleted file mode 100644 index 4253ca7..0000000 --- a/src/main/resources/data/terraoriginum/origins/merfolk.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "powers": [ - "terraoriginum:merfolk-powers/hydration", - "terraoriginum:merfolk-powers/hydrodiff", - "terraoriginum:merfolk-powers/lackofhydrodamage", - "terraoriginum:merfolk-powers/waterbreathing", - "terraoriginum:merfolk-powers/webbedfeet", - "terraoriginum:merfolk-powers/webbedfeet2", - "terraoriginum:merfolk-powers/wethands", - "origins:swim_speed", - "origins:like_water", - "origins:aqua_affinity", - "origins:water_vision" - ], - "icon": "minecraft:prismarine_shard", - "order": 1005, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/monarch.json b/src/main/resources/data/terraoriginum/origins/monarch.json deleted file mode 100644 index 8f3d63c..0000000 --- a/src/main/resources/data/terraoriginum/origins/monarch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "powers": [ - "terraoriginum:monarch-powers/solar_energy", - "terraoriginum:monarch-powers/nuclear_rush", - "terraoriginum:monarch-powers/instant_transmission", - "terraoriginum:monarch-powers/super_dash", - "terraoriginum:monarch-powers/hyperefficient_blood", - "terraoriginum:monarch-powers/hydropetrification", - "terraoriginum:monarch-powers/sun_fueled", - "terraoriginum:monarch-powers/totem_fueled", - "terraoriginum:monarch-powers/nyctophobia", - "terraoriginum:monarch-powers/shining", - "terraoriginum:monarch-powers/lackofsundamage" - ], - "icon": "fire_charge", - "order": 999, - "impact": 3 - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/munch.json b/src/main/resources/data/terraoriginum/origins/munch.json deleted file mode 100644 index 0fb7004..0000000 --- a/src/main/resources/data/terraoriginum/origins/munch.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "powers": [ - "terraoriginum:munch-powers/tiny", - "terraoriginum:munch-powers/short_arms", - "terraoriginum:munch-powers/tiny_motion", - "terraoriginum:munch-powers/tiny_width", - "terraoriginum:munch-powers/little_health", - "terraoriginum:munch-powers/better_health", - "terraoriginum:munch-powers/tiny_appetite", - "terraoriginum:munch-powers/nimble", - "terraoriginum:munch-powers/quiet", - "terraoriginum:munch-powers/climbing", - "terraoriginum:munch-powers/mounting", - "terraoriginum:munch-powers/speedy_bastard", - "terraoriginum:florian-powers/passivemobs" - ], - "icon": { - "item": "terraoriginum:tiny" - }, - "order": 999, - "impact": 3 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/mync.json b/src/main/resources/data/terraoriginum/origins/mync.json deleted file mode 100644 index 39910f4..0000000 --- a/src/main/resources/data/terraoriginum/origins/mync.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "powers": [ - "terraoriginum:mync-powers/mync_vision", - "terraoriginum:mync-powers/mync_blind", - "terraoriginum:lato-powers/twelve_hearts", - "terraoriginum:mync-powers/mync_natural_armour", - "terraoriginum:lato-powers/lato_blooded", - "terraoriginum:lato-powers/sun_damage", - "terraoriginum:mync-powers/mync_tailwind", - "terraoriginum:mync-powers/mync_strong", - "terraoriginum:mync-powers/mync_rage", - "terraoriginum:mync-powers/mync_rage_addition", - "terraoriginum:mync-powers/mync_echolocate", - "terraoriginum:lato-powers/tall", - "terraoriginum:lato-powers/tall_hitbox", - "terraoriginum:lato-powers/tall_width", - "terraoriginum:lato-powers/tall_width_hitbox", - "terraoriginum:lato-powers/long_arms" - ], - "icon": { - "item": "terraoriginum:mync_eye" - }, - "order": 999, - "impact": 3 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/serpenta.json b/src/main/resources/data/terraoriginum/origins/serpenta.json deleted file mode 100644 index 17c87b0..0000000 --- a/src/main/resources/data/terraoriginum/origins/serpenta.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "powers": [ - - "terraoriginum:serpenta-powers/boilingshot", - "terraoriginum:serpenta-powers/scales", - "terraoriginum:merfolk-powers/hydration", - "terraoriginum:merfolk-powers/hydrodiff", - "terraoriginum:merfolk-powers/lackofhydrodamage", - "terraoriginum:merfolk-powers/waterbreathing", - "terraoriginum:merfolk-powers/webbedfeet", - "terraoriginum:merfolk-powers/webbedfeet2", - "terraoriginum:merfolk-powers/wethands", - "origins:swim_speed", - "origins:like_water", - "origins:aqua_affinity", - "origins:water_vision" - ], - "icon": "minecraft:ender_eye", - "order": 1006, - "impact": 3 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/shade.json b/src/main/resources/data/terraoriginum/origins/shade.json deleted file mode 100644 index 9c282de..0000000 --- a/src/main/resources/data/terraoriginum/origins/shade.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "powers": [ - "terraoriginum:shade-powers/invisibility1", - "terraoriginum:shade-powers/invisibility2", - "terraoriginum:shade-powers/invisibility3", - "terraoriginum:spirit-powers/ectoplasm", - "terraoriginum:spirit-powers/ectodiff", - "terraoriginum:spirit-powers/lackofectodmg", - "terraoriginum:spirit-powers/skin", - "terraoriginum:spirit-powers/phasing1", - "terraoriginum:spirit-powers/phasing2", - "terraoriginum:spirit-powers/phasing3", - "terraoriginum:spirit-powers/undead", - "terraoriginum:spirit-powers/nightvis", - "terraoriginum:ectotest" - ], - "icon": "minecraft:black_candle", - "order": 1004, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/spirit.json b/src/main/resources/data/terraoriginum/origins/spirit.json deleted file mode 100644 index 2c2ea81..0000000 --- a/src/main/resources/data/terraoriginum/origins/spirit.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "powers": [ - "terraoriginum:spirit-powers/ectoplasm", - "terraoriginum:spirit-powers/ectodiff", - "terraoriginum:spirit-powers/lackofectodmg", - "terraoriginum:spirit-powers/skin", - "terraoriginum:spirit-powers/phasing1", - "terraoriginum:spirit-powers/phasing2", - "terraoriginum:spirit-powers/phasing3", - "terraoriginum:spirit-powers/undead", - "terraoriginum:spirit-powers/nightvis" - ], - "icon": "terraoriginum:spirit", - "order": 1001, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/sylt.json b/src/main/resources/data/terraoriginum/origins/sylt.json deleted file mode 100644 index c68e3a9..0000000 --- a/src/main/resources/data/terraoriginum/origins/sylt.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "powers": [ - "terraoriginum:lato-powers/lato_blooded", - "terraoriginum:lato-powers/twelve_hearts", - "terraoriginum:lato-powers/natural_armor", - "terraoriginum:lato-powers/tailwind", - "terraoriginum:lato-powers/rage", - "terraoriginum:lato-powers/rage_addition", - "terraoriginum:lato-powers/perfect_vision", - "terraoriginum:lato-powers/sun_damage", - "terraoriginum:lato-powers/teleport", - "terraoriginum:lato-powers/strong" - ], - "icon": "diamond_axe", - "order": 1011, - "impact": 3 - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/wraith.json b/src/main/resources/data/terraoriginum/origins/wraith.json deleted file mode 100644 index e125027..0000000 --- a/src/main/resources/data/terraoriginum/origins/wraith.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "powers": [ - "terraoriginum:wraith-powers/soaring1", - "terraoriginum:wraith-powers/soaring2", - "terraoriginum:wraith-powers/soaring3", - "terraoriginum:wraith-powers/torment1", - "terraoriginum:wraith-powers/torment2", - "terraoriginum:wraith-powers/torment3", - "terraoriginum:wraith-powers/charred", - "terraoriginum:spirit-powers/phasing1", - "terraoriginum:spirit-powers/phasing2", - "terraoriginum:spirit-powers/phasing3", - "terraoriginum:spirit-powers/ectoplasm", - "terraoriginum:spirit-powers/ectodiff", - "terraoriginum:spirit-powers/lackofectodmg", - "terraoriginum:spirit-powers/undead", - "terraoriginum:spirit-powers/nightvis", - "terraoriginum:ectotest" - ], - "icon": "minecraft:phantom_membrane", - "order": 1003, - "impact": 3 -} diff --git a/src/main/resources/data/terraoriginum/origins/yulde.json b/src/main/resources/data/terraoriginum/origins/yulde.json deleted file mode 100755 index 45e7cde..0000000 --- a/src/main/resources/data/terraoriginum/origins/yulde.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "powers": [ - "terraoriginum:lato-powers/lato_blooded", - "terraoriginum:lato-powers/twelve_hearts", - "terraoriginum:lato-powers/natural_armor", - "terraoriginum:lato-powers/tailwind", - "terraoriginum:yulde-powers/last_stand", - "terraoriginum:yulde-powers/last_stand-effects", - "terraoriginum:yulde-powers/last_stand-death", - "terraoriginum:lato-powers/perfect_vision", - "terraoriginum:lato-powers/sun_damage", - "terraoriginum:lato-powers/teleport", - "terraoriginum:lato-powers/strong", - "terraoriginum:lato-powers/long_arms", - "terraoriginum:lato-powers/tall", - "terraoriginum:lato-powers/tall_hitbox", - "terraoriginum:lato-powers/tall_width", - "terraoriginum:lato-powers/tall_width_hitbox" - ], - "icon": "creeper_head", - "order": 998, - "impact": 3 - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/angel-powers/angel_wings.json b/src/main/resources/data/terraoriginum/powers/angel-powers/angel_wings.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json b/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json deleted file mode 100644 index fc50261..0000000 --- a/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "type": "origins:multiple", - "divine_grace": - { - "type": "origins:resource", - "min": 0, - "max": 22, - "start_value": 11, - "hud_render": { - "should_render": true, - "bar_index": 4, - "sprite_location": "origins:textures/gui/resource_bar.png" - } - }, - "instant_fall_from_grace": - { - "type": "origins:self_action_on_kill", - "target_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:in_tag", - "tag": "terraoriginum:nomercy" - } - ] - }, - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "*:*_divine_grace", - "change": -22 - } - ] - }, - "cooldown": 0, - "hud_render": { - "should_render": false - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json b/src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json deleted file mode 100644 index 047760d..0000000 --- a/src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:delay", - "action": { - "type": "origins:raycast", - "distance": 20, - "block": false, - "entity": true, - "shape_type": "visual", - "fluid_handling": "any", - "miss_action": { - "type": "origins:nothing" - }, - "command_at_hit": "/execute as @e[distance=..2] run effect give @s minecraft:regeneration 0 5", - "command_along_ray": "/particle electric_spark ~ ~ ~ 0 0 0 0 10", - "command_step": 0.3 - }, - "ticks": 0 - }, - { - "type": "origins:play_sound", - "sound": "block.beacon.activate", - "volume": 1, - "pitch": 1 - } - - ] - }, - "cooldown": 100, - "hud_render": { - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": "4" - }, - "key": "secondary" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json b/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json deleted file mode 100644 index bec8b95..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 1, - "entity_action": { - "type": "origins:block_action_at", - "block_action": { - "type": "origins:area_of_effect", - "radius": 6, - "shape": "cube", - "block_condition": { - "type": "origins:block_state", - "property": "age" - }, - "block_action": { - "type": "origins:chance", - "chance": 1, - "action": { - "type": "origins:modify_block_state", - "property": "age", - "operation": "add", - "change": -1 - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json b/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json deleted file mode 100644 index a6e9aaf..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 1, - "condition": { - "type": "origins:on_block", - "block_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:block", - "block": "minecraft:grass_block" - }, - { - "type": "origins:block", - "block": "minecraft:moss_block" - }, - { - "type": "origins:block", - "block": "minecraft:dirt" - }, - { - "type": "origins:block", - "block": "minecraft:dirt_path" - }, - { - "type": "origins:block", - "block": "minecraft:mycelium" - }, - { - "type": "origins:block", - "block": "minecraft:farmland" - } - ] - } - }, - "entity_action": { - "type": "origins:execute_command", - "command": "setblock ~ ~-1 ~ minecraft:coarse_dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json b/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json deleted file mode 100644 index def61ac..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.armor", - "value": 5.0, - "operation": "addition" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json b/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json deleted file mode 100644 index 61c4b0b..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "type": "origins:multiple", - "hidden": true, - "res": { - "type": "origins:resource", - "min": 0, - "max": 30, - "start_value": 0, - "hud_render": { - "should_render": false - }, - "max_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:feed", - "food": 4, - "saturation": 0.8 - }, - { - "type": "origins:execute_command", - "command": "playsound minecraft:entity.player.burp player @a ~ ~ ~" - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:regeneration", - "amplifier": 0, - "duration": 100 - } - }, - { - "type": "origins:if_else_list", - "actions": [{ - "condition": { - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - } - }, - "action": { - "type": "origins:equipped_item_action", - "equipment_slot": "mainhand", - "action": { - "type": "origins:consume", - "amount": 1 - } - } - }, - { - "condition": { - "type": "origins:equipped_item", - "equipment_slot": "offhand", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - } - }, - "action": { - "type": "origins:equipped_item_action", - "equipment_slot": "offhand", - "action": { - "type": "origins:consume", - "amount": 1 - } - } - } - ] - }, - { - "type": "origins:change_resource", - "resource": "*:*_res", - "change": 0, - "operation": "set" - } - ] - } - }, - "0": { - "condition": { - "type": "origins:or", - "conditions": [{ - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - }, - { - "type": "origins:equipped_item", - "equipment_slot": "offhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - } - ] - }, - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:change_resource", - "resource": "*:*_res", - "change": 0, - "operation": "set" - }] - }, - "cooldown": 1, - "hud_render": { - "should_render": false - }, - "key": { - "key": "key.use" - } - }, - "grow": { - "condition": { - "type": "origins:or", - "conditions": [{ - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - }, - { - "type": "origins:equipped_item", - "equipment_slot": "offhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - } - ] - }, - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:change_resource", - "resource": "*:*_res", - "change": 1 - }] - }, - "cooldown": 1, - "hud_render": { - "should_render": false - }, - "key": { - "key": "key.use", - "continuous": true - } - }, - "particle": { - "condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:or", - "conditions": [{ - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - }, - { - "type": "origins:equipped_item", - "equipment_slot": "offhand", - "item_condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:flowers" - } - }] - } - } - ] - }, - { - "type": "origins:food_level", - "comparison": "<", - "compare_to": 20 - } - ] - }, - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:execute_command", - "command": "execute positioned ~ ~0.2 ~0.1 rotated as @s run particle minecraft:large_smoke ^ ^ ^0.1 0.1 0.1 0.1 0.055 4" - }, - { - "type": "origins:execute_command", - "command": "playsound minecraft:entity.generic.eat player @s ~ ~ ~" - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "duration": 5, - "show_particles": false, - "amplifier": 1, - "show_icon": false - } - } - ] - }, - "cooldown": 4, - "hud_render": { - "should_render": false - }, - "key": { - "key": "key.use", - "continuous": true - } - }, - "restrict": { - "condition": { - "type": "origins:and", - "conditions": [{ - "type": "origins:food_level", - "comparison": "==", - "compare_to": 20 - }, - { - "inverted": true, - "type": "origins:gamemode", - "gamemode": "creative" - } - ] - }, - "type": "origins:action_over_time", - "interval": 2, - "entity_action": { - "type": "origins:set_resource", - "resource": "*:*_res", - "value": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json deleted file mode 100644 index a33325a..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:effect_immunity", - "effects": [ - "minecraft:wither", - "minecraft:poison", - "minecraft:instant_damage", - "minecraft:hunger" - ] - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json deleted file mode 100644 index 7434012..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "origins:model_color", - "red": 0.9, - "green": 0.6, - "blue": 0.55 -} diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json b/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json deleted file mode 100644 index 9569f2c..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "origins:modify_player_spawn", - "dimension": "minecraft:the_nether", - "spawn_strategy": "center" - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json b/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json deleted file mode 100644 index 49983b8..0000000 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "origins:disable_regen", - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json b/src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json deleted file mode 100644 index 28fefad..0000000 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/extra_health.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "name": "Max health increase", - "attribute": "minecraft:generic.max_health", - "value": 4, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration1.json b/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration1.json deleted file mode 100644 index 1defc09..0000000 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": ">=", - "compare_to": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json b/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json deleted file mode 100644 index 49f8509..0000000 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration2.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 5, - "hidden": true, - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 35, - "amplifier": 1, - "show_icon": false - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 35, - "amplifier": 1, - "show_icon": false - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:resistance", - "duration": 35, - "amplifier": 1, - "show_icon": false - } - }, - { - "type": "origins:exhaust", - "amount": 0.5 - } - ] - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:demon-powers/self_transfiguration1" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration3.json b/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration3.json deleted file mode 100644 index 360ed6f..0000000 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/self_transfiguration3.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:demon-powers/self_transfiguration1" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -9, - "operation": "add" - } - ] - } - } - ] - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/demon-powers/stained.json b/src/main/resources/data/terraoriginum/powers/demon-powers/stained.json deleted file mode 100644 index 81328a0..0000000 --- a/src/main/resources/data/terraoriginum/powers/demon-powers/stained.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "origins:model_color", - "blue": 0.5, - "green": 0.5, - "alpha": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/dominion-powers/greater_heal_ray.json b/src/main/resources/data/terraoriginum/powers/dominion-powers/greater_heal_ray.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/powers/dominion-powers/larger.json b/src/main/resources/data/terraoriginum/powers/dominion-powers/larger.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/powers/dominion-powers/suppression_of_power.json b/src/main/resources/data/terraoriginum/powers/dominion-powers/suppression_of_power.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/powers/ectotest.json b/src/main/resources/data/terraoriginum/powers/ectotest.json deleted file mode 100644 index 17857fb..0000000 --- a/src/main/resources/data/terraoriginum/powers/ectotest.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "hidden": true, - "condition": { - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:mync_eye" - } - } - }, - "type": "origins:action_over_time", - "interval": 10, - "entity_action": { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": 100, - "operation": "add" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json deleted file mode 100644 index e4f34e7..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/fragile.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.max_health", - "value": -10, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json deleted file mode 100644 index 46444a0..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/nimble.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "origins:restrict_armor", - "head": { - "type": "origins:armor_value", - "comparison": ">", - "compare_to": 2 - }, - "chest": { - "type": "origins:armor_value", - "comparison": ">", - "compare_to": 5 - }, - "legs": { - "type": "origins:armor_value", - "comparison": ">", - "compare_to": 4 - }, - "feet": { - "type": "origins:armor_value", - "comparison": ">", - "compare_to": 1 - } -} diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json deleted file mode 100644 index 4f9814e..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 1, - "entity_action": { - "type": "origins:block_action_at", - "block_action": { - "type": "origins:area_of_effect", - "radius": 4, - "shape": "cube", - "block_condition": { - "type": "origins:block_state", - "property": "age" - }, - "block_action": { - "type": "origins:chance", - "chance": 0.005, - "action": { - "type": "origins:modify_block_state", - "property": "age", - "operation": "add", - "change": 1 - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json deleted file mode 100644 index 3809db5..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallheight.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:height 0.5" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json deleted file mode 100644 index 722b79d..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxheight.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_height 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json deleted file mode 100644 index 722b79d..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallhitboxwidth.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_height 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json deleted file mode 100644 index 0693a89..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/smallwidth.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:width 0.5" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json deleted file mode 100644 index 133e52b..0000000 --- a/src/main/resources/data/terraoriginum/powers/fairy-powers/yummyhoney.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "origins:modify_food", - "item_condition": { - "type": "origins:ingredient", - "ingredient": - { - "item": "minecraft:honey_bottle" - } - }, - "food_modifier": - { - "operation": "addition", - "value": 4.0 - }, - "saturation_modifier": - { - "operation": "addition", - "value": 20 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/absorbing.json b/src/main/resources/data/terraoriginum/powers/florian-powers/absorbing.json deleted file mode 100644 index 05f2773..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/absorbing.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:stacking_status_effect", - "condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:fluid_height", - "fluid": "minecraft:water", - "comparison": ">", - "compare_to": 0.0 - }, - { - "type": "origins:in_rain" - } - ] - }, - "min_stacks": 0, - "max_stacks": 1, - "duration_per_stack": 30, - "effect": { - "effect": "minecraft:strength", - "is_ambient": true, - "show_particles": false, - "show_icon": true - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/aura_of_growth.json b/src/main/resources/data/terraoriginum/powers/florian-powers/aura_of_growth.json deleted file mode 100644 index e242ff6..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/aura_of_growth.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 1, - "entity_action": { - "type": "origins:block_action_at", - "block_action": { - "type": "origins:area_of_effect", - "radius": 7, - "shape": "cube", - "block_condition": { - "type": "origins:block_state", - "property": "age" - }, - "block_action": { - "type": "origins:chance", - "chance": 0.005, - "action": { - "type": "origins:modify_block_state", - "property": "age", - "operation": "add", - "change": 1 - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/bonemeal.json b/src/main/resources/data/terraoriginum/powers/florian-powers/bonemeal.json deleted file mode 100644 index 3d6a687..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/bonemeal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "origins:action_when_damage_taken", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:block_action_at", - "block_action": { - "type": "origins:area_of_effect", - "radius": 8, - "shape": "sphere", - "block_action": { - "type": "origins:bonemeal", - "effects": true - } - } - - } - ] - }, - "cooldown": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/compost.json b/src/main/resources/data/terraoriginum/powers/florian-powers/compost.json deleted file mode 100644 index 9e1a49a..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/compost.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": - { - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter unless block ~ ~ ~ minecraft:composter[level=7] unless block ~ ~ ~ minecraft:composter[level=8] run particle minecraft:composter ~ ~.5 ~ .2 .3 .2 1 10" - }, - { - "type": "origins:choice", - "actions": [ - { - "weight": 50, - "element": - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter unless block ~ ~ ~ minecraft:composter[level=7] unless block ~ ~ ~ minecraft:composter[level=8] run playsound minecraft:block.composter.fill block @a[distance=..10] ~ ~ ~ 1 1" - } - }, - { - "weight": 50, - "element": - { - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter unless block ~ ~ ~ minecraft:composter[level=7] unless block ~ ~ ~ minecraft:composter[level=8] run playsound minecraft:block.composter.fill_success block @a[distance=..10] ~ ~ ~ 1 1" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=6] run setblock ~ ~ ~ minecraft:composter[level=7] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=5] run setblock ~ ~ ~ minecraft:composter[level=6] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=4] run setblock ~ ~ ~ minecraft:composter[level=5] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=3] run setblock ~ ~ ~ minecraft:composter[level=4] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=2] run setblock ~ ~ ~ minecraft:composter[level=3] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=1] run setblock ~ ~ ~ minecraft:composter[level=2] replace" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter[level=0] run setblock ~ ~ ~ minecraft:composter[level=1] replace" - } - ] - } - } - ] - } - ] - }, - "condition": - { - "type": "origins:command", - "inverted": false, - "comparison": "==", - "compare_to": 1, - "permission_level": 4, - "command": "execute if block ~ ~ ~ minecraft:composter unless block ~ ~ ~ minecraft:composter[level=7] unless block ~ ~ ~ minecraft:composter[level=8]" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/five_hearts.json b/src/main/resources/data/terraoriginum/powers/florian-powers/five_hearts.json deleted file mode 100755 index f8b3eac..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/five_hearts.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.max_health", - "value": -10.0, - "operation": "addition" - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/flammable.json b/src/main/resources/data/terraoriginum/powers/florian-powers/flammable.json deleted file mode 100644 index f1f86f9..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/flammable.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:modify_damage_taken", - "damage_condition": { - "type": "origins:fire" - }, - "modifier": { - "name": "Origin modifier", - "operation": "multiply_base", - "value": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/green_fingered.json b/src/main/resources/data/terraoriginum/powers/florian-powers/green_fingered.json deleted file mode 100644 index 8f57e91..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/green_fingered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:model_color", - "red": 0.8, - "blue": 0.8, - "green": 1, - "alpha": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json b/src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json deleted file mode 100644 index 0cc7113..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type":"origins:action_over_time", - "entity_action":{ - "type":"origins:and", - "actions":[ - { - "type":"origins:execute_command", - "command":"team add aggropassive" - }, - { - "type":"origins:execute_command", - "command":"team join aggropassive @s" - }, - { - "type":"origins:execute_command", - "command":"team join aggropassive @e[type=#terraoriginum:hostiles]" - } - ] - }, - "interval":20 - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/photosynthesis.json b/src/main/resources/data/terraoriginum/powers/florian-powers/photosynthesis.json deleted file mode 100644 index 78df087..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/photosynthesis.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "type": "origins:multiple", - "regenerate_food": { - "type": "origins:action_over_time", - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:daytime" - }, - { - "type": "origins:exposed_to_sky" - }, - { - "type": "origins:or", - "conditions": [ - { - "type": "origins:food_level", - "comparison": "<", - "compare_to": 20 - }, - { - "type": "origins:saturation_level", - "comparison": "<", - "compare_to": 20 - } - ] - } - ] - }, - "interval": 20, - "entity_action": { - "type": "origins:feed", - "food": 1, - "saturation": 1 - } - }, - "prevent_healing": { - "type": "origins:disable_regen" - }, - "natural_regeneration": { - "type": "origins:action_over_time", - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:relative_health", - "comparison": "<", - "compare_to": 1 - }, - { - "type": "origins:food_level", - "comparison": ">", - "compare_to": 0 - } - ] - }, - "interval": 40, - "entity_action": { - "type": "origins:heal", - "amount": 1 - } - }, - "natural_regeneration_exhaustion": { - "type": "origins:action_over_time", - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:relative_health", - "comparison": "<", - "compare_to": 1 - }, - { - "type": "origins:food_level", - "comparison": ">", - "compare_to": 0 - } - ] - }, - "interval": 40, - "entity_action": { - "type": "origins:exhaust", - "amount": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/pocket_sand.json b/src/main/resources/data/terraoriginum/powers/florian-powers/pocket_sand.json deleted file mode 100644 index 2375504..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/pocket_sand.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "origins:active_self", - "cooldown": 200, - "key": - { - "key": "key.origins.primary_active", - "continuous": false - }, - "hud_render": - { - "should_render": true, - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": 13 - }, - "entity_action": - { - "type": "origins:and", - "actions": - [ - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute anchored eyes positioned ^ ^ ^2 run effect give @e[distance=..2] minecraft:blindness 10 0 false" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute anchored eyes positioned ^ ^ ^2 run particle minecraft:falling_dust minecraft:sand ~ ~ ~ .5 .5 .5 0 100 normal" - }, - { - "type": "origins:execute_command", - "permission_level": 4, - "command": "execute anchored eyes positioned ^ ^ ^2 run playsound minecraft:block.sand.place player @a[distance=..32] ~ ~ ~ 1 1" - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/small.json b/src/main/resources/data/terraoriginum/powers/florian-powers/small.json deleted file mode 100644 index c7f80f5..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:height 0.625" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/small_hitbox.json b/src/main/resources/data/terraoriginum/powers/florian-powers/small_hitbox.json deleted file mode 100644 index 722b79d..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/small_hitbox.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_height 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/small_width.json b/src/main/resources/data/terraoriginum/powers/florian-powers/small_width.json deleted file mode 100644 index 72af2be..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/small_width.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:width 0.625" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/small_width_hitbox.json b/src/main/resources/data/terraoriginum/powers/florian-powers/small_width_hitbox.json deleted file mode 100644 index df0e9f0..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/small_width_hitbox.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_width 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/florian-powers/weak.json b/src/main/resources/data/terraoriginum/powers/florian-powers/weak.json deleted file mode 100644 index c1c4077..0000000 --- a/src/main/resources/data/terraoriginum/powers/florian-powers/weak.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "origins:modify_damage_dealt", - "condition": { - "type": "origins:in_block_anywhere", - "block_condition": { - "type": "origins:block", - "block": "minecraft:water" - }, - "comparison": "<=", - "compare_to": 1 - }, - "modifier": { - "name": "less damage when not submerged", - "operation": "multiply_total", - "value": 0.2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/immortal_human-powers/immortal.json b/src/main/resources/data/terraoriginum/powers/immortal_human-powers/immortal.json deleted file mode 100644 index 1e517f5..0000000 --- a/src/main/resources/data/terraoriginum/powers/immortal_human-powers/immortal.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "origins:prevent_death", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:clear_effect" - }, - { - "type": "origins:apply_effect", - "effects": [ - { - "effect": "minecraft:regeneration", - "amplifier": 1, - "duration": 900 - }, - { - "effect": "minecraft:fire_resistance", - "duration": 800 - }, - { - "effect": "minecraft:absorption", - "amplifier": 1, - "duration": 100 - } - ] - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/immortal_human-powers/pathetic.json b/src/main/resources/data/terraoriginum/powers/immortal_human-powers/pathetic.json deleted file mode 100644 index 628df25..0000000 --- a/src/main/resources/data/terraoriginum/powers/immortal_human-powers/pathetic.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "origins:stacking_status_effect", - "min_stacks": 0, - "max_stacks": 1, - "duration_per_stack": 35, - "effect": { - "effect": "weakness", - "duration": 35, - "amplifier": 7, - "is_abient": true, - "show_particles": false, - "show_icon": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json deleted file mode 100644 index 4b1f136..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/armor.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:restrict_armor", - "head": { - "type": "origins:ingredient", - "ingredient": { - "tag": "terraoriginum:helmet" - } - }, - "chest": { - "type": "origins:ingredient", - "ingredient": { - "tag": "terraoriginum:chestplate" - } - }, - "legs": { - "type": "origins:ingredient", - "ingredient": { - "tag": "terraoriginum:leggings" - } - }, - "feet": { - "type": "origins:ingredient", - "ingredient": { - "tag": "terraoriginum:boots" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json deleted file mode 100644 index 3a84452..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/diet.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "origins:prevent_item_use", - "item_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:food" - }, - { - "type": "origins:ingredient", - "ingredient": { - "tag": "minecraft:fishes" - }, - "inverted": true - }, - { - "type": "origins:meat", - "inverted": true - }, - { - "type": "origins:ingredient", - "ingredient": { - "item": "glow_berries" - }, - "inverted": true - }, - { - "type": "origins:ingredient", - "ingredient": { - "item": "sweet_berries" - }, - "inverted": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json deleted file mode 100644 index e7f8119..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_eyes.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:night_vision", - "strength": 0.3, - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water", - "inverted": true - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json deleted file mode 100644 index e3ae1ef..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:inventory", - "drop_on_death": false, - "key": { - "key": "key.origins.ternary_active", - "continuous": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json deleted file mode 100644 index d4e8dbb..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fox_pouch_sound.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:chance", - "action": - { - "type": "origins:execute_command", - "command": "playsound minecraft:entity.fox.eat player @s ~ ~ ~ 1 1 1", - "permission_level": 4 - }, - "chance": 100.0 - }, - "hidden": true, - "key": { - "key": "key.origins.ternary_active", - "continuous": false - }, - "cooldown": 0, - "hud_render": { - "should_render": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json deleted file mode 100644 index 711f966..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/fragilefox.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.max_health", - "value": -8.0, - "operation": "addition" - }, - "hidden": true, - "tick_rate": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json deleted file mode 100644 index e887b3a..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:modify_exhaustion", - "modifier":{ - "value": 1.5, - "operation": "multiply_base" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json deleted file mode 100644 index f121e2a..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/invisibility.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:invisibility", - "render_armor": true, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:kitsune-powers/phantomize" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json deleted file mode 100644 index 8c48618..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/monch.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:chance", - "action": - { - "type": "origins:execute_command", - "command": "playsound minecraft:entity.fox.bite player @a ~ ~ ~ 1 1 0", - "permission_level": 4 - }, - "chance": 100.0 - }, - "hidden": true, - "key": { - "key": "key.attack", - "continuous": false - }, - "cooldown": 0, - "hud_render": { - "should_render": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json deleted file mode 100644 index 7b36be9..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:modify_projectile_damage", - "modifier": { - "operation": "multiply_total", - "value": -0.5 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json deleted file mode 100644 index 1214dba..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/paws_shield.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "hidden": true, - "type": "origins:prevent_item_use", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "tag": "origins:shields" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json deleted file mode 100644 index 90b5c04..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phantomize.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": "false", - "hidden": true, - "key": { - "key": "key.origins.secondary_active", - "continuous": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json deleted file mode 100644 index 08d3cf8..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phase_fix.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "origins:multiple", - "hidden": true, - "invulnerabilities": { - "type": "origins:invulnerability", - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:kitsune-powers/phantomize" - }, - "damage_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:name", - "name": "inWall" - }, - { - "type": "origins:name", - "name": "cramming" - } - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json deleted file mode 100644 index 4c221fe..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "origins:phasing", - "blacklist": true, - "render_type": "blindness", - "view_distance": 10, - "block_condition": { - "type": "origins:in_tag", - "tag": "terraoriginum:unphasable" - }, - "phase_down_condition": { - "type": "origins:constant", - "value": false - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:kitsune-powers/phantomize" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json deleted file mode 100644 index 73a183f..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/phasing_jump.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "hidden": true, - "type": "origins:modify_jump", - "modifier": { - "operation": "addition", - "value": -1.0 - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:kitsune-powers/phantomize" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json deleted file mode 100644 index 171d812..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "command": "particle minecraft:cloud ~ ~ ~ 0.5 0 0.5 0.2 20 force", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "playsound minecraft:entity.fox.ambient player @a[distance=..10] ~ ~ ~ 1 1 1", - "permission_level": 4 - }, - { - "type": "origins:add_velocity", - "z": 1, - "space": "local" - }, - { - "type": "origins:add_velocity", - "y": 0.2 - }, - { - "type": "origins:exhaust", - "amount": 0.6 - } - ] - }, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "cooldown": 150, - "hud_render": { - "should_render": true, - "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_03.png", - "bar_index": 23 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json deleted file mode 100644 index 3df047e..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_aerialdamage.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "hidden": true, - "type": "origins:multiple", - - "falling_false": { - "type": "origins:action_on_land", - "entity_action": { - "type": "origins:change_resource", - "resource": "terraoriginum:kitsune-powers/pounce_falling", - "change": -1 - } - }, - - "falling_true": { - "type": "origins:active_self", - "entity_action": { - "type": "origins:change_resource", - "resource": "terraoriginum:kitsune-powers/pounce_falling", - "change": 1 - }, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "cooldown": 100, - "hud_render": { - "should_render": false - } - }, - - "deal_damage": { - "type": "origins:modify_damage_dealt", - "modifier": { - "value": 1.1, - "operation": "multiply_base" - }, - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:fall_distance", - "comparison": ">", - "compare_to": 0 - }, - { - "type": "origins:resource", - "resource": "terraoriginum:kitsune-powers/pounce_falling", - "comparison": "==", - "compare_to": 1 - } - ] - } - } -} diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json deleted file mode 100644 index c0ea223..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/pounce_falling.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:resource", - "min": 0, - "max": 1, - "hud_render": { - "should_render": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json deleted file mode 100644 index 0d24c9c..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/run.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type":"origins:conditioned_attribute", - "modifier":{ - "attribute": "minecraft:generic.movement_speed", - "value": 0.015, - "operation": "addition" - }, - "condition": - { - "type": "origins:health", - "comparison": "<", - "compare_to": 7 - }, - "tick_rate": 2 -} - - diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json deleted file mode 100644 index 2d05a38..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/smolman.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "origins:action_on_callback", - "entity_action_gained":{ - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "command": "scale set pehkui:height .80 @s", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "scale set pehkui:width .80 @s", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "scale persist set true", - "permission_level": 4 - } - ] - }, - "when_orb": true, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json deleted file mode 100644 index 79ffc48..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/speed.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type":"origins:attribute", - "modifier":{ - "attribute": "minecraft:generic.movement_speed", - "value": 0.02, - "operation": "addition" - }, - "tick_rate": 2 -} - - diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json deleted file mode 100644 index 44766a4..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "hidden": true, - "type": "origins:starting_equipment", - "stack": { - "item": "minecraft:book" - }, - "stacks": [ - { - "item": "minecraft:sweet_berries", - "amount": 32 - }, - { - "item": "minecraft:glow_berries", - "amount": 32 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json deleted file mode 100644 index 6884c54..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yum.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "origins:modify_food", - "item_condition": { - "type": "origins:ingredient", - "ingredient": - { - "item": "minecraft:glow_berries" - } - }, - "food_modifier": - { - "operation": "addition", - "value": 5.0 - }, - "saturation_modifier": - { - "operation": "addition", - "value": 13 - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json deleted file mode 100644 index 4a1fe3c..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/yummy_berries.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "origins:modify_food", - "item_condition": { - "type": "origins:ingredient", - "ingredient": - { - "item": "minecraft:sweet_berries" - } - }, - "food_modifier": - { - "operation": "addition", - "value": 5.0 - }, - "saturation_modifier": - { - "operation": "addition", - "value": 13 - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json deleted file mode 100644 index ffdd811..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/zberry_no_hurt.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:invulnerability", - "damage_condition": { - "type": "origins:name", - "name": "sweetBerryBush" - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/lato_blooded.json b/src/main/resources/data/terraoriginum/powers/lato-powers/lato_blooded.json deleted file mode 100755 index 6e76844..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/lato_blooded.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:effect_immunity", - "effects": [ - "minecraft:wither", - "minecraft:poison", - "minecraft:instant_damage", - "minecraft:hunger" - ] -} diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/long_arms.json b/src/main/resources/data/terraoriginum/powers/lato-powers/long_arms.json deleted file mode 100644 index 1fffcdf..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/long_arms.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "origins:attribute", - "modifiers": - [ - { - "name": "Long Arms reach", - "attribute": "reach-entity-attributes:reach", - "value": 2, - "operation": "addition" - }, - { - "name": "Long Arms attack range", - "attribute": "reach-entity-attributes:attack_range", - "value": 2, - "operation": "addition" - } - ] - -} diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/natural_armor.json b/src/main/resources/data/terraoriginum/powers/lato-powers/natural_armor.json deleted file mode 100644 index 8ac4238..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/natural_armor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "name": "Natural Armor health bonus", - "attribute": "minecraft:generic.armor", - "value": 5.0, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/perfect_vision.json b/src/main/resources/data/terraoriginum/powers/lato-powers/perfect_vision.json deleted file mode 100755 index 1da60af..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/perfect_vision.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "origins:toggle_night_vision", - "active_by_default": "true", - "strength": 0.3, - "key": "ternary" -} diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/rage.json b/src/main/resources/data/terraoriginum/powers/lato-powers/rage.json deleted file mode 100755 index 7d91c21..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/rage.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 400, - "amplifier": 1 - } - }, - { - "type": "origins:exhaust", - "amount": 3 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/ability_bar.png", - "bar_index": "0" - } -} diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/rage_addition.json b/src/main/resources/data/terraoriginum/powers/lato-powers/rage_addition.json deleted file mode 100755 index 9cf33d5..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/rage_addition.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:active_self", - "hidden": "true", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 400, - "amplifier": 1 - } - }, - { - "type": "origins:heal", - "amount": 8 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/nothing.png", - "bar_index": "0" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/strong.json b/src/main/resources/data/terraoriginum/powers/lato-powers/strong.json deleted file mode 100644 index 11a09af..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/strong.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "origins:attribute", - "modifiers": - [ - { - "name": "Strong damage", - "attribute": "generic.attack_damage", - "value": 2.0, - "operation": "addition" - } - ] - -} diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json b/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json deleted file mode 100644 index ebb14ff..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "condition": { - "type": "origins:and", - "conditions": [ - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "weapon.mainhand", - "weapon.offhand" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:umbrella" - } - } - }, - { - "type": "origins:exposed_to_sun" - } - ] - }, - "type": "origins:damage_over_time", - "interval": 15, - "onset_delay": 1, - "damage": 3, - "damage_easy": 2, - "damage_source": { - "name": "terraoriginum:burn_in_sun", - "unblockable": true, - "bypasses_armor": true - }, - "protection_enchantment": "terraoriginum:sun_protection", - "protection_effectiveness": 1.2 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/tailwind.json b/src/main/resources/data/terraoriginum/powers/lato-powers/tailwind.json deleted file mode 100644 index a4e9306..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/tailwind.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "name": "Tailwind speed bonus", - "attribute": "minecraft:generic.movement_speed", - "value": 0.15, - "operation": "multiply_base" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/tall.json b/src/main/resources/data/terraoriginum/powers/lato-powers/tall.json deleted file mode 100644 index 11b9f49..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/tall.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:height 1.25" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_hitbox.json b/src/main/resources/data/terraoriginum/powers/lato-powers/tall_hitbox.json deleted file mode 100644 index 722b79d..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_hitbox.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_height 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width.json b/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width.json deleted file mode 100644 index 903afa7..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:width 1.25" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width_hitbox.json b/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width_hitbox.json deleted file mode 100644 index df0e9f0..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/tall_width_hitbox.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:hitbox_width 1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/teleport.json b/src/main/resources/data/terraoriginum/powers/lato-powers/teleport.json deleted file mode 100644 index ce1adf9..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/teleport.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:delay", - "action": { - "type": "origins:raycast", - "distance": 120, - "block": true, - "entity": true, - "shape_type": "visual", - "fluid_handling": "any", - "miss_action": { - "type": "origins:nothing" - }, - "command_at_hit": "tp @s ~ ~ ~", - "command_along_ray": "particle minecraft:dust_color_transition 1.0 0.0 0.0 1.0 0.0 0.0 1.0 ~ ~1 ~", - "command_step": 0.3 - }, - "ticks": 10 - }, - { - "type": "origins:play_sound", - "sound": "entity.illusioner.cast_spell", - "volume": 1, - "pitch": 1 - }, - { - "type": "origins:spawn_particles", - "particle": "dragon_breath", - "count": 800, - "speed": 0.1, - "force": true, - "spread": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "offset_y": 0.5 - } - ] - }, - "cooldown": 3600, - "hud_render": { - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": "19" - }, - "key": { - "key": "secondary" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/twelve_hearts.json b/src/main/resources/data/terraoriginum/powers/lato-powers/twelve_hearts.json deleted file mode 100755 index f57cece..0000000 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/twelve_hearts.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.max_health", - "value": 4.0, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json deleted file mode 100644 index 3910a00..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydration.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:resource", - "min": 0, - "max": 200, - "start_value": 100, - "hud_render": { - "should_render": true, - "sprite_location": "origins:textures/gui/community/huang/resource_bar_02.png", - "bar_index": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json deleted file mode 100644 index 49b11ca..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/hydrodiff.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": - { - "type": "origins:submerged_in", - "fluid": "minecraft:water" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "change": 10, - "operation": "add" - } - ] - } - }, - { - "condition": - { - "type": "origins:in_rain" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "change": 4, - "operation": "add" - } - ] - } - }, - { - "condition": { - "type": "origins:on_fire" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "change": -10, - "operation": "add" - } - ] - } - }, - { - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water", - "inverted": true - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "change": -1, - "operation": "add" - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json deleted file mode 100644 index 43ddf01..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/lackofhydrodamage.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "comparison": "<", - "compare_to": 1 - }, - "action": { - "type": "origins:damage", - "amount": 1, - "damage_type": "minecraft:dry_out" - } - - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json deleted file mode 100644 index f40cf63..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/waterbreathing.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "origins:action_over_time", - "entity_action": { - "type": "origins:gain_air", - "value": 20 - }, - "interval": 1, - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json deleted file mode 100644 index fcb79e9..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "origins:conditioned_attribute", - "hidden": true, - "modifier": { - "operation": "addition", - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water", - "inverted": true - }, - "value": -0.035, - "attribute": "generic.movement_speed" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json deleted file mode 100644 index 6eae40f..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/webbedfeet2.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "origins:modify_jump", - "hidden": true, - "modifier": { - "operation": "addition", - "value": -0.05 - }, - "entity_action": { - "type": "origins:execute_command", - "command": "particle splash ~ ~ ~ 0.3 0.3 0.3 0.01 16 normal @a" - } -} diff --git a/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json b/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json deleted file mode 100644 index e5f4aab..0000000 --- a/src/main/resources/data/terraoriginum/powers/merfolk-powers/wethands.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "origins:modify_break_speed", - "modifier": { - "operation": "multiply_base", - "value": -0.5 - }, - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water", - "inverted": true - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json deleted file mode 100644 index 64ad5cf..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 1, - "condition": { - "type": "origins:submerged_in", - "fluid": "minecraft:water" - }, - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:add_velocity", - "x": 0, - "y": 0, - "z": 0, - "set": true - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:mining_fatigue", - "duration": 10, - "amplifier": 2 - } - - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json deleted file mode 100644 index a33325a..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:effect_immunity", - "effects": [ - "minecraft:wither", - "minecraft:poison", - "minecraft:instant_damage", - "minecraft:hunger" - ] - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json deleted file mode 100644 index 90dc184..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "comparison": ">=", - "compare_to": 50 - }, - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:delay", - "action": { - "type": "origins:raycast", - "distance": 20, - "block": true, - "entity": true, - "shape_type": "visual", - "fluid_handling": "any", - "miss_action": { - "type": "origins:nothing" - }, - "command_at_hit": "tp @s ~ ~ ~", - "command_along_ray": "/particle smoke ~ ~ ~ 0 0 0 0 10", - "command_step": 0.3 - }, - "ticks": 0 - }, - { - "type": "origins:play_sound", - "sound": "entity.illusioner.cast_spell", - "volume": 1, - "pitch": 1 - }, - { - "type": "origins:spawn_particles", - "particle": "instant_effect", - "count": 800, - "speed": 0.1, - "force": true, - "spread": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "offset_y": 0.5 - }, - { - "type": "origins:change_resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "change": -50, - "operation": "add" - } - - ] - }, - "cooldown": 0, - "hud_render": { - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": "19" - }, - "key": { - "key": "secondary" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json deleted file mode 100644 index 88ae6d3..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "origins:action_over_time", - "hidden": true, - "interval": 20, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "comparison": "<", - "compare_to": 50 - }, - "action": { - "type": "origins:damage", - "amount": 6, - "damage_type": "terraoriginum:lack_of_sun" - } - - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json deleted file mode 100644 index 54f9651..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "comparison": ">=", - "compare_to": 100 - }, - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 120, - "amplifier": 4 - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 200, - "amplifier": 3 - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:resistance", - "duration": 200, - "amplifier": 3 - } - }, - { - "type": "origins:change_resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "change": -100, - "operation": "add" - }, - { - "type": "origins:exhaust", - "amount": 2 - } - ] - - }, - "cooldown": 3000, - "hud_render": { - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": "7" - }, - "key": "primary" - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json deleted file mode 100644 index 5d738e5..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "origins:action_over_time", - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:daytime", - "inverted": true - }, - { - "type": "origins:inventory", - "inverted": true, - "process_mode": "items", - "slots": [ - "weapon.mainhand", - "weapon.offhand" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:sun_totem" - } - } - } - ] -}, - "entity_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:apply_effect", - "effects": [{ - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 35, - "show_particles": false, - "show_icon": false - }, - { - "effect": "minecraft:weakness", - "amplifier": 2, - "duration": 35, - "show_particles": false, - "show_icon": false - } - ] - } - ] - }, - "update_health": true - } - \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json deleted file mode 100644 index 5ea6e92..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "origins:model_color", - "blue": 0.5, - "red": 1, - "green": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json deleted file mode 100644 index 29539d3..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:resource", - "min": 0, - "max": 400, - "start_value": 60, - "hud_render": { - "should_render": true, - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": 14 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json deleted file mode 100644 index 4e7b837..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -"condition": { - "type": "origins:exposed_to_sun" - }, - "type": "origins:action_over_time", - "interval": 40, - "entity_action": { - "type": "origins:change_resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "change": 10, - "operation": "add" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json deleted file mode 100644 index 53b6094..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [{ - "type": "origins:play_sound", - "sound": "minecraft:entity.evoker.cast_spell" - }, - { - "type": "origins:add_velocity", - "space": "local", - "z": 20 - }, - { - "type": "origins:execute_command", - "command": "particle dust_color_transition 0.9 0.38 0 1 0.88 0.11 0.14 ~ ~1 ~ 0.5 0 0.5 10 100 force" - }, - { - "type": "origins:execute_command", - "command": "particle explosion ~ ~1 ~ 0 0 0 0 1" - }, - { - "type": "origins:change_resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "change": -300 - } - ] - }, - "key": { - "key": "key.origins.ternary_active" - }, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "comparison": ">=", - "compare_to": 200 - }, -"cooldown": 100, -"hud_render": { -"sprite_location": "origins:textures/gui/community/huang/resource_bar_02.png", -"bar_index": 5, -"should_render": true -} -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json deleted file mode 100644 index 114bebd..0000000 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": { - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "weapon.mainhand", - "weapon.offhand" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:sun_totem" - } - } - }, - "type": "origins:action_over_time", - "interval": 40, - "entity_action": { - "type": "origins:change_resource", - "resource": "terraoriginum:monarch-powers/solar_energy", - "change": 4, - "operation": "add" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json deleted file mode 100644 index db7a044..0000000 --- a/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "origins:ignore_water" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json deleted file mode 100644 index 1f72634..0000000 --- a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "retain_state": false - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json deleted file mode 100644 index 29704d0..0000000 --- a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "origins:phasing", - "render_type": "blindness", - "view_distance": 10, - "hidden": true, - "block_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:block", - "block": "minecraft:dirt" - }, - { - "type": "origins:block", - "block": "minecraft:grass_block" - }, - { - "type": "origins:block", - "block": "minecraft:podzol" - }, - { - "type": "origins:block", - "block": "minecraft:mycelium" - }, - { - "type": "origins:block", - "block": "minecraft:coarse_dirt" - }, - { - "type": "origins:block", - "block": "minecraft:mud" - } - - ] - }, - "phase_down_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:sneaking" - }, - { - "type": "origins:on_block" - } - ] - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:muckunde-powers/likesoil1" - } -} diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json deleted file mode 100644 index cd22fe7..0000000 --- a/src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.armor", - "value": 4.0, - "operation": "addition" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json deleted file mode 100644 index e6de023..0000000 --- a/src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "origins:modify_food", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "minecraft:beetroot" - } - }, - "food_modifier": { - "name": "Increased food points", - "operation": "addition", - "value": 3.0 - }, - "saturation_modifier": { - "name": "Increased saturation points", - "operation": "addition", - "value": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/better_health.json b/src/main/resources/data/terraoriginum/powers/munch-powers/better_health.json deleted file mode 100644 index 27b6cc4..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/better_health.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:modify_healing", - "modifier":{ - "operation": "multiply_total", - "value": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/climbing.json b/src/main/resources/data/terraoriginum/powers/munch-powers/climbing.json deleted file mode 100644 index 9435767..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/climbing.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "type": "origins:multiple", - "toggle": { - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active" - }, - "retain_state": true - }, - "wall_run": { - "type": "origins:action_over_time", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type":"origins:apply_effect", - "effect":{ - "effect":"minecraft:levitation", - "duration":2, - "amplifier":-1, - "is_ambient":false, - "show_particles":false, - "show_icon":false - } - }, - { - "type":"origins:add_velocity", - "x": 0.0, - "y": 0.0, - "z":0.05, - "space":"local", - "client": true, - "server": true, - "set":false - } - ] - }, - "falling_action": { - "type":"origins:clear_effect", - "effect":"minecraft:levitation" - }, - "interval": 1, - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:power_active", - "power": "terraoriginum:munch-powers/climbing_toggle" - }, - { - "type":"origins:on_block", - "inverted":true - }, - { - "type": "origins:or", - "conditions": [ - { - "type":"origins:block_collision", - "offset_x":0.1, - "offset_z":0.1, - "offset_y":0, - "inverted":false - }, - { - "type":"origins:block_collision", - "offset_x":-0.1, - "offset_z":-0.1, - "offset_y":0, - "inverted":false - } - ], - "inverted": false - } - ] - } - } - -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/little_health.json b/src/main/resources/data/terraoriginum/powers/munch-powers/little_health.json deleted file mode 100755 index c862687..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/little_health.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.max_health", - "value": -12.0, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/mounting.json b/src/main/resources/data/terraoriginum/powers/munch-powers/mounting.json deleted file mode 100644 index fb2471b..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/mounting.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "type":"origins:multiple", - "mount":{ - "type":"origins:active_self", - "entity_action":{ - "type":"origins:raycast", - "distance":10.00, - "block":false, - "entity":true, - "shape_type":"collider", - "fluid_handling":"none", - "bientity_condition":{ - "type":"origins:target_condition", - "condition":{ - "type":"origins:living" - } - }, - "bientity_action":{ - "type":"origins:mount" - }, - "entity_distance":3.00, - "command_step":1.00, - "command_along_ray_only_on_hit":false - }, - "cooldown":1, - "hud_render":{ - "should_render":false - }, - "key":{ - "key":"key.origins.secondary_active", - "continuous":false - }, - "condition":{ - "type":"origins:riding", - "inverted":true - } - }, - "dismount":{ - "type":"origins:active_self", - "entity_action":{ - "type":"origins:dismount" - }, - "cooldown":1, - "hud_render":{ - "should_render":false - }, - "key":{ - "key":"key.sneak", - "continuous":false - }, - "condition":{ - "type":"origins:riding", - "inverted":false - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/nimble.json b/src/main/resources/data/terraoriginum/powers/munch-powers/nimble.json deleted file mode 100644 index 308ee18..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/nimble.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "origins:multiple", - "damage_immunity": { - "type": "origins:invulnerability", - "damage_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:name", - "name": "cactus" - }, - { - "type": "origins:name", - "name": "sweetBerryBush" - }, - { - "type": "origins:name", - "name": "thorns" - } - ] - } - }, - "prevent_block_slowness": { - "type": "terraoriginum:prevent_block_slowness" - }, - "can_walk_on_powder_snow": { - "type": "terraoriginum:can_walk_on_powder_snow" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/quiet.json b/src/main/resources/data/terraoriginum/powers/munch-powers/quiet.json deleted file mode 100644 index 22991e4..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/quiet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:prevent_game_event", - "events":[ - "minecraft:step", - "minecraft:hit_ground" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/short_arms.json b/src/main/resources/data/terraoriginum/powers/munch-powers/short_arms.json deleted file mode 100644 index d9a6f2c..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/short_arms.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:reach 0.5" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/speedy_bastard.json b/src/main/resources/data/terraoriginum/powers/munch-powers/speedy_bastard.json deleted file mode 100644 index 460bcca..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/speedy_bastard.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "origins:active_self", - "key": "key.origins.ternary_active", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 600, - "amplifier": 4 - } - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "origins:textures/gui/resource_bar.png", - "bar_index": "2" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny.json b/src/main/resources/data/terraoriginum/powers/munch-powers/tiny.json deleted file mode 100644 index 3d8c644..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:height 0.13" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_appetite.json b/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_appetite.json deleted file mode 100644 index a34ba42..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_appetite.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:modify_exhaustion", - "modifier": { - "name": "Origin modifier", - "operation": "multiply_base", - "value": -0.75 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_motion.json b/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_motion.json deleted file mode 100644 index 61b66fb..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_motion.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:motion 0.55" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_width.json b/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_width.json deleted file mode 100644 index 27b72ec..0000000 --- a/src/main/resources/data/terraoriginum/powers/munch-powers/tiny_width.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:action_over_time", - "hidden": true, - "interval": 20, - "entity_action": { - "type": "origins:execute_command", - "command": "/scale set pehkui:width 0.13" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_blind.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_blind.json deleted file mode 100644 index 860e0bb..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_blind.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "origins:stacking_status_effect", - "min_stacks": 0, - "max_stacks": 1, - "duration_per_stack": 35, - "effect": { - "effect": "blindness", - "duration": 35, - "amplifier": 2, - "is_abient": true, - "show_particles": false, - "show_icon": false - }, - "interval": 60, - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:block_in_radius", - "radius": 1, - "inverted": true, - "block_condition": { - "type": "origins:in_tag", - "tag": "terraoriginum:mushrooms" - } - }, - { - "type": "origins:status_effect", - "effect": "minecraft:night_vision", - "inverted": true - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_echolocate.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_echolocate.json deleted file mode 100644 index 4ab98ae..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_echolocate.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "type": "origins:active_self", - "cooldown": 800, - "hud_render": { - "should_render":true, - "sprite_location":"origins:textures/gui/community/spiderkolo/resource_bar_02.png", - "bar_index": 7 - }, - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:if_else", - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:equipped_item", - "equipment_slot": "mainhand", - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "minecraft:fermented_spider_eye" - } - } - } - ] - }, - - "if_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "command": "effect give @s minecraft:night_vision 60 0 true", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "clear @s minecraft:fermented_spider_eye 1", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "playsound block.block.conduit.attack.target master @e[distance=..15] ~ ~ ~ 10 1 1", - "permission_level": 4 - } - ] - }, - - "else_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:execute_command", - "command": "playsound block.conduit.attack.target master @p[distance=..15] ~ ~ ~ 10 1 1", - "permission_level": 4 - }, - { - "type": "origins:execute_command", - "command": "effect give @p minecraft:night_vision 5 1 true", - "permission_level": 4 - } - ], - "cooldown": 20, - "hud_render": { - "should_render": false, - "sprite_location": "origins:textures/gui/resource_bar.png", - "bar_index": 4 - } - } - - } - ] - }, - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:block_in_radius", - "radius": 4, - "inverted": true, - "block_condition": { - "type": "origins:in_tag", - "tag": "terraoriginum:wool" - } - } - ] - }, - "key": { - "key":"key.playerlist", - "continuous": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_natural_armour.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_natural_armour.json deleted file mode 100644 index 5009146..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_natural_armour.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "name": "Natural Armor health bonus", - "attribute": "minecraft:generic.armor", - "value": 6.0, - "operation": "addition" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage.json deleted file mode 100755 index da60b34..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 400, - "amplifier": 1 - } - }, - { - "type": "origins:exhaust", - "amount": 2 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/ability_bar.png", - "bar_index": "0" - } -} diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage_addition.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage_addition.json deleted file mode 100755 index 40ae8ba..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_rage_addition.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:active_self", - "hidden": "true", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 400, - "amplifier": 1 - } - }, - { - "type": "origins:heal", - "amount": 12 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/nothing.png", - "bar_index": "0" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_strong.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_strong.json deleted file mode 100644 index 260b411..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_strong.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "origins:attribute", - "modifiers": - [ - { - "name": "Strong damage", - "attribute": "generic.attack_damage", - "value": 3.0, - "operation": "addition" - } - ] - -} diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_tailwind.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_tailwind.json deleted file mode 100644 index 65353cf..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_tailwind.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "name": "Tailwind speed bonus", - "attribute": "minecraft:generic.movement_speed", - "value": 0.05, - "operation": "multiply_base" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_vision.json b/src/main/resources/data/terraoriginum/powers/mync-powers/mync_vision.json deleted file mode 100644 index 9fb1953..0000000 --- a/src/main/resources/data/terraoriginum/powers/mync-powers/mync_vision.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "origins:shader", - "shader": "terraoriginum:shaders/post/sobel.json", - "toggleable": false -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json b/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json deleted file mode 100644 index 01e90d6..0000000 --- a/src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:delay", - "action": { - "type": "origins:raycast", - "distance": 20, - "block": false, - "entity": true, - "shape_type": "visual", - "fluid_handling": "any", - "miss_action": { - "type": "origins:nothing" - }, - "command_at_hit": "/execute as @e[distance=..2] run damage @s 10 terraoriginum:boiling", - "command_along_ray": "/particle splash ~ ~ ~ 0 0 0 0 10", - "command_step": 0.3 - }, - "ticks": 0 - }, - { - "type": "origins:play_sound", - "sound": "entity.dolphin.splash", - "volume": 1, - "pitch": 1 - }, - { - "type": "origins:change_resource", - "resource": "terraoriginum:merfolk-powers/hydration", - "change": -50, - "operation": "add" - } - - ] - }, - "cooldown": 600, - "hud_render": { - "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_02.png", - "bar_index": "15" - }, - "key": "secondary" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json b/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json deleted file mode 100644 index cd22fe7..0000000 --- a/src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "origins:attribute", - "modifier": { - "attribute": "minecraft:generic.armor", - "value": 4.0, - "operation": "addition" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility1.json b/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility1.json deleted file mode 100644 index 1defc09..0000000 --- a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": ">=", - "compare_to": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility2.json b/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility2.json deleted file mode 100644 index 42c1c06..0000000 --- a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "origins:invisibility", - "render_armor": true, - "render_outline": true, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:shade-powers/invisibility1" - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility3.json b/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility3.json deleted file mode 100644 index a9ad461..0000000 --- a/src/main/resources/data/terraoriginum/powers/shade-powers/invisibility3.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:shade-powers/invisibility1" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -5, - "operation": "add" - } - ] - } - } - ] - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json deleted file mode 100644 index 9c2b4ef..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 40, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:brightness", - "comparison": "<=", - "compare_to": 0.17948718 - } - ] - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": 4, - "operation": "add" - } - ] - } - }, - { - "condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.head" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_helmet" - } - } - }, - { - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.chest" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_chestplate" - } - } - }, - { - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.legs" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_leggings" - } - } - }, - { - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.feet" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_boots" - } - } - } - ] - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": 4, - "operation": "add" - } - ] - } - }, - { - "condition": { - "type": "origins:enchantment", - "enchantment": "terraoriginum:light_protection", - "calculation": "sum", - "comparison": ">=", - "compare_to": 1 - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -1, - "operation": "add" - } - ] - } - }, - { - "condition": { - "type": "origins:brightness", - "comparison": ">", - "compare_to": 0.17948718 - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -2, - "operation": "add" - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectoplasm.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectoplasm.json deleted file mode 100644 index d5bb72d..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectoplasm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "origins:resource", - "min": 0, - "max": 200, - "start_value": 100, - "hud_render": { - "should_render": true, - "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png", - "bar_index": 5 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json deleted file mode 100644 index f259fa6..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "origins:action_over_time", - "hidden": true, - "interval": 20, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": "<", - "compare_to": 13 - }, - "action": { - "type": "origins:damage", - "amount": 1, - "damage_type": "terraoriginum:lack_of_ectoplasm" - } - - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/nightvis.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/nightvis.json deleted file mode 100644 index 0c5794e..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/nightvis.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "origins:night_vision", - "strength": 0.2 -} diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing1.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing1.json deleted file mode 100644 index 0fc6abf..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "secondary", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": ">=", - "compare_to": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing2.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing2.json deleted file mode 100644 index 7862d1c..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing2.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:phasing", - "hidden": true, - "blacklist": true, - "render_type": "blindness", - "view_distance": 10, - "block_condition": { - "type": "origins:in_tag", - "tag": "origins:unphasable" - }, - "phase_down_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:sneaking" - }, - { - "type": "origins:on_block" - } - ] - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:spirit-powers/phasing1" - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing3.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing3.json deleted file mode 100644 index e0e088d..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/phasing3.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:spirit-powers/phasing1" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -7, - "operation": "add" - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/pure_ghost.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/pure_ghost.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/skin.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/skin.json deleted file mode 100644 index f25b38b..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/skin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "origins:model_color", - "alpha": 0.7 - -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/undead.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/undead.json deleted file mode 100644 index c11041a..0000000 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/undead.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "origins:entity_group", - "group": "undead" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json deleted file mode 100644 index c6d658c..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/charred.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "origins:model_color", - "blue": 0.2, - "green": 0.2, - "red": 0.2, - "alpha": 0.9 -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json deleted file mode 100644 index 728af96..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.ternary_active", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": ">=", - "compare_to": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json deleted file mode 100644 index 0437531..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "hidden": true, - "type": "origins:swimming", - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:wraith-powers/soaring1", - "inverted": false - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.json deleted file mode 100644 index 30b90b8..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/soaring3.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:wraith-powers/soaring1" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -6, - "operation": "add" - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json deleted file mode 100644 index 1defc09..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "origins:toggle", - "active_by_default": false, - "key": { - "key": "key.origins.primary_active", - "continuous": false - }, - "retain_state": false, - "condition": { - "type": "origins:resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "comparison": ">=", - "compare_to": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json deleted file mode 100644 index 58bf729..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment2.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 5, - "hidden": true, - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 35, - "amplifier": 0, - "show_icon": false - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 35, - "amplifier": 1, - "show_icon": false - } - }, - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:resistance", - "duration": 35, - "amplifier": 0, - "show_icon": false - } - }, - { - "type": "origins:exhaust", - "amount": 0.5 - } - ] - }, - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:wraith-powers/torment1" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json b/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json deleted file mode 100644 index 6590af3..0000000 --- a/src/main/resources/data/terraoriginum/powers/wraith-powers/torment3.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "origins:action_over_time", - "interval": 20, - "hidden": true, - "entity_action": { - "type": "origins:if_else_list", - "actions": [ - { - "condition": { - "type": "origins:power_active", - "power": "terraoriginum:wraith-powers/torment1" - }, - "action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:change_resource", - "resource": "terraoriginum:spirit-powers/ectoplasm", - "change": -9, - "operation": "add" - } - ] - } - } - ] - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json deleted file mode 100644 index ac7a357..0000000 --- a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-death.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - - "type": "origins:damage_over_time", - "interval": 40, - "onset_delay": 1200, - "damage": 500, - "damage_easy": 2, - "damage_source": { - "name": "terraoriginum:last_stand", - "unblockable": true, - "bypasses_armor": true - }, - "condition": { - "type": "origins:status_effect", - "effect": "minecraft:strength", - "min_amplifier": 3, - "min_duration": 0 - }, - "hidden": true -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json deleted file mode 100755 index f47cee1..0000000 --- a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand-effects.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "origins:active_self", - "hidden": "true", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:speed", - "duration": 1400, - "amplifier": 1 - } - }, - { - "type": "origins:heal", - "amount": 8 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/nothing.png", - "bar_index": "0" - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json b/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json deleted file mode 100755 index 6aa0365..0000000 --- a/src/main/resources/data/terraoriginum/powers/yulde-powers/last_stand.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "origins:active_self", - "entity_action": { - "type": "origins:and", - "actions": [ - { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:strength", - "duration": 1400, - "amplifier": 3 - } - }, - { - "type": "origins:exhaust", - "amount": 5 - } - ] - }, - "cooldown": 2400, - "hud_render": { - "sprite_location": "terraoriginum:textures/gui/ability_bar.png", - "bar_index": "0" - } -} diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_boots.json b/src/main/resources/data/terraoriginum/recipes/ghostly_boots.json deleted file mode 100644 index d094863..0000000 --- a/src/main/resources/data/terraoriginum/recipes/ghostly_boots.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#E#", - " # " - ], - "key": { - "#": { - "item": "terraoriginum:ghostly_cloth" - }, - "E": { - "item": "minecraft:netherite_boots" - } - }, - "result": { - "item": "terraoriginum:ghostly_boots", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_chestplate.json b/src/main/resources/data/terraoriginum/recipes/ghostly_chestplate.json deleted file mode 100644 index ad08bdd..0000000 --- a/src/main/resources/data/terraoriginum/recipes/ghostly_chestplate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#E#", - " # " - ], - "key": { - "#": { - "item": "terraoriginum:ghostly_cloth" - }, - "E": { - "item": "minecraft:netherite_chestplate" - } - }, - "result": { - "item": "terraoriginum:ghostly_chestplate", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json b/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json deleted file mode 100644 index 617b5ac..0000000 --- a/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#E#", - " # " - ], - "key": { - "#": { - "item": "terraoriginum:cotton_ball" - }, - "E": { - "item": "minecraft:echo_shard" - } - }, - "result": { - "item": "terraoriginum:ghostly_cloth", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_helmet.json b/src/main/resources/data/terraoriginum/recipes/ghostly_helmet.json deleted file mode 100644 index fbd246d..0000000 --- a/src/main/resources/data/terraoriginum/recipes/ghostly_helmet.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#E#", - " # " - ], - "key": { - "#": { - "item": "terraoriginum:ghostly_cloth" - }, - "E": { - "item": "minecraft:netherite_helmet" - } - }, - "result": { - "item": "terraoriginum:ghostly_helmet", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_leggings.json b/src/main/resources/data/terraoriginum/recipes/ghostly_leggings.json deleted file mode 100644 index c5a4d96..0000000 --- a/src/main/resources/data/terraoriginum/recipes/ghostly_leggings.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#E#", - " # " - ], - "key": { - "#": { - "item": "terraoriginum:ghostly_cloth" - }, - "E": { - "item": "minecraft:netherite_leggings" - } - }, - "result": { - "item": "terraoriginum:ghostly_leggings", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/sun_totem.json b/src/main/resources/data/terraoriginum/recipes/sun_totem.json deleted file mode 100644 index 7134f7c..0000000 --- a/src/main/resources/data/terraoriginum/recipes/sun_totem.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " D ", - "#P#", - " / " - ], - "key": { - "#": { - "item": "minecraft:redstone" - }, - "/": { - "item": "minecraft:fire_charge" - }, - "P": { - "item": "minecraft:totem_of_undying" - }, - "D": { - "item": "minecraft:nether_star" - } - }, - "result": { - "item": "terraoriginum:sun_totem", - "count": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/umbrella.json b/src/main/resources/data/terraoriginum/recipes/umbrella.json deleted file mode 100644 index 5828188..0000000 --- a/src/main/resources/data/terraoriginum/recipes/umbrella.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "#P#", - " / " - ], - "key": { - "#": { - "item": "minecraft:leather" - }, - "/": { - "item": "minecraft:stick" - }, - "P": { - "item": "minecraft:netherite_scrap" - } - }, - "result": { - "item": "terraoriginum:umbrella", - "count": 1 - } - } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1e7c55b..75c449d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,30 +1,29 @@ { "schemaVersion": 1, - "id": "terraoriginum", + "id": "faithful", "provides": [ "extrakeybinds" ], "version": "${version}", - "name": "Terra Originum", + "name": "Faithful Origins", "description": "Origins for Celestia SMP", "authors": [ "Gæmer", "CosmoOrSth(or sth)" ], "contact": { - "issues": "https://github.com/BigGaemer/terra-originum/issues", - "repo": "https://github.com/BigGaemer/terra-originum" + "issues": "https://git.bigsmithy.org/Smithy/faithful-origins/issues", + "repo": "https://git.bigsmithy.org/Smithy/faithful-origins" }, - "license": "Custom License", + "license": "GPL-3.0", "icon": "assets/terraoriginum.png", "environment": "*", "entrypoints": { "main": [ - "com.smithy.terraoriginum.TerraOriginum" + "com.smithy.faithful.Faithful" ], "client": [ - "com.smithy.terraoriginum.client.TerraKeybinds", - "com.smithy.terraoriginum.client.LayerRenderer" + "com.smithy.faithful.client.TerraKeybinds" ] }, "mixins": [ diff --git a/src/main/resources/terra.mixins.json b/src/main/resources/faithful.mixins.json similarity index 72% rename from src/main/resources/terra.mixins.json rename to src/main/resources/faithful.mixins.json index 9ac065d..aa7b325 100644 --- a/src/main/resources/terra.mixins.json +++ b/src/main/resources/faithful.mixins.json @@ -1,11 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "com.smithy.terraoriginum.mixin", + "package": "com.smithy.faithful.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ - "PlayerConditionsMixin", - "PlayerEntityMixin", "EntityMixin", "PowderSnowBlockMixin", "IcarusHelperMixin"