From b358727602313984345589ad57b4649544e4facb Mon Sep 17 00:00:00 2001 From: Minecraftschurli Date: Mon, 19 Feb 2024 20:47:38 +0100 Subject: [PATCH] Update to 1.20.1 (#439) --------- Co-authored-by: IchHabeHunger54 --- .github/ISSUE_TEMPLATE/bug-report.yml | 5 +- build.gradle.kts | 20 +- gradle.properties | 40 ++-- .../PlayerLearnedSkillTrigger.java | 10 +- .../api/advancement/PlayerLevelUpTrigger.java | 10 +- .../api/client/ISpellIngredientRenderer.java | 3 +- .../api/client/OcculusTabRenderer.java | 20 +- .../arsmagicalegacy/data/AMAdvancements.java | 4 +- .../arsmagicalegacy/data/AMDatagen.java | 7 - .../data/AMLootTableProvider.java | 2 +- .../data/AMPatchouliBookProvider.java | 7 +- .../data/AMRecipeProvider.java | 1 + .../update120/Update120BlockTagsProvider.java | 26 --- .../update120/Update120LootTableProvider.java | 34 --- .../update120/Update120RecipeProvider.java | 23 -- .../02295ad36ea0ce6c977417e22465951e19d6d5de | 2 - .../0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7 | 2 +- .../23311cab2a0699e1373ff6662d45536b84c4dfbf | 2 +- .../25bc9cae032fc12ef88c2ad95f56cfdc7020591b | 176 ++++++++++++++ .../2684ce933959e21b1877dd70df4e2422904619b1 | 216 +++++++++--------- .../2ac0b173402772a5dbd4f3ddb39436ec62ca180e | 2 +- .../43859251295d9c95a473674d37532ff90981f2fe | 2 +- .../4514f0a5cf5bd19fc9aab7d7474e707d515a64ff | 62 +++++ .../552763967fefb6e400cbf8810ea5a6f7653c0b0b | 149 ++++++++++++ .../6deee57a789289495e0e4b2297d0baad21cdb85f | 171 ++++++++++++++ .../70787991046ee4fc01c27abb22b81127c97594d6 | 112 +++++++++ .../828e6b158606486c03118ac5f3fd682296779b9c | 92 ++++++++ .../83c470eb0163363e09250d5117f0d60a576c4c0f | 2 +- .../a2c45b2c7ed8b2a33b6a9805d2b8e3d89cb5d727 | 3 - .../bdbf20cc6a20b4b111b6b92fdbc55c906cde687e | 4 +- .../c4176b2371ddb03b4fcc28d4a4b130d886e34712 | 2 + .../e286d819b86d3f2c716d4522338b1b44a9d0807e | 40 ++++ .../e887c9ae77fce67213b15120513f6f18186c1aeb | 3 - .../e951e14a64d238c49e2ddb8ca184b4e9a4b3c5b2 | 117 ++++++++++ .../f48255af366ba1d3afbc0e01c7e37bdbaf48d909 | 2 + .../fb45a2d2f80ca09dfb6b0085e2abfb3a46714dae | 2 +- .../ff85aeffff7b400453d938ac4326ddfe68257a73 | 2 +- .../en_us/entries/blocks/flowers.json | 10 +- .../advancements/book/absorption.json | 3 +- .../book/affinity_gains_boost.json | 3 +- .../advancements/book/agility.json | 3 +- .../advancements/book/aoe.json | 3 +- .../advancements/book/astral_distortion.json | 3 +- .../advancements/book/attract.json | 3 +- .../advancements/book/augmented_casting.json | 3 +- .../advancements/book/banish_rain.json | 3 +- .../advancements/book/beam.json | 3 +- .../advancements/book/blindness.json | 3 +- .../advancements/book/blink.json | 3 +- .../advancements/book/blizzard.json | 3 +- .../advancements/book/bounce.json | 3 +- .../advancements/book/chain.json | 3 +- .../advancements/book/channel.json | 3 +- .../advancements/book/charm.json | 3 +- .../advancements/book/color.json | 3 +- .../advancements/book/contingency_damage.json | 3 +- .../advancements/book/contingency_death.json | 3 +- .../advancements/book/contingency_fall.json | 3 +- .../advancements/book/contingency_fire.json | 3 +- .../advancements/book/contingency_health.json | 3 +- .../advancements/book/create_water.json | 3 +- .../advancements/book/damage.json | 3 +- .../advancements/book/daylight.json | 3 +- .../advancements/book/dig.json | 3 +- .../advancements/book/disarm.json | 3 +- .../advancements/book/dismembering.json | 3 +- .../advancements/book/dispel.json | 3 +- .../book/divine_intervention.json | 3 +- .../advancements/book/drought.json | 3 +- .../advancements/book/drowning_damage.json | 3 +- .../advancements/book/duration.json | 3 +- .../advancements/book/effect_power.json | 3 +- .../advancements/book/ender_intervention.json | 3 +- .../advancements/book/entangle.json | 3 +- .../advancements/book/explosion.json | 3 +- .../advancements/book/falling_star.json | 3 +- .../advancements/book/fire_damage.json | 3 +- .../advancements/book/fire_rain.json | 3 +- .../advancements/book/flight.json | 3 +- .../advancements/book/fling.json | 3 +- .../advancements/book/forge.json | 3 +- .../advancements/book/frost.json | 3 +- .../advancements/book/frost_damage.json | 3 +- .../advancements/book/fury.json | 3 +- .../advancements/book/gravity.json | 3 +- .../advancements/book/gravity_well.json | 3 +- .../advancements/book/grow.json | 3 +- .../advancements/book/harvest.json | 3 +- .../advancements/book/haste.json | 3 +- .../advancements/book/heal.json | 3 +- .../advancements/book/healing.json | 3 +- .../advancements/book/health_boost.json | 3 +- .../advancements/book/ignition.json | 3 +- .../advancements/book/invisibility.json | 3 +- .../advancements/book/jump_boost.json | 3 +- .../advancements/book/knockback.json | 3 +- .../advancements/book/levitation.json | 3 +- .../advancements/book/life_drain.json | 3 +- .../advancements/book/life_tap.json | 3 +- .../advancements/book/light.json | 3 +- .../advancements/book/lightning_damage.json | 3 +- .../advancements/book/lunar.json | 3 +- .../advancements/book/magic_damage.json | 3 +- .../advancements/book/mana_blast.json | 3 +- .../advancements/book/mana_drain.json | 3 +- .../advancements/book/mana_regen_boost_1.json | 3 +- .../advancements/book/mana_regen_boost_2.json | 3 +- .../advancements/book/mana_regen_boost_3.json | 3 +- .../advancements/book/mining_power.json | 3 +- .../advancements/book/moonrise.json | 3 +- .../advancements/book/night_vision.json | 3 +- .../advancements/book/physical_damage.json | 3 +- .../advancements/book/piercing.json | 3 +- .../advancements/book/place_block.json | 3 +- .../advancements/book/plant.json | 3 +- .../advancements/book/plow.json | 3 +- .../advancements/book/projectile.json | 3 +- .../advancements/book/prosperity.json | 3 +- .../advancements/book/random_teleport.json | 3 +- .../advancements/book/range.json | 3 +- .../advancements/book/recall.json | 3 +- .../advancements/book/reflect.json | 3 +- .../advancements/book/regeneration.json | 3 +- .../advancements/book/repel.json | 3 +- .../advancements/book/rift.json | 3 +- .../advancements/book/root.json | 3 +- .../advancements/book/rune.json | 3 +- .../advancements/book/rune_procs.json | 3 +- .../advancements/book/self.json | 3 +- .../advancements/book/shield.json | 3 +- .../advancements/book/shield_overload.json | 3 +- .../advancements/book/shrink.json | 3 +- .../advancements/book/silence.json | 3 +- .../advancements/book/silk_touch.json | 3 +- .../advancements/book/slow_falling.json | 3 +- .../advancements/book/slowness.json | 3 +- .../advancements/book/solar.json | 3 +- .../advancements/book/spell_motion.json | 3 +- .../advancements/book/storm.json | 3 +- .../advancements/book/summon.json | 3 +- .../advancements/book/swift_swim.json | 3 +- .../advancements/book/target_non_solid.json | 3 +- .../advancements/book/telekinesis.json | 3 +- .../advancements/book/temporal_anchor.json | 3 +- .../advancements/book/touch.json | 3 +- .../advancements/book/transplace.json | 3 +- .../advancements/book/true_sight.json | 3 +- .../advancements/book/velocity.json | 3 +- .../advancements/book/wall.json | 3 +- .../advancements/book/water_breathing.json | 3 +- .../advancements/book/watery_grave.json | 3 +- .../advancements/book/wave.json | 3 +- .../advancements/book/wizards_autumn.json | 3 +- .../advancements/book/zone.json | 3 +- .../building_blocks/stripped_witchwood.json | 3 +- .../recipes/building_blocks/witchwood.json | 3 +- .../building_blocks/witchwood_planks.json | 3 +- .../building_blocks/witchwood_slab.json | 3 +- .../building_blocks/witchwood_stairs.json | 3 +- .../recipes/combat/battlemage_boots.json | 3 +- .../recipes/combat/battlemage_chestplate.json | 3 +- .../recipes/combat/battlemage_helmet.json | 3 +- .../recipes/combat/battlemage_leggings.json | 3 +- .../recipes/combat/mage_boots.json | 3 +- .../recipes/combat/mage_chestplate.json | 3 +- .../recipes/combat/mage_helmet.json | 3 +- .../recipes/combat/mage_leggings.json | 3 +- .../recipes/combat/spell_book.json | 3 +- .../recipes/decorations/vinteum_torch.json | 3 +- .../recipes/decorations/witchwood_fence.json | 3 +- .../decorations/witchwood_hanging_sign.json | 5 +- .../recipes/decorations/witchwood_sign.json | 3 +- .../advancements/recipes/food/mana_cake.json | 3 +- .../recipes/food/mana_martini.json | 3 +- .../recipes/misc/affinity_essence_air.json | 3 +- .../recipes/misc/affinity_essence_arcane.json | 3 +- .../recipes/misc/affinity_essence_earth.json | 3 +- .../recipes/misc/affinity_essence_ender.json | 3 +- .../recipes/misc/affinity_essence_fire.json | 3 +- .../recipes/misc/affinity_essence_ice.json | 3 +- .../recipes/misc/affinity_essence_life.json | 3 +- .../misc/affinity_essence_lightning.json | 3 +- .../recipes/misc/affinity_essence_nature.json | 3 +- .../recipes/misc/affinity_essence_water.json | 3 +- .../advancements/recipes/misc/altar_core.json | 3 +- .../advancements/recipes/misc/arcane_ash.json | 3 +- .../recipes/misc/arcane_compendium.json | 3 +- .../recipes/misc/arcane_compound.json | 3 +- .../advancements/recipes/misc/black_rune.json | 3 +- .../advancements/recipes/misc/blank_rune.json | 3 +- .../misc/blue_dye_from_cerublossom.json | 5 +- .../advancements/recipes/misc/blue_rune.json | 3 +- .../misc/brown_dye_from_tarma_root.json | 5 +- .../advancements/recipes/misc/brown_rune.json | 3 +- .../advancements/recipes/misc/chimerite.json | 3 +- .../recipes/misc/chimerite_block.json | 3 +- ...chimerite_from_blasting_chimerite_ore.json | 3 +- ...from_blasting_deepslate_chimerite_ore.json | 3 +- ...chimerite_from_smelting_chimerite_ore.json | 3 +- ...from_smelting_deepslate_chimerite_ore.json | 3 +- .../advancements/recipes/misc/cyan_rune.json | 3 +- .../advancements/recipes/misc/gray_rune.json | 3 +- .../advancements/recipes/misc/green_rune.json | 3 +- .../recipes/misc/inscription_table.json | 3 +- .../misc/inscription_table_tier_1.json | 3 +- .../misc/inscription_table_tier_2.json | 3 +- .../misc/inscription_table_tier_3.json | 3 +- .../inscription_table_upgrade_tier_1.json | 3 +- .../inscription_table_upgrade_tier_2.json | 3 +- .../inscription_table_upgrade_tier_3.json | 3 +- .../recipes/misc/light_blue_rune.json | 3 +- .../recipes/misc/light_gray_rune.json | 3 +- .../advancements/recipes/misc/lime_rune.json | 3 +- .../misc/magenta_dye_from_wakebloom.json | 5 +- .../recipes/misc/magenta_rune.json | 3 +- .../advancements/recipes/misc/magic_wall.json | 3 +- .../advancements/recipes/misc/moonstone.json | 3 +- .../recipes/misc/moonstone_block.json | 3 +- ...from_blasting_deepslate_moonstone_ore.json | 3 +- ...moonstone_from_blasting_moonstone_ore.json | 3 +- ...from_smelting_deepslate_moonstone_ore.json | 3 +- ...moonstone_from_smelting_moonstone_ore.json | 3 +- .../advancements/recipes/misc/obelisk.json | 3 +- .../advancements/recipes/misc/occulus.json | 3 +- .../recipes/misc/orange_rune.json | 3 +- .../recipes/misc/pink_dye_from_aum.json | 5 +- .../advancements/recipes/misc/pink_rune.json | 3 +- .../recipes/misc/purified_vinteum_dust.json | 3 +- .../recipes/misc/purple_rune.json | 3 +- .../misc/red_dye_from_desert_nova.json | 5 +- .../advancements/recipes/misc/red_rune.json | 3 +- .../recipes/misc/spell_parchment.json | 3 +- .../advancements/recipes/misc/sunstone.json | 3 +- .../recipes/misc/sunstone_block.json | 3 +- .../advancements/recipes/misc/topaz.json | 3 +- .../recipes/misc/topaz_block.json | 3 +- ...paz_from_blasting_deepslate_topaz_ore.json | 3 +- .../misc/topaz_from_blasting_topaz_ore.json | 3 +- ...paz_from_smelting_deepslate_topaz_ore.json | 3 +- .../misc/topaz_from_smelting_topaz_ore.json | 3 +- .../recipes/misc/vinteum_block.json | 3 +- .../recipes/misc/vinteum_dust.json | 3 +- ...t_from_blasting_deepslate_vinteum_ore.json | 3 +- ...inteum_dust_from_blasting_vinteum_ore.json | 3 +- ...t_from_smelting_deepslate_vinteum_ore.json | 3 +- ...inteum_dust_from_smelting_vinteum_ore.json | 3 +- .../advancements/recipes/misc/white_rune.json | 3 +- .../recipes/misc/yellow_rune.json | 3 +- .../recipes/redstone/witchwood_button.json | 3 +- .../recipes/redstone/witchwood_door.json | 3 +- .../redstone/witchwood_fence_gate.json | 3 +- .../redstone/witchwood_pressure_plate.json | 3 +- .../recipes/redstone/witchwood_trapdoor.json | 3 +- .../recipes/tools/crystal_wrench.json | 3 +- .../recipes/tools/magitech_goggles.json | 3 +- .../advancements/recipes/tools/rune_bag.json | 3 +- .../recipes/tools/wizards_chalk.json | 3 +- .../recipes/transportation/gold_inlay.json | 3 +- .../recipes/transportation/iron_inlay.json | 3 +- .../transportation/redstone_inlay.json | 3 +- .../loot_tables/blocks/altar_core.json | 3 +- .../loot_tables/blocks/aum.json | 3 +- .../loot_tables/blocks/black_aurem.json | 3 +- .../loot_tables/blocks/celestial_prism.json | 3 +- .../loot_tables/blocks/cerublossom.json | 3 +- .../loot_tables/blocks/chimerite_block.json | 3 +- .../loot_tables/blocks/chimerite_ore.json | 3 +- .../blocks/deepslate_chimerite_ore.json | 3 +- .../blocks/deepslate_moonstone_ore.json | 3 +- .../blocks/deepslate_topaz_ore.json | 3 +- .../blocks/deepslate_vinteum_ore.json | 3 +- .../loot_tables/blocks/desert_nova.json | 3 +- .../loot_tables/blocks/gold_inlay.json | 3 +- .../loot_tables/blocks/inscription_table.json | 3 +- .../loot_tables/blocks/iron_inlay.json | 3 +- .../loot_tables/blocks/magic_wall.json | 3 +- .../loot_tables/blocks/moonstone_block.json | 3 +- .../loot_tables/blocks/moonstone_ore.json | 3 +- .../loot_tables/blocks/obelisk.json | 3 +- .../loot_tables/blocks/occulus.json | 3 +- .../loot_tables/blocks/potted_aum.json | 3 +- .../blocks/potted_cerublossom.json | 3 +- .../blocks/potted_desert_nova.json | 3 +- .../loot_tables/blocks/potted_tarma_root.json | 3 +- .../loot_tables/blocks/potted_wakebloom.json | 3 +- .../blocks/potted_witchwood_sapling.json | 3 +- .../loot_tables/blocks/redstone_inlay.json | 3 +- .../blocks/stripped_witchwood.json | 3 +- .../blocks/stripped_witchwood_log.json | 3 +- .../loot_tables/blocks/sunstone_block.json | 3 +- .../loot_tables/blocks/sunstone_ore.json | 3 +- .../loot_tables/blocks/tarma_root.json | 3 +- .../loot_tables/blocks/topaz_block.json | 3 +- .../loot_tables/blocks/topaz_ore.json | 3 +- .../loot_tables/blocks/vinteum_block.json | 3 +- .../loot_tables/blocks/vinteum_ore.json | 3 +- .../loot_tables/blocks/vinteum_torch.json | 3 +- .../blocks/vinteum_wall_torch.json | 3 +- .../loot_tables/blocks/wakebloom.json | 3 +- .../loot_tables/blocks/witchwood.json | 3 +- .../loot_tables/blocks/witchwood_button.json | 3 +- .../loot_tables/blocks/witchwood_door.json | 3 +- .../loot_tables/blocks/witchwood_fence.json | 3 +- .../blocks/witchwood_fence_gate.json | 3 +- .../loot_tables/blocks/witchwood_leaves.json | 7 +- .../loot_tables/blocks/witchwood_log.json | 3 +- .../loot_tables/blocks/witchwood_planks.json | 3 +- .../blocks/witchwood_pressure_plate.json | 3 +- .../loot_tables/blocks/witchwood_sapling.json | 3 +- .../loot_tables/blocks/witchwood_sign.json | 3 +- .../loot_tables/blocks/witchwood_slab.json | 3 +- .../loot_tables/blocks/witchwood_stairs.json | 3 +- .../blocks/witchwood_trapdoor.json | 3 +- .../chests/modify/abandoned_mineshaft.json | 3 +- .../chests/modify/ancient_city.json | 3 +- .../chests/modify/ancient_city_ice_box.json | 3 +- .../chests/modify/bastion_treasure.json | 3 +- .../chests/modify/desert_pyramid.json | 3 +- .../chests/modify/end_city_treasure.json | 3 +- .../chests/modify/igloo_chest.json | 3 +- .../chests/modify/jungle_temple.json | 3 +- .../chests/modify/nether_bridge.json | 3 +- .../chests/modify/pillager_outpost.json | 3 +- .../chests/modify/shipwreck_treasure.json | 3 +- .../chests/modify/simple_dungeon.json | 3 +- .../chests/modify/stronghold_library.json | 3 +- .../chests/modify/underwater_ruin_big.json | 3 +- .../chests/modify/underwater_ruin_small.json | 3 +- .../modify/village/village_desert_house.json | 3 +- .../modify/village/village_plains_house.json | 3 +- .../modify/village/village_savanna_house.json | 3 +- .../modify/village/village_snowy_house.json | 3 +- .../modify/village/village_taiga_house.json | 3 +- .../chests/modify/village/village_temple.json | 3 +- .../chests/modify/woodland_mansion.json | 3 +- .../loot_tables/entities/air_guardian.json | 3 +- .../loot_tables/entities/arcane_guardian.json | 3 +- .../loot_tables/entities/dryad.json | 3 +- .../loot_tables/entities/earth_guardian.json | 3 +- .../loot_tables/entities/ender_guardian.json | 3 +- .../loot_tables/entities/fire_guardian.json | 3 +- .../loot_tables/entities/ice_guardian.json | 3 +- .../loot_tables/entities/life_guardian.json | 3 +- .../entities/lightning_guardian.json | 3 +- .../loot_tables/entities/mage.json | 3 +- .../loot_tables/entities/mana_creeper.json | 3 +- .../loot_tables/entities/nature_guardian.json | 3 +- .../loot_tables/entities/water_guardian.json | 3 +- .../recipes/witchwood_hanging_sign.json | 0 .../recipes/misc/rune_bag_from_bundle.json | 3 +- .../blocks/witchwood_hanging_sign.json | 20 -- .../tags/blocks/ceiling_hanging_signs.json | 5 - .../tags/blocks/wall_hanging_signs.json | 5 - src/main/generated/pack.mcmeta | 3 +- .../arsmagicalegacy/client/AMRenderTypes.java | 38 +++ .../arsmagicalegacy/client/ClientHelper.java | 31 +-- .../arsmagicalegacy/client/ClientInit.java | 54 ++--- .../client/SpellParticleSpawners.java | 12 +- .../client/gui/ColorPickerScreen.java | 18 +- .../client/gui/ColorPickerWidget.java | 71 +++--- .../client/gui/ObeliskScreen.java | 10 +- .../client/gui/RenderUtil.java | 144 ++++++------ .../client/gui/RiftScreen.java | 22 +- .../client/gui/RuneBagScreen.java | 16 +- .../client/gui/SelfClearingEditBox.java | 6 +- .../client/gui/SpellBookScreen.java | 20 +- .../client/gui/SpellCustomizationScreen.java | 26 +-- .../client/gui/SpellRecipeScreen.java | 43 ++-- .../InscriptionTableScreen.java | 24 +- .../gui/inscriptiontable/ShapeGroupArea.java | 19 +- .../inscriptiontable/ShapeGroupListArea.java | 6 +- .../inscriptiontable/SpellGrammarArea.java | 6 +- .../inscriptiontable/SpellPartDraggable.java | 22 +- .../inscriptiontable/SpellPartSourceArea.java | 6 +- .../occulus/OcculusAffinityTabRenderer.java | 86 +++---- .../client/gui/occulus/OcculusScreen.java | 24 +- .../occulus/OcculusSkillTreeTabRenderer.java | 61 +++-- .../client/gui/occulus/OcculusTabButton.java | 8 +- .../client/gui/occulus/SkillPointPanel.java | 79 +++---- .../client/hud/AbstractHUD.java | 19 +- .../client/hud/BurnoutHUD.java | 6 +- .../arsmagicalegacy/client/hud/ManaHUD.java | 6 +- .../client/hud/ShapeGroupHUD.java | 4 +- .../client/hud/SpellBookHUD.java | 40 ++-- .../arsmagicalegacy/client/hud/XpHUD.java | 16 +- .../client/renderer/spell/BeamRenderer.java | 2 +- .../common/block/OcculusBlock.java | 3 +- .../common/block/WizardsChalkBlock.java | 3 +- .../common/block/altar/AltarCoreBlock.java | 4 +- .../common/block/altar/AltarViewBlock.java | 3 +- .../block/blackaurem/BlackAuremBlock.java | 5 +- .../celestialprism/CelestialPrismBlock.java | 3 +- .../common/block/flower/WakebloomBlock.java | 6 +- .../InscriptionTableBlock.java | 3 +- .../InscriptionTableBlockEntity.java | 2 +- .../InscriptionTableMenu.java | 4 +- .../block/spellrune/SpellRuneBlock.java | 3 +- .../common/effect/IlluminationEffect.java | 4 +- .../common/effect/ScrambleSynapsesEffect.java | 4 +- .../common/entity/AbstractBoss.java | 35 ++- .../common/entity/AbstractSpellEntity.java | 2 +- .../common/entity/ArcaneGuardian.java | 2 +- .../common/entity/Blizzard.java | 6 +- .../arsmagicalegacy/common/entity/Dryad.java | 8 +- .../common/entity/EnderGuardian.java | 8 +- .../common/entity/FallingStar.java | 16 +- .../common/entity/FireGuardian.java | 20 +- .../common/entity/FireRain.java | 6 +- .../common/entity/IceGuardian.java | 6 +- .../common/entity/LifeGuardian.java | 8 +- .../common/entity/LightningGuardian.java | 4 +- .../common/entity/ManaCreeper.java | 4 +- .../common/entity/ManaVortex.java | 3 +- .../common/entity/NatureGuardian.java | 2 +- .../common/entity/NatureScythe.java | 6 +- .../common/entity/Projectile.java | 3 +- .../common/entity/Shockwave.java | 1 + .../common/entity/ThrownRock.java | 6 +- .../arsmagicalegacy/common/entity/Wall.java | 12 +- .../common/entity/WaterGuardian.java | 4 +- .../arsmagicalegacy/common/entity/Wave.java | 12 +- .../common/entity/Whirlwind.java | 16 +- .../common/entity/WintersGrasp.java | 6 +- .../arsmagicalegacy/common/entity/Zone.java | 12 +- .../common/entity/ai/AbstractBossGoal.java | 4 +- .../common/entity/ai/CloneGoal.java | 4 +- .../common/entity/ai/DispelGoal.java | 2 +- .../common/entity/ai/EnderTorrentGoal.java | 6 +- .../entity/ai/ExecuteRandomSpellGoal.java | 2 +- .../common/entity/ai/ExecuteSpellGoal.java | 4 +- .../common/entity/ai/FireRainGoal.java | 6 +- .../common/entity/ai/HealGoal.java | 2 +- .../common/entity/ai/HurricaneGoal.java | 4 +- .../common/entity/ai/LightningRodGoal.java | 18 +- .../entity/ai/OtherworldlyRoarGoal.java | 2 +- .../common/entity/ai/SmashGoal.java | 10 +- .../common/entity/ai/SpinGoal.java | 2 +- .../common/entity/ai/StaticGoal.java | 2 +- .../common/entity/ai/StrikeGoal.java | 2 +- .../common/entity/ai/SummonAlliesGoal.java | 13 +- .../common/entity/ai/ThrowArmGoal.java | 8 +- .../common/entity/ai/ThrowRockGoal.java | 10 +- .../common/entity/ai/ThrowScytheGoal.java | 8 +- .../common/entity/ai/WhirlwindGoal.java | 8 +- .../common/handler/AbilityHandler.java | 20 +- .../common/handler/EffectHandler.java | 8 +- .../common/handler/EventHandler.java | 84 ++++--- .../common/handler/TickHandler.java | 19 +- .../arsmagicalegacy/common/init/AMBlocks.java | 72 +++--- .../common/init/AMDamageSources.java | 10 +- .../common/item/SpellItem.java | 6 +- .../level/loot/AddPoolToTableModifier.java | 2 +- .../common/magic/ContingencyHelper.java | 2 +- .../common/magic/rift/RiftMenu.java | 2 +- .../ritual/trigger/EntityDeathTrigger.java | 2 +- .../ritual/trigger/ItemDropRitualTrigger.java | 2 +- .../SpellComponentCastRitualTrigger.java | 2 +- .../common/skill/SkillHelper.java | 25 +- .../common/spell/EtheriumSpellIngredient.java | 5 +- .../spell/IngredientSpellIngredient.java | 5 +- .../common/spell/component/Attract.java | 2 +- .../common/spell/component/LifeDrain.java | 2 +- .../common/spell/component/LifeTap.java | 2 +- .../common/spell/component/Repel.java | 2 +- .../common/spell/modifier/Lunar.java | 10 +- .../common/spell/modifier/Solar.java | 10 +- .../common/spell/shape/Chain.java | 4 +- .../arsmagicalegacy/common/util/AMUtil.java | 8 +- .../compat/jade/AltarComponentProvider.java | 9 +- .../jade/EtheriumComponentProvider.java | 13 +- .../compat/jei/SkillCategory.java | 18 +- .../compat/jei/SkillIngredient.java | 7 +- .../compat/patchouli/SpellPartPage.java | 42 ++-- .../mixin/SummonedEntityTriggerMixin.java | 8 +- .../InscriptionTableCreateSpellPacket.java | 2 +- .../network/InscriptionTableSyncPacket.java | 2 +- .../network/LearnSkillPacket.java | 2 +- .../network/SetLecternPagePacket.java | 2 +- .../TakeSpellRecipeFromLecternPacket.java | 2 +- .../server/NatureGuardianSpawnHandler.java | 2 +- .../server/commands/AffinityCommand.java | 14 +- .../server/commands/MagicXpCommand.java | 10 +- .../server/commands/SkillCommand.java | 22 +- .../server/commands/SkillPointCommand.java | 18 +- .../resources/META-INF/accesstransformer.cfg | 2 + 485 files changed, 2643 insertions(+), 1524 deletions(-) delete mode 100644 src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120BlockTagsProvider.java delete mode 100644 src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120LootTableProvider.java delete mode 100644 src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120RecipeProvider.java delete mode 100644 src/main/generated/.cache/02295ad36ea0ce6c977417e22465951e19d6d5de create mode 100644 src/main/generated/.cache/25bc9cae032fc12ef88c2ad95f56cfdc7020591b create mode 100644 src/main/generated/.cache/4514f0a5cf5bd19fc9aab7d7474e707d515a64ff create mode 100644 src/main/generated/.cache/552763967fefb6e400cbf8810ea5a6f7653c0b0b create mode 100644 src/main/generated/.cache/6deee57a789289495e0e4b2297d0baad21cdb85f create mode 100644 src/main/generated/.cache/70787991046ee4fc01c27abb22b81127c97594d6 create mode 100644 src/main/generated/.cache/828e6b158606486c03118ac5f3fd682296779b9c delete mode 100644 src/main/generated/.cache/a2c45b2c7ed8b2a33b6a9805d2b8e3d89cb5d727 create mode 100644 src/main/generated/.cache/c4176b2371ddb03b4fcc28d4a4b130d886e34712 create mode 100644 src/main/generated/.cache/e286d819b86d3f2c716d4522338b1b44a9d0807e delete mode 100644 src/main/generated/.cache/e887c9ae77fce67213b15120513f6f18186c1aeb create mode 100644 src/main/generated/.cache/e951e14a64d238c49e2ddb8ca184b4e9a4b3c5b2 create mode 100644 src/main/generated/.cache/f48255af366ba1d3afbc0e01c7e37bdbaf48d909 rename src/main/generated/data/{minecraft/datapacks/update_1_20/data => }/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json (94%) rename src/main/generated/data/{minecraft/datapacks/update_1_20/data => }/arsmagicalegacy/recipes/witchwood_hanging_sign.json (100%) delete mode 100644 src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json delete mode 100644 src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/ceiling_hanging_signs.json delete mode 100644 src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/wall_hanging_signs.json create mode 100644 src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/AMRenderTypes.java diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1d4ecdca6..35d236510 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -70,8 +70,9 @@ body: - 1.19.2-1.2.4 - 1.19.2-1.3.0 - 1.19.2-1.3.1 - - 1.19.2-1.4.0 - - 1.19.4-1.4.0 + - 1.19.3-1.3.1 + - 1.19.4-1.3.1 + - 1.20.1-1.3.1 validations: required: true - type: input diff --git a/build.gradle.kts b/build.gradle.kts index 4fe6b4840..0fede6900 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -279,8 +279,8 @@ dependencies { annotationProcessor(group = "org.spongepowered", name = "mixin", version = mixin_version, classifier = "processor") // jei for integration - modAPI(fg.deobf("mezz.jei:jei-1.19.4-common-api:${jei_version}")) - runtimeMod(fg.deobf("mezz.jei:jei-1.19.4-forge:${jei_version}")) + modAPI(fg.deobf("mezz.jei:jei-1.20.1-common-api:${jei_version}")) + runtimeMod(fg.deobf("mezz.jei:jei-1.20.1-forge:${jei_version}")) // curios for additional inventory slots modAPI(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")) @@ -291,8 +291,8 @@ dependencies { runtimeMod(fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")) // geckolib for animations - modAPI(fg.deobf("software.bernie.geckolib:geckolib-forge-${mc_version}:${geckolib_version}")) - runtimeMod(fg.deobf("software.bernie.geckolib:geckolib-forge-${mc_version}:${geckolib_version}")) + modAPI(fg.deobf("software.bernie.geckolib:geckolib-forge-${mc_major_version}:${geckolib_version}")) + runtimeMod(fg.deobf("software.bernie.geckolib:geckolib-forge-${mc_major_version}:${geckolib_version}")) // theoneprobe for integration modAPI(fg.deobf("mcjty.theoneprobe:theoneprobe:${top_version}:api") { (this as ModuleDependency).setTransitive(false) }) @@ -312,17 +312,17 @@ dependencies { } // add internal libraries - include(fg.deobf("com.github.minecraftschurlimods:simplenetlib:1.19.4-1.0-SNAPSHOT") { - jarJar.ranged(this, "[1.19.4-1.0-SNAPSHOT,)") + include(fg.deobf("com.github.minecraftschurlimods:simplenetlib:1.20.1-1.0-SNAPSHOT") { + jarJar.ranged(this, "[1.20.1-1.0-SNAPSHOT,)") }) - include(fg.deobf("com.github.minecraftschurlimods:codeclib:1.19-1.0-SNAPSHOT") { - jarJar.ranged(this, "[1.19-1.0-SNAPSHOT,)") + include(fg.deobf("com.github.minecraftschurlimods:codeclib:1.20.1-1.0-SNAPSHOT") { + jarJar.ranged(this, "[1.20.1-1.0-SNAPSHOT,)") }) include(fg.deobf("com.github.minecraftschurlimods:betterkeybindlib:1.19-1.1-SNAPSHOT") { jarJar.ranged(this, "[1.19-1.1-SNAPSHOT,)") }) - include(fg.deobf("com.github.minecraftschurlimods:betterhudlib:1.19.4-1.0-SNAPSHOT") { - jarJar.ranged(this, "[1.19-1.0-SNAPSHOT,)") + include(fg.deobf("com.github.minecraftschurlimods:betterhudlib:1.20.1-1.0-SNAPSHOT") { + jarJar.ranged(this, "[1.20.1-1.0-SNAPSHOT,)") }) modAPI(fg.deobf("com.github.minecraftschurlimods:easydatagenlib:1.19.3-1.1.1-SNAPSHOT")) datagenLibrary(fg.deobf("com.github.minecraftschurlimods:easydatagenlib:1.19.3-1.1.1-SNAPSHOT")) diff --git a/gradle.properties b/gradle.properties index 670e818a1..88654797a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false mod_group=com.github.minecraftschurlimods mod_id=arsmagicalegacy mod_name=Ars Magica: Legacy -mod_version=1.4.0 +mod_version=1.3.1 mod_author=Minecraftschurli, IchHabeHunger54 mod_credits=Mithion for the original mod mod_url=https://www.curseforge.com/minecraft/mc-mods/ars-magica-legacy @@ -18,31 +18,31 @@ java_version=17 mixin_version=0.8.5 mappings_channel=parchment -mappings_version=2023.06.26-1.19.4 +mappings_version=2023.06.26-1.20.1 -mc_version=1.19.4 -mc_major_version=1.19 -forge_version=45.1.0 +mc_version=1.20.1 +mc_major_version=1.20 +forge_version=47.0.34 -loader_version_range=[45,) -forge_version_range=[45.1.0,) -mc_version_range=[1.19.4,1.20) -patchouli_version_range=[1.19-78,1.20) +loader_version_range=[47,) +forge_version_range=[47.0.34,) +mc_version_range=[1.20.1,1.20.2) +patchouli_version_range=[1.20.1-80,1.20.2) geckolib_version_range=[4.2,5) -jade_version_range=[10.3.1,11) +jade_version_range=[11.7.0,12) embeddium_version_range=[0.2.12,) -curios_version_range=[1.19.4,1.20) -jei_version_range=[13,) +curios_version_range=[5.2.0-beta.3+1.20.1,6) +jei_version_range=[15,) -jei_version=13.1.0.9 -top_version=1.19.4-8.0.0-1 -curios_version=1.19.4-5.1.5.3 -patchouli_version=1.19.4-79-FORGE +jei_version=15.2.0.22 +top_version=1.20.0-9.0.0-1 +curios_version=5.2.0-beta.3+1.20.1 +patchouli_version=1.20.1-80-FORGE-SNAPSHOT geckolib_version=4.2 -jade_version=10.3.1 -embeddium_version=0.2.12+mc1.19.2 -potionbundles_version=1.19.4-1.7 -controlling_version=10.0+4 +jade_version=11.7.0 +embeddium_version=0.2.12+mc1.20.1 +potionbundles_version=1.20-1.7 +controlling_version=12.0.1 modrinth_project_id=hm4S7JIe curse_project_id=350734 diff --git a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLearnedSkillTrigger.java b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLearnedSkillTrigger.java index a354ce14a..8450e2507 100644 --- a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLearnedSkillTrigger.java +++ b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLearnedSkillTrigger.java @@ -3,8 +3,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.google.gson.JsonObject; import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; +import net.minecraft.advancements.critereon.ContextAwarePredicate; import net.minecraft.advancements.critereon.DeserializationContext; -import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.SerializationContext; import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.resources.ResourceLocation; @@ -23,9 +23,9 @@ public ResourceLocation getId() { } @Override - protected TriggerInstance createInstance(JsonObject pJson, EntityPredicate.Composite pPlayer, DeserializationContext pContext) { + protected TriggerInstance createInstance(JsonObject pJson, ContextAwarePredicate pPredicate, DeserializationContext pDeserializationContext) { ResourceLocation skill = pJson.has("skill") ? new ResourceLocation(GsonHelper.getAsString(pJson, "skill")) : null; - return new TriggerInstance(pPlayer, skill); + return new TriggerInstance(pPredicate, skill); } /** @@ -40,8 +40,8 @@ public void trigger(ServerPlayer pPlayer, ResourceLocation skill) { public static class TriggerInstance extends AbstractCriterionTriggerInstance { private final ResourceLocation skill; - public TriggerInstance(EntityPredicate.Composite pPlayer, ResourceLocation skill) { - super(PlayerLearnedSkillTrigger.ID, pPlayer); + public TriggerInstance(ContextAwarePredicate pPredicate, ResourceLocation skill) { + super(PlayerLearnedSkillTrigger.ID, pPredicate); this.skill = skill; } diff --git a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLevelUpTrigger.java b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLevelUpTrigger.java index 940e5caa7..6a0e8447f 100644 --- a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLevelUpTrigger.java +++ b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/advancement/PlayerLevelUpTrigger.java @@ -3,8 +3,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.google.gson.JsonObject; import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance; +import net.minecraft.advancements.critereon.ContextAwarePredicate; import net.minecraft.advancements.critereon.DeserializationContext; -import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.MinMaxBounds; import net.minecraft.advancements.critereon.SerializationContext; import net.minecraft.advancements.critereon.SimpleCriterionTrigger; @@ -23,8 +23,8 @@ public ResourceLocation getId() { } @Override - protected PlayerLevelUpTrigger.TriggerInstance createInstance(JsonObject pJson, EntityPredicate.Composite pPlayer, DeserializationContext pContext) { - return new PlayerLevelUpTrigger.TriggerInstance(pPlayer, MinMaxBounds.Ints.fromJson(pJson.get("level"))); + protected PlayerLevelUpTrigger.TriggerInstance createInstance(JsonObject pJson, ContextAwarePredicate pPredicate, DeserializationContext pContext) { + return new PlayerLevelUpTrigger.TriggerInstance(pPredicate, MinMaxBounds.Ints.fromJson(pJson.get("level"))); } /** @@ -39,8 +39,8 @@ public void trigger(ServerPlayer pPlayer, int level) { public static class TriggerInstance extends AbstractCriterionTriggerInstance { private final MinMaxBounds.Ints level; - public TriggerInstance(EntityPredicate.Composite pPlayer, MinMaxBounds.Ints level) { - super(PlayerLevelUpTrigger.ID, pPlayer); + public TriggerInstance(ContextAwarePredicate pPredicate, MinMaxBounds.Ints level) { + super(PlayerLevelUpTrigger.ID, pPredicate); this.level = level; } diff --git a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/ISpellIngredientRenderer.java b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/ISpellIngredientRenderer.java index cf4446f97..78ca85f77 100644 --- a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/ISpellIngredientRenderer.java +++ b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/ISpellIngredientRenderer.java @@ -3,6 +3,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellIngredient; import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.SpellIngredientType; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; /** @@ -21,7 +22,7 @@ public interface ISpellIngredientRenderer { * * @param ingredient The ingredient to render. */ - void renderInGui(T ingredient, PoseStack poseStack, int x, int y, int mouseX, int mouseY); + void renderInGui(T ingredient, GuiGraphics graphics, int x, int y, int mouseX, int mouseY); @SuppressWarnings("unchecked") static ISpellIngredientRenderer getFor(SpellIngredientType type) { diff --git a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/OcculusTabRenderer.java b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/OcculusTabRenderer.java index 0e1e2f33d..0b59be999 100644 --- a/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/OcculusTabRenderer.java +++ b/src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/client/OcculusTabRenderer.java @@ -1,9 +1,9 @@ package com.github.minecraftschurlimods.arsmagicalegacy.api.client; import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.OcculusTab; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.AbstractContainerEventHandler; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -41,18 +41,18 @@ protected OcculusTabRenderer(OcculusTab occulusTab, Screen parent) { } /** - * Don't call this method, use {@link OcculusTabRenderer#renderBg(PoseStack, int, int, float)} and {@link OcculusTabRenderer#renderFg(PoseStack, int, int, float)} instead. + * Don't call this method, use {@link OcculusTabRenderer#renderBg(GuiGraphics, int, int, float)} and {@link OcculusTabRenderer#renderFg(GuiGraphics, int, int, float)} instead. */ @Internal @Override - public final void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks) { - pMatrixStack.pushPose(); - pMatrixStack.translate(7, 7, 0); + public final void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { + graphics.pose().pushPose(); + graphics.pose().translate(7, 7, 0); pMouseX -= posX; pMouseY -= posY; - renderBg(pMatrixStack, pMouseX, pMouseY, pPartialTicks); - renderFg(pMatrixStack, pMouseX, pMouseY, pPartialTicks); - pMatrixStack.popPose(); + renderBg(graphics, pMouseX, pMouseY, pPartialTicks); + renderFg(graphics, pMouseX, pMouseY, pPartialTicks); + graphics.pose().popPose(); } /** @@ -72,12 +72,12 @@ public final void init(int width, int height, int screenWidth, int screenHeight, /** * Render the background in this method. */ - protected abstract void renderBg(PoseStack stack, int mouseX, int mouseY, float partialTicks); + protected abstract void renderBg(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks); /** * Render the foreground in this method. */ - protected abstract void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTicks); + protected abstract void renderFg(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks); @Override public List children() { diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMAdvancements.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMAdvancements.java index 9b1a20ce4..db1cf1711 100644 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMAdvancements.java +++ b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMAdvancements.java @@ -4,7 +4,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.advancement.PlayerLearnedSkillTrigger; import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.Skill; import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.ContextAwarePredicate; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -35,7 +35,7 @@ public void generate(HolderLookup.Provider registries, Consumer sav registries.lookupOrThrow(Skill.REGISTRY_KEY).listElementIds().forEach(skill -> Advancement.Builder .advancement() .parent(root) - .addCriterion("knows", new PlayerLearnedSkillTrigger.TriggerInstance(EntityPredicate.Composite.ANY, skill.location())) + .addCriterion("knows", new PlayerLearnedSkillTrigger.TriggerInstance(ContextAwarePredicate.ANY, skill.location())) .save(saver, ArsMagicaAPI.MOD_ID + ":book/" + skill.location().getPath())); } } diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMDatagen.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMDatagen.java index 88ac83279..7041724b3 100644 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMDatagen.java +++ b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMDatagen.java @@ -1,9 +1,6 @@ package com.github.minecraftschurlimods.arsmagicalegacy.data; import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; -import com.github.minecraftschurlimods.arsmagicalegacy.data.update120.Update120BlockTagsProvider; -import com.github.minecraftschurlimods.arsmagicalegacy.data.update120.Update120LootTableProvider; -import com.github.minecraftschurlimods.arsmagicalegacy.data.update120.Update120RecipeProvider; import com.github.minecraftschurlimods.easydatagenlib.api.DatapackRegistryGenerator; import com.mojang.datafixers.util.Function4; import com.mojang.datafixers.util.Function5; @@ -66,10 +63,6 @@ static void gatherData(GatherDataEvent evt) { client.addProvider(wrapWith(AMParticleDefinitionsProvider::new, existingFileHelper)); client.addProvider(wrapWith(AMSoundDefinitionsProvider::new, existingFileHelper)); client.addProvider(wrapWith(AMEnglishLanguageProvider::new, lang)); - DataGenerator.PackGenerator update120 = generator.getBuiltinDatapack(includeServer, "update_1_20"); - update120.addProvider(Update120RecipeProvider::new); - update120.addProvider(wrapWith(Update120BlockTagsProvider::new, lookupProvider, existingFileHelper)); - update120.addProvider(Update120LootTableProvider::new); new AMCompatDataProvider(evt); } diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMLootTableProvider.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMLootTableProvider.java index 9952b61d4..dd8dcda59 100644 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMLootTableProvider.java +++ b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMLootTableProvider.java @@ -112,7 +112,7 @@ protected void generate() { dropSelf(AMBlocks.WITCHWOOD_BUTTON.get()); dropSelf(AMBlocks.WITCHWOOD_PRESSURE_PLATE.get()); dropSelf(AMBlocks.WITCHWOOD_SIGN.get()); - add(AMBlocks.WITCHWOOD_HANGING_SIGN.get(), noDrop()); + dropSelf(AMBlocks.WITCHWOOD_HANGING_SIGN.get()); dropSelf(AMBlocks.AUM.get()); dropSelf(AMBlocks.CERUBLOSSOM.get()); dropSelf(AMBlocks.DESERT_NOVA.get()); diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMPatchouliBookProvider.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMPatchouliBookProvider.java index ea32491eb..fa1450a8a 100644 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMPatchouliBookProvider.java +++ b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/AMPatchouliBookProvider.java @@ -25,7 +25,6 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.ObjectUtils; @@ -134,9 +133,9 @@ protected void addBooks(HolderLookup.Provider provider, Consumer consumer) { var helper = ArsMagicaAPI.get().getAffinityHelper(); generateRecipes(consumer, AMBlockFamilies.WITCHWOOD_PLANKS.get()); + hangingSign(consumer, AMItems.WITCHWOOD_HANGING_SIGN.get(), AMBlocks.STRIPPED_WITCHWOOD_LOG.get()); planksFromLogs(consumer, AMBlocks.WITCHWOOD_PLANKS.get(), AMTags.Items.WITCHWOOD_LOGS, 4); woodFromLogs(consumer, AMBlocks.WITCHWOOD.get(), AMBlocks.WITCHWOOD_LOG.get()); woodFromLogs(consumer, AMBlocks.STRIPPED_WITCHWOOD.get(), AMBlocks.STRIPPED_WITCHWOOD_LOG.get()); diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120BlockTagsProvider.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120BlockTagsProvider.java deleted file mode 100644 index 9bf050f37..000000000 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120BlockTagsProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.github.minecraftschurlimods.arsmagicalegacy.data.update120; - -import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; -import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMBlocks; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.tags.BlockTags; -import net.minecraftforge.common.data.BlockTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; - -import java.util.concurrent.CompletableFuture; - -/** - * - */ -public class Update120BlockTagsProvider extends BlockTagsProvider { - public Update120BlockTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { - super(output, lookupProvider, ArsMagicaAPI.MOD_ID, existingFileHelper); - } - - @Override - protected void addTags(HolderLookup.Provider lookup) { - this.tag(BlockTags.CEILING_HANGING_SIGNS).add(AMBlocks.WITCHWOOD_HANGING_SIGN.get()); - this.tag(BlockTags.WALL_HANGING_SIGNS).add(AMBlocks.WITCHWOOD_WALL_HANGING_SIGN.get()); - } -} diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120LootTableProvider.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120LootTableProvider.java deleted file mode 100644 index a0d6052cf..000000000 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120LootTableProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.minecraftschurlimods.arsmagicalegacy.data.update120; - -import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMBlocks; -import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.loot.BlockLootSubProvider; -import net.minecraft.data.loot.LootTableProvider; -import net.minecraft.world.flag.FeatureFlagSet; -import net.minecraft.world.flag.FeatureFlags; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; -import net.minecraftforge.registries.RegistryObject; - -import java.util.List; -import java.util.Set; - -/** - * - */ -public class Update120LootTableProvider extends LootTableProvider { - public Update120LootTableProvider(PackOutput output) { - super(output, Set.of(), List.of(new SubProviderEntry(() -> new BlockLootSubProvider(Set.of(), FeatureFlagSet.of(FeatureFlags.UPDATE_1_20)) { - @Override - protected void generate() { - dropSelf(AMBlocks.WITCHWOOD_HANGING_SIGN.get()); - } - - @Override - protected Iterable getKnownBlocks() { - return AMRegistries.BLOCKS.getEntries().stream().map(RegistryObject::get).toList(); - } - }, LootContextParamSets.BLOCK))); - } -} diff --git a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120RecipeProvider.java b/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120RecipeProvider.java deleted file mode 100644 index 873070f79..000000000 --- a/src/data/java/com/github/minecraftschurlimods/arsmagicalegacy/data/update120/Update120RecipeProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.minecraftschurlimods.arsmagicalegacy.data.update120; - -import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMBlocks; -import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMItems; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeProvider; - -import java.util.function.Consumer; - -/** - * - */ -public class Update120RecipeProvider extends RecipeProvider { - public Update120RecipeProvider(PackOutput output) { - super(output); - } - - @Override - protected void buildRecipes(Consumer consumer) { - hangingSign(consumer, AMItems.WITCHWOOD_HANGING_SIGN.get(), AMBlocks.STRIPPED_WITCHWOOD_LOG.get()); - } -} diff --git a/src/main/generated/.cache/02295ad36ea0ce6c977417e22465951e19d6d5de b/src/main/generated/.cache/02295ad36ea0ce6c977417e22465951e19d6d5de deleted file mode 100644 index d3a5250b9..000000000 --- a/src/main/generated/.cache/02295ad36ea0ce6c977417e22465951e19d6d5de +++ /dev/null @@ -1,2 +0,0 @@ -// 1.19.4 2023-08-02T19:28:09.172815 update_1_20/Loot Tables -833c417f5cc9db8b537307f50987a941b330503b data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json diff --git a/src/main/generated/.cache/0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7 b/src/main/generated/.cache/0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7 index bfd41af64..d4fd9322d 100644 --- a/src/main/generated/.cache/0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7 +++ b/src/main/generated/.cache/0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7 @@ -1,2 +1,2 @@ -// 1.19.4 2024-04-07T00:43:41.993162 vanilla/Languages: en_us +// 1.20.1 2024-04-07T01:33:48.2314181 vanilla/Languages: en_us b53bbccafca556842932a1560d252f979798d5ef assets/arsmagicalegacy/lang/en_us.json diff --git a/src/main/generated/.cache/23311cab2a0699e1373ff6662d45536b84c4dfbf b/src/main/generated/.cache/23311cab2a0699e1373ff6662d45536b84c4dfbf index 09df5c4c7..018cf8d53 100644 --- a/src/main/generated/.cache/23311cab2a0699e1373ff6662d45536b84c4dfbf +++ b/src/main/generated/.cache/23311cab2a0699e1373ff6662d45536b84c4dfbf @@ -1,3 +1,3 @@ -// 1.19.4 2023-08-02T19:28:09.2325899 vanilla/atlases generator for arsmagicalegacy +// 1.20.1 2024-02-19T19:43:01.1572606 vanilla/atlases generator for arsmagicalegacy 0254730bc481465701f873af6e295cab13d8a2e3 assets/arsmagicalegacy/atlases/skill_icons.json 9c6e0719cce0e93150b41abfdee75d6e4f521c78 assets/arsmagicalegacy/atlases/spell_icons.json diff --git a/src/main/generated/.cache/25bc9cae032fc12ef88c2ad95f56cfdc7020591b b/src/main/generated/.cache/25bc9cae032fc12ef88c2ad95f56cfdc7020591b new file mode 100644 index 000000000..da7f945a0 --- /dev/null +++ b/src/main/generated/.cache/25bc9cae032fc12ef88c2ad95f56cfdc7020591b @@ -0,0 +1,176 @@ +// 1.20.1 2024-02-19T19:43:01.1232608 vanilla/Patchouli Book Provider +41c02952860aef72d58b96d2e77ff1d195b09ad5 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/affinities.json +d1bc5251356b8f54fbeb5edfea4ea2cb78cea9ed assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/blocks.json +467b16a243fc07f7cf2449953541bb15c81d5c49 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/bosses.json +71c3867d2962fee21a2c60d3427f8cafb84b5604 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/components.json +bd6559c9e40c6463c168b94dde9eec4e44a3ee32 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/entities.json +6ee812e557b6b28c863310c65a404b26b3b4df92 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/items.json +c0747586349c2f8591e528a95ae5ea84effcde92 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/mechanics.json +7fdbd99125447b75d0df39e6d3f22feb73780fca assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/modifiers.json +aca967d67ad0baa4e7f94f14de5328e3776fe3aa assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/shapes.json +1c2cff61bb58d71b8541ff0c83306f7db3597168 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/categories/talents.json +9494c2b497a6e64b06cfc3ed139706222e9c4f97 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/affinities.json +0fcafe77fa217e7f8e7785599f7ba76dc220fb57 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/air.json +ea7fb90abcfb60346e513ac5038386a28a5d5c2c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/arcane.json +71792f352a202c8423a543babef0a072ef02690e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/earth.json +c209c85afb843cae46e7dc74730b8957da6a8783 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/ender.json +a28258d1f9bb5abbf7d8ae0cd7c05947f6a3225f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/fire.json +e0388ca3059fdd8a3c21430d3b616ca1ff4caa42 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/ice.json +0ac187299e7ece7dabab9fde78b4e0ddacd5c1b2 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/life.json +13aff41cdb3f504ab133ad343cc428a258026265 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/lightning.json +47061c65953cc25320a6688eb1e8883f410baf78 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/nature.json +228e9a1ae54ef29baf2c108e491a41906565407a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/affinities/water.json +22afc6ff33b0bcb15f1a0cb766766fdf53e22aa3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/black_aurem.json +b263c064b9adca5f3217c203c27cf0a85b2b5f9c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/celestial_prism.json +ffad0dcb2bd5b15354e812908cafaa8c084c568a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/flowers.json +0105b9dd0c27285a8ed7232b911c8e3100450b3a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/inlays.json +95b73a5a4aa9070780640fd863fca87db71ee861 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/inscription_table.json +a54942f908c0fd72cb2b66c1d2615568e91e9e9b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/obelisk.json +56f5120de6d820513d3ea992a0e1fabd059883df assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/occulus.json +3b2e3e565472294e26a1298336c2f90f5fe96e64 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/ores.json +b8bb62bedc237fb795bf86169e31097f8be93ecd assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/vinteum_torch.json +65c790f1ca3eca54433a48b8c375fffd98685527 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/witchwood.json +746e12341c89005085fc4b29fd312f59e614b2bd assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/wizards_chalk.json +d1ab4dbe4a0d9836d1d6e8daaba5f529baaccfe5 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/air_guardian.json +9d45b58d5f07a7d9b62254ba66d73567cb17f20a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/arcane_guardian.json +fa82fe340741570c99688ac4a972becbf31f42f0 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/earth_guardian.json +672e27722684d828d23377e20c6cb43bd57e953a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/ender_guardian.json +c55414afb17f49e8b4fda5e48cca92e3f331acc3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/fire_guardian.json +6cf04938f3b28162830946669aa9813526e1824d assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/ice_guardian.json +38135f3eb0f1b152b7876a5ed28f2a467115237e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/life_guardian.json +7e06904c28ada2ca09eb43f11816e3e4089a589f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/lightning_guardian.json +5857716a24dae9f30d2b695bc099996f3fbf0643 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/nature_guardian.json +ed8fbab8342228b6a659e7d91b6e66231407d79a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/bosses/water_guardian.json +a3b649fb8a61d3f9f8830fc60e0e119dbf7e445f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/absorption.json +73899af1e5fd2585ac069a74b30cb5e83474ab12 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/agility.json +849ef552797e7ce00ec5833bae7d7431d702861b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/astral_distortion.json +5e4912c4c07f351b394154d6ab8b92e19121e402 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/attract.json +dcb84334a360dc575326e2f52c12dff09dd3b827 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/banish_rain.json +ba71238901d8db6c978d446957b35a303734b74e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/blindness.json +9522430df6c4e5772670615757e14e3a19fdd4a8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/blink.json +f52e3ee40faa60222c1dad09757619a1fac5cbd3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/blizzard.json +0c8d06e7262f47e40e576ba8cf78cdef5f1d9ee2 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/charm.json +443ca8489198e554c9e4a556764dafdc2df789d4 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/create_water.json +a57f87eadfca638519d4c72ffdcddc1231b28cf5 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/daylight.json +6d09932ae74cd20d6f16cfaa6b15db49e76c450d assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/dig.json +7ccb407e219a7f0037b48842314191926cc6cfd8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/disarm.json +4a2e5a73084dc157731e84817a438025c6df8216 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/dispel.json +e7a1d9b3fb20123fe466aa2c01e7db4d218a35ee assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/divine_intervention.json +3fdb165eccb14d79dda8e58a6be5f4a7da10b808 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/drought.json +ddcc713ea70de8590d47526e2ec62d7c42f23fa5 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/drowning_damage.json +e9954fcc519905d43d81d1ebf861abce1b0bd4f1 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/ender_intervention.json +f7f970fe02ee5e3c695de7fabef33f86febeaeee assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/entangle.json +0d90f8a2a5072a0fa9b6117e1e31b8cc2b558ac8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/explosion.json +170bbb2331bee3215762478d7ee45c88cd262556 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/falling_star.json +20fc8974550d4ab0372199b703013c879ccc3a37 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/fire_damage.json +a0ed5868ddf4f9f50655a2b092ee0d2f60fbffb0 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/fire_rain.json +1c5587d9056f331e44d86c5296b8f3303e5b86e3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/flight.json +2f909d7634e53af7ce13a8e5d6aaf3a3539ce513 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/fling.json +b32cccb6f86c7bef554cdcaf7a1c0283f180ba88 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/forge.json +323933510b0bb9b3b342a431bb06d37eb4875831 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/frost.json +02454f75bf08ee435a672abce1969dfb31413d99 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/frost_damage.json +93701f184e4af1d6b72706dc6aaf8148610c911f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/fury.json +2a7574912364a9356fadb9ea17d61934060856ba assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/gravity_well.json +02fa79f2b728339376cb069e28987f3c187d8956 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/grow.json +6cd54b5f65f66a6ae0bbb28616b0165489bb69cc assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/harvest.json +06872831cd6052933c95516009a334eba8e7d4eb assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/haste.json +42ca8cbaeda4cc3633c72d95b35a9caed252a4de assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/heal.json +efcfdca2de74cc466621689bb32804273d1c88c3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/health_boost.json +8a4820f4238bbb662be9fc7c1ce4bd3812ebc050 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/ignition.json +32f04ab4f5a5bcbb26395f71713f5c439c3f8cf9 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/invisibility.json +31feda6b00d801695a3da0a92f1485ef97fed25c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/jump_boost.json +1ca77eb4edb44e2072244a62b8809b4049d8ffe9 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/knockback.json +e4787062bf0ae23b76b63dcc4e9a6a5654704916 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/levitation.json +0965b75546258338f4a328fc57b87d16cf028652 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/life_drain.json +727699da30e702e6d483d08b29abdcbbd40248c8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/life_tap.json +0b9b5d70a1232546b2822190ac61b633c93c808e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/light.json +af36e99218cec406dc6a83f73049f8b8f518ee4d assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/lightning_damage.json +1513cce47315ed2eb2425411c3b26d7bd8b20cac assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/magic_damage.json +73e3fcf8577b723d78bd243ad4ae1b75b565abfa assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/mana_blast.json +7c9c2cd6876006386a809162087a32f3767ae4a5 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/mana_drain.json +572b2fbbf5acf12e8bb9bea5f74db02bd8f8d48e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/moonrise.json +393ba976f8905132c6cad9cf95cb948a433c0b52 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/night_vision.json +a6248940dff28fc42aa59c4ac9703796fb7d8ef7 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/physical_damage.json +605deb1e9e79c60c3a2c4415aeb72ecb9f1e581a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/place_block.json +ab22011d66a586d4bd4c4dbf8f6d9ef6c3782b93 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/plant.json +f0f70d3e0f8f7f555f0c3658a27f32ceb1e17c5f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/plow.json +267a824b7ec92e04d036f6b93cb7c2c92d3ea95a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/random_teleport.json +f54067af7e1dbaa671cbbb9b6328e8151a099a4b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/recall.json +9ae02a5a9d3f10f00d1652e8f3c4b4bb633e4704 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/reflect.json +8f11ae130ded283820dd69972bc2594112fd315c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/regeneration.json +e1a8d364bed45046f4ee0fbbc714a66e767baa30 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/repel.json +c489964f6195a84f7c29c940ce04e2f6f81d4c48 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/rift.json +25f2f701f2ddccff92d72c191124e4886a384015 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/shield.json +9f2d54eeb247d64b52b1c8b2d6c3989b9d690a43 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/shrink.json +01ec4d3bf03643244be1d68d7886156eb431a8d8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/silence.json +cd21044f9ac9aa9af2ea6727970ab7b1d13f4f75 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/slowness.json +b14de94d9bd4415b158126f9639f632b9ec45a39 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/slow_falling.json +4d8061cd668fce25b316a01f4a2a8c6e42e77ee9 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/storm.json +954221939ccbfafa261211688f0748c0e4a5ae9b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/summon.json +d013bfb66024254ba89cb7b96d3e1729a453fc84 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/swift_swim.json +a42389106f4f9b1615744fc742b622835d36b09a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/telekinesis.json +0b1b5aaadb4da1810738814d0ff89a54573e07c2 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/temporal_anchor.json +0776212be2b4cd2ef965ba74e9a28c2661f5f8f4 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/transplace.json +7cc822b9c74e7118560e2e93ee55768e38eaa8d6 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/true_sight.json +d10edc4414f25aef6cdcff4c8fb99fd5e0d36949 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/watery_grave.json +2c0c5f1879bec4391bf8f337e7fb63de66652327 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/water_breathing.json +22f11852401e3738034734859f15cec904d15678 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/components/wizards_autumn.json +5824fbe7bc9045b6e69b827c6eaac14b74f01cff assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/entities/mana_creeper.json +4a803db45d55c0aeb57fe2b5903ace1efe9117fd assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/affinity_tome.json +67a1c5313d1223d7e34b9eb3846a030d660ccd4e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/arcane_ash.json +469bf21ca7afd5f3b9221b67f75c08865f8fd5ae assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/arcane_compound.json +d024ccb453dc1a6f773c9dcff31717de6ce67699 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/mage_armor.json +795f4cef1b84e6bc21ceec8fbd7b887bf5d3fd4f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/magitech_goggles.json +e8fb8f0a13374216863699045646f393bded440e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/mana_food.json +e4dbd8a73ab482db23c5984afc6b54c5bc8cafff assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/purified_vinteum_dust.json +b81a7a01dfaa2147115475dbd9b2139df4065ebf assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/runes.json +b945a6666d8ea54980dbb37ed49592cc11b41ebe assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/rune_bag.json +97d7a087edd2261370ae89d0d40ab39e9c40eeee assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/spell_book.json +4cf779747673ff63e7cd5b4444383ecec211ed7b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/items/spell_parchment.json +8a291b4cc8bef6155e03fdec67ba95ca4e733e49 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/mechanics/crafting_altar.json +3fce58ec8891bf52816dd9161145ffa9c4fd28d2 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/mechanics/etherium.json +f67a9784411dcc8037085e0a6fa2f9a744c47bb6 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/mechanics/getting_started.json +1b74ce3814d18458c783eb44342691acc4e6140f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/mechanics/liquid_essence.json +6863c000c6e68121d190162bb4c5bfc5f841dfc0 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/mechanics/shape_groups.json +548d92f1ba28f08e341d0918a8829461db21a270 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/bounce.json +f994a015a88fffcf152d2a372a06abfb81ffdc5c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/color.json +2a7ee158470e40e008b5e9396d038d9f36ed0d9d assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/damage.json +9c7e118c7638d41ae02a35205782fcf3ef9a77c3 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/dismembering.json +9738d199f85a583b2e1b1702355246e1fe6661d2 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/duration.json +4074f09cefd154872f8ac7ca30f34925309f5539 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/effect_power.json +228aa0ff2793be0c3b90f16d1bbe205723c7c658 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/gravity.json +1bff1ceef71e46ed6c80582b7db3e6ccfe690e31 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/healing.json +a9455898af368e137b433e2c7b39e1b6acfc1d25 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/lunar.json +f5038cc818baf27b3a6bbf54110d098e93022baa assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/mining_power.json +dcca41b6c59d148016325afb34fbcc13934780bd assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/piercing.json +3f0e7f91a26376efc95f792b1e2b5a41dc768419 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/prosperity.json +5385e2e3605b69351d91cdfe6893a8124bd74f46 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/range.json +38806447c7de9ef3a260b22907c29b7956da0a51 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/rune_procs.json +eb33f8f52735e9249f012b4ab8268275b120c15f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/silk_touch.json +e68b1b886de924aca9e6b3eb6c23e4464e2f5baf assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/solar.json +5ee172c4e77af1c86cac0f15e980692b198a48dc assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/target_non_solid.json +dfa9771c75cbfa520a36e90bfa945e0a06faf25f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/modifiers/velocity.json +09f2e9dc4a2ac37e1c681fe7cdb4b55b5dce9dd4 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/aoe.json +6f333c040737800b60228235b17234daec20862b assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/beam.json +0761a7aabda4e2783ab18fc66bc5498e3fa9a984 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/chain.json +f036f6a02d84478c75eb5978e60fe8e88eb003d8 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/channel.json +1e33bc27ff29654417ebba07ec1e564ff92e0039 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/contingency_damage.json +2ea9b173c6e239ec9e5ee0a530847caebe56a366 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/contingency_death.json +e63be1e66e8235571b055507111a0b3d4c5531ba assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/contingency_fall.json +492c87f94966880a9e6960af955dcac9f42e313d assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/contingency_fire.json +f50d8463a0cf057ec02f822244a39ddc95814543 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/contingency_health.json +687d847fd97e0d503600d2b33f3c4f96b1b6d127 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/projectile.json +b700e6d8408c05c38610219cfb6907dedabd1d59 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/rune.json +8023dd6723f017f805316642011adccf6ad141ac assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/self.json +6c8ea1a0853221eaa9b944c99452a7cf272b03f4 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/touch.json +f8b1d88a5699847add379f95a76c3a6ec578f7e4 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/wall.json +eb750a094d0b1cf7b4df1795cec90a019b74e7ac assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/wave.json +a758f72976238441939edc2438a2ce6f1d083a4e assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/shapes/zone.json +2ce0877051739c129c0a8dbcd558895c3d231a60 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/affinity_gains_boost.json +4455e979ae3c3bddd8ba651e8aaf3c9b33ecc26c assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/augmented_casting.json +2f86a3308321d7d9f7a706818ad2ac9a3358470a assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/mana_regen_boost_1.json +597d5e0fc596800f5a4208be91247cb8a66234aa assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/mana_regen_boost_2.json +70b7088e9b257cdbef48a93a24e589788e55fef6 assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/mana_regen_boost_3.json +e1679f019a70fa3ad8d37edc3d9c541017cbfaef assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/shield_overload.json +aab2e092082b3137ec8cfd948f2f2bc529aa452f assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/talents/spell_motion.json +0baeda2e2a20a31ccbde6c70b2f9805877cf4c4e data/arsmagicalegacy/patchouli_books/arcane_compendium/book.json diff --git a/src/main/generated/.cache/2684ce933959e21b1877dd70df4e2422904619b1 b/src/main/generated/.cache/2684ce933959e21b1877dd70df4e2422904619b1 index 64b583395..6bdcabee6 100644 --- a/src/main/generated/.cache/2684ce933959e21b1877dd70df4e2422904619b1 +++ b/src/main/generated/.cache/2684ce933959e21b1877dd70df4e2422904619b1 @@ -1,109 +1,110 @@ -// 1.19.4 2023-08-02T19:28:09.2078106 vanilla/Recipes -d956a147f6662c25bcde37672e10c0d9e52e66b7 data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json -5c4023d9dad627f17709ffc0e099eae9f0311ce3 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json -ba7df54830ba65fa04aac0df0c1a7179b4f412b9 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json -4008cf7e21d8dbc0c23878e5da0e80803852fba1 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json -d301fc5162d32d6209054ec878f219148ea11e45 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json -9cb00913471bafb093c4edafe5b1a3810ddbae34 data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json -7fc1e3bdc7963be259809f306e03d6a043398900 data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json -c856ea30a9fd8a7b7ca1863b25b9983188543d9f data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json -46dd11a94e9942b0cfc84dd491c06871dff4d845 data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json -ec94adbb580e7ac3061f6f7dacaf3be916ce1ff3 data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json -15f832109fbe2161886bb521c32b7dbb17b2f51b data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json -666e792e175c8aa78e1d4c37bc33e16ec6e9c72d data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json -394d403c13cd13d19c54b9f7cf2a91b7a78d2e39 data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json -cb7d3bde74483f6637e1975bb0a931e1f7265b5c data/arsmagicalegacy/advancements/recipes/combat/spell_book.json -8d39e4d3ce5a1f85c318bf5e6227f6b37c1f7019 data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json -0f9bc45c690acc89897b8fc61b2ef45e874a1d12 data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json -60336a3fbd8f4d8047ac3937ac93552381299655 data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json -ddfd71d7553ebfa8d38dbe4beb3ee21ef2337012 data/arsmagicalegacy/advancements/recipes/food/mana_cake.json -171953021ed072fc70b96d97dbd71e8a907b81a4 data/arsmagicalegacy/advancements/recipes/food/mana_martini.json -5d608621b88372a31c93749e2aaef82e90359828 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json -109d0b52199b1f6ffa60cce200c2f80ae7261e2b data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json -aee071e30afe5fa12880ff3e947d0bf0298f17f9 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json -0dd1e4ced1072dfed3622ecd2681e6ffa558c57e data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json -532961333315b956fac2699e0bf8480e6764740d data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json -9bc4b4fc3f5dbf1ddd61b3084f2164420d348f73 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json -9cf76dcff6b860ab33b553d8b9da8eaa42be3ac7 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json -43a7bd1b50d6b8468030995ceba83c5bfc72253f data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json -6cd17eab110db911087f3aa2cd1f88b72ed1a9a8 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json -756d5d8de285a53dd17c78f59c94ce25069ad2ab data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json -f6b199a12d8f15aae2e9bdb80e6c479d262ca39d data/arsmagicalegacy/advancements/recipes/misc/altar_core.json -587eaecb7467fa9df6c9db058677e3db0c6ce3b4 data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json -bd3fca75fa8e99b2f2685e6544eaf0bb0a06c45c data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json -7819a9aef9571830f394888a1ea091c32a2c6028 data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json -d9b6ab0e8bf999f43eda435e4158eee6a2cc5105 data/arsmagicalegacy/advancements/recipes/misc/black_rune.json -b5580dd0c61817f925052d1fae8d2559744804cf data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json -1c7ed4aa74fc6735065417acaf42a33180b375e9 data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json -fff19f8bcf1174738c86a4befc1bdd184bea8c13 data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json -0a52269af89fef4e555875ff9f1bb5e39957addd data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json -4a3298e372fe0876fef6845ae9f5396bd70a8002 data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json -881fd7b20e692fce649c51218d0cb10e77aa5a77 data/arsmagicalegacy/advancements/recipes/misc/chimerite.json -9860aac5ae303f4d18f915c388c9b0999ff3f01c data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json -96ed8f809d1c1a5f6439d7e769176f609de09004 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json -211ec9cc107e2e5e2eafbe0a8219533ec54d8527 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json -b11baa0d52b12d10b038709a42b0b8429689b60d data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json -043833555ad84804628f31cf16036bce19f1f138 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json -f58cb1075fb4465f64c2bbc97d76930fbdcdc229 data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json -08beb75e441e0a10d66f1d844f181ef2cd8050a6 data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json -ae589fe167b3732c1741f2ca520b93c15f2e18af data/arsmagicalegacy/advancements/recipes/misc/green_rune.json -0c35b46aa6e3dcede42dc63d86397e392964237e data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json -4c10e8b05cdfeac68b2ebbcaec1347b5ff783668 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json -e72a6dc1517e9df27a29a59cf818cbd65acbfe5d data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json -95907954c71eb5ccd560d09b080ed2baa1b86809 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json -e4d9c5eb513fe81bca3db609035e067542686f38 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json -65a9b3b97ba002d5cce6b905c6eae3664d425356 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json -bc662e11e75d7c40b7a22c3314f09756d6987272 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json -d54c0743539963e9bd76f2ae1180c6e863187971 data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json -47f27b9f5b4c0ca4fe96843556888a4d8b1f9469 data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json -819a1ee9fe46aaf17ed1b0543f735370bda10b39 data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json -8ca4a4a9f7ea0cd97ae329ecacce0ecce6077931 data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json -26a62e29b7204fdcc4530602e27bf64e360b126f data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json -30230d2a6e4ded853d63b85564492a970abbc5e4 data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json -f0b1da97012a09908c98053e445edb0a631631e2 data/arsmagicalegacy/advancements/recipes/misc/moonstone.json -984e3552f81816122a548aa20dde746fd63202a6 data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json -785966e5668a7348cc7192fd978defc365b71c95 data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json -356f2793862d4d9d1e7f60140aa0df993ec9834e data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json -22a924a47d840b7c7b2cf411bff0e05a1df8f5a8 data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json -7be969ca2d6c036e98455c8e61e5a895d5657916 data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json -13ee18be9e307c3ddc3564fafab84db7978e5ca1 data/arsmagicalegacy/advancements/recipes/misc/obelisk.json -b6585320464eff2eb19451c9ff3878c49e0d8962 data/arsmagicalegacy/advancements/recipes/misc/occulus.json -2625f35f0e4af136065e92b6f47ce9c7d12371de data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json -910038e76b71d89077d107256c67daf76e732251 data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json -d77ecd33b76f2798b430caf899f94d87b0f86d94 data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json -7076d4d548221be38a144f76bbb5806d5b329a65 data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json -a9b59d402b7cbf09bea772fd8012bd8edc831091 data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json -0a8c6073b81a4126238f01381b123835da46681e data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json -5b7b9f5d16c098e3f56c3e8fa64d8109fd9b068a data/arsmagicalegacy/advancements/recipes/misc/red_rune.json -76d16a9eeada3da90651766143ff08dd9be403cb data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json -19aee5e430d62e0b1e42d0c826d3c7f411c02c97 data/arsmagicalegacy/advancements/recipes/misc/sunstone.json -4aef0b7f5452b6560f27f8f8e80d79e485721d37 data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json -0a8a577a68f19c7e9300c85c5502abb8dedf50a1 data/arsmagicalegacy/advancements/recipes/misc/topaz.json -edbf47864b95fba4afd12e24d4984e166e468ef4 data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json -6e6f74f41d1321a796f3282ff34375c282f551f4 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json -55d7f4c2cddd0717e1b95b3c374cf55040857cb3 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json -884f08020a275d0f1a6c4e774101166746b10d2b data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json -21855359f87425b86bfb6820fd4ac7d2326bc7c6 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json -dba035e2cf13fb766dbfa629b3e247dbd1cb0925 data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json -d9db22bf70518bcd7c6c8cbc4138b9302bc97cda data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json -512bd3722106ae10ce41fcc73a1c06197ad21e8d data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json -03664c1653970cfac74577cc150175dd9802b129 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json -c1db02525d066539b6a5071c6040724b6268fb19 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json -817293672092392687884e49c8a2506f1c3283b1 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json -b66540a78db1d75ec1f534a4d26e4dc36cf508c8 data/arsmagicalegacy/advancements/recipes/misc/white_rune.json -e2636b11a251fe4624caee0621d979f14517c2a3 data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json -1ac17448ab52ffc86800c33adda4e7df2556f922 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json -c301da662626490a69db4994c8e878d4c6309e49 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json -6e0cdba4fe2056be863bb6aae5eeadab8576c745 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json -5d9556fc2c84f94ebbbef0178284a43cb340c10a data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json -b57ddbc42630287eff8143e79d0f9fbe64538097 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json -8355cb452e30b190bc82bcbdf9fff388bd873e1e data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json -f3491740e9d8989c2b01c70645ed2c058216be38 data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json -1521734e5ecc46c38420202ad0f5eb827b979c5d data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json -1269ca9dd47eaa8140efdcc2ea1e4a54a31ca9a5 data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json -ea6146376162b9fad79fcd34b6da38e85e7a36a1 data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json -11806db457ebf8126944f8c9493abb37265932df data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json -21670aeca6d58c50af562d67c2ed704a575b4d88 data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json +// 1.20.1 2024-02-19T19:43:01.1332613 vanilla/Recipes +4099c3e6693a1e203f5dd802f339ef56753e3c94 data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json +8a686c0184a955c9b92d9f125df9428ade6c5577 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json +ec3a079ec2d9f3e329dd811fad5f506a63dd6566 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json +1d2e19668804ba87eeff04ed647476ee20bb3441 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json +46db77e897e52827bb9c33a1061c274a473399a9 data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json +485417bfb241cc989e1dfea87f16574110e34484 data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json +d8b2b6cf6007d730c3fd3bbfbfa805a46343f3d7 data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json +8ba496d2689790c73b4f369e51497fba86c54fb4 data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json +856150528034bb7b4650362c5dbe1527df619f89 data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json +b7175f2cf9be16a59ec98199f93aea98289ce267 data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json +6d2945e812cb070fbe6aff0c2339091f15bae31d data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json +2e8fe39876049b134525d86d9fb5cb863504d78f data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json +02e381311ebd9c3221098343cc690ebf6857d975 data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json +aa44616a51fb01fa21f92996dc01885ac48424cc data/arsmagicalegacy/advancements/recipes/combat/spell_book.json +aa08f7d857f694709287a8d39f29de3cc7297b10 data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json +191d8b2dc7b6cde2e25c46dc24275c961a2ec337 data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json +3bb9de4152440c9ceff25208d13af56a48596d6c data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json +ed59d3c7a800655d908663a69fe0e5164f5d7d6a data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json +68500231780a5174463d06a4b5f650d0295cf16a data/arsmagicalegacy/advancements/recipes/food/mana_cake.json +4a6f68b2542f21f41203607b3a0ecc99f9d0ea69 data/arsmagicalegacy/advancements/recipes/food/mana_martini.json +44a44a420986c290e67348efe7895b650f073d14 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json +e150cf751c61627b69720ecf74db50a45d96fc08 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json +11e0db8936a6c5f51f83a84da779fdd0d360bd4b data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json +ff7183df60de3a9e1a0478dc77b3ab810007692e data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json +6cdeea9ffd0b7761d12b49b1d3997c5ecaaf6854 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json +8d2fe9a1f0ff7fb084d42de5e46b1ef46288546b data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json +103d999ef93e22e050e47bcec4a3fcf8cf8ff0a7 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json +4dbf764579f21d0c4adafd4d9cb0eb021a08e0a0 data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json +95c755e2589483124a824213179728cb46b69c1a data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json +d9fa40959a457f6c135a6b9349d5668851f2831b data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json +5044b0a5c25386f43728f585286fdc1c8f3af9fb data/arsmagicalegacy/advancements/recipes/misc/altar_core.json +259f8bf987124a5666dd531b6b0ac7272c128d4f data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json +f4deaa38fdded380fc5d5e0279f783919d0e9977 data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json +0de1c5233c6e34cbc431ad632a8075379b34768e data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json +c90d40cf44dc785f2f39c5071c35e17984a2a5fa data/arsmagicalegacy/advancements/recipes/misc/black_rune.json +60e11cd9b7bf79642861ff6902152a1b2bd14596 data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json +8633f3156c521aa4cbb340342dc9f8fab91296de data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json +0bde034e6c9599c34389500fbdbf98a6af9534bf data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json +c59f598ebea8149c6420a368aa2b9b5a8dca68f3 data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json +be64c5e62cc5c5bf6106a3c12d17267d44c6f034 data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json +da69a818e2b8cbd3fbdf9c2dafb5b70020d6389b data/arsmagicalegacy/advancements/recipes/misc/chimerite.json +022ea901a8f34c27d5ab011809550c2c5ff5117a data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json +c1d684269d20733b4df0294e82a7500d9277f408 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json +b75e272da53f7baecd9207e03537905cb25b5af2 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json +bfa28a2ee68d87e73bab7906d92177aed2c17aa6 data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json +ecb576692725e16a825c37d04537c3332a7adffd data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json +bd386c90bc6438265a1490edeb888b1fcc160a01 data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json +66760b6da921e58748482060d37cff582451330f data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json +e115def5deed6c6428edd498fc150b907edefca1 data/arsmagicalegacy/advancements/recipes/misc/green_rune.json +6dce1fbfd0682e0387a42625528cc17d22a67794 data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json +137c60ed05c0d0c297e8c610ad5876fe850309fc data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json +b6ad2c1cf871342525fdcf25af2aec24d97c82e4 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json +a94a0972d9905329b6a79127bde354616e08c36b data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json +48bf227c3d46545265e9b1adcf444bf4046a0aaf data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json +52c861b296525245a8c241f548ecee169c19c7b7 data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json +9c4e9b7c0accaf7e87ee6b3ae54820b0fa18245f data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json +f1a9c498de2322cc7324a74ce5edc738e6242d31 data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json +75dd7ecd80b6dc7836162e01cb519166c6c89e1b data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json +8edf9f7e53f42b6fa5e74a89cfc1830b33bdcd8a data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json +711f295b93c528c1c397c4e67b5efbbf977d571e data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json +3e6fb718fed7868cf4fc55330d754c3d8c51d452 data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json +a9e8e8f75ed307a8ab62dbd778caeb64660774ca data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json +370b5bcacda02908c49ebadf7a49dff1f9bd4b5e data/arsmagicalegacy/advancements/recipes/misc/moonstone.json +add09ff3970acb3d2a39cbaf8bf535365c51086c data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json +d7c71f473bcbca066fcfff5e68d43652bcbc4f59 data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json +d62b38c0db1ff8c4dfac5ade266260fc790e3e4c data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json +9141c3c13205a6b039dfc7e5304ce585df65962b data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json +f47bb1c41095699bc1239328802cb064a89076b1 data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json +3168e34312d7867ff6855844ce3eab188cda1987 data/arsmagicalegacy/advancements/recipes/misc/obelisk.json +74208112b44e5c54f5b61a342c5fb3777f725b49 data/arsmagicalegacy/advancements/recipes/misc/occulus.json +e90d2a2daa1d6691074804a491d76ed1a2c139a4 data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json +681aaef766b4b3de258bb62d5d1a996525647330 data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json +274012705299d57c1ef418a9f510fb927404eb35 data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json +5377157213fb614311e638e5506ed9fe42bd7df9 data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json +286d6cedcf3b4628b114c5afeef412a7edabb1fe data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json +c2b367a270fae8c25955303de04818dfe52cc599 data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json +b30896ecd14a4788b177ef2f65a8b514a9cc3e94 data/arsmagicalegacy/advancements/recipes/misc/red_rune.json +9938450919de031c3f2d8fa6c00456163023595c data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json +77408a68d70baa245d89c19606fea4f042c3ecd2 data/arsmagicalegacy/advancements/recipes/misc/sunstone.json +51da1de135cb2be1119bd07011df7de6132a4de5 data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json +697d7b6974a86ce984b0b61acd4a1ca4fc952d85 data/arsmagicalegacy/advancements/recipes/misc/topaz.json +e17fb7cd7b0bbeba1e88597ed323fde6616bded7 data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json +3c4965a41b06c8da744d2907f3b09a88009f7ca3 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json +f66a884b45fa4443f067cb4bd343e773081970af data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json +cc24190a4d5110c75fa0fa1a9ca6e13dd2ed4153 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json +85f2a025359fe953f29fdb42f8ba9595f1b9da09 data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json +7bb4ceaeca3fb1e6c8a5729f5ae9f8ae9e6d3e06 data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json +d9d9d7f1da3ea73c4ef1665b4a12db68f1b1c822 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json +8f613c4a92c894c3216b7fa502889fb91c25167c data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json +91fab54b6c7e297b467f2df7410df1347a631ec1 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json +bea8147d98f6748b2ddda94cfe68e578c5e685d1 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json +17bd958c9ba95836d0e5b3a82299f153984b1fd1 data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json +a1951b1aabc6418c6953b78e35a3bafc7b03ddb2 data/arsmagicalegacy/advancements/recipes/misc/white_rune.json +3a60793b08724716273772257a27ed01b0867c8d data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json +e6a23d5ff567b9f7181d389461d77cf2bebdaf3a data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json +62845f271852717650737658740912ab76be4bbe data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json +f0dd96b32a7cc50033bf5cf8c1044fbf50c37140 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json +8f4b139b70eab1dafd5727cc37ee430fde25c104 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json +9c840b079f98ec7b5a1c47054cb8ccf778de2164 data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json +49b060103ec48c9bb185d1b06197a7b95f917147 data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json +b17824879a92042df5db9f19080d2d8b0921e2bc data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json +9146b60dce86fb74ffeffad31e22106f7258e38e data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json +d89b8b4efadb25f51a8bf9eba0e042494a3ec71d data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json +cd4b88c1b33534ce633187de12092fc02d90edbb data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json +7215ca3c08a9350fd5e5367845f2fe0e00cd5262 data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json +9acf3c17abd888961413a0680fe02bb3dcb69130 data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json b2d77d49231458cdcb83bcac8e6b5e3be6aec3bd data/arsmagicalegacy/recipes/affinity_essence_air.json 9d8c0e17c7a19b2e35156b63cbbec82c3b86159a data/arsmagicalegacy/recipes/affinity_essence_arcane.json d9e4898d734e35ee8075d8e88b454c45f2d822ea data/arsmagicalegacy/recipes/affinity_essence_earth.json @@ -201,6 +202,7 @@ a49ec42cd86bd146a744232729a86debc12d448e data/arsmagicalegacy/recipes/witchwood_ 78461fb203d2a6f95d386657ec6d26bb4ad6ae39 data/arsmagicalegacy/recipes/witchwood_door.json e0f16edc283bfce92cbb74abdecf81bce4e71a92 data/arsmagicalegacy/recipes/witchwood_fence.json d484d0dd4b76c6c9ebe11467a38dd022252bef90 data/arsmagicalegacy/recipes/witchwood_fence_gate.json +b4ef0fff345360ec6dc0750b0627436ced885219 data/arsmagicalegacy/recipes/witchwood_hanging_sign.json fa2141098eeaf815c5d4493356f29b0164acd6b7 data/arsmagicalegacy/recipes/witchwood_planks.json 87301045bc1f2d44849ab6f32c43bff93b2ee80c data/arsmagicalegacy/recipes/witchwood_pressure_plate.json f242949968cbdfd5dd051c3e1f7d3384b6ab426a data/arsmagicalegacy/recipes/witchwood_sign.json @@ -209,5 +211,5 @@ e8d633f0d7ecbb32adce23b34d00a66e492ef8a3 data/arsmagicalegacy/recipes/witchwood_ fdcdbca205069148504036b198e29c379121973a data/arsmagicalegacy/recipes/witchwood_trapdoor.json 326f68951f729ba073333ae7328c90a29624749f data/arsmagicalegacy/recipes/wizards_chalk.json a8a5646b0b8990b3d0ec961a3d0d555833fe1654 data/arsmagicalegacy/recipes/yellow_rune.json -a213f5f93b4fe63ca4885b7c2fc333f43d3889bb data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json +c70ae100e66608c935a71d550e3372afd14557fa data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json 7f1962be034b38a21bcab3cf8156606c79bf7184 data/minecraft/recipes/rune_bag_from_bundle.json diff --git a/src/main/generated/.cache/2ac0b173402772a5dbd4f3ddb39436ec62ca180e b/src/main/generated/.cache/2ac0b173402772a5dbd4f3ddb39436ec62ca180e index 9cb4dfff7..70ea1bb65 100644 --- a/src/main/generated/.cache/2ac0b173402772a5dbd4f3ddb39436ec62ca180e +++ b/src/main/generated/.cache/2ac0b173402772a5dbd4f3ddb39436ec62ca180e @@ -1,4 +1,4 @@ -// 1.19.4 2023-08-02T19:28:09.2168581 vanilla/Global Loot Modifiers : arsmagicalegacy +// 1.20.1 2024-02-19T19:43:01.1552603 vanilla/Global Loot Modifiers : arsmagicalegacy c5adde4e53adcefce7155cd116306326aa83cbf9 data/arsmagicalegacy/loot_modifiers/abandoned_mineshaft.json 3b3ad0c38dc7c403ed00dfcf721427b21f48ff83 data/arsmagicalegacy/loot_modifiers/ancient_city.json 5717d551d6a4b08ae4b2703423df625dbefceb9a data/arsmagicalegacy/loot_modifiers/ancient_city_ice_box.json diff --git a/src/main/generated/.cache/43859251295d9c95a473674d37532ff90981f2fe b/src/main/generated/.cache/43859251295d9c95a473674d37532ff90981f2fe index 1a3515e1c..a09dea898 100644 --- a/src/main/generated/.cache/43859251295d9c95a473674d37532ff90981f2fe +++ b/src/main/generated/.cache/43859251295d9c95a473674d37532ff90981f2fe @@ -1 +1 @@ -// 1.19.4 2023-08-02T19:28:09.2028345 vanilla/Tags for minecraft:entity_type mod id arsmagicalegacy +// 1.20.1 2024-02-19T19:43:01.1312605 vanilla/Tags for minecraft:entity_type mod id arsmagicalegacy diff --git a/src/main/generated/.cache/4514f0a5cf5bd19fc9aab7d7474e707d515a64ff b/src/main/generated/.cache/4514f0a5cf5bd19fc9aab7d7474e707d515a64ff new file mode 100644 index 000000000..b5a899b23 --- /dev/null +++ b/src/main/generated/.cache/4514f0a5cf5bd19fc9aab7d7474e707d515a64ff @@ -0,0 +1,62 @@ +// 1.20.1 2023-08-06T00:51:49.2322279 vanilla/Tags for minecraft:item mod id arsmagicalegacy +7c50968c8a1ea719ed4d876acecae84e9151fd3d data/arsmagicalegacy/tags/items/inscription_table_books.json +ac08e7755658188bc121b8cce95fa5a057098996 data/arsmagicalegacy/tags/items/runes.json +bf2ff7f1168fe233c660f374f8cb43a29c227e84 data/arsmagicalegacy/tags/items/runes/black.json +6d8e32f4cdc0fe371bb34e661ca342e42cb8ff9b data/arsmagicalegacy/tags/items/runes/blue.json +c9567eca1ffbadec8f56e96d9efb2c5dab924c70 data/arsmagicalegacy/tags/items/runes/brown.json +09af43a7a9cb6962a8d5e9b378368f12aeddbd79 data/arsmagicalegacy/tags/items/runes/colorless.json +ebb1c5bfad559288297915d9086c1500b566450f data/arsmagicalegacy/tags/items/runes/cyan.json +af23f3e6480545831c313c233922b71b1e510fa4 data/arsmagicalegacy/tags/items/runes/gray.json +6f9a143bb541235f515126be853d5ecc3427cdd0 data/arsmagicalegacy/tags/items/runes/green.json +15bd87f9563de1f72ebad259454a62d10ba845b6 data/arsmagicalegacy/tags/items/runes/light_blue.json +2591531faa3f41c2e9ff8b8fe7f15e7116b36409 data/arsmagicalegacy/tags/items/runes/light_gray.json +d4c1fa5311b7dae72b0c8dcf1afd60253fd2afb9 data/arsmagicalegacy/tags/items/runes/lime.json +190fea15156d0ecd2d4947e2500224fc005c1e90 data/arsmagicalegacy/tags/items/runes/magenta.json +4bd2b629759dbfec1cdbdf0719ae17e666a9018a data/arsmagicalegacy/tags/items/runes/orange.json +0d749dd3e33589c4bba41dee6752118baee29940 data/arsmagicalegacy/tags/items/runes/pink.json +6dc475614fe65c4f84273d343d8ca123926d9fb8 data/arsmagicalegacy/tags/items/runes/purple.json +30fba6c2ba59841003877c5ef756e8fd8d76aa95 data/arsmagicalegacy/tags/items/runes/red.json +917075cdb4df4f90fd4e78d5a4d77aa9fdc04c88 data/arsmagicalegacy/tags/items/runes/white.json +b1774ad103cba4626fdc860193f93058ea93ce9a data/arsmagicalegacy/tags/items/runes/yellow.json +3172b3316d9e9bc7f03efe84082a0da0bbe360d4 data/arsmagicalegacy/tags/items/spellcrafting_end.json +1ab4f91f47360dfda84ec956fed7c78f564fd36d data/arsmagicalegacy/tags/items/spellcrafting_start.json +09a8495f82a08691d533f5301ffce0cc0afe0bcf data/arsmagicalegacy/tags/items/witchwood_logs.json +a0b375c98ae151eb3539b82b5d8156b2e68f85e2 data/curios/tags/items/head.json +3779c7cc8657968e1c820faaa585855a17d7e663 data/forge/tags/items/dusts.json +e46d2848fb8306c4399c2c45c6da8992ce815b98 data/forge/tags/items/dusts/arcane_ash.json +a0db303737f01768da20a014bb01858549331f0a data/forge/tags/items/dusts/arcane_compound.json +1d0eecda30f363a8510e676ee89b4270cf39125b data/forge/tags/items/dusts/purified_vinteum.json +7fcd32eacf9a02dc1b26ab6b609517b78238e1b9 data/forge/tags/items/dusts/vinteum.json +75597f58eaad48b98e64ba095c0e13b1573e0f4e data/forge/tags/items/fences/wooden.json +4509a6dbe8b8c6353fbe06cefd812efe1dca2727 data/forge/tags/items/fence_gates/wooden.json +3de02cf5d7f4b5680161b6e15be1ebd0441a02ba data/forge/tags/items/gems.json +d498a45e33548db20878c11a7e960e316d6a1df0 data/forge/tags/items/gems/chimerite.json +488d0bdfa28de16b2566d3bab85ea861e7506b3c data/forge/tags/items/gems/moonstone.json +7e63b15ceb697ef3b27f01905b243751ec381055 data/forge/tags/items/gems/sunstone.json +a7f6812a9c0945143ebe0724e650e942a6338527 data/forge/tags/items/gems/topaz.json +6a558a0ed28ed310142c59a33f3143ba05e8fbca data/forge/tags/items/ores.json +0cfa5b473056ef4e219ce978c6b1fd5a947ed556 data/forge/tags/items/ores/chimerite.json +e60ce640b03c19e40fc4fd591174c0bb5f6849d1 data/forge/tags/items/ores/moonstone.json +74f13af5245edcd85eb79b9ddba0e16a3b9dcff4 data/forge/tags/items/ores/sunstone.json +d601eb2422bbbb9e026d8ff13e1e102aa6a2e794 data/forge/tags/items/ores/topaz.json +3411592573e08ce8589c59292dd1db64c65057d2 data/forge/tags/items/ores/vinteum.json +04e4ab4daf44d017409481ba8957f1f77599e7ad data/forge/tags/items/storage_blocks.json +a5efaf624ecc4e7aa79239bfda857f660c06c552 data/forge/tags/items/storage_blocks/chimerite.json +92cb1537d82e26e6146281141600e9d640113080 data/forge/tags/items/storage_blocks/moonstone.json +44a23cc79dc5ba635c2c0cab92dcdf6d05104734 data/forge/tags/items/storage_blocks/sunstone.json +76df3f25234406bbe4c797c04449e8b9683eefcd data/forge/tags/items/storage_blocks/topaz.json +1b98676a20688653887cd8966162861777356e7e data/forge/tags/items/storage_blocks/vinteum.json +cd4ee8afe25cbc17263f3bcd49ba4402450d4b66 data/minecraft/tags/items/leaves.json +dd339a82f6a267df22cce143dbc4859a4ea30176 data/minecraft/tags/items/lectern_books.json +cc20d8d43b66ef761c1f2d6f55740085c58a35f3 data/minecraft/tags/items/logs.json +638b279febd41d749f4abb6380caa1aeb19c0d00 data/minecraft/tags/items/planks.json +3a056c5644cf343a86bec06721ab75a71e7d4d20 data/minecraft/tags/items/rails.json +a5cc6f3a50fcd1f61d2ba94c42b27f82e25e2c8e data/minecraft/tags/items/saplings.json +4646c92ac03ea27d3a443cb64e53ee5b9a6de33c data/minecraft/tags/items/small_flowers.json +277695cc2f20524f716a39aaee2b5a0f411d8af9 data/minecraft/tags/items/wooden_buttons.json +86b8cf4f20c521d1ddc7dbf8cf710466ebb12bdd data/minecraft/tags/items/wooden_doors.json +75597f58eaad48b98e64ba095c0e13b1573e0f4e data/minecraft/tags/items/wooden_fences.json +802bce3671f3f3da836547e7885bfa388fe753d1 data/minecraft/tags/items/wooden_pressure_plates.json +4ebb96267c6c38a793210c2c8d39acb8e40281df data/minecraft/tags/items/wooden_slabs.json +df0cd475149984fc3cf4cef962ef40707c439454 data/minecraft/tags/items/wooden_stairs.json +604d97418c492d03d2afdf186aca7668415cc6c8 data/minecraft/tags/items/wooden_trapdoors.json diff --git a/src/main/generated/.cache/552763967fefb6e400cbf8810ea5a6f7653c0b0b b/src/main/generated/.cache/552763967fefb6e400cbf8810ea5a6f7653c0b0b new file mode 100644 index 000000000..8a7a87449 --- /dev/null +++ b/src/main/generated/.cache/552763967fefb6e400cbf8810ea5a6f7653c0b0b @@ -0,0 +1,149 @@ +// 1.20.1 2023-08-06T00:51:49.2382232 vanilla/Item Models: arsmagicalegacy +bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/arsmagicalegacy/models/item/affinity_essence.json +6e0b262bb6740bdbe7b3564e182497239ff375ac assets/arsmagicalegacy/models/item/affinity_essence_air.json +84174d0bc6eb1016c4946a0937eb7ec35e19f1d8 assets/arsmagicalegacy/models/item/affinity_essence_arcane.json +30a8164938d38c30eeb732879d3cd38955490293 assets/arsmagicalegacy/models/item/affinity_essence_earth.json +60b6706e2eafaea51fab798351728767a34e86c5 assets/arsmagicalegacy/models/item/affinity_essence_ender.json +abee1bca5887e776d08ec9e1ce60d0b8302abea5 assets/arsmagicalegacy/models/item/affinity_essence_fire.json +4b32b232981aa85259b0e98bdd3ad144dadd17a1 assets/arsmagicalegacy/models/item/affinity_essence_ice.json +e5277d92be039622292493c3812839094620fe86 assets/arsmagicalegacy/models/item/affinity_essence_life.json +fc1beaa4f23800e755d40cf02f0b7cfbf92a798d assets/arsmagicalegacy/models/item/affinity_essence_lightning.json +fcada4500b163ea0c7abe4a187bebc43c1e328ca assets/arsmagicalegacy/models/item/affinity_essence_nature.json +48ca1a5b3e9dcf196abc0697fce7c0f3a791baba assets/arsmagicalegacy/models/item/affinity_essence_water.json +bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/arsmagicalegacy/models/item/affinity_tome.json +a7dddd38da7bf5f8b8a51732460bb71f028bf6c0 assets/arsmagicalegacy/models/item/affinity_tome_air.json +bdbffb50d29797fb64c042910189fecc5f306d9d assets/arsmagicalegacy/models/item/affinity_tome_arcane.json +6ac9ec380a77fb9d3f46792932fa1d5d0aa78c75 assets/arsmagicalegacy/models/item/affinity_tome_earth.json +45af1186f6dc152dc59a96f72614466e6f8cd930 assets/arsmagicalegacy/models/item/affinity_tome_ender.json +db5d69cb4f346f20980fd86528f5d2b1dd1e675c assets/arsmagicalegacy/models/item/affinity_tome_fire.json +c0662180477063f2eff2e4cf73ba92ccdc9f4aa0 assets/arsmagicalegacy/models/item/affinity_tome_ice.json +f858907157d6b293e372bcdab15b3fc5ed396c13 assets/arsmagicalegacy/models/item/affinity_tome_life.json +7465fa77019dbc3568c8a060fb3ed055e43c16fc assets/arsmagicalegacy/models/item/affinity_tome_lightning.json +e2e6bcd81684be8a6c026c2b476f8b53e361ae8d assets/arsmagicalegacy/models/item/affinity_tome_nature.json +bd93b3eb1c4912992a4fc11a0801c861b24ddc01 assets/arsmagicalegacy/models/item/affinity_tome_none.json +7d3188c7cc9bb65f8917b612e805327b168c4671 assets/arsmagicalegacy/models/item/affinity_tome_water.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/air_guardian_spawn_egg.json +672d7426cbe3ad0c3e54fa979072b925bba35226 assets/arsmagicalegacy/models/item/altar_core.json +5ade3f37b24782c7cdf40a3a83a6306d90db510a assets/arsmagicalegacy/models/item/arcane_ash.json +7a015fda319f9dd8d3baab4993daaec647132edb assets/arsmagicalegacy/models/item/arcane_compendium.json +cc2cb15d367f1057fc85a254ed16a8d5ea9fd02b assets/arsmagicalegacy/models/item/arcane_compound.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/arcane_guardian_spawn_egg.json +479f46ca80005c14a383332494b60e0b757b4f70 assets/arsmagicalegacy/models/item/aum.json +580dc6c1ad7abc24560ca8e93fe93a029ad4c547 assets/arsmagicalegacy/models/item/battlemage_boots.json +d8b2e0f981903a0ba591b08f767495b2f1ce7273 assets/arsmagicalegacy/models/item/battlemage_chestplate.json +207c2013cee9f69bd44b0d2c83cd3828d31ed46c assets/arsmagicalegacy/models/item/battlemage_helmet.json +fe085d359408c9f131025759be45a7e824af6add assets/arsmagicalegacy/models/item/battlemage_leggings.json +03d6d90c70548cf19223da5f99e65178ab7bd2cf assets/arsmagicalegacy/models/item/black_aurem.json +9cc168c5c7d6018e6c02f1d8f40dd4fc008d1782 assets/arsmagicalegacy/models/item/black_rune.json +1e97cd23f92995dada9ded0b943ed936fe532d26 assets/arsmagicalegacy/models/item/blank_rune.json +78fda52d641e619051035ca42e0102740b412225 assets/arsmagicalegacy/models/item/blue_rune.json +d87cb1d957df2f45a524fc14d0d577b646a7dd5d assets/arsmagicalegacy/models/item/brown_rune.json +4f7901f41f1e3228aeab5336def79070b53da018 assets/arsmagicalegacy/models/item/celestial_prism.json +28a0fc5d380ab0d239e86927904b7533407f3766 assets/arsmagicalegacy/models/item/cerublossom.json +6c1eeae7f5e5a36cc5147228704ed8173be15c36 assets/arsmagicalegacy/models/item/chimerite.json +379ee8d24d333ed5382839985eaef620a27d0f92 assets/arsmagicalegacy/models/item/chimerite_block.json +a173017a013a2594a6c3c8c44dfdca0c60018f2b assets/arsmagicalegacy/models/item/chimerite_ore.json +fc394511d334e110e503fba01ae8a516d9b31673 assets/arsmagicalegacy/models/item/crystal_wrench.json +8ff967403269c80859578dd7da45ee16595cc764 assets/arsmagicalegacy/models/item/cyan_rune.json +61b734af14cbc76804490be973ea35ecc8fa98a5 assets/arsmagicalegacy/models/item/deepslate_chimerite_ore.json +ceb5816f7bffe087aa2d7d3ab4507a55e32a6728 assets/arsmagicalegacy/models/item/deepslate_moonstone_ore.json +4892dbefcbae56b7dc6c96b81fc878d04e96e1d5 assets/arsmagicalegacy/models/item/deepslate_topaz_ore.json +9e475bb40fa9e38c089c3a22ad0a5e8a10b2fa9b assets/arsmagicalegacy/models/item/deepslate_vinteum_ore.json +0d0ca386538be770abcd2f8b8d94c6148e5b3ca9 assets/arsmagicalegacy/models/item/desert_nova.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/dryad_spawn_egg.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/earth_guardian_spawn_egg.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/ender_guardian_spawn_egg.json +3c357128f66121146e6c67dff38e370592823f14 assets/arsmagicalegacy/models/item/etherium_placeholder.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/fire_guardian_spawn_egg.json +18d4246fda3363738c85b64260317fe6cb19374a assets/arsmagicalegacy/models/item/gold_inlay.json +1ee0b234c539257428ef980254c2dea028ed3a94 assets/arsmagicalegacy/models/item/gray_rune.json +0cce297b364fda90b75c6098721b5eedf0bec3ce assets/arsmagicalegacy/models/item/green_rune.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/ice_guardian_spawn_egg.json +bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/arsmagicalegacy/models/item/infinity_orb.json +c21f706e116e5b2bf9c64682d65b99589f03a313 assets/arsmagicalegacy/models/item/infinity_orb_blue.json +201371065f932814e5c3c997f9b6d6c63da0473f assets/arsmagicalegacy/models/item/infinity_orb_green.json +9805099af512c579c92252573616148b527148e4 assets/arsmagicalegacy/models/item/infinity_orb_none.json +b8d7707941aa5120979431bb89c54c0f18600ec0 assets/arsmagicalegacy/models/item/infinity_orb_red.json +7dcd628c4c52ef98feed77db425cf9dc806ec945 assets/arsmagicalegacy/models/item/inscription_table_upgrade_tier_1.json +a97d8f349dbb1f1c3acd894d9e618214c93a77c6 assets/arsmagicalegacy/models/item/inscription_table_upgrade_tier_2.json +e5ab563b4ffb87d5a0bc7e67d4f7bb089f5c93ec assets/arsmagicalegacy/models/item/inscription_table_upgrade_tier_3.json +10524e7f6ce8b24b1aeeb89d8069e40f8e9da0cd assets/arsmagicalegacy/models/item/iron_inlay.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/life_guardian_spawn_egg.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/lightning_guardian_spawn_egg.json +3e3d968958428483ce14a4b63ebfef6f55f9a27f assets/arsmagicalegacy/models/item/light_blue_rune.json +f23802e331e186775bfb9211aab6c426820e1f6a assets/arsmagicalegacy/models/item/light_gray_rune.json +7de8caeb86db5ef926a02117b3d614ec253cf4e8 assets/arsmagicalegacy/models/item/lime_rune.json +4319de210acacaaef02eb277be8e7c7332a553cd assets/arsmagicalegacy/models/item/liquid_essence_bucket.json +4efd9f80996b62a4cfa761ba92fa1e1eb3741e4e assets/arsmagicalegacy/models/item/magenta_rune.json +d2009a05fd1491bd1054981535286fd1232d8fc8 assets/arsmagicalegacy/models/item/mage_boots.json +81fa2919df0cd12ecc8acf0464fe921d3a47e867 assets/arsmagicalegacy/models/item/mage_chestplate.json +bf4830e970edd94c32ac8f163368ba337b340783 assets/arsmagicalegacy/models/item/mage_helmet.json +365eac1fcfbfda90d80c566397d7c61c71d09147 assets/arsmagicalegacy/models/item/mage_leggings.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/mage_spawn_egg.json +31f73b71f6340806e253951fe796c55ba519a28e assets/arsmagicalegacy/models/item/magic_wall.json +6fa5c59f2f5df549dee40d1f738c533e264cc876 assets/arsmagicalegacy/models/item/magitech_goggles.json +832742322eac44f0c68d71fdf61fd6b7ea81231a assets/arsmagicalegacy/models/item/mana_cake.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/mana_creeper_spawn_egg.json +c4e17685da9d9ca8b69c3f02bd2a8a4cbe5ad328 assets/arsmagicalegacy/models/item/mana_martini.json +29e2e8f8d2a39b2a1650ef1531a047453daf1587 assets/arsmagicalegacy/models/item/moonstone.json +c53606ff6e745abe68542b67f9898bb41ab0e429 assets/arsmagicalegacy/models/item/moonstone_block.json +fae4c9c3d165032bf10bd242e080dc1857dd027e assets/arsmagicalegacy/models/item/moonstone_ore.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/nature_guardian_spawn_egg.json +0700f58c26b8f6f60cd330203b41352197c0bb7e assets/arsmagicalegacy/models/item/obelisk.json +7cc3fac8ad4b5a36b4ba649cd3e19527fd7a9c42 assets/arsmagicalegacy/models/item/occulus.json +c4bad8cba42a6ad57f3f07aa9114169c4262a2ef assets/arsmagicalegacy/models/item/orange_rune.json +84a1c846975221a6ec8da6e5c746fb3b2fb4c1e2 assets/arsmagicalegacy/models/item/pink_rune.json +fa2a7dbb22b29acdc4051e3568755d8f4546d69f assets/arsmagicalegacy/models/item/purified_vinteum_dust.json +e0b4ee8d0a2e88a657cc7e240419e7f063c35710 assets/arsmagicalegacy/models/item/purple_rune.json +86efefefa9999944a2e52bedd0c2bebc10c705cd assets/arsmagicalegacy/models/item/redstone_inlay.json +f16cb1a0064c41af929f3c88c399c767177ec5bb assets/arsmagicalegacy/models/item/red_rune.json +f6b1c90afbf36e7694251a0ada03f924a53f0760 assets/arsmagicalegacy/models/item/rune_bag.json +bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/arsmagicalegacy/models/item/spell.json +9e2ccfdc72a1f495bf64b077dd72c2b27fed87ec assets/arsmagicalegacy/models/item/spell_air.json +08f5d5cdb8d2c51bf8c946aba201e2c03853ec43 assets/arsmagicalegacy/models/item/spell_arcane.json +bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/arsmagicalegacy/models/item/spell_book.json +518e8b27d5c0e7a6987582c3362568ee4a15fd1b assets/arsmagicalegacy/models/item/spell_book_handheld.json +1585b951ee1340cff593047f6cefb371661a9c5d assets/arsmagicalegacy/models/item/spell_earth.json +a6c852ad8f1daefcf0bca51b67a1aa20e614a10d assets/arsmagicalegacy/models/item/spell_ender.json +3ce951ec2755ce44ff583ceb4e8c8fdf6e106296 assets/arsmagicalegacy/models/item/spell_fire.json +d2a877cb6eac6e46984c3262250c9ff9e767aa60 assets/arsmagicalegacy/models/item/spell_ice.json +22c52e7d065749e250c6189f8b74e87d0fefb22b assets/arsmagicalegacy/models/item/spell_life.json +c13c5097dc958397074c98b4ce23cc6bca7bb6ff assets/arsmagicalegacy/models/item/spell_lightning.json +cc4b5736e37e75dd4ff5ab1f699f27495871c7c8 assets/arsmagicalegacy/models/item/spell_nature.json +dd40c3132cc43eef1237b4efe5009bfa3be412ff assets/arsmagicalegacy/models/item/spell_none.json +9dfdee46a41f56a75b2658592d91d5c901bef09b assets/arsmagicalegacy/models/item/spell_parchment.json +923cdaff5f13580f4d97e75ef18190eb75ecccde assets/arsmagicalegacy/models/item/spell_recipe.json +77407e9c1a75c383d9ee18ef1bc971f97c9f2f86 assets/arsmagicalegacy/models/item/spell_water.json +c5c08fd13cf74672fc67e26c749aeae7346a4ef7 assets/arsmagicalegacy/models/item/stripped_witchwood.json +9253fce70168a98d5bf234ddb1a5ff0f3258ed73 assets/arsmagicalegacy/models/item/stripped_witchwood_log.json +db1d131d27c09a93c04d0040d43d1b96d4aaf664 assets/arsmagicalegacy/models/item/sunstone.json +5c5b0bcbd0d55f1a3482dd34c66e668a932d6990 assets/arsmagicalegacy/models/item/sunstone_block.json +b63422503347de92b8c2ce9126eb91e9fa227f59 assets/arsmagicalegacy/models/item/sunstone_ore.json +7c79dcea839822e8979afe587a3a6aaed5da31fb assets/arsmagicalegacy/models/item/tarma_root.json +5c819e3783d5ce06c5a3576504b24111401dab03 assets/arsmagicalegacy/models/item/topaz.json +c39cef2d9348158e24f4bcc005adff814f58cc35 assets/arsmagicalegacy/models/item/topaz_block.json +b22958073963cb86c97a87532b4f0303b8d1c9bf assets/arsmagicalegacy/models/item/topaz_ore.json +fb6dcd13d8d51669f3015ba2ae81dad58fb9ca38 assets/arsmagicalegacy/models/item/vinteum_block.json +b8bfbbec0501d1cb57247ead9a025848e5d96658 assets/arsmagicalegacy/models/item/vinteum_dust.json +1fac3efb11845e6e4072ac6eaaf3402c68e48a72 assets/arsmagicalegacy/models/item/vinteum_ore.json +04923c0a58b7162cdfd4a0ad66e79d828a763a27 assets/arsmagicalegacy/models/item/vinteum_torch.json +f2c8838af0eaefe17fe25f241608ea5e986931c7 assets/arsmagicalegacy/models/item/wakebloom.json +63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/arsmagicalegacy/models/item/water_guardian_spawn_egg.json +e933e0452dd5bd442b7dd886503bb0cd0051efcd assets/arsmagicalegacy/models/item/white_rune.json +9bb6569ea537aa9699038bd8dddc4f5dcc8a3751 assets/arsmagicalegacy/models/item/witchwood.json +0d18accbe51907f2fe0eba427cfc36726b6ccc31 assets/arsmagicalegacy/models/item/witchwood_button.json +967ce7b11486341e692012dc605f5868fb8bcaac assets/arsmagicalegacy/models/item/witchwood_door.json +dc18e0d0b85bb0d49eccb002331a70d862ed511c assets/arsmagicalegacy/models/item/witchwood_fence.json +b0137c7f4424a804e977b86a0b90afc807adb52d assets/arsmagicalegacy/models/item/witchwood_fence_gate.json +29fbb98a78f2d0a1a55254d00e93a1be1a36d30c assets/arsmagicalegacy/models/item/witchwood_hanging_sign.json +eac8c6aa4b6de7a397681a5e4c3f7e9958a96235 assets/arsmagicalegacy/models/item/witchwood_leaves.json +d9c5bf5dd60792bf8982874ea995b808bdf31160 assets/arsmagicalegacy/models/item/witchwood_log.json +aac29ceaba013d7325359720ff4fab0f1868762c assets/arsmagicalegacy/models/item/witchwood_planks.json +3f147e373baeaf3df3256569fc08d0d7f907eb95 assets/arsmagicalegacy/models/item/witchwood_pressure_plate.json +5a1c12577ed4117e8255cac15f4f2c4743036a3e assets/arsmagicalegacy/models/item/witchwood_sapling.json +146d96ff586e516525d4ebd71c4acf63546f23cd assets/arsmagicalegacy/models/item/witchwood_sign.json +4e8f02397fe605cf3737775174f8541d5ef11be8 assets/arsmagicalegacy/models/item/witchwood_slab.json +10650bd7485c723d38a09aed82ef8862d78d9192 assets/arsmagicalegacy/models/item/witchwood_stairs.json +ae15cfa128b13830635c630db2e676aa69726838 assets/arsmagicalegacy/models/item/witchwood_trapdoor.json +2d46b5e6053fb10091d1d8b7e02bb0881e32530b assets/arsmagicalegacy/models/item/wizards_chalk.json +b3c9db5fc6b386b264fc666d0399649910a5f68c assets/arsmagicalegacy/models/item/yellow_rune.json diff --git a/src/main/generated/.cache/6deee57a789289495e0e4b2297d0baad21cdb85f b/src/main/generated/.cache/6deee57a789289495e0e4b2297d0baad21cdb85f new file mode 100644 index 000000000..bee452efc --- /dev/null +++ b/src/main/generated/.cache/6deee57a789289495e0e4b2297d0baad21cdb85f @@ -0,0 +1,171 @@ +// 1.20.1 2023-08-06T00:51:49.2292185 vanilla/Block States: arsmagicalegacy +9ff96b56b738b4ea85e1140167a077e69db0178f assets/arsmagicalegacy/blockstates/altar_core.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/arsmagicalegacy/blockstates/altar_view.json +beb7ab7de7f6ae890282ef38e36400685d083d78 assets/arsmagicalegacy/blockstates/aum.json +30af4342d085e8fb94bdc195acfdc2f95908074c assets/arsmagicalegacy/blockstates/black_aurem.json +a7fac6ccf05eb3e5425b7ee42f68fddf739fd3c6 assets/arsmagicalegacy/blockstates/celestial_prism.json +41a6820d81a4f10a322441df3d03bd96ce3efecc assets/arsmagicalegacy/blockstates/cerublossom.json +ceceed48dd9d01498eedc67f1dcd1052b88d2d62 assets/arsmagicalegacy/blockstates/chimerite_block.json +d01833886c5b1836ffdc1285c1c8f413ee252f7b assets/arsmagicalegacy/blockstates/chimerite_ore.json +c0224328cad0f3e6bb1347836a3f560cc2e52c6a assets/arsmagicalegacy/blockstates/deepslate_chimerite_ore.json +e118990f2354d8057ffd20d25b19d074d5882f4e assets/arsmagicalegacy/blockstates/deepslate_moonstone_ore.json +a8a47ba67e51620f00f1b30264127ca623befab6 assets/arsmagicalegacy/blockstates/deepslate_topaz_ore.json +c3a58e44c492a0628efe6a8247b330cdef358886 assets/arsmagicalegacy/blockstates/deepslate_vinteum_ore.json +2b8a5ca05f8b1618544a0b4b93112dd9e803e01f assets/arsmagicalegacy/blockstates/desert_nova.json +41b38daf530d6e2699de3e77d6dc7cf796d6641d assets/arsmagicalegacy/blockstates/gold_inlay.json +de551ea1a60d3fe1004d0b8768519cc8f9dd551f assets/arsmagicalegacy/blockstates/inscription_table.json +7340a1466afec6385b0b91134414ec740e63107d assets/arsmagicalegacy/blockstates/iron_inlay.json +8b41ba7ee1d20724ac2582cbf0bc2f5a5ccf552f assets/arsmagicalegacy/blockstates/liquid_essence.json +1a7daa060ad204c8f6414ba8ec5753894a487384 assets/arsmagicalegacy/blockstates/magic_wall.json +7cae732aa1a031540d4d291df27eb98115c8bac5 assets/arsmagicalegacy/blockstates/moonstone_block.json +b7adcf17a7e4c5b1df798c2b817f13b8846a4f5a assets/arsmagicalegacy/blockstates/moonstone_ore.json +b61c8ba189d1e0e26c2e329a6d859a02ce1c2ab8 assets/arsmagicalegacy/blockstates/obelisk.json +f5b0ca45bc530e0a7dc45235befd62c679dea925 assets/arsmagicalegacy/blockstates/occulus.json +b2a87a378e81583ca59905000831a8bc6b3317d8 assets/arsmagicalegacy/blockstates/potted_aum.json +750e200e72f8c92bdee038f4115c42d3c206a4df assets/arsmagicalegacy/blockstates/potted_cerublossom.json +36cce7a5c9b0fd78f43cb15a7734505f7cecab7a assets/arsmagicalegacy/blockstates/potted_desert_nova.json +ed089d4fa3396dae16b84a3ff0d1135740b6ac23 assets/arsmagicalegacy/blockstates/potted_tarma_root.json +3340eb6afe263c27c9827b9f253c19f57b9e3469 assets/arsmagicalegacy/blockstates/potted_wakebloom.json +94a20f1b0097685df5c935d5cabbb521bb4fbce8 assets/arsmagicalegacy/blockstates/potted_witchwood_sapling.json +e332519dbbb853c14094170090a327cc6a5d8f9f assets/arsmagicalegacy/blockstates/redstone_inlay.json +e971cee019f36933fb553a418a7f0331a51be3fc assets/arsmagicalegacy/blockstates/spell_rune.json +5ec887c42c2024c0c1ec35a8d4ecfd39486d2aec assets/arsmagicalegacy/blockstates/stripped_witchwood.json +44903e5c1a4998eb0642e7c75d89310b8c68e92b assets/arsmagicalegacy/blockstates/stripped_witchwood_log.json +a87a0f07fc33396b84a28a902b04e78c9e24d81b assets/arsmagicalegacy/blockstates/sunstone_block.json +b493006d6795d122cabcbd8dbe8ab595a92c5ecc assets/arsmagicalegacy/blockstates/sunstone_ore.json +846e06b13dc480a6d8ebc864bed09b18652f4359 assets/arsmagicalegacy/blockstates/tarma_root.json +3b120ebb24d88ecf02b6b115ea573d8f049075b9 assets/arsmagicalegacy/blockstates/topaz_block.json +fc4c89dcb66a7fb6d9c0143d53bc65b427aeb370 assets/arsmagicalegacy/blockstates/topaz_ore.json +caea3caf665880c5a2c9e07fe5581557a36fdba3 assets/arsmagicalegacy/blockstates/vinteum_block.json +16a541592a4f9ceb651c431e46e9d8a2533c0a3a assets/arsmagicalegacy/blockstates/vinteum_ore.json +2fe9d24950a9a28204d3ba30568f33868649579d assets/arsmagicalegacy/blockstates/vinteum_torch.json +6a063b6a5c8e41a4c02531e4b2d7d5fccb9e009c assets/arsmagicalegacy/blockstates/vinteum_wall_torch.json +b36ed86dfcaf47f3c93d5eb430917b3c24b47225 assets/arsmagicalegacy/blockstates/wakebloom.json +03c8a0d7cc5a6fd1e02c9a60fdced9165a08400d assets/arsmagicalegacy/blockstates/witchwood.json +81a0845e9aaa45f3e75fdf4894dda3b56a1d3114 assets/arsmagicalegacy/blockstates/witchwood_button.json +8450b9368042c7abd6befd7e49ab527f92029254 assets/arsmagicalegacy/blockstates/witchwood_door.json +d2e0f5fba41ae0a5e3990ad487a362249e4f7185 assets/arsmagicalegacy/blockstates/witchwood_fence.json +4822e07283a3b7abb0af107bf42ef12dbfd13414 assets/arsmagicalegacy/blockstates/witchwood_fence_gate.json +dd87c328b6e626a6914e826d25d6af926cef3dca assets/arsmagicalegacy/blockstates/witchwood_hanging_sign.json +e1cb010cf50228f6737ca0466c75110b42f21909 assets/arsmagicalegacy/blockstates/witchwood_leaves.json +8fc53223fdca867a6c05676e304555420fabd9ea assets/arsmagicalegacy/blockstates/witchwood_log.json +90d4594cd194569cfad497609f91c8c248433984 assets/arsmagicalegacy/blockstates/witchwood_planks.json +5edcdce413dc73f9043d2ee6f9b422336bdd35b5 assets/arsmagicalegacy/blockstates/witchwood_pressure_plate.json +53bc2e19780819e5444e106e5a3af0b096e4679a assets/arsmagicalegacy/blockstates/witchwood_sapling.json +ea15851e101b5bed51079e09c20e3108874d26ab assets/arsmagicalegacy/blockstates/witchwood_sign.json +8ebfa9374706e18192e7f7689d999bfdf9e2ff48 assets/arsmagicalegacy/blockstates/witchwood_slab.json +cff096d1ca9c9fb86a04dbd7513321e8b00146ee assets/arsmagicalegacy/blockstates/witchwood_stairs.json +2529f83e7603352c9eb8dbe4343f3423a2c0f146 assets/arsmagicalegacy/blockstates/witchwood_trapdoor.json +dd87c328b6e626a6914e826d25d6af926cef3dca assets/arsmagicalegacy/blockstates/witchwood_wall_hanging_sign.json +ea15851e101b5bed51079e09c20e3108874d26ab assets/arsmagicalegacy/blockstates/witchwood_wall_sign.json +bbb195b12c389533eeab1fd35c616bd51c4d9215 assets/arsmagicalegacy/blockstates/wizards_chalk.json +4cac0db389e8865590d8b6808758cf4f93e342f8 assets/arsmagicalegacy/models/block/altar_core.json +dede1a5e7c82ee7d2761a303d884419943ea96b7 assets/arsmagicalegacy/models/block/altar_core_overlay.json +a92a86fd0961228b76c96d8d27427847da7fcb9d assets/arsmagicalegacy/models/block/aum.json +8bac0cbdf24600f7bea0a472136d4a050dc677b5 assets/arsmagicalegacy/models/block/black_aurem.json +4d4e071a46d30789b28008828a7085a490690b91 assets/arsmagicalegacy/models/block/celestial_prism.json +d8121fbca06f74f2c4cdbe8d829c32172201c1ab assets/arsmagicalegacy/models/block/celestial_prism_upper.json +73320da5fccf4478a4a612157a9c174477193eb6 assets/arsmagicalegacy/models/block/cerublossom.json +a418d19b121a13b5c8477b854a93c748e442d0b3 assets/arsmagicalegacy/models/block/chimerite_block.json +37caa62b5e57bb1b2529f74f507d8e6b927c90f0 assets/arsmagicalegacy/models/block/chimerite_ore.json +e78fb52c06f697e48f7a6ebfded156173fd52e24 assets/arsmagicalegacy/models/block/deepslate_chimerite_ore.json +d33253d8907010c4fba7fec592517e9a478839d4 assets/arsmagicalegacy/models/block/deepslate_moonstone_ore.json +d7272bc14413eb751d22c1dd49f5f9157452c543 assets/arsmagicalegacy/models/block/deepslate_topaz_ore.json +db4e65f1499e6eed4f255bbf37490e1374bf8018 assets/arsmagicalegacy/models/block/deepslate_vinteum_ore.json +6fcae3b45654f82e72d3055110d8e5b62888a354 assets/arsmagicalegacy/models/block/desert_nova.json +088b7719763814ed1ec007f98f6d301f0770d6f4 assets/arsmagicalegacy/models/block/gold_inlay.json +ff99d72deeb3de9f22a5101c21ff23906e56f6cf assets/arsmagicalegacy/models/block/gold_inlay_corner.json +e3a8dc0483c6edd6321063b2fb1c0c90ccd5c521 assets/arsmagicalegacy/models/block/gold_inlay_raised_ne.json +27ec474c92a3f4b01f0b5f94e9b42fa1ee29402b assets/arsmagicalegacy/models/block/gold_inlay_raised_sw.json +9ec06a8eafa832c7fc2f27affafe55b11989fe7c assets/arsmagicalegacy/models/block/iron_inlay.json +78b62ccdd78980899e5e46c42a1d45b4110af148 assets/arsmagicalegacy/models/block/iron_inlay_corner.json +0e0494bf163016af4825f84ca85d4fc905fbc8bf assets/arsmagicalegacy/models/block/iron_inlay_raised_ne.json +21932c8e246fe644b49f2856eb16e27a7840d9a7 assets/arsmagicalegacy/models/block/iron_inlay_raised_sw.json +20cf8c4fd53b517b1d5fd0727e0da3d06473f150 assets/arsmagicalegacy/models/block/liquid_essence.json +473f1e7e192c4cb45e6bf4de44f822d82cfd8978 assets/arsmagicalegacy/models/block/magic_wall.json +c9879977d87892fecdebebd013240ac3e2e053c6 assets/arsmagicalegacy/models/block/moonstone_block.json +778c9d6a21bf9053f451dc0252597b7722870cfd assets/arsmagicalegacy/models/block/moonstone_ore.json +2aa4a5b73a0cb68a51f7bfcd510e5d629f1c1445 assets/arsmagicalegacy/models/block/obelisk.json +f9d0ef98ee61c1800c372631e8f74eb347e21533 assets/arsmagicalegacy/models/block/obelisk_lit.json +ac2673de6b61ecf954ef76f6983deafa781feb56 assets/arsmagicalegacy/models/block/obelisk_upper.json +22b596a34fcf733f63e07051bc3016f96785789b assets/arsmagicalegacy/models/block/potted_aum.json +ecee8b6bdfadc7c1e016d3eb27094c4756e79c1c assets/arsmagicalegacy/models/block/potted_cerublossom.json +c09095a92c1e06660daed359bee90596813a833c assets/arsmagicalegacy/models/block/potted_desert_nova.json +4a5bac214f0882fa3b30388b1cfa59ac06d7308e assets/arsmagicalegacy/models/block/potted_tarma_root.json +58797e5b58b76f7ca6b057166c0bc46b15e6893d assets/arsmagicalegacy/models/block/potted_wakebloom.json +3ba4dee0203553b56dcec6cbf840bfbbf545366a assets/arsmagicalegacy/models/block/potted_witchwood_sapling.json +69ece4835b0d387b70de1200d0f3ac9964de5938 assets/arsmagicalegacy/models/block/redstone_inlay.json +0d46a1501458e5f91748c7852b28b832caa4d5aa assets/arsmagicalegacy/models/block/redstone_inlay_corner.json +1ff491d24c8d1eba1ad82537845b85369b95fe0c assets/arsmagicalegacy/models/block/redstone_inlay_raised_ne.json +ddff9202e026635ed13e11d3dfdf1d122b436f05 assets/arsmagicalegacy/models/block/redstone_inlay_raised_sw.json +8c15246b2b5ec1b1176940cbf9a8b3bd42e3b7c7 assets/arsmagicalegacy/models/block/spell_rune_down.json +4ebaf2b4931e3694854303cece78f2a07879a9b1 assets/arsmagicalegacy/models/block/spell_rune_east.json +83537d52d1c6798da9967387aba8a2b1b5a49878 assets/arsmagicalegacy/models/block/spell_rune_north.json +e5355d1cac9b38854efd72c56cdb7f6219b8e963 assets/arsmagicalegacy/models/block/spell_rune_south.json +e929069ad241d55f465a313f4e8f35f29ea8f6aa assets/arsmagicalegacy/models/block/spell_rune_up.json +1f09ac362ca7adb89a0d87deef91a3059ef72a5c assets/arsmagicalegacy/models/block/spell_rune_west.json +0ee0ff4787ba114237ac6d1a891ae0cc727e5f05 assets/arsmagicalegacy/models/block/stripped_witchwood.json +4e01272ecab31e2b8f97a27d148291cf6250f11c assets/arsmagicalegacy/models/block/stripped_witchwood_log.json +1ecd015149b1832c25bfdfe39cdf82b756a9432b assets/arsmagicalegacy/models/block/stripped_witchwood_log_horizontal.json +0dba048d88f57f3324f7697a8cdf987fc05cc962 assets/arsmagicalegacy/models/block/sunstone_block.json +412339af850d78de8e15e257e82148f90c9e90ed assets/arsmagicalegacy/models/block/sunstone_ore.json +dc2a6dc73c93ec4b681732d3dc1647035633bf7a assets/arsmagicalegacy/models/block/tarma_root.json +d0a014418b5f6aa77c87db723740f2b4aa04c2e2 assets/arsmagicalegacy/models/block/topaz_block.json +f72d454c34bb488bb42faa373095d60b6f2bbb34 assets/arsmagicalegacy/models/block/topaz_ore.json +e167f35cf038d559dc1db28c273d7973b9dc3078 assets/arsmagicalegacy/models/block/vinteum_block.json +e369b133d2979938aaf7cdc044682f1898bf1093 assets/arsmagicalegacy/models/block/vinteum_ore.json +a22181d1923c899a0f0bbfffc55a4d92549ca506 assets/arsmagicalegacy/models/block/vinteum_torch.json +6592d0fe16abadc33d981e27f694fae90a5af7f7 assets/arsmagicalegacy/models/block/vinteum_wall_torch.json +e510b4c7c45ece3e9f58b54ad168832e6b33662c assets/arsmagicalegacy/models/block/wakebloom.json +1c03464f98ea52f4d832f9d8be8b1b55d143de30 assets/arsmagicalegacy/models/block/witchwood.json +7758853365158e73dd9e13358cccdd7138b36f94 assets/arsmagicalegacy/models/block/witchwood_button.json +f90b6e4c21d2bc26d804137166149b28a4dea39e assets/arsmagicalegacy/models/block/witchwood_button_inventory.json +4ebe6e8160938191d62d4b325a5db5b0a347ee2d assets/arsmagicalegacy/models/block/witchwood_button_pressed.json +d55f87866ff076c473ce3fc33a39422aa6af2a53 assets/arsmagicalegacy/models/block/witchwood_door_bottom_left.json +dce2ffb201f2144757722ad7deabf6d8def376c3 assets/arsmagicalegacy/models/block/witchwood_door_bottom_left_open.json +fdcb872a44708e831cfca88c529bfe935a7aea57 assets/arsmagicalegacy/models/block/witchwood_door_bottom_right.json +73e3f20b7ce804e962337a2bcf0adaaa0f6e7b10 assets/arsmagicalegacy/models/block/witchwood_door_bottom_right_open.json +1b4ee6d41c7de0692db89d3391654db26672cef1 assets/arsmagicalegacy/models/block/witchwood_door_top_left.json +06a40e6d2f2e407fd1207f8082d46831492e1e23 assets/arsmagicalegacy/models/block/witchwood_door_top_left_open.json +a3b73e23325a49c204d0a30927f92038495751ba assets/arsmagicalegacy/models/block/witchwood_door_top_right.json +f7220ed380372152917b9a45157bc695dfb40b74 assets/arsmagicalegacy/models/block/witchwood_door_top_right_open.json +21290c16e3b7dee3a405c93a976b2d6f2086eea7 assets/arsmagicalegacy/models/block/witchwood_fence_gate.json +bf34174404c183ea9574f7c4ef5d4ca8af4c87d0 assets/arsmagicalegacy/models/block/witchwood_fence_gate_open.json +45c109130afac1f30fa1ce9ccaf7f2f8a31214ae assets/arsmagicalegacy/models/block/witchwood_fence_gate_wall.json +8bc8b16023fb62e79b8b7a4cffce78466469e34e assets/arsmagicalegacy/models/block/witchwood_fence_gate_wall_open.json +d5be92b0798ca94c47f7be292c75ee5908ed6132 assets/arsmagicalegacy/models/block/witchwood_fence_inventory.json +15970d81f66447d418a9671f801bd34240456414 assets/arsmagicalegacy/models/block/witchwood_fence_post.json +9bec16951edd7a6af4972575fb8a905b80168a1f assets/arsmagicalegacy/models/block/witchwood_fence_side.json +97dbe0ef0e4337c90b7298d5826fb3e469557333 assets/arsmagicalegacy/models/block/witchwood_hanging_sign.json +c04df1738fb9abd138f9e97940c81263cf7067c3 assets/arsmagicalegacy/models/block/witchwood_leaves.json +7051257d45dc3fd57af88108819f560f5168f4d0 assets/arsmagicalegacy/models/block/witchwood_log.json +22733459e8d4a9b4ebe0eedbe524ec9b73ba8300 assets/arsmagicalegacy/models/block/witchwood_log_horizontal.json +be4f07fbf9b77ab63d1312ec912f7ff994128d74 assets/arsmagicalegacy/models/block/witchwood_planks.json +f443131f240dd6a4c158e8d373bd37a33f18fa7e assets/arsmagicalegacy/models/block/witchwood_pressure_plate.json +72854a3235ac95f5062df4afbcc1297ebf246272 assets/arsmagicalegacy/models/block/witchwood_pressure_plate_down.json +b635376b385bc2cbff43dbd2e03eeece10382b0d assets/arsmagicalegacy/models/block/witchwood_sapling.json +a8deb5cb75b65442414fc14c058e070260429eda assets/arsmagicalegacy/models/block/witchwood_sign.json +31ea7120ce9996f9265e38020058af07c3f5d124 assets/arsmagicalegacy/models/block/witchwood_slab.json +71e5ccd7af39ebf411ceffbdfc555b0737da5c53 assets/arsmagicalegacy/models/block/witchwood_slab_top.json +aa66770a1a09565bea28181f391eb64b5227c8a4 assets/arsmagicalegacy/models/block/witchwood_stairs.json +501476981a41b9c372e35e9ac8368c1f40e5bcb8 assets/arsmagicalegacy/models/block/witchwood_stairs_inner.json +631cb7bb83b6a8e532d2c88a8ed248c2f1a685ff assets/arsmagicalegacy/models/block/witchwood_stairs_outer.json +e27157208f88c25d6c6cecfa668855ed8f2c805f assets/arsmagicalegacy/models/block/witchwood_trapdoor_bottom.json +bee6b21d9208510e62aae4077806a682453d364f assets/arsmagicalegacy/models/block/witchwood_trapdoor_open.json +0f511a4d2489002966b48554fc02ea57fc71ea97 assets/arsmagicalegacy/models/block/witchwood_trapdoor_top.json +cc472d467bd7f24c30f6fe546f8b41298bd5263c assets/arsmagicalegacy/models/block/wizards_chalk_0.json +222f8c6a1c1bd05fcb4ec17ee97622bd9f7bc2b1 assets/arsmagicalegacy/models/block/wizards_chalk_1.json +6f5d30ef35be4a64f38726d530e0c0ca0d839fd1 assets/arsmagicalegacy/models/block/wizards_chalk_10.json +ed921b25119bb7b5e4df686a30a34b910b4b0d3c assets/arsmagicalegacy/models/block/wizards_chalk_11.json +e807e7bf22288c196382332b535380fede4d7b17 assets/arsmagicalegacy/models/block/wizards_chalk_12.json +874fc11a43f11f3cf980a23c5f6ff469fe79160b assets/arsmagicalegacy/models/block/wizards_chalk_13.json +8377e5bef4952607df7a5cd2ff5491576ea4f849 assets/arsmagicalegacy/models/block/wizards_chalk_14.json +332f3a2ad0335957a2bfdeb5335ac42286ab4205 assets/arsmagicalegacy/models/block/wizards_chalk_15.json +8f1e9b65f4f00506a7715df1cc712fb1932a3cd0 assets/arsmagicalegacy/models/block/wizards_chalk_2.json +531437ff1f59044004c05357b7151ee064c870d4 assets/arsmagicalegacy/models/block/wizards_chalk_3.json +fc8740d6a3b8c5223740a4a2c53c67076167d248 assets/arsmagicalegacy/models/block/wizards_chalk_4.json +8bcd7196a0eb021fbfbbc292ef68d633c9c45fa0 assets/arsmagicalegacy/models/block/wizards_chalk_5.json +c0010628a8f7c0687fa3e67dec827eefdb60c535 assets/arsmagicalegacy/models/block/wizards_chalk_6.json +2b28f4dbd835377d5197b831235112872526efe0 assets/arsmagicalegacy/models/block/wizards_chalk_7.json +3e84098b84fcaed6d4efe7ea38493be342dc109b assets/arsmagicalegacy/models/block/wizards_chalk_8.json +3843ab25f3e7879bc20074f204692904cb79b0ff assets/arsmagicalegacy/models/block/wizards_chalk_9.json diff --git a/src/main/generated/.cache/70787991046ee4fc01c27abb22b81127c97594d6 b/src/main/generated/.cache/70787991046ee4fc01c27abb22b81127c97594d6 new file mode 100644 index 000000000..6b549ec46 --- /dev/null +++ b/src/main/generated/.cache/70787991046ee4fc01c27abb22b81127c97594d6 @@ -0,0 +1,112 @@ +// 1.20.1 2024-02-19T19:43:01.1182611 vanilla/Spell Part Data[arsmagicalegacy] +a4de437e2684c4430e5680fa49f477ea0ee0aa25 data/arsmagicalegacy/spell_parts/absorption.json +c53b0d76b76d9d2a24bbe62ed45e1d1c98c79510 data/arsmagicalegacy/spell_parts/agility.json +5ffc3ea9a65c738348f0d9f377323be9f7efe0db data/arsmagicalegacy/spell_parts/aoe.json +e396c7fd1db6256bac42ff090962da9629c98e17 data/arsmagicalegacy/spell_parts/astral_distortion.json +efc8cdff03d698910b39ac03661d2c5d55f0b82f data/arsmagicalegacy/spell_parts/attract.json +20b7d7aefad4ab181576d935f1e61cb2d571bdaf data/arsmagicalegacy/spell_parts/banish_rain.json +158725d11e2a9d99094c1b9ec16b0bd0fd7c72b6 data/arsmagicalegacy/spell_parts/beam.json +46ae85b75445431a4df8f5f997db4d2883bcddad data/arsmagicalegacy/spell_parts/blindness.json +25cb3d3e207d8c1277f85a9ec77b04994dc46682 data/arsmagicalegacy/spell_parts/blink.json +78cd90ccec4433955c6052cf861c1aea57edc8fc data/arsmagicalegacy/spell_parts/blizzard.json +b4ef687bb8b843ad6906f6509d84097a65f80f77 data/arsmagicalegacy/spell_parts/bounce.json +9e3a6c4ffe78d699328acd71c3f08b88d32d49eb data/arsmagicalegacy/spell_parts/chain.json +d596667261c57af43f8668698be72e4b1185655f data/arsmagicalegacy/spell_parts/channel.json +210cf5b815dbcbb01216cdcf9d76b1b237b9b513 data/arsmagicalegacy/spell_parts/charm.json +c2081779e4fc60336023503ca45c771c72535991 data/arsmagicalegacy/spell_parts/color.json +a442cf9e50b60f25160670d902d279a26d0cdc5d data/arsmagicalegacy/spell_parts/contingency_damage.json +198c6dda1ba494ee27673cfd76e087a4ffe72af8 data/arsmagicalegacy/spell_parts/contingency_death.json +122e5a2cf020c757ba4558cc0388db4a6dd12c96 data/arsmagicalegacy/spell_parts/contingency_fall.json +b8020a81cb8b32c5b4f56e480bfb8b22bb0ea591 data/arsmagicalegacy/spell_parts/contingency_fire.json +c1d5572e776cdf09e107582d8ddbd548b6d50bfa data/arsmagicalegacy/spell_parts/contingency_health.json +6069e3b3371c2233cdf9b77366a67d984ad03d5e data/arsmagicalegacy/spell_parts/create_water.json +85a4c897b00f8d15180312aedb230022f373a2ca data/arsmagicalegacy/spell_parts/damage.json +e38dc8db551601d022fcb404b1be0a11cb555a5d data/arsmagicalegacy/spell_parts/daylight.json +8e02813e590adfe2a72465da000edc87cee086ed data/arsmagicalegacy/spell_parts/dig.json +11fdcc53e40528c29d30002ed38be89125e363a4 data/arsmagicalegacy/spell_parts/disarm.json +944ea592f85fb81045f5f615a410f8e3275052ef data/arsmagicalegacy/spell_parts/dismembering.json +f916d5b03f1898a8acc3465797041c934565b82f data/arsmagicalegacy/spell_parts/dispel.json +81d540684492d1b97a8d51909c553d5fb23ca839 data/arsmagicalegacy/spell_parts/divine_intervention.json +75cb698f35ad3fe2cec1e0f0aa5384416563ee68 data/arsmagicalegacy/spell_parts/drought.json +b832ed92891daf5c17581bac4ef3917a4329ba56 data/arsmagicalegacy/spell_parts/drowning_damage.json +2560567019f40636ee719aaf3a427d82782cd800 data/arsmagicalegacy/spell_parts/duration.json +e4e13f62b81d0da057a233c028c23cdc068a8c55 data/arsmagicalegacy/spell_parts/effect_power.json +a8ac9e82e8d5ddfe90ea37a4838d6e78746e9611 data/arsmagicalegacy/spell_parts/ender_intervention.json +7e3bb265b9d6dde05904500900bde3712e3cc29d data/arsmagicalegacy/spell_parts/entangle.json +4f50d0f0ee80534ac3373e7a53ab43ba99fcc7dd data/arsmagicalegacy/spell_parts/explosion.json +0acd298bc9005efc033199cd59852ac38c77e1be data/arsmagicalegacy/spell_parts/falling_star.json +8be88f6b6dc570a623be91a0a23a290a8a9df32e data/arsmagicalegacy/spell_parts/fire_damage.json +0dd0c728ebe1235a955e2b3ebad63c0b9ba4f0c4 data/arsmagicalegacy/spell_parts/fire_rain.json +f466368d9ed4058d10cfbadce42d1a31dae0e179 data/arsmagicalegacy/spell_parts/flight.json +780991bd9ad34efc4ccfe17ec2f745300ecd8c74 data/arsmagicalegacy/spell_parts/fling.json +4e571ca845c71e0ea1f77909775951c0fb0661fc data/arsmagicalegacy/spell_parts/forge.json +41dfd56cfbc5dc2249f6d8eb3cbd78787d659852 data/arsmagicalegacy/spell_parts/frost.json +0e6d45b7b0ef17b351b5cf482a9e1949e5709326 data/arsmagicalegacy/spell_parts/frost_damage.json +dcbc184fbb3ae21268a6c4868b247af77b3f1c6e data/arsmagicalegacy/spell_parts/fury.json +b1e67768ceffc59c5f5e24086ac1aa9199753151 data/arsmagicalegacy/spell_parts/gravity.json +5ae1ca13fa5e87ae7564f930c470d9983c771403 data/arsmagicalegacy/spell_parts/gravity_well.json +ee050d8659f1706dc32a3995f5238550cac3afb7 data/arsmagicalegacy/spell_parts/grow.json +d396697c7244dadca4ee0c81c698570db9e5c9af data/arsmagicalegacy/spell_parts/harvest.json +641811d8041158d193afcf622c131f52a97bdab8 data/arsmagicalegacy/spell_parts/haste.json +951085f131ca479f4b176a172527d1c8aa2df963 data/arsmagicalegacy/spell_parts/heal.json +dc361214492003b20fb4ddc08db9c6cabba31020 data/arsmagicalegacy/spell_parts/healing.json +f31f60b41948738eeb6dff2caa62d9526f32763a data/arsmagicalegacy/spell_parts/health_boost.json +1b852c27a883afd7438cd16e61379916822efa88 data/arsmagicalegacy/spell_parts/ignition.json +5a05fdfee974ef2ff83d2d7a13c74535035def40 data/arsmagicalegacy/spell_parts/invisibility.json +5f0ef7d6a18e1f5c7e938d4f8222aafd3598e65c data/arsmagicalegacy/spell_parts/jump_boost.json +64c63e0e4eb0c9d3fa90b3623f447aaf00411b6c data/arsmagicalegacy/spell_parts/knockback.json +50326fadae3c7ce45d1b9eb6058bec42c0b0ee50 data/arsmagicalegacy/spell_parts/levitation.json +e2bc1bfec1bf65cdf9db60cb712a640438169063 data/arsmagicalegacy/spell_parts/life_drain.json +227684e6ecdf60dde2f332c1bbc44f40d1333fd7 data/arsmagicalegacy/spell_parts/life_tap.json +923458cc7542c3b0de3d915eed564e7048e87018 data/arsmagicalegacy/spell_parts/light.json +ec2669297311be59c70e88eda9fe1711c526e6f3 data/arsmagicalegacy/spell_parts/lightning_damage.json +2d6d9fc2127fdfda2e3d581779e55b85c0ac3675 data/arsmagicalegacy/spell_parts/lunar.json +46e9b7d63a017bcf2a9c1f46b7c1ec1bb95f57a5 data/arsmagicalegacy/spell_parts/magic_damage.json +2163a58dbbcf889fa1547d49341228b92675e1d9 data/arsmagicalegacy/spell_parts/mana_blast.json +2332533e83dd06c662dc3274c8492c636dbd294f data/arsmagicalegacy/spell_parts/mana_drain.json +acdf5b74f2ee55c198db25a9b1367513a496cb3e data/arsmagicalegacy/spell_parts/melt_armor.json +e03a0af758ee56dc8fc8c1bf2258118727f721be data/arsmagicalegacy/spell_parts/mining_power.json +caee51a4d4d3816714bc58c34dc38d764c341ed2 data/arsmagicalegacy/spell_parts/moonrise.json +447ce2caf654a5ea143aee673c60f31bf167e04e data/arsmagicalegacy/spell_parts/nausea.json +7bb7a45cc3e060b957d680973609125ac9c9677d data/arsmagicalegacy/spell_parts/night_vision.json +3d22d0fecc08c02df674bffb3b2a0a78ed4a2693 data/arsmagicalegacy/spell_parts/physical_damage.json +985a968810e5ad0a7d462fcebe9e5101d5513fb0 data/arsmagicalegacy/spell_parts/piercing.json +e5b6e8bf4928239a7d782df0fbe39d269f03aeb9 data/arsmagicalegacy/spell_parts/place_block.json +4487fdf586dd939ccf73e337b4a276aca4c97ee4 data/arsmagicalegacy/spell_parts/plant.json +06fd77521e62bebbcaed6f35ea931d220f1b06b6 data/arsmagicalegacy/spell_parts/plow.json +64054e2f18fd8af352d93127a691282afb8f4aa3 data/arsmagicalegacy/spell_parts/projectile.json +025d44cf6aaacd14b6fe1c127d4184c55386fa72 data/arsmagicalegacy/spell_parts/prosperity.json +b84474ce02f4624e6afb98e4eb537f0b4ab73a3a data/arsmagicalegacy/spell_parts/random_teleport.json +e52d86ca0668c1b4764d4de5cbe23af94af82650 data/arsmagicalegacy/spell_parts/range.json +247653402c2aa7efc8dbd29c526b7a41abbbe533 data/arsmagicalegacy/spell_parts/recall.json +e2896ed3f43fd01984de1048bf093112261aca2f data/arsmagicalegacy/spell_parts/reflect.json +b826381b8b963ae7c9d94c43217bc243a98a6006 data/arsmagicalegacy/spell_parts/regeneration.json +1cf8070d9f5ada5a3b43cf44969f9314ffdaf5bf data/arsmagicalegacy/spell_parts/repel.json +9a601a07d9e653ecd6c5e335f2173bf305e241e4 data/arsmagicalegacy/spell_parts/rift.json +9e90c2632f22b130d4d77f7adc4627ecbaa187be data/arsmagicalegacy/spell_parts/rune.json +fc944ad40fb5a1c4d5a1b6e1c3bbf5401998b5af data/arsmagicalegacy/spell_parts/rune_procs.json +e8fe41fdf14904abd28a74926a848585899558c1 data/arsmagicalegacy/spell_parts/scramble_synapses.json +e393209d90aaf3cd972bf7a58e3a6ab368852b4c data/arsmagicalegacy/spell_parts/self.json +0daff20846af2ba0d06bbfdfdb57520ea77ec82d data/arsmagicalegacy/spell_parts/shield.json +c0a070f7cbe3794636cd112fdfb49f24a0c951e0 data/arsmagicalegacy/spell_parts/shrink.json +2cf4e1f74e6a502fac389bdc3d710adfe4c752e1 data/arsmagicalegacy/spell_parts/silence.json +9be323701e5b31c7388dc7e6636f7abb40bc6a21 data/arsmagicalegacy/spell_parts/silk_touch.json +683d51e6f3aaf5c545264d7d18ca03ed1c1c21fd data/arsmagicalegacy/spell_parts/slowness.json +a872ae6e5e32a22df052bbd81db09f776c5be03d data/arsmagicalegacy/spell_parts/slow_falling.json +c89c4dfcc455c7a2f5c493d711fca81bafea5075 data/arsmagicalegacy/spell_parts/solar.json +4dcea0424b97545ce2def9536f7b236e2e0e16c2 data/arsmagicalegacy/spell_parts/storm.json +8cf9a660a5114817cff5b87b8555def59c7d00bb data/arsmagicalegacy/spell_parts/summon.json +852d74e54bca6ed64550718254298ec26418ea8c data/arsmagicalegacy/spell_parts/swift_swim.json +8fce0c5dc4611a6eedf4451c7f69feb8dd6dc7e2 data/arsmagicalegacy/spell_parts/target_non_solid.json +0ad98d7e60bcd906cb32f4da70ba4f09671f7ade data/arsmagicalegacy/spell_parts/telekinesis.json +89b54c9c5b32b3a1b145c97c935ce40a0597ac63 data/arsmagicalegacy/spell_parts/temporal_anchor.json +21ba12d6e5c2c969ed0a9ccf7f1be646d1b1d439 data/arsmagicalegacy/spell_parts/touch.json +55b869ac40b4a596b7d4302af90d0e0763263ccc data/arsmagicalegacy/spell_parts/transplace.json +d5377a7d166f23c9a98eb64fffcc0644aeb8b471 data/arsmagicalegacy/spell_parts/true_sight.json +eee897769f263e6ada91d81fb2f872736973b35a data/arsmagicalegacy/spell_parts/velocity.json +aaa3eb9814cc2946aea390e12429e52b30241887 data/arsmagicalegacy/spell_parts/wall.json +53f17eaee63c5352d6dce387e8bb764c870c2be2 data/arsmagicalegacy/spell_parts/watery_grave.json +e04bf46f12bcbc8dd5c959c1b030fa1c01afc632 data/arsmagicalegacy/spell_parts/water_breathing.json +ca67b10af5d86b517a97001e03dcb3a68392505f data/arsmagicalegacy/spell_parts/wave.json +4afb2c8e9912788c74ad6dc633871ea848921826 data/arsmagicalegacy/spell_parts/wizards_autumn.json +fd029d06d43b596deb98dbd62bcbfa51042ec5c6 data/arsmagicalegacy/spell_parts/zone.json diff --git a/src/main/generated/.cache/828e6b158606486c03118ac5f3fd682296779b9c b/src/main/generated/.cache/828e6b158606486c03118ac5f3fd682296779b9c new file mode 100644 index 000000000..fb3032061 --- /dev/null +++ b/src/main/generated/.cache/828e6b158606486c03118ac5f3fd682296779b9c @@ -0,0 +1,92 @@ +// 1.20.1 2023-08-06T00:51:49.2362486 vanilla/Loot Tables +f0e4c8134bf2f68e1425a328c83498f858e1e26c data/arsmagicalegacy/loot_tables/blocks/altar_core.json +32900dde32312718365d978d0183dc6f16140e5e data/arsmagicalegacy/loot_tables/blocks/aum.json +eb1a581730e7ef2fb1b34eee0ad85fd9cbf9024f data/arsmagicalegacy/loot_tables/blocks/black_aurem.json +2fe3b9dea2d7df1f265f0c33d9519aa1560eda9c data/arsmagicalegacy/loot_tables/blocks/celestial_prism.json +daf97df4684b563e6463619dc0c459960aa239d5 data/arsmagicalegacy/loot_tables/blocks/cerublossom.json +8a4deec9686b20594baed24fcf1768c27608a89c data/arsmagicalegacy/loot_tables/blocks/chimerite_block.json +2dae28a5bc78b98cc01747f8cc00a6f5975694d9 data/arsmagicalegacy/loot_tables/blocks/chimerite_ore.json +a986421e9c04b9fc1a6b28750e59bbb64fc276d6 data/arsmagicalegacy/loot_tables/blocks/deepslate_chimerite_ore.json +524ac046d191914b1225c01ca59bf9da323785ba data/arsmagicalegacy/loot_tables/blocks/deepslate_moonstone_ore.json +93bc7d4f4d88ae373b94c4f7abe8932e3f391047 data/arsmagicalegacy/loot_tables/blocks/deepslate_topaz_ore.json +6b1af99e736e2f56c8ae452ff0bd7feb69c349e2 data/arsmagicalegacy/loot_tables/blocks/deepslate_vinteum_ore.json +ff10144fa503dd08a6ace88216f77f6494577cde data/arsmagicalegacy/loot_tables/blocks/desert_nova.json +2d280d46227ba45f526b5ae850d1992e0a41da5c data/arsmagicalegacy/loot_tables/blocks/gold_inlay.json +d42f8f30f5126326214483c5d266fe631b476326 data/arsmagicalegacy/loot_tables/blocks/inscription_table.json +490a390a5a7395da48df8c2634bd6fdc37460a81 data/arsmagicalegacy/loot_tables/blocks/iron_inlay.json +2c73e12110810d1dd11b5012c8fe6677cb7c28cc data/arsmagicalegacy/loot_tables/blocks/magic_wall.json +5483c7845bc130ea789bc2ce99a170b494e54b18 data/arsmagicalegacy/loot_tables/blocks/moonstone_block.json +48d65bae0ed945e49e155e303af8996f2c5702a9 data/arsmagicalegacy/loot_tables/blocks/moonstone_ore.json +5348bac8f5eeaadc6525882fd7f2fc99b0a0e9b3 data/arsmagicalegacy/loot_tables/blocks/obelisk.json +b20d80adf0ae68d99db6cb1d7bb3c52480fcc7a7 data/arsmagicalegacy/loot_tables/blocks/occulus.json +38cff8a06562e34b720b2feb63d79d91e883cd29 data/arsmagicalegacy/loot_tables/blocks/potted_aum.json +52251cce2ede9f750d77cd838b0ceb1974835f53 data/arsmagicalegacy/loot_tables/blocks/potted_cerublossom.json +c1cc32ef2c9b84105342a65ccc74b0a4ce2eeef5 data/arsmagicalegacy/loot_tables/blocks/potted_desert_nova.json +62aba4fa5883aaf8592638bff2793908498a0f62 data/arsmagicalegacy/loot_tables/blocks/potted_tarma_root.json +52f6f4977f56abeafcb01d98cf9219938dd5e848 data/arsmagicalegacy/loot_tables/blocks/potted_wakebloom.json +3a3940e44a1efb2aa8295aff88cf2cf43f5c02c2 data/arsmagicalegacy/loot_tables/blocks/potted_witchwood_sapling.json +4e8dc66a6e98fa0bbf0342b7201fbf204d2b29b8 data/arsmagicalegacy/loot_tables/blocks/redstone_inlay.json +c67b60bd45d3e2dbad7561b08b923c909f88db38 data/arsmagicalegacy/loot_tables/blocks/spell_rune.json +d1a3c000a4748e20191c9d8c87af3eb833cc71ba data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood.json +6c21f465117448404ab310f5547ab605b7fea132 data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood_log.json +ce3a80de49e788f7fa35f9b04f5cb5f9b7f681eb data/arsmagicalegacy/loot_tables/blocks/sunstone_block.json +3f84c9d7cacbfaef6a9ca79455bd1c8c26434974 data/arsmagicalegacy/loot_tables/blocks/sunstone_ore.json +ac419171469a08f650b1b8924cc13876938d2548 data/arsmagicalegacy/loot_tables/blocks/tarma_root.json +a536dfa2ebab55bbbb1e7afcda5d939af42430ff data/arsmagicalegacy/loot_tables/blocks/topaz_block.json +16927bf23fa9eef522ba60ee809ef1b7cebe3d1f data/arsmagicalegacy/loot_tables/blocks/topaz_ore.json +a976cb8613647185d03fa2917f8dae740fdf916e data/arsmagicalegacy/loot_tables/blocks/vinteum_block.json +58452e7ba931407e7848ec383e30de6e93c5c2c6 data/arsmagicalegacy/loot_tables/blocks/vinteum_ore.json +33232edd49429a5867f751612931cba14c4a7220 data/arsmagicalegacy/loot_tables/blocks/vinteum_torch.json +cc45cca4690c208892fe1ffbcfc00a5f9e63bf39 data/arsmagicalegacy/loot_tables/blocks/vinteum_wall_torch.json +c79a1168913aad941b10b6c8ec68970a12b5a2f1 data/arsmagicalegacy/loot_tables/blocks/wakebloom.json +894fe8687bc4d3a31de58a5ef4601c55904ffa85 data/arsmagicalegacy/loot_tables/blocks/witchwood.json +2ad050764f9d1f2e4b22b3fb1469063a4e7bd1c1 data/arsmagicalegacy/loot_tables/blocks/witchwood_button.json +84e3d80cd5004fd07a7fe47a2e8228163c773bf1 data/arsmagicalegacy/loot_tables/blocks/witchwood_door.json +a786fb75e6fe71aeee26341ec2d32253506055fb data/arsmagicalegacy/loot_tables/blocks/witchwood_fence.json +910c6c60b00bd7398182e60894d71863d476e16e data/arsmagicalegacy/loot_tables/blocks/witchwood_fence_gate.json +4cb8e1cd00bca207454b2e310a9b4a4aa8437d60 data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json +a64b1b82ec78189841e7f1db6ad01dd2b210f80b data/arsmagicalegacy/loot_tables/blocks/witchwood_leaves.json +6fd63aed37369c54c2a1cf2c99e084b2d5ef57d8 data/arsmagicalegacy/loot_tables/blocks/witchwood_log.json +ca81f9454a19e6bbb8fe9dad53902042eacb9d02 data/arsmagicalegacy/loot_tables/blocks/witchwood_planks.json +e38902768e70823475c1474061fbee5d117078bb data/arsmagicalegacy/loot_tables/blocks/witchwood_pressure_plate.json +b8fa9bbdb0260e98592974a2df8b36891d818587 data/arsmagicalegacy/loot_tables/blocks/witchwood_sapling.json +232c2cae4e6c57ac40974db5cab07e388a55f5cb data/arsmagicalegacy/loot_tables/blocks/witchwood_sign.json +2f165c74d31f226c64c6a663c914573161893377 data/arsmagicalegacy/loot_tables/blocks/witchwood_slab.json +7cb49b98b61fce9f43751dab99c0a0314d809260 data/arsmagicalegacy/loot_tables/blocks/witchwood_stairs.json +8ffa1ced4d66946f1886cfb43b635a39965b48c0 data/arsmagicalegacy/loot_tables/blocks/witchwood_trapdoor.json +830df41a6a46556009fd9448ddc73bff1f6caa2a data/arsmagicalegacy/loot_tables/blocks/wizards_chalk.json +1f1c187cbe60baa7ebc88ead15dd0bc48561334e data/arsmagicalegacy/loot_tables/chests/modify/abandoned_mineshaft.json +66d99328da020b5a7b2bcf9fe08accc42f821421 data/arsmagicalegacy/loot_tables/chests/modify/ancient_city.json +babb088d29176cb96ca468338683fe5170630d77 data/arsmagicalegacy/loot_tables/chests/modify/ancient_city_ice_box.json +9d8acddd2998abf52e5b315e68c192ef2b65156b data/arsmagicalegacy/loot_tables/chests/modify/bastion_treasure.json +a9140fc9e691fedb6315a7ec45f25a8e56f63e05 data/arsmagicalegacy/loot_tables/chests/modify/desert_pyramid.json +c70dc65775dce74f5d4c259fe081dbd8083aa8ea data/arsmagicalegacy/loot_tables/chests/modify/end_city_treasure.json +f68f18440fc86d8f7c1d26798e96449ad9781f12 data/arsmagicalegacy/loot_tables/chests/modify/igloo_chest.json +f878a20dbe5a59929de072b10f0ee912905c1e36 data/arsmagicalegacy/loot_tables/chests/modify/jungle_temple.json +3f1f93a301e051db690b0c7ddc9dde1c4f426dd5 data/arsmagicalegacy/loot_tables/chests/modify/nether_bridge.json +cc600874d24865efe6d1ae42fc60f7c50f76e745 data/arsmagicalegacy/loot_tables/chests/modify/pillager_outpost.json +87d04bee38dfa7987b18d900e3d8568d6b61673a data/arsmagicalegacy/loot_tables/chests/modify/shipwreck_treasure.json +1671724d75ec8cb81e24d2cac60bf7250942596a data/arsmagicalegacy/loot_tables/chests/modify/simple_dungeon.json +82455be1795eee0153a94f42d1dabaff182d4723 data/arsmagicalegacy/loot_tables/chests/modify/stronghold_library.json +49458eb60a25ea86f2aa53b9fcd0956bc5b92201 data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_big.json +7b5a93077d820dc1fd52e96c86889ed6188fd461 data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_small.json +fee25d4e06ba97cbf5178903a75b267a278dd1c5 data/arsmagicalegacy/loot_tables/chests/modify/village/village_desert_house.json +f9829b2e305138c4080007bc8c1463d5baf52304 data/arsmagicalegacy/loot_tables/chests/modify/village/village_plains_house.json +953200e537aca344cd5f6fc3678974a23b36ecbd data/arsmagicalegacy/loot_tables/chests/modify/village/village_savanna_house.json +c9b6550b3309dfface1195e92e1a15e7c8991568 data/arsmagicalegacy/loot_tables/chests/modify/village/village_snowy_house.json +a211c4bf7a285a72507ca6876559a6b3e1cc5363 data/arsmagicalegacy/loot_tables/chests/modify/village/village_taiga_house.json +ebec54015c45d81fa4fb707a47fb1aadcc2e34da data/arsmagicalegacy/loot_tables/chests/modify/village/village_temple.json +3d5cee13656f298daa622d1720e9a3f8fb02e8ba data/arsmagicalegacy/loot_tables/chests/modify/woodland_mansion.json +1151f6df2f5dc0d11a5dc930ab9023d362222b4f data/arsmagicalegacy/loot_tables/entities/air_guardian.json +979822caa36466a183ed44897abb4dc2a04577dc data/arsmagicalegacy/loot_tables/entities/arcane_guardian.json +fe583cd50e8bb2b747a73ff395f7a2089d0315ae data/arsmagicalegacy/loot_tables/entities/dryad.json +a4ebe833cf86b26836f9ec1c1a574538b82913a9 data/arsmagicalegacy/loot_tables/entities/earth_guardian.json +5236fdc436760317f380236f2f437fdad6ee2366 data/arsmagicalegacy/loot_tables/entities/ender_guardian.json +939d3412a0c5f34ccca74402a4c41978012a217d data/arsmagicalegacy/loot_tables/entities/fire_guardian.json +feb98b587cd67993105e3eb5857ee94a44f39543 data/arsmagicalegacy/loot_tables/entities/ice_guardian.json +eeec3faf1190f93bf274bbf2f31cf789968115e0 data/arsmagicalegacy/loot_tables/entities/life_guardian.json +c76552be8bcde3208c762a1647f85cf394e139d3 data/arsmagicalegacy/loot_tables/entities/lightning_guardian.json +270c5f39a84ecf6f3543333ce8c17bde5c8f6339 data/arsmagicalegacy/loot_tables/entities/mage.json +476093eb251aaace6510205250efada0493ce9f7 data/arsmagicalegacy/loot_tables/entities/mana_creeper.json +efb732892e7b32b705dcaedd447dfdfcb1f221eb data/arsmagicalegacy/loot_tables/entities/nature_guardian.json +97c608832764383208ae56bea6a2de7991f83caf data/arsmagicalegacy/loot_tables/entities/water_guardian.json diff --git a/src/main/generated/.cache/83c470eb0163363e09250d5117f0d60a576c4c0f b/src/main/generated/.cache/83c470eb0163363e09250d5117f0d60a576c4c0f index a8a104c5a..ba2ef8023 100644 --- a/src/main/generated/.cache/83c470eb0163363e09250d5117f0d60a576c4c0f +++ b/src/main/generated/.cache/83c470eb0163363e09250d5117f0d60a576c4c0f @@ -1,2 +1,2 @@ -// 1.19.4 2023-08-02T19:28:09.1798147 vanilla/Tags for minecraft:damage_type mod id arsmagicalegacy +// 1.20.1 2024-02-19T19:43:01.1212603 vanilla/Tags for minecraft:damage_type mod id arsmagicalegacy 187ec63cb4213044f3e304b75a6c55f7ed5d2968 data/minecraft/tags/damage_type/is_projectile.json diff --git a/src/main/generated/.cache/a2c45b2c7ed8b2a33b6a9805d2b8e3d89cb5d727 b/src/main/generated/.cache/a2c45b2c7ed8b2a33b6a9805d2b8e3d89cb5d727 deleted file mode 100644 index c4e5eb11e..000000000 --- a/src/main/generated/.cache/a2c45b2c7ed8b2a33b6a9805d2b8e3d89cb5d727 +++ /dev/null @@ -1,3 +0,0 @@ -// 1.19.4 2023-08-02T19:28:09.2068146 update_1_20/Tags for minecraft:block mod id arsmagicalegacy -d9eb014cca9e9eb1edefc2e7b423dacb98df705a data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/ceiling_hanging_signs.json -bf9a8cf1f89cd7a3754be41e6c5e4f71198804c8 data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/wall_hanging_signs.json diff --git a/src/main/generated/.cache/bdbf20cc6a20b4b111b6b92fdbc55c906cde687e b/src/main/generated/.cache/bdbf20cc6a20b4b111b6b92fdbc55c906cde687e index 7a851b903..423419945 100644 --- a/src/main/generated/.cache/bdbf20cc6a20b4b111b6b92fdbc55c906cde687e +++ b/src/main/generated/.cache/bdbf20cc6a20b4b111b6b92fdbc55c906cde687e @@ -1,2 +1,2 @@ -// 1.19.4 2023-08-02T19:28:09.173812 vanilla/Pack Metadata -dd7b20e28b480ecbb2c84f63abc84c77dce4fd8b pack.mcmeta +// 1.20.1 2024-02-19T19:43:01.1162605 vanilla/Pack Metadata +03593c99e10a506be152ea940ea6c2dc5d836b08 pack.mcmeta diff --git a/src/main/generated/.cache/c4176b2371ddb03b4fcc28d4a4b130d886e34712 b/src/main/generated/.cache/c4176b2371ddb03b4fcc28d4a4b130d886e34712 new file mode 100644 index 000000000..6f39af7a8 --- /dev/null +++ b/src/main/generated/.cache/c4176b2371ddb03b4fcc28d4a4b130d886e34712 @@ -0,0 +1,2 @@ +// 1.20.1 2023-08-06T00:51:49.2342193 vanilla/Tags for minecraft:worldgen/biome mod id arsmagicalegacy +20350f862e9cdf1ac1f21355a452c91912babf8f data/arsmagicalegacy/tags/worldgen/biome/can_spawn_water_guardian.json diff --git a/src/main/generated/.cache/e286d819b86d3f2c716d4522338b1b44a9d0807e b/src/main/generated/.cache/e286d819b86d3f2c716d4522338b1b44a9d0807e new file mode 100644 index 000000000..123e7c9b4 --- /dev/null +++ b/src/main/generated/.cache/e286d819b86d3f2c716d4522338b1b44a9d0807e @@ -0,0 +1,40 @@ +// 1.20.1 2023-08-06T00:51:49.2422176 vanilla/Tags for minecraft:block mod id arsmagicalegacy +09a8495f82a08691d533f5301ffce0cc0afe0bcf data/arsmagicalegacy/tags/blocks/witchwood_logs.json +75597f58eaad48b98e64ba095c0e13b1573e0f4e data/forge/tags/blocks/fences/wooden.json +4509a6dbe8b8c6353fbe06cefd812efe1dca2727 data/forge/tags/blocks/fence_gates/wooden.json +6a558a0ed28ed310142c59a33f3143ba05e8fbca data/forge/tags/blocks/ores.json +0cfa5b473056ef4e219ce978c6b1fd5a947ed556 data/forge/tags/blocks/ores/chimerite.json +e60ce640b03c19e40fc4fd591174c0bb5f6849d1 data/forge/tags/blocks/ores/moonstone.json +74f13af5245edcd85eb79b9ddba0e16a3b9dcff4 data/forge/tags/blocks/ores/sunstone.json +d601eb2422bbbb9e026d8ff13e1e102aa6a2e794 data/forge/tags/blocks/ores/topaz.json +3411592573e08ce8589c59292dd1db64c65057d2 data/forge/tags/blocks/ores/vinteum.json +04e4ab4daf44d017409481ba8957f1f77599e7ad data/forge/tags/blocks/storage_blocks.json +a5efaf624ecc4e7aa79239bfda857f660c06c552 data/forge/tags/blocks/storage_blocks/chimerite.json +92cb1537d82e26e6146281141600e9d640113080 data/forge/tags/blocks/storage_blocks/moonstone.json +44a23cc79dc5ba635c2c0cab92dcdf6d05104734 data/forge/tags/blocks/storage_blocks/sunstone.json +76df3f25234406bbe4c797c04449e8b9683eefcd data/forge/tags/blocks/storage_blocks/topaz.json +1b98676a20688653887cd8966162861777356e7e data/forge/tags/blocks/storage_blocks/vinteum.json +d9eb014cca9e9eb1edefc2e7b423dacb98df705a data/minecraft/tags/blocks/ceiling_hanging_signs.json +1a4eff2c48bd361078321ca31d310e24213d135b data/minecraft/tags/blocks/flower_pots.json +cd4ee8afe25cbc17263f3bcd49ba4402450d4b66 data/minecraft/tags/blocks/leaves.json +cc20d8d43b66ef761c1f2d6f55740085c58a35f3 data/minecraft/tags/blocks/logs.json +6c76f8b5b219562dbbcc5b98196c09a310ca3938 data/minecraft/tags/blocks/mineable/axe.json +179dcd05e3cdaeda54fb29d5a875e0130f16a788 data/minecraft/tags/blocks/mineable/pickaxe.json +74f13af5245edcd85eb79b9ddba0e16a3b9dcff4 data/minecraft/tags/blocks/needs_diamond_tool.json +e60ce640b03c19e40fc4fd591174c0bb5f6849d1 data/minecraft/tags/blocks/needs_iron_tool.json +1a63d756130eb0d58458cbab1cf85ec6ef37bb88 data/minecraft/tags/blocks/needs_stone_tool.json +638b279febd41d749f4abb6380caa1aeb19c0d00 data/minecraft/tags/blocks/planks.json +3a056c5644cf343a86bec06721ab75a71e7d4d20 data/minecraft/tags/blocks/rails.json +a5cc6f3a50fcd1f61d2ba94c42b27f82e25e2c8e data/minecraft/tags/blocks/saplings.json +4646c92ac03ea27d3a443cb64e53ee5b9a6de33c data/minecraft/tags/blocks/small_flowers.json +bec95c5a9654ef121c0a192294230b225cbec632 data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json +c03fe02c08be18b1f15dcfbd3e923baed847268a data/minecraft/tags/blocks/standing_signs.json +bf9a8cf1f89cd7a3754be41e6c5e4f71198804c8 data/minecraft/tags/blocks/wall_hanging_signs.json +d0df540ca957aa8f45eab82096a849542c152d5f data/minecraft/tags/blocks/wall_signs.json +277695cc2f20524f716a39aaee2b5a0f411d8af9 data/minecraft/tags/blocks/wooden_buttons.json +86b8cf4f20c521d1ddc7dbf8cf710466ebb12bdd data/minecraft/tags/blocks/wooden_doors.json +75597f58eaad48b98e64ba095c0e13b1573e0f4e data/minecraft/tags/blocks/wooden_fences.json +802bce3671f3f3da836547e7885bfa388fe753d1 data/minecraft/tags/blocks/wooden_pressure_plates.json +4ebb96267c6c38a793210c2c8d39acb8e40281df data/minecraft/tags/blocks/wooden_slabs.json +df0cd475149984fc3cf4cef962ef40707c439454 data/minecraft/tags/blocks/wooden_stairs.json +604d97418c492d03d2afdf186aca7668415cc6c8 data/minecraft/tags/blocks/wooden_trapdoors.json diff --git a/src/main/generated/.cache/e887c9ae77fce67213b15120513f6f18186c1aeb b/src/main/generated/.cache/e887c9ae77fce67213b15120513f6f18186c1aeb deleted file mode 100644 index c7c12d549..000000000 --- a/src/main/generated/.cache/e887c9ae77fce67213b15120513f6f18186c1aeb +++ /dev/null @@ -1,3 +0,0 @@ -// 1.19.4 2023-08-02T19:28:09.1688124 update_1_20/Recipes -ba2cbb67c573bb04e799282c7501c5e8bbcc023e data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json -b4ef0fff345360ec6dc0750b0627436ced885219 data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/recipes/witchwood_hanging_sign.json diff --git a/src/main/generated/.cache/e951e14a64d238c49e2ddb8ca184b4e9a4b3c5b2 b/src/main/generated/.cache/e951e14a64d238c49e2ddb8ca184b4e9a4b3c5b2 new file mode 100644 index 000000000..f14a455be --- /dev/null +++ b/src/main/generated/.cache/e951e14a64d238c49e2ddb8ca184b4e9a4b3c5b2 @@ -0,0 +1,117 @@ +// 1.20.1 2024-02-19T19:43:01.1122605 vanilla/Advancements +98026f787e158ab3306e960ea2b4ea211cedbd60 data/arsmagicalegacy/advancements/book/absorption.json +da0c2174efc403729468a38743abe2b452409594 data/arsmagicalegacy/advancements/book/affinity_gains_boost.json +a38b9cf37137bc6bb9822e0092e2ed4357c50407 data/arsmagicalegacy/advancements/book/agility.json +a758f563274cac5f5fd16b8d25a2e5f63b0ca86c data/arsmagicalegacy/advancements/book/aoe.json +c0fb4e5733e1b64ae08cb00dd859495cc20b16ca data/arsmagicalegacy/advancements/book/astral_distortion.json +d821eb08d6a38a49c61f234e842cff75e1828f0a data/arsmagicalegacy/advancements/book/attract.json +d7104e5e8c2ce4497815fb45c0a8d19d1d252de0 data/arsmagicalegacy/advancements/book/augmented_casting.json +1d63bea6df02ba57015a2a9fba405442cc0d90fd data/arsmagicalegacy/advancements/book/banish_rain.json +8190830ee8efc2916e549aec5f5c59335fb8e78d data/arsmagicalegacy/advancements/book/beam.json +eb9d612b63e9bb08f6693d8e070a0f460ecba5d4 data/arsmagicalegacy/advancements/book/blindness.json +05080417be0ecd46bf6e7d358c174df8f43b2e0c data/arsmagicalegacy/advancements/book/blink.json +8334294f16e49f6e05ae83539139116eb7ea15ae data/arsmagicalegacy/advancements/book/blizzard.json +cba04a5e10decce10d07f15d742364f7455e4168 data/arsmagicalegacy/advancements/book/bounce.json +567107d641306d3aae501043d15b59c43983ec7d data/arsmagicalegacy/advancements/book/chain.json +9593caa7d80ca56a63b744d38f0f781b60f5aaa8 data/arsmagicalegacy/advancements/book/channel.json +279d8e7f327614251ffdcc229d4bf9ba7e35c6b0 data/arsmagicalegacy/advancements/book/charm.json +060fa990506b285a9e23fae95edf285bef11e6b1 data/arsmagicalegacy/advancements/book/color.json +f62f6a55267e19d2a4705e84281ac8c24e9e191d data/arsmagicalegacy/advancements/book/contingency_damage.json +bcff9040f39fa61d70abae6ced6ae702bd2ed030 data/arsmagicalegacy/advancements/book/contingency_death.json +7f75d1f907d3621811f0112c6ffed0bde3f93046 data/arsmagicalegacy/advancements/book/contingency_fall.json +92a2dd51d9eaf3dcaff6ebe830f2378fd35223c6 data/arsmagicalegacy/advancements/book/contingency_fire.json +67241adebc3bf8640e2d1e3dcd6a343a8ba615f0 data/arsmagicalegacy/advancements/book/contingency_health.json +f1824a808ba3732cb718f4abc0050e8e7fe10b27 data/arsmagicalegacy/advancements/book/create_water.json +ad390cb45025840b0b70f8112bdc518132c377b2 data/arsmagicalegacy/advancements/book/damage.json +05d8bc4e42ad1dbc047ddc2ed9a62ddaf8ada60e data/arsmagicalegacy/advancements/book/daylight.json +998d09ec342fbe22524e0e923086804f31a34a36 data/arsmagicalegacy/advancements/book/dig.json +657754242008e29e21fcda47a9c0b32f00d6377a data/arsmagicalegacy/advancements/book/disarm.json +3e49ae4e468e657123fa7f415a8c89d9a344537f data/arsmagicalegacy/advancements/book/dismembering.json +2b44a157e823bdf6f5095a111ece36610f05a0af data/arsmagicalegacy/advancements/book/dispel.json +09425ac7418322ee2dd99476ff18998cc8a865d2 data/arsmagicalegacy/advancements/book/divine_intervention.json +aa962c2e44079780fd9dd75e97983d5c04c24398 data/arsmagicalegacy/advancements/book/drought.json +cd06ffd872c56fdba540c5826285207b3f81573f data/arsmagicalegacy/advancements/book/drowning_damage.json +91e4c3eb5e77e2b3b4f72dae04c329ad62306c2f data/arsmagicalegacy/advancements/book/duration.json +0bfffe49a75e630a7da2baa29e4cbc30e9fe1961 data/arsmagicalegacy/advancements/book/effect_power.json +a989c61ac3cf59d35822e80263a7b667a0f1f43d data/arsmagicalegacy/advancements/book/ender_intervention.json +15a70f3931b087f8fbba0d0ad0fe79e7fc220bae data/arsmagicalegacy/advancements/book/entangle.json +bf6dba49125e321cfca71d254942ab214f9be7b7 data/arsmagicalegacy/advancements/book/explosion.json +20f41d7ebbb98e9d6202e985cb51a3ba50890eac data/arsmagicalegacy/advancements/book/falling_star.json +a8e4d02125ec1959885870238b63cc2e3bcdfefd data/arsmagicalegacy/advancements/book/fire_damage.json +fbb30e20f37e88d35fa4c0d0758204ad1530df7e data/arsmagicalegacy/advancements/book/fire_rain.json +40dc1edfccdd64cb1391a908ad2a04d24d6bc253 data/arsmagicalegacy/advancements/book/flight.json +c5ee95ec3de4614d7260a4c92ca9d9b399c14f8f data/arsmagicalegacy/advancements/book/fling.json +f9cca93843f17cafb28b36558c1837a81f2e65d2 data/arsmagicalegacy/advancements/book/forge.json +d1bc5a3af68c0a9e09fdd701cf90dc4278be8c99 data/arsmagicalegacy/advancements/book/frost.json +1199253fe73d2fbef502ff7cf1448f246b3ec73b data/arsmagicalegacy/advancements/book/frost_damage.json +49a4349aec16a2f62b46f71b2463d48bca0fdc6f data/arsmagicalegacy/advancements/book/fury.json +ff88cd312acb3761f8aa4c56e3bb0da6c46281fa data/arsmagicalegacy/advancements/book/gravity.json +42675dcef9366d511413d815a770713a2caeae5a data/arsmagicalegacy/advancements/book/gravity_well.json +af0611bd7bc5243f7523ef0b64dc7e8a3658c431 data/arsmagicalegacy/advancements/book/grow.json +f1177e72bd275c82644325ce0db5d30aeeb69163 data/arsmagicalegacy/advancements/book/harvest.json +1fb55ce735e4abc5e291862a4a1474c06f3660f3 data/arsmagicalegacy/advancements/book/haste.json +7998f1e379a966f9613e1aa0742ea1c30b88235b data/arsmagicalegacy/advancements/book/heal.json +5d0dff33b35b3cfebcfadfb894222040a5cd1616 data/arsmagicalegacy/advancements/book/healing.json +69f204c0fb8e1f101daab8a918b91cd9ae0248c7 data/arsmagicalegacy/advancements/book/health_boost.json +ce227c915c4c996143d1713dfd496e956c9e74ba data/arsmagicalegacy/advancements/book/ignition.json +1857606da021ae49f2ef12576ecbb2eafb4f9244 data/arsmagicalegacy/advancements/book/invisibility.json +434c94a99e5f4d1ceccdad10d4a9faea19840a13 data/arsmagicalegacy/advancements/book/jump_boost.json +e1e482b4d09752ea5bdf107a1319f6b58ea4ddf8 data/arsmagicalegacy/advancements/book/knockback.json +8f66c96e4bbb9524636aef66027db68473868201 data/arsmagicalegacy/advancements/book/levitation.json +f33f04b2831541c29cd895d7059aaf0767763b15 data/arsmagicalegacy/advancements/book/life_drain.json +3de3052e1dd97e6161bc688205fec3b0f604153d data/arsmagicalegacy/advancements/book/life_tap.json +6fa4b9b8b68a45943ccb526c717775b77d71cffb data/arsmagicalegacy/advancements/book/light.json +a90af0924c8c7c829d97124755ee74b92466b75a data/arsmagicalegacy/advancements/book/lightning_damage.json +4201d46b20136884502b0ee1124b14da7d1e50f5 data/arsmagicalegacy/advancements/book/lunar.json +ebdd2b47caa7a2a07a96503afe4a2bcc67323cd0 data/arsmagicalegacy/advancements/book/magic_damage.json +cf05d6bc0b5160294edf05024b93a4d3c83e4233 data/arsmagicalegacy/advancements/book/mana_blast.json +9381d639a07cc3bc98ad027ba6818fe6e4bb5067 data/arsmagicalegacy/advancements/book/mana_drain.json +b3ca1cd91b333ce657b0e39aa12ad68247bbb71e data/arsmagicalegacy/advancements/book/mana_regen_boost_1.json +bf35e7926fcd426d72b955516e8155ea73fde263 data/arsmagicalegacy/advancements/book/mana_regen_boost_2.json +e2f38b35a91b6217ab3ea73e4177453be7f6e988 data/arsmagicalegacy/advancements/book/mana_regen_boost_3.json +c297cf03c009e358102c10915fcbedfa04307558 data/arsmagicalegacy/advancements/book/mining_power.json +488a3b7ce9b4c27c2e91f330e199350e822ff54e data/arsmagicalegacy/advancements/book/moonrise.json +55d9abc9709551faa3561ee619e04c5d3d316070 data/arsmagicalegacy/advancements/book/night_vision.json +4181d6f0e96d9b1c9871920b135946e0666dc3f5 data/arsmagicalegacy/advancements/book/physical_damage.json +97f7c9ed36ff0d0710c08f0970afcd80ad12a3ce data/arsmagicalegacy/advancements/book/piercing.json +05ac535af3321540653d4053f3ccf0a1ccf9ad20 data/arsmagicalegacy/advancements/book/place_block.json +faf5f784faf99170f690caded7c3960080261181 data/arsmagicalegacy/advancements/book/plant.json +f415bf8377fae3887041ed326f6dd630daf5556c data/arsmagicalegacy/advancements/book/plow.json +5b48f81854080311b6d9c609adcafd13beb460b1 data/arsmagicalegacy/advancements/book/projectile.json +5b7588356e59209f62597fb18b9dd9ef57a518ca data/arsmagicalegacy/advancements/book/prosperity.json +82693c16f3c7b93ada4518c3fa2bb4274ad6cf0b data/arsmagicalegacy/advancements/book/random_teleport.json +fb656b8f0d9b908bc7eb4d1dc09555ac36c6a6ce data/arsmagicalegacy/advancements/book/range.json +11b52712a98680f232ac85cbd2d476fe8ec7e068 data/arsmagicalegacy/advancements/book/recall.json +e8dec872f3baac942aa34bfecf9c94e9c42e15bb data/arsmagicalegacy/advancements/book/reflect.json +cb4d30481e513b4f00e3fe539e22023aaa2561f8 data/arsmagicalegacy/advancements/book/regeneration.json +19829b30bbfbfc1ca9172635ce1b55067aa9b644 data/arsmagicalegacy/advancements/book/repel.json +ac0fe17c96ac240fddaa333d50f45e73832d4d15 data/arsmagicalegacy/advancements/book/rift.json +e899042a4ed418da8025546cd00985bf1d3150e3 data/arsmagicalegacy/advancements/book/root.json +28b3ef39c8111d106428e084129d1dab51d781e4 data/arsmagicalegacy/advancements/book/rune.json +f6148f029e5d7b461034fe27a0e029df779d9c22 data/arsmagicalegacy/advancements/book/rune_procs.json +6f30720bc1bcb3920e591a58d86dfac0d3f88029 data/arsmagicalegacy/advancements/book/self.json +267ffb6617b13aba219a2f68af78f42dbfcfd7ba data/arsmagicalegacy/advancements/book/shield.json +8d082a5c23a61e90b6e7e936076fa7189714ffce data/arsmagicalegacy/advancements/book/shield_overload.json +ade9b0820d7bbe587c2dfc0a229eac2781508eae data/arsmagicalegacy/advancements/book/shrink.json +3b5f6b07250a2e6c04bd627495144f4665f2e5fe data/arsmagicalegacy/advancements/book/silence.json +a163c91de92bcbff53e9ac893610f6f27d2800a3 data/arsmagicalegacy/advancements/book/silk_touch.json +f7ee45827e5d47538f64f62c69245599cb72bdd8 data/arsmagicalegacy/advancements/book/slowness.json +b98d6af4938913f18dc8ef28fdbcbd7ee0d93b3f data/arsmagicalegacy/advancements/book/slow_falling.json +1e3986adbf4cc91bb9378208af59168137c77cdd data/arsmagicalegacy/advancements/book/solar.json +a2fea9c276f2de39b752f64d9a7d74f584ca0da9 data/arsmagicalegacy/advancements/book/spell_motion.json +058d6edefba57940fae56828cdd0c98c3faea1f5 data/arsmagicalegacy/advancements/book/storm.json +0f3cc0010c81686211526e0005a2e632117cf351 data/arsmagicalegacy/advancements/book/summon.json +fb8909e16fc7effe8e3eedd04f6b1e54707397f4 data/arsmagicalegacy/advancements/book/swift_swim.json +8f9df795c948d3234d861c026101b1ee751b1a17 data/arsmagicalegacy/advancements/book/target_non_solid.json +f331e0092019ded966d9f2d7daec70ad03049dd6 data/arsmagicalegacy/advancements/book/telekinesis.json +4d6dcd410c0668d00fed374a1b30dbd3ffb67b63 data/arsmagicalegacy/advancements/book/temporal_anchor.json +0730689b14fcfcc412f155eb164dc19a09707b4e data/arsmagicalegacy/advancements/book/touch.json +51f0701105ebc4cdec016dc1402ce141b1793cfa data/arsmagicalegacy/advancements/book/transplace.json +24bbb17dbd3836053220f61bfba314247dbf131c data/arsmagicalegacy/advancements/book/true_sight.json +37c59623351ee0c2ebb2c1d2a01d626ec2a3deb4 data/arsmagicalegacy/advancements/book/velocity.json +aaa68719eaf970d5925c629f3df2ab822e0cb8b5 data/arsmagicalegacy/advancements/book/wall.json +4d36379be8cb95b6199649670c9f5687356111f0 data/arsmagicalegacy/advancements/book/watery_grave.json +863a4d90af414481bb5bb6939a0cb32580f92f1e data/arsmagicalegacy/advancements/book/water_breathing.json +51263823e2c0cac25f0a178fe0d2d94ed0bde6f9 data/arsmagicalegacy/advancements/book/wave.json +5a59af9b0032fb436bf862b5b1e90b07130da674 data/arsmagicalegacy/advancements/book/wizards_autumn.json +f1178e57f55677552f611a6fa2b380f3083f2fa9 data/arsmagicalegacy/advancements/book/zone.json diff --git a/src/main/generated/.cache/f48255af366ba1d3afbc0e01c7e37bdbaf48d909 b/src/main/generated/.cache/f48255af366ba1d3afbc0e01c7e37bdbaf48d909 new file mode 100644 index 000000000..ce3f808f6 --- /dev/null +++ b/src/main/generated/.cache/f48255af366ba1d3afbc0e01c7e37bdbaf48d909 @@ -0,0 +1,2 @@ +// 1.20.1 2023-08-06T00:51:49.2282247 vanilla/Sound Definitions +323638e62e7be16647661c02f608033e013ee865 assets/arsmagicalegacy/sounds.json diff --git a/src/main/generated/.cache/fb45a2d2f80ca09dfb6b0085e2abfb3a46714dae b/src/main/generated/.cache/fb45a2d2f80ca09dfb6b0085e2abfb3a46714dae index 1fd0e1542..829def873 100644 --- a/src/main/generated/.cache/fb45a2d2f80ca09dfb6b0085e2abfb3a46714dae +++ b/src/main/generated/.cache/fb45a2d2f80ca09dfb6b0085e2abfb3a46714dae @@ -1 +1 @@ -// 1.19.4 2023-08-02T19:28:09.1858131 vanilla/Tags for minecraft:fluid mod id arsmagicalegacy +// 1.20.1 2024-02-19T19:43:01.1222606 vanilla/Tags for minecraft:fluid mod id arsmagicalegacy diff --git a/src/main/generated/.cache/ff85aeffff7b400453d938ac4326ddfe68257a73 b/src/main/generated/.cache/ff85aeffff7b400453d938ac4326ddfe68257a73 index 754580776..446f4fb03 100644 --- a/src/main/generated/.cache/ff85aeffff7b400453d938ac4326ddfe68257a73 +++ b/src/main/generated/.cache/ff85aeffff7b400453d938ac4326ddfe68257a73 @@ -1,4 +1,4 @@ -// 1.19.4 2023-12-23T21:17:42.4257197 vanilla/Registries +// 1.20.1 2024-02-19T19:43:01.0982637 vanilla/Registries eae1dfc92ac50f1836c6895f54a76e376de43673 data/arsmagicalegacy/arsmagicalegacy/ability/clarity.json 78df5cdde19973be3e1e2f7da9b2c1060d37f368 data/arsmagicalegacy/arsmagicalegacy/ability/enderman_pumpkin.json c9009d7042d9f8a21354875ce2694eb70c0a4495 data/arsmagicalegacy/arsmagicalegacy/ability/enderman_thorns.json diff --git a/src/main/generated/assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/flowers.json b/src/main/generated/assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/flowers.json index a3a7dfb7e..0601493ad 100644 --- a/src/main/generated/assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/flowers.json +++ b/src/main/generated/assets/arsmagicalegacy/patchouli_books/arcane_compendium/en_us/entries/blocks/flowers.json @@ -39,17 +39,17 @@ }, { "type": "patchouli:crafting", - "recipe": "arsmagicalegacy:pink_dye", - "recipe2": "arsmagicalegacy:blue_dye" + "recipe": "arsmagicalegacy:pink_dye_from_aum", + "recipe2": "arsmagicalegacy:blue_dye_from_cerublossom" }, { "type": "patchouli:crafting", - "recipe": "arsmagicalegacy:red_dye", - "recipe2": "arsmagicalegacy:brown_dye" + "recipe": "arsmagicalegacy:red_dye_from_desert_nova", + "recipe2": "arsmagicalegacy:brown_dye_from_tarma_root" }, { "type": "patchouli:crafting", - "recipe": "arsmagicalegacy:magenta_dye" + "recipe": "arsmagicalegacy:magenta_dye_from_wakebloom" } ] } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/absorption.json b/src/main/generated/data/arsmagicalegacy/advancements/book/absorption.json index 0283462f0..98e4b61ae 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/absorption.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/absorption.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/affinity_gains_boost.json b/src/main/generated/data/arsmagicalegacy/advancements/book/affinity_gains_boost.json index 723411c90..cfff6b43b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/affinity_gains_boost.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/affinity_gains_boost.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/agility.json b/src/main/generated/data/arsmagicalegacy/advancements/book/agility.json index 931eae39d..68895d1e0 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/agility.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/agility.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/aoe.json b/src/main/generated/data/arsmagicalegacy/advancements/book/aoe.json index 124ebbf8e..0b57aa0c6 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/aoe.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/aoe.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/astral_distortion.json b/src/main/generated/data/arsmagicalegacy/advancements/book/astral_distortion.json index 8c4ed6ce5..eb02e4f8e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/astral_distortion.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/astral_distortion.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/attract.json b/src/main/generated/data/arsmagicalegacy/advancements/book/attract.json index 38d5e1bba..b9fff259d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/attract.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/attract.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/augmented_casting.json b/src/main/generated/data/arsmagicalegacy/advancements/book/augmented_casting.json index 676840b31..205b8cd8c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/augmented_casting.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/augmented_casting.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/banish_rain.json b/src/main/generated/data/arsmagicalegacy/advancements/book/banish_rain.json index d247dc3b2..8df5f3fd6 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/banish_rain.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/banish_rain.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/beam.json b/src/main/generated/data/arsmagicalegacy/advancements/book/beam.json index 020bd1336..d04210422 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/beam.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/beam.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/blindness.json b/src/main/generated/data/arsmagicalegacy/advancements/book/blindness.json index 91678a21f..049238753 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/blindness.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/blindness.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/blink.json b/src/main/generated/data/arsmagicalegacy/advancements/book/blink.json index 413d84459..1885d517c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/blink.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/blink.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/blizzard.json b/src/main/generated/data/arsmagicalegacy/advancements/book/blizzard.json index a2bf7c133..eea81158f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/blizzard.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/blizzard.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/bounce.json b/src/main/generated/data/arsmagicalegacy/advancements/book/bounce.json index 267425679..de6c5f83b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/bounce.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/bounce.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/chain.json b/src/main/generated/data/arsmagicalegacy/advancements/book/chain.json index e9f441eec..59dd52865 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/chain.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/chain.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/channel.json b/src/main/generated/data/arsmagicalegacy/advancements/book/channel.json index b8e0cac37..5a0a26576 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/channel.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/channel.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/charm.json b/src/main/generated/data/arsmagicalegacy/advancements/book/charm.json index 3ae961271..3844977d2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/charm.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/charm.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/color.json b/src/main/generated/data/arsmagicalegacy/advancements/book/color.json index 1c71a32dc..acc35ce2e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/color.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/color.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_damage.json index c1937f5e8..969482b4b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_death.json b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_death.json index 5b5177b39..c5bce8537 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_death.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_death.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fall.json b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fall.json index 4779406a1..673ce9f8d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fall.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fall.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fire.json b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fire.json index bb0ed2ef4..625e8eb42 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fire.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_fire.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_health.json b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_health.json index 8dd112c6b..f4edca625 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_health.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/contingency_health.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/create_water.json b/src/main/generated/data/arsmagicalegacy/advancements/book/create_water.json index 1dc7f957b..e78593667 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/create_water.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/create_water.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/damage.json index ae7c9f2df..2f7a4a17a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/daylight.json b/src/main/generated/data/arsmagicalegacy/advancements/book/daylight.json index 348dd112e..300104aab 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/daylight.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/daylight.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/dig.json b/src/main/generated/data/arsmagicalegacy/advancements/book/dig.json index 33ce7d987..6c98ecfb1 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/dig.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/dig.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/disarm.json b/src/main/generated/data/arsmagicalegacy/advancements/book/disarm.json index df09af91b..400a19989 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/disarm.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/disarm.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/dismembering.json b/src/main/generated/data/arsmagicalegacy/advancements/book/dismembering.json index 646251883..8186b6f4a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/dismembering.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/dismembering.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/dispel.json b/src/main/generated/data/arsmagicalegacy/advancements/book/dispel.json index 2d5302c90..8e1dc31dc 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/dispel.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/dispel.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/divine_intervention.json b/src/main/generated/data/arsmagicalegacy/advancements/book/divine_intervention.json index 36daf2911..708a377ca 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/divine_intervention.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/divine_intervention.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/drought.json b/src/main/generated/data/arsmagicalegacy/advancements/book/drought.json index 11f066106..1cdea0beb 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/drought.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/drought.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/drowning_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/drowning_damage.json index 419547e09..5b482354e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/drowning_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/drowning_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/duration.json b/src/main/generated/data/arsmagicalegacy/advancements/book/duration.json index 6fe6dbe4b..b3540af8e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/duration.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/duration.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/effect_power.json b/src/main/generated/data/arsmagicalegacy/advancements/book/effect_power.json index 4854bc02d..1055f4b9e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/effect_power.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/effect_power.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/ender_intervention.json b/src/main/generated/data/arsmagicalegacy/advancements/book/ender_intervention.json index 64df1b7c7..3d22da782 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/ender_intervention.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/ender_intervention.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/entangle.json b/src/main/generated/data/arsmagicalegacy/advancements/book/entangle.json index 72d82bea5..c87a1fe7b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/entangle.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/entangle.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/explosion.json b/src/main/generated/data/arsmagicalegacy/advancements/book/explosion.json index 02c2bc8d1..c6bfc6c03 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/explosion.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/explosion.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/falling_star.json b/src/main/generated/data/arsmagicalegacy/advancements/book/falling_star.json index 7830723e5..65e3bd92c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/falling_star.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/falling_star.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/fire_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/fire_damage.json index 381339354..1dc485f54 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/fire_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/fire_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/fire_rain.json b/src/main/generated/data/arsmagicalegacy/advancements/book/fire_rain.json index 9bf212dd7..7d620f784 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/fire_rain.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/fire_rain.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/flight.json b/src/main/generated/data/arsmagicalegacy/advancements/book/flight.json index b645e987e..97b395175 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/flight.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/flight.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/fling.json b/src/main/generated/data/arsmagicalegacy/advancements/book/fling.json index 92dc66ecf..de7835b09 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/fling.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/fling.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/forge.json b/src/main/generated/data/arsmagicalegacy/advancements/book/forge.json index 24f73c1bb..706e79c1e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/forge.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/forge.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/frost.json b/src/main/generated/data/arsmagicalegacy/advancements/book/frost.json index 630802337..a0cb9f2cc 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/frost.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/frost.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/frost_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/frost_damage.json index 356a30b24..bfe2dd959 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/frost_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/frost_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/fury.json b/src/main/generated/data/arsmagicalegacy/advancements/book/fury.json index 484e01fd9..1cdbd0107 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/fury.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/fury.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/gravity.json b/src/main/generated/data/arsmagicalegacy/advancements/book/gravity.json index 988c88f92..ad3c10e77 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/gravity.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/gravity.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/gravity_well.json b/src/main/generated/data/arsmagicalegacy/advancements/book/gravity_well.json index 799753be6..e743a9fec 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/gravity_well.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/gravity_well.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/grow.json b/src/main/generated/data/arsmagicalegacy/advancements/book/grow.json index 8af374606..f56ae950a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/grow.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/grow.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/harvest.json b/src/main/generated/data/arsmagicalegacy/advancements/book/harvest.json index 71b5c24bc..992d607f8 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/harvest.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/harvest.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/haste.json b/src/main/generated/data/arsmagicalegacy/advancements/book/haste.json index ed85e4cee..eea025b9f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/haste.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/haste.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/heal.json b/src/main/generated/data/arsmagicalegacy/advancements/book/heal.json index a6ba1eb8f..0f1cb61b2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/heal.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/heal.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/healing.json b/src/main/generated/data/arsmagicalegacy/advancements/book/healing.json index b1ebe98c1..06e8acd27 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/healing.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/healing.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/health_boost.json b/src/main/generated/data/arsmagicalegacy/advancements/book/health_boost.json index 4a101dc79..9914c9e05 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/health_boost.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/health_boost.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/ignition.json b/src/main/generated/data/arsmagicalegacy/advancements/book/ignition.json index c18eebcaf..bc32bdf08 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/ignition.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/ignition.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/invisibility.json b/src/main/generated/data/arsmagicalegacy/advancements/book/invisibility.json index b07649a19..4e395e95c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/invisibility.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/invisibility.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/jump_boost.json b/src/main/generated/data/arsmagicalegacy/advancements/book/jump_boost.json index 4fce1ae41..b6fa65c37 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/jump_boost.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/jump_boost.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/knockback.json b/src/main/generated/data/arsmagicalegacy/advancements/book/knockback.json index cdf3c3cbe..c1e946b15 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/knockback.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/knockback.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/levitation.json b/src/main/generated/data/arsmagicalegacy/advancements/book/levitation.json index 87abc9491..834f93663 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/levitation.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/levitation.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/life_drain.json b/src/main/generated/data/arsmagicalegacy/advancements/book/life_drain.json index 185c05022..cb1fc192e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/life_drain.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/life_drain.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/life_tap.json b/src/main/generated/data/arsmagicalegacy/advancements/book/life_tap.json index 478e6b3c3..daac9e891 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/life_tap.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/life_tap.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/light.json b/src/main/generated/data/arsmagicalegacy/advancements/book/light.json index 966cf1e6f..09c7dfe43 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/light.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/light.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/lightning_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/lightning_damage.json index 8ead1dca8..4c0eecc8c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/lightning_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/lightning_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/lunar.json b/src/main/generated/data/arsmagicalegacy/advancements/book/lunar.json index 0f25691c4..62310dfc4 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/lunar.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/lunar.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/magic_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/magic_damage.json index 053e04057..2b5775ad0 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/magic_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/magic_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_blast.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_blast.json index cab985702..7f6aa2c43 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_blast.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_blast.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_drain.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_drain.json index ca9ac5016..03b6e0d15 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_drain.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_drain.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_1.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_1.json index 45f958148..3934d65ce 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_1.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_1.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_2.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_2.json index 2cc3eaf04..1cf3d668a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_2.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_2.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_3.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_3.json index f4ddeeac3..5b3ae8b4b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_3.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mana_regen_boost_3.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/mining_power.json b/src/main/generated/data/arsmagicalegacy/advancements/book/mining_power.json index e4a83c686..3fddf418d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/mining_power.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/mining_power.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/moonrise.json b/src/main/generated/data/arsmagicalegacy/advancements/book/moonrise.json index 8a7641493..b29adc8b4 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/moonrise.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/moonrise.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/night_vision.json b/src/main/generated/data/arsmagicalegacy/advancements/book/night_vision.json index 88b36b6cd..cdf59e9ae 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/night_vision.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/night_vision.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/physical_damage.json b/src/main/generated/data/arsmagicalegacy/advancements/book/physical_damage.json index 3018708ae..96b729db6 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/physical_damage.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/physical_damage.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/piercing.json b/src/main/generated/data/arsmagicalegacy/advancements/book/piercing.json index 73b3aa2ff..69112ae69 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/piercing.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/piercing.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/place_block.json b/src/main/generated/data/arsmagicalegacy/advancements/book/place_block.json index c30a5f0c4..2d309e4a5 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/place_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/place_block.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/plant.json b/src/main/generated/data/arsmagicalegacy/advancements/book/plant.json index 8101dfdce..93cfdd47d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/plant.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/plant.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/plow.json b/src/main/generated/data/arsmagicalegacy/advancements/book/plow.json index 71f08d5a4..3d2a1ce3d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/plow.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/plow.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/projectile.json b/src/main/generated/data/arsmagicalegacy/advancements/book/projectile.json index cce1f1f45..e4c82f0f9 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/projectile.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/projectile.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/prosperity.json b/src/main/generated/data/arsmagicalegacy/advancements/book/prosperity.json index af62218f7..198686a49 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/prosperity.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/prosperity.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/random_teleport.json b/src/main/generated/data/arsmagicalegacy/advancements/book/random_teleport.json index a97a3a3b3..ddc65a94d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/random_teleport.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/random_teleport.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/range.json b/src/main/generated/data/arsmagicalegacy/advancements/book/range.json index ab7887eee..74e7e0555 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/range.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/range.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/recall.json b/src/main/generated/data/arsmagicalegacy/advancements/book/recall.json index c8e60b45b..1c2658720 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/recall.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/recall.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/reflect.json b/src/main/generated/data/arsmagicalegacy/advancements/book/reflect.json index fbf9136be..2b50bedb8 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/reflect.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/reflect.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/regeneration.json b/src/main/generated/data/arsmagicalegacy/advancements/book/regeneration.json index 11ffa41a9..14b5ba116 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/regeneration.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/regeneration.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/repel.json b/src/main/generated/data/arsmagicalegacy/advancements/book/repel.json index b997c53ff..310deef5e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/repel.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/repel.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/rift.json b/src/main/generated/data/arsmagicalegacy/advancements/book/rift.json index ec889549d..78c5c1866 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/rift.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/rift.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/root.json b/src/main/generated/data/arsmagicalegacy/advancements/book/root.json index 01d5a6963..81a3ecb3d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/root.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/root.json @@ -17,5 +17,6 @@ [ "arcane_compendium" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/rune.json b/src/main/generated/data/arsmagicalegacy/advancements/book/rune.json index 2b3dfa314..d370e1dc4 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/rune.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/rune_procs.json b/src/main/generated/data/arsmagicalegacy/advancements/book/rune_procs.json index aa7682bd6..b3459283d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/rune_procs.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/rune_procs.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/self.json b/src/main/generated/data/arsmagicalegacy/advancements/book/self.json index 1603623ff..91c147845 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/self.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/self.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/shield.json b/src/main/generated/data/arsmagicalegacy/advancements/book/shield.json index 333c9e200..5fadfa3ad 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/shield.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/shield.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/shield_overload.json b/src/main/generated/data/arsmagicalegacy/advancements/book/shield_overload.json index 01a99b2c6..23840ab55 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/shield_overload.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/shield_overload.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/shrink.json b/src/main/generated/data/arsmagicalegacy/advancements/book/shrink.json index ac4542ef7..2e66e54db 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/shrink.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/shrink.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/silence.json b/src/main/generated/data/arsmagicalegacy/advancements/book/silence.json index 54d0a99d4..c20634e45 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/silence.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/silence.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/silk_touch.json b/src/main/generated/data/arsmagicalegacy/advancements/book/silk_touch.json index 063b8bf5b..7ecea8e63 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/silk_touch.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/silk_touch.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/slow_falling.json b/src/main/generated/data/arsmagicalegacy/advancements/book/slow_falling.json index 43aecef44..15e58c3fe 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/slow_falling.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/slow_falling.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/slowness.json b/src/main/generated/data/arsmagicalegacy/advancements/book/slowness.json index e42ca6c8e..878652d07 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/slowness.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/slowness.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/solar.json b/src/main/generated/data/arsmagicalegacy/advancements/book/solar.json index 4e5260f52..c99e4486a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/solar.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/solar.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/spell_motion.json b/src/main/generated/data/arsmagicalegacy/advancements/book/spell_motion.json index 9080f2f9e..3f0e2943f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/spell_motion.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/spell_motion.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/storm.json b/src/main/generated/data/arsmagicalegacy/advancements/book/storm.json index f96a9c81c..72626646c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/storm.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/storm.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/summon.json b/src/main/generated/data/arsmagicalegacy/advancements/book/summon.json index e28a3c9b1..650e5c0f0 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/summon.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/summon.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/swift_swim.json b/src/main/generated/data/arsmagicalegacy/advancements/book/swift_swim.json index 68e652181..6cdcbeedc 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/swift_swim.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/swift_swim.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/target_non_solid.json b/src/main/generated/data/arsmagicalegacy/advancements/book/target_non_solid.json index 27b44e702..288495517 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/target_non_solid.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/target_non_solid.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/telekinesis.json b/src/main/generated/data/arsmagicalegacy/advancements/book/telekinesis.json index e3e3d8169..ac53be235 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/telekinesis.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/telekinesis.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/temporal_anchor.json b/src/main/generated/data/arsmagicalegacy/advancements/book/temporal_anchor.json index 520401d2d..9f3aff2f5 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/temporal_anchor.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/temporal_anchor.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/touch.json b/src/main/generated/data/arsmagicalegacy/advancements/book/touch.json index 3f313cc48..241dfa617 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/touch.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/touch.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/transplace.json b/src/main/generated/data/arsmagicalegacy/advancements/book/transplace.json index 3e51cfd62..bbd34cc2e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/transplace.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/transplace.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/true_sight.json b/src/main/generated/data/arsmagicalegacy/advancements/book/true_sight.json index 5b69b0d00..1aafed09a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/true_sight.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/true_sight.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/velocity.json b/src/main/generated/data/arsmagicalegacy/advancements/book/velocity.json index 5e61cbe21..6765b8828 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/velocity.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/velocity.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/wall.json b/src/main/generated/data/arsmagicalegacy/advancements/book/wall.json index bb9a6b78c..9c2e8479d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/wall.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/wall.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/water_breathing.json b/src/main/generated/data/arsmagicalegacy/advancements/book/water_breathing.json index 7bc25ee84..b76021e4d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/water_breathing.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/water_breathing.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/watery_grave.json b/src/main/generated/data/arsmagicalegacy/advancements/book/watery_grave.json index d81ad9fdb..64fbc7f01 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/watery_grave.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/watery_grave.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/wave.json b/src/main/generated/data/arsmagicalegacy/advancements/book/wave.json index abb179e5a..fe0f44d54 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/wave.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/wave.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/wizards_autumn.json b/src/main/generated/data/arsmagicalegacy/advancements/book/wizards_autumn.json index 56e766245..58d88cb68 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/wizards_autumn.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/wizards_autumn.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/book/zone.json b/src/main/generated/data/arsmagicalegacy/advancements/book/zone.json index 200e39f41..adbced551 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/book/zone.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/book/zone.json @@ -12,5 +12,6 @@ [ "knows" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json index feb0bcb9a..ce114544c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/stripped_witchwood.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:stripped_witchwood" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json index 0b72a2d31..19dddd4ea 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json index f0506fe3c..c6b20fdf5 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_planks.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:witchwood_planks" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json index 0f107a8bf..07be536d2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_slab.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_slab" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json index 81a9a82e4..0a2e290ec 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/building_blocks/witchwood_stairs.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_stairs" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json index 1842e04b2..00edfbcec 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_boots.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:battlemage_boots" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json index f764cd3cb..88d141390 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_chestplate.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:battlemage_chestplate" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json index b18a7dcf0..5125dd074 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_helmet.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:battlemage_helmet" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json index 578da24b2..debf2bc1f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/battlemage_leggings.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:battlemage_leggings" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json index 2a33ac540..2fa26d07e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_boots.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mage_boots" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json index 0291298a8..5285289b9 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_chestplate.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mage_chestplate" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json index 3a5efdcb8..872dddb50 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_helmet.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mage_helmet" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json index f6d1106ba..60e5e7b36 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/mage_leggings.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mage_leggings" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/spell_book.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/spell_book.json index 8cf736156..4953665da 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/spell_book.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/combat/spell_book.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:spell_book" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json index 1852b792d..d80745463 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/vinteum_torch.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:vinteum_torch" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json index a7a111250..e98d1191a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_fence.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_fence" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json similarity index 94% rename from src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json rename to src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json index 3ec955705..e9761f266 100644 --- a/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_hanging_sign.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_hanging_sign" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json index d921dc7d7..9b6b82e58 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/decorations/witchwood_sign.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_sign" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_cake.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_cake.json index 7cdb76ad7..5d3f60a40 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_cake.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_cake.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mana_cake" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_martini.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_martini.json index 4067a8488..e17da1c55 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_martini.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/food/mana_martini.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:mana_martini" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json index 87da03f78..bd54b0272 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_air.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_air" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json index f0e44a6a9..d1c9262c6 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_arcane.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_arcane" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json index 7eb486b15..71279713a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_earth.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_earth" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json index 7bacd8ce3..c64b4578f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ender.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_ender" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json index a195d5227..f287c4280 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_fire.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_fire" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json index 962620c2a..8ab5b1d16 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_ice.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_ice" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json index 37c8816cc..a3707b64a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_life.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_life" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json index 3f818c1d1..8c2089b90 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_lightning.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_lightning" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json index be9be1906..7b2131ebf 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_nature.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_nature" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json index f5709d281..1f324df64 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/affinity_essence_water.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:affinity_essence_water" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/altar_core.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/altar_core.json index 003d1ca8e..b4d39a628 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/altar_core.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/altar_core.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:altar_core" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json index a0afc6e54..6159ae3de 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_ash.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:arcane_ash" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json index 7d2692a4c..995dd6fde 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compendium.json @@ -48,5 +48,6 @@ "recipes": [ "arsmagicalegacy:arcane_compendium" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json index 6a746ebfe..d28bac046 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/arcane_compound.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:arcane_compound" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/black_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/black_rune.json index 42a36d31b..b51e509c6 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/black_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/black_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:black_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json index 57f2174c0..def6a5ccb 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blank_rune.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:blank_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json index da0d91c8f..930ae1ab7 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_dye_from_cerublossom.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:blue_dye_from_cerublossom" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json index 6a4bc3438..14f180170 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/blue_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:blue_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json index b02f49448..3672e5be3 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_dye_from_tarma_root.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:brown_dye_from_tarma_root" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json index f9c554914..45b850046 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/brown_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:brown_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite.json index 95934c77d..b54b82f0f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json index 4ae6d798a..4a0961493 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_block.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite_block" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json index 773e1876f..1fecd8c3f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_chimerite_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite_from_blasting_chimerite_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json index fb1a96b7d..e5df2234d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_blasting_deepslate_chimerite_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite_from_blasting_deepslate_chimerite_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json index b28ea4db6..73c5836d1 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_chimerite_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite_from_smelting_chimerite_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json index e14bcfc87..8d0597014 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/chimerite_from_smelting_deepslate_chimerite_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:chimerite_from_smelting_deepslate_chimerite_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json index 16186fc20..95ba65414 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/cyan_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:cyan_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json index 32fdf5a1d..3bc0f17f5 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/gray_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:gray_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/green_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/green_rune.json index a4ee48ba1..25805d4b3 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/green_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/green_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:green_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json index 490d4cd77..ba06c647c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json index c9c721709..8c5efc816 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_1.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_tier_1" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json index dda1ddfc1..e1d3dc281 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_2.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_tier_2" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json index 9e926a842..c4b5c5281 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_tier_3.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_tier_3" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json index 55f2a809b..72073eab0 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_1.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_upgrade_tier_1" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json index b378cf315..a3520a3fb 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_2.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_upgrade_tier_2" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json index 450174653..72a7576e2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/inscription_table_upgrade_tier_3.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:inscription_table_upgrade_tier_3" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json index d195e76db..71fbf4b79 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_blue_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:light_blue_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json index 354917505..819b66e35 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/light_gray_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:light_gray_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json index 86e16e68d..028b28efe 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/lime_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:lime_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json index 62575a7e3..0204c65dd 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_dye_from_wakebloom.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:magenta_dye_from_wakebloom" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json index 462d0a3f0..2f6953151 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magenta_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:magenta_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json index e4d023470..8ad7a20ee 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/magic_wall.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:magic_wall" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone.json index 9a936f8af..4a809de7a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json index 890a5ad3d..89280ed95 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_block.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone_block" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json index f4fb8b875..58cb3728f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_deepslate_moonstone_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone_from_blasting_deepslate_moonstone_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json index a207bd522..3bca3e845 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_blasting_moonstone_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone_from_blasting_moonstone_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json index bdc17db91..33a452738 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_deepslate_moonstone_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone_from_smelting_deepslate_moonstone_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json index e584336c5..ea24b4dd3 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/moonstone_from_smelting_moonstone_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:moonstone_from_smelting_moonstone_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/obelisk.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/obelisk.json index b592567be..fb118f10b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/obelisk.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/obelisk.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:obelisk" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/occulus.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/occulus.json index 3c61745e3..40e67e918 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/occulus.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/occulus.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:occulus" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json index 5b78f520d..a230c3070 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/orange_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:orange_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json index af50cb794..1b877f364 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_dye_from_aum.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:pink_dye_from_aum" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json index 3c45333c0..689f07c26 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/pink_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:pink_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json index 542a41ecf..4264b8fef 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purified_vinteum_dust.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:purified_vinteum_dust" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json index 6d4038527..918cfe8f3 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/purple_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:purple_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json index 02fa21aa9..d616f0a7a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_dye_from_desert_nova.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:red_dye_from_desert_nova" ] - } -} + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_rune.json index a86f41a6b..4f001649e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/red_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:red_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json index 980fa4202..e1172a6c2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/spell_parchment.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:spell_parchment" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone.json index d637a1ace..3a7b802fd 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:sunstone" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json index feaa36f67..5bb966b8d 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/sunstone_block.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:sunstone_block" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz.json index 0a54d8f42..974595357 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json index 96c32f8a3..7c7961d9c 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_block.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz_block" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json index 96331cdbd..4d88f6442 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_deepslate_topaz_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz_from_blasting_deepslate_topaz_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json index e1ecad979..c87915188 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_blasting_topaz_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz_from_blasting_topaz_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json index d15a687fa..58dc8d0f2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_deepslate_topaz_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz_from_smelting_deepslate_topaz_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json index 7fd878098..b3693298f 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/topaz_from_smelting_topaz_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:topaz_from_smelting_topaz_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json index 1c03969ea..f2a8265a9 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_block.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_block" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json index ba33bd454..08fd2ecb9 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_dust" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json index 46771da6d..98a022a78 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_deepslate_vinteum_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_dust_from_blasting_deepslate_vinteum_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json index bb079927f..77bf6c217 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_blasting_vinteum_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_dust_from_blasting_vinteum_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json index e5f3fdea1..bcf2e1d80 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_deepslate_vinteum_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_dust_from_smelting_deepslate_vinteum_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json index 38a727275..97e259afa 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/vinteum_dust_from_smelting_vinteum_ore.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:vinteum_dust_from_smelting_vinteum_ore" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/white_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/white_rune.json index 1386c3f8a..b539816b2 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/white_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/white_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:white_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json index 7b90b5465..7f37aae32 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/misc/yellow_rune.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:yellow_rune" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json index 2ae30e76c..508315119 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_button.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_button" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json index cd9322e84..a763396d1 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_door.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_door" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json index 80141f07e..7d84d68b3 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_fence_gate.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_fence_gate" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json index 659723dc8..674169571 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_pressure_plate.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_pressure_plate" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json index 694e82d6e..d52b2c928 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/redstone/witchwood_trapdoor.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:witchwood_trapdoor" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json index 3a95e62d1..b5b4e8b16 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/crystal_wrench.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:crystal_wrench" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json index 1057dc057..7440d2058 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/magitech_goggles.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:magitech_goggles" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json index 5c1674ad5..48b766d2b 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/rune_bag.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:rune_bag" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json index b164d8b55..0dd8bc51e 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/tools/wizards_chalk.json @@ -28,5 +28,6 @@ "recipes": [ "arsmagicalegacy:wizards_chalk" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json index 9e133b9d4..83c7eedcf 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/gold_inlay.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:gold_inlay" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json index 38719f548..0518b1c9a 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/iron_inlay.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:iron_inlay" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json index 68e53f15f..0614adab7 100644 --- a/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/advancements/recipes/transportation/redstone_inlay.json @@ -30,5 +30,6 @@ "recipes": [ "arsmagicalegacy:redstone_inlay" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/altar_core.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/altar_core.json index 49eef648f..25a9f8aa4 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/altar_core.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/altar_core.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/altar_core" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/aum.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/aum.json index 36c2c16fd..f421abc89 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/aum.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/aum.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/aum" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/black_aurem.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/black_aurem.json index b39cab4b2..5af1beaa8 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/black_aurem.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/black_aurem.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/black_aurem" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/celestial_prism.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/celestial_prism.json index 466d216c6..5ebb90551 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/celestial_prism.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/celestial_prism.json @@ -25,5 +25,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/celestial_prism" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/cerublossom.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/cerublossom.json index 86566bce9..9f3ebaa68 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/cerublossom.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/cerublossom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/cerublossom" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_block.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_block.json index d5171332e..dc0e81cac 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_block.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/chimerite_block" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_ore.json index 139ade5b1..22538172e 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/chimerite_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/chimerite_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_chimerite_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_chimerite_ore.json index d431bf49c..78facf1dc 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_chimerite_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_chimerite_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/deepslate_chimerite_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_moonstone_ore.json index 3da34b052..d654c6544 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_moonstone_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/deepslate_moonstone_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_topaz_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_topaz_ore.json index 5363dbab5..bd9010e24 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_topaz_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/deepslate_topaz_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_vinteum_ore.json index 1c8f32e22..7527b8185 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/deepslate_vinteum_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/deepslate_vinteum_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/desert_nova.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/desert_nova.json index 5c5b312fe..bbeffbd47 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/desert_nova.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/desert_nova.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/desert_nova" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/gold_inlay.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/gold_inlay.json index 7eafc96df..8fed2787b 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/gold_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/gold_inlay.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/gold_inlay" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/inscription_table.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/inscription_table.json index 773ba4a07..a1b2f34a9 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/inscription_table.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/inscription_table.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/inscription_table" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/iron_inlay.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/iron_inlay.json index ee2d42526..a463a19bd 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/iron_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/iron_inlay.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/iron_inlay" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/magic_wall.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/magic_wall.json index e84f59f65..090156ee3 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/magic_wall.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/magic_wall.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/magic_wall" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_block.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_block.json index 5f8a2e6a4..3deb3e3c5 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_block.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/moonstone_block" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_ore.json index 5bf53a81e..363b6209f 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/moonstone_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/moonstone_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/obelisk.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/obelisk.json index 32997961e..9105b3d05 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/obelisk.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/obelisk.json @@ -25,5 +25,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/obelisk" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/occulus.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/occulus.json index 5347841d7..daef3e8ef 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/occulus.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/occulus.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/occulus" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_aum.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_aum.json index 814377f97..7036a46e9 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_aum.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_aum.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_aum" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_cerublossom.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_cerublossom.json index b7d6efda1..5d2a58205 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_cerublossom.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_cerublossom.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_cerublossom" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_desert_nova.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_desert_nova.json index 7ad3136a0..357d14875 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_desert_nova.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_desert_nova.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_desert_nova" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_tarma_root.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_tarma_root.json index afaf86eac..f7cbb9e81 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_tarma_root.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_tarma_root.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_tarma_root" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_wakebloom.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_wakebloom.json index 03bce50e6..a528b14dd 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_wakebloom.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_wakebloom.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_wakebloom" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_witchwood_sapling.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_witchwood_sapling.json index 8b95aedbd..0231cfbe6 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_witchwood_sapling.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/potted_witchwood_sapling.json @@ -31,5 +31,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/potted_witchwood_sapling" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/redstone_inlay.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/redstone_inlay.json index a63402258..c0f24aaba 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/redstone_inlay.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/redstone_inlay.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/redstone_inlay" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood.json index 89bbfa922..b56545241 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/stripped_witchwood" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood_log.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood_log.json index 5b2d3fb3a..f0ab4f3d1 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood_log.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/stripped_witchwood_log.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/stripped_witchwood_log" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_block.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_block.json index 656579678..d88dbbd90 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_block.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/sunstone_block" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_ore.json index 93b9e6990..ca26c9cab 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/sunstone_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/sunstone_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/tarma_root.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/tarma_root.json index 200e99ebb..594e6df91 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/tarma_root.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/tarma_root.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/tarma_root" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_block.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_block.json index 830191f17..da6313ed6 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_block.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/topaz_block" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_ore.json index 6169663e9..80d1bc479 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/topaz_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/topaz_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_block.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_block.json index b181a3636..85168ddc8 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_block.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/vinteum_block" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_ore.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_ore.json index d7eb27cee..06f8a5875 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_ore.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/vinteum_ore" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_torch.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_torch.json index 65a27a82f..82ca05cb3 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_torch.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_torch.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/vinteum_torch" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_wall_torch.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_wall_torch.json index 65a27a82f..2d75170ac 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_wall_torch.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/vinteum_wall_torch.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/vinteum_wall_torch" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/wakebloom.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/wakebloom.json index 1969848fc..7a565f1f5 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/wakebloom.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/wakebloom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/wakebloom" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood.json index deb06cc6c..4601b8e8e 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_button.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_button.json index 2bb7a7396..ade65f321 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_button.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_button.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_button" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_door.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_door.json index 31360b007..705504c30 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_door.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_door.json @@ -25,5 +25,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_door" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence.json index f33df5e30..1f8f573f2 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_fence" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence_gate.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence_gate.json index 3acb450f5..0019f49a3 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence_gate.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_fence_gate.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_fence_gate" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_leaves.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_leaves.json index 40eccf019..aa18947df 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_leaves.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_leaves.json @@ -11,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -69,7 +69,7 @@ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -131,5 +131,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_leaves" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_log.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_log.json index b06669d0f..b4e262857 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_log.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_log.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_log" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_planks.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_planks.json index 7885b3dc9..2c2b34c98 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_planks.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_planks.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_planks" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_pressure_plate.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_pressure_plate.json index 2a037503b..1b55523b9 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_pressure_plate.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_pressure_plate.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_pressure_plate" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sapling.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sapling.json index 14b5ab8e6..75871c720 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sapling.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sapling.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_sapling" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sign.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sign.json index 6bf3365ab..0726b4005 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sign.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_sign.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_sign" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_slab.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_slab.json index 98117327c..e4899dd15 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_slab.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_slab.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_slab" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_stairs.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_stairs.json index e6c7037ee..d3c9b393b 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_stairs.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_stairs.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_stairs" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_trapdoor.json b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_trapdoor.json index 707d85146..efbccd8cc 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_trapdoor.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/blocks/witchwood_trapdoor.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:blocks/witchwood_trapdoor" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/abandoned_mineshaft.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/abandoned_mineshaft.json index 647c62473..cb3cb5ad2 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/abandoned_mineshaft.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/abandoned_mineshaft.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/abandoned_mineshaft" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city.json index 8cc0d0e30..ae64f597b 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/ancient_city" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city_ice_box.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city_ice_box.json index 8cc0d0e30..269d4e3ed 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city_ice_box.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/ancient_city_ice_box.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/ancient_city_ice_box" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/bastion_treasure.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/bastion_treasure.json index c7ef5037a..85c0e1e96 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/bastion_treasure.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/bastion_treasure.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/bastion_treasure" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/desert_pyramid.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/desert_pyramid.json index 075b7353d..10981cd66 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/desert_pyramid.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/desert_pyramid.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/desert_pyramid" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/end_city_treasure.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/end_city_treasure.json index 21aa5f7b1..97398c120 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/end_city_treasure.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/end_city_treasure.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/end_city_treasure" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/igloo_chest.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/igloo_chest.json index ec05c8764..f3438be04 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/igloo_chest.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/igloo_chest.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/igloo_chest" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/jungle_temple.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/jungle_temple.json index bc9173c6c..0edacfb72 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/jungle_temple.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/jungle_temple.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/jungle_temple" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/nether_bridge.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/nether_bridge.json index ab544f7d8..a3085c7eb 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/nether_bridge.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/nether_bridge.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/nether_bridge" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/pillager_outpost.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/pillager_outpost.json index 1dacdb267..25365acfc 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/pillager_outpost.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/pillager_outpost.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/pillager_outpost" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/shipwreck_treasure.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/shipwreck_treasure.json index ea5022e48..36aa469a1 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/shipwreck_treasure.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/shipwreck_treasure.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/shipwreck_treasure" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/simple_dungeon.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/simple_dungeon.json index 647c62473..2beeb29b0 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/simple_dungeon.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/simple_dungeon.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/simple_dungeon" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/stronghold_library.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/stronghold_library.json index a8235838b..6a74c580c 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/stronghold_library.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/stronghold_library.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/stronghold_library" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_big.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_big.json index 44761647b..d623a8db0 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_big.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_big.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/underwater_ruin_big" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_small.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_small.json index 44761647b..470f8aa4d 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_small.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/underwater_ruin_small.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/underwater_ruin_small" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_desert_house.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_desert_house.json index fbf19557a..c1e7332ec 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_desert_house.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_desert_house.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_desert_house" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_plains_house.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_plains_house.json index 9b0c5454c..5482e3703 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_plains_house.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_plains_house.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_plains_house" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_savanna_house.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_savanna_house.json index 3808a9fdb..bb40fd149 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_savanna_house.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_savanna_house.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_savanna_house" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_snowy_house.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_snowy_house.json index c29f816f0..7329989eb 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_snowy_house.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_snowy_house.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_snowy_house" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_taiga_house.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_taiga_house.json index c29f816f0..e476d594d 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_taiga_house.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_taiga_house.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_taiga_house" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_temple.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_temple.json index 462a52308..c7e4b125e 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_temple.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/village/village_temple.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/village/village_temple" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/woodland_mansion.json b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/woodland_mansion.json index 46533a1aa..97987f38b 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/woodland_mansion.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/chests/modify/woodland_mansion.json @@ -32,5 +32,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:chests/modify/woodland_mansion" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/air_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/air_guardian.json index 9a3eef2ab..7ee57c790 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/air_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/air_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/air_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/arcane_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/arcane_guardian.json index 14a551e72..373ba1da6 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/arcane_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/arcane_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/arcane_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/dryad.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/dryad.json index 601c1935a..44e3aa7ce 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/dryad.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/dryad.json @@ -1,3 +1,4 @@ { - "type": "minecraft:entity" + "type": "minecraft:entity", + "random_sequence": "arsmagicalegacy:entities/dryad" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/earth_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/earth_guardian.json index ca23ec8f9..4fab82c01 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/earth_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/earth_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/earth_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ender_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ender_guardian.json index aa484aced..94e0eb743 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ender_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ender_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/ender_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/fire_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/fire_guardian.json index be113391f..89f8ad071 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/fire_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/fire_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/fire_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ice_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ice_guardian.json index c5372c959..f03d77ad6 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ice_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/ice_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/ice_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/life_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/life_guardian.json index 051019cab..67082f279 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/life_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/life_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/life_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/lightning_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/lightning_guardian.json index d9a8803a2..b7bd04bfe 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/lightning_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/lightning_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/lightning_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mage.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mage.json index 601c1935a..62bbb4003 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mage.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mage.json @@ -1,3 +1,4 @@ { - "type": "minecraft:entity" + "type": "minecraft:entity", + "random_sequence": "arsmagicalegacy:entities/mage" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mana_creeper.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mana_creeper.json index 7a9cd3b5c..a73deea40 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mana_creeper.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/mana_creeper.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/mana_creeper" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/nature_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/nature_guardian.json index 45104df71..2e64f468b 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/nature_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/nature_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/nature_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/water_guardian.json b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/water_guardian.json index 59212b8e0..fbcbd163e 100644 --- a/src/main/generated/data/arsmagicalegacy/loot_tables/entities/water_guardian.json +++ b/src/main/generated/data/arsmagicalegacy/loot_tables/entities/water_guardian.json @@ -17,5 +17,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "arsmagicalegacy:entities/water_guardian" } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/recipes/witchwood_hanging_sign.json b/src/main/generated/data/arsmagicalegacy/recipes/witchwood_hanging_sign.json similarity index 100% rename from src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/recipes/witchwood_hanging_sign.json rename to src/main/generated/data/arsmagicalegacy/recipes/witchwood_hanging_sign.json diff --git a/src/main/generated/data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json b/src/main/generated/data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json index ec76fbd94..c9e12cdb2 100644 --- a/src/main/generated/data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json +++ b/src/main/generated/data/minecraft/advancements/recipes/misc/rune_bag_from_bundle.json @@ -28,5 +28,6 @@ "recipes": [ "minecraft:rune_bag_from_bundle" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json b/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json deleted file mode 100644 index e14754239..000000000 --- a/src/main/generated/data/minecraft/datapacks/update_1_20/data/arsmagicalegacy/loot_tables/blocks/witchwood_hanging_sign.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "arsmagicalegacy:witchwood_hanging_sign" - } - ], - "rolls": 1.0 - } - ] -} diff --git a/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/ceiling_hanging_signs.json b/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/ceiling_hanging_signs.json deleted file mode 100644 index 06a7d5cd2..000000000 --- a/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/ceiling_hanging_signs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "arsmagicalegacy:witchwood_hanging_sign" - ] -} diff --git a/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/wall_hanging_signs.json b/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/wall_hanging_signs.json deleted file mode 100644 index 086a2fc7a..000000000 --- a/src/main/generated/data/minecraft/datapacks/update_1_20/data/minecraft/tags/blocks/wall_hanging_signs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "arsmagicalegacy:witchwood_wall_hanging_sign" - ] -} diff --git a/src/main/generated/pack.mcmeta b/src/main/generated/pack.mcmeta index 7373003d8..314d21a36 100644 --- a/src/main/generated/pack.mcmeta +++ b/src/main/generated/pack.mcmeta @@ -3,7 +3,6 @@ "description": { "text": "Ars Magica: Legacy" }, - "forge:server_data_pack_format": 12, - "pack_format": 13 + "pack_format": 15 } } \ No newline at end of file diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/AMRenderTypes.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/AMRenderTypes.java new file mode 100644 index 000000000..69d994219 --- /dev/null +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/AMRenderTypes.java @@ -0,0 +1,38 @@ +package com.github.minecraftschurlimods.arsmagicalegacy.client; + +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.client.renderer.RenderStateShard; +import net.minecraft.client.renderer.RenderType; + +public class AMRenderTypes { + public static final RenderStateShard.ShaderStateShard COLOR_WHEEL_SHADER = new RenderStateShard.ShaderStateShard(AMShaders::getColorWheelShader); + public static float colorWheelCenterX, colorWheelCenterY, colorWheelRadius, colorWheelBrightness; // TODO: This is incredibly hacky, find a better way + + public static void setColorWheel(float cX, float cY, float radius, float brightness) { + colorWheelCenterX = cX; + colorWheelCenterY = cY; + colorWheelRadius = radius; + colorWheelBrightness = brightness; + } + + public static final RenderType COLOR_WHEEL = RenderType.create( + "color_wheel", + DefaultVertexFormat.POSITION_COLOR, + VertexFormat.Mode.QUADS, + 256, + false, + false, + RenderType.CompositeState + .builder() + .setShaderState(COLOR_WHEEL_SHADER) + .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setLayeringState(new RenderStateShard.LayeringStateShard("set_uniforms", () -> { + AMShaders.setUniform("center", colorWheelCenterX, colorWheelCenterY); + AMShaders.setUniform("radius", colorWheelRadius); + AMShaders.setUniform("brightness", colorWheelBrightness); + }, () -> {})) + .createCompositeState(false) + ); +} diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientHelper.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientHelper.java index b267238e2..747df0fb5 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientHelper.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientHelper.java @@ -4,12 +4,9 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.SpellCustomizationScreen; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.SpellRecipeScreen; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.occulus.OcculusScreen; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; @@ -29,17 +26,12 @@ public final class ClientHelper { * @param x The x coordinate to draw the part at. * @param y The y coordinate to draw the part at. */ - public static void drawItemStack(PoseStack poseStack, ItemStack itemStack, int x, int y) { + public static void drawItemStack(GuiGraphics graphics, ItemStack itemStack, int x, int y) { Minecraft minecraft = Minecraft.getInstance(); - ItemRenderer itemRenderer = minecraft.getItemRenderer(); - PoseStack mvs = RenderSystem.getModelViewStack(); - mvs.pushPose(); - mvs.mulPoseMatrix(poseStack.last().pose()); - RenderSystem.applyModelViewMatrix(); - itemRenderer.renderGuiItem(poseStack, itemStack, x, y); - itemRenderer.renderGuiItemDecorations(poseStack, minecraft.font, itemStack, x, y); - mvs.popPose(); - RenderSystem.applyModelViewMatrix(); + graphics.pose().pushPose(); + graphics.renderItem(itemStack, x, y); + graphics.renderItemDecorations(minecraft.font, itemStack, x, y); + graphics.pose().popPose(); } /** @@ -52,12 +44,11 @@ public static void drawItemStack(PoseStack poseStack, ItemStack itemStack, int x * @param width The width to draw the part with. * @param height The height to draw the part with. */ - public static void drawSpellPart(PoseStack poseStack, ISpellPart spellPart, int x, int y, int width, int height) { + public static void drawSpellPart(GuiGraphics graphics, ISpellPart spellPart, int x, int y, int width, int height) { TextureAtlasSprite sprite = SkillIconAtlas.instance().getSprite(spellPart.getId()); - poseStack.pushPose(); - RenderSystem.setShaderTexture(0, sprite.atlasLocation()); - GuiComponent.blit(poseStack, x, y, 0, width, height, sprite); - poseStack.popPose(); + graphics.pose().pushPose(); + graphics.blit(x, y, 0, width, height, sprite); + graphics.pose().popPose(); } /** @@ -75,7 +66,7 @@ public static Player getLocalPlayer() { public static Level getLocalLevel() { Player localPlayer = getLocalPlayer(); if (localPlayer == null) return null; - return localPlayer.level; + return localPlayer.level(); } /** diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientInit.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientInit.java index cefc1efa0..381c32c4c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientInit.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/ClientInit.java @@ -180,34 +180,34 @@ private static void registerClientReloadListeners(RegisterClientReloadListenersE } private static void registerParticleProviders(RegisterParticleProvidersEvent event) { - event.register(AMParticleTypes.NONE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.WATER_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.FIRE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.EARTH_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.AIR_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ICE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.LIGHTNING_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.NATURE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.LIFE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ARCANE_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ENDER_HAND.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ARCANE.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.CLOCK.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.EMBER.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.EXPLOSION.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.GHOST.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.LEAF.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.LENS_FLARE.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.LIGHTS.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.PLANT.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.PULSE.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ROCK.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.ROTATING_RINGS.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.STARDUST.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.WATER_BALL.get(), AMVanillaParticle.Provider::new); - event.register(AMParticleTypes.WIND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.NONE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.WATER_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.FIRE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.EARTH_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.AIR_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ICE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.LIGHTNING_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.NATURE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.LIFE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ARCANE_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ENDER_HAND.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ARCANE.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.CLOCK.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.EMBER.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.EXPLOSION.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.GHOST.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.LEAF.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.LENS_FLARE.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.LIGHTS.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.PLANT.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.PULSE.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ROCK.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.ROTATING_RINGS.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.STARDUST.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.WATER_BALL.get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(AMParticleTypes.WIND.get(), AMVanillaParticle.Provider::new); for (Map.Entry> symbol : AMParticleTypes.SYMBOLS.values().entrySet()) { - event.register(symbol.getValue().get(), AMVanillaParticle.Provider::new); + event.registerSpriteSet(symbol.getValue().get(), AMVanillaParticle.Provider::new); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/SpellParticleSpawners.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/SpellParticleSpawners.java index 3a6237667..8526e6f15 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/SpellParticleSpawners.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/SpellParticleSpawners.java @@ -707,7 +707,7 @@ public static void handleReceivedPacket(int i) { private static void blizzard(Blizzard blizzard) { float radius = blizzard.getRadius(); - RandomSource random = blizzard.getLevel().getRandom(); + RandomSource random = blizzard.level().getRandom(); int color = blizzard.getColor(); AMParticle.bulkCreate(100, (ClientLevel) Objects.requireNonNull(ClientHelper.getLocalLevel()), blizzard.getX(), blizzard.getY() + 10, blizzard.getZ(), ParticleTypes.SNOWFLAKE).forEach(particle -> { particle.setAlpha(0.6f); @@ -760,7 +760,7 @@ private static void fallingStar(FallingStar fallingStar) { private static void fireRain(FireRain fireRain) { float radius = fireRain.getRadius(); - RandomSource random = fireRain.getLevel().getRandom(); + RandomSource random = fireRain.level().getRandom(); int color = fireRain.getColor(); AMParticle.bulkCreate(100, (ClientLevel) Objects.requireNonNull(ClientHelper.getLocalLevel()), fireRain.getX(), fireRain.getY() + 10, fireRain.getZ(), AMParticleTypes.EXPLOSION.get()).forEach(particle -> { particle.setSpeed(random.nextDouble() * 0.2 - 0.1, random.nextDouble() * 0.1 - 0.05, random.nextDouble() * 0.2 - 0.1); @@ -775,9 +775,9 @@ private static void fireRain(FireRain fireRain) { private static void manaVortex(ManaVortex manaVortex) { int duration = manaVortex.getDuration(); - RandomSource random = manaVortex.getLevel().getRandom(); + RandomSource random = manaVortex.level().getRandom(); if (duration - manaVortex.tickCount > 30) { - AMParticle particle = particle(new EntityHitResult(manaVortex), AMParticleTypes.EMBER.get(), 0x3d3dcc, 10 + manaVortex.getLevel().getRandom().nextInt(10)); + AMParticle particle = particle(new EntityHitResult(manaVortex), AMParticleTypes.EMBER.get(), 0x3d3dcc, 10 + manaVortex.level().getRandom().nextInt(10)); particle.addRandomOffset(0.2, 0.2, 0.2); } if (duration - manaVortex.tickCount <= 10) { @@ -840,11 +840,11 @@ private static void wallOrWave(ISpell spell, RandomSource random, Vec3 position, } private static void wall(Wall wall) { - wallOrWave(wall.getSpell(), wall.level.getRandom(), wall.position(), wall.getRadius(), wall.getYRot(), wall.getColor()); + wallOrWave(wall.getSpell(), wall.level().getRandom(), wall.position(), wall.getRadius(), wall.getYRot(), wall.getColor()); } private static void wave(Wave wave) { - wallOrWave(wave.getSpell(), wave.level.getRandom(), wave.position(), wave.getRadius(), wave.getYRot(), wave.getColor()); + wallOrWave(wave.getSpell(), wave.level().getRandom(), wave.position(), wave.getRadius(), wave.getYRot(), wave.getColor()); } private static void zone(Zone zone) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerScreen.java index f2dd38799..57e37ca57 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerScreen.java @@ -4,9 +4,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.databinding.Listenable; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; @@ -85,7 +84,7 @@ protected void init() { int cY = height / 2 - 5; top = cY - textureHeight / 2 + 7; left = cX - textureWidth / 2 - 17; - addRenderableOnly((pPoseStack, pMouseX, pMouseY, pPartialTick) -> drawString(pPoseStack, font, title, left + 6, top + 6, 0xFFFFFFFF)); + addRenderableOnly((graphics, pMouseX, pMouseY, pPartialTick) -> graphics.drawString(font, title, left + 6, top + 6, 0xFFFFFFFF)); colorPicker = addRenderableWidget(new ColorPickerWidget(cX, cY, 50, getTitle(), colorPicker)); addRenderableWidget(colorPicker.brightnessSlider(cX + 55, cY - 50, 10, 100, getTitle(), ColorPickerWidget.BrightnessSlider.Orientation.BOTTOM_TO_TOP)); final int len = presetColors.size(); @@ -121,13 +120,12 @@ protected void init() { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - renderBackground(pPoseStack); - pPoseStack.pushPose(); - RenderSystem.setShaderTexture(0, BACKGROUND); - blit(pPoseStack, left, top, 0, 0, textureWidth, textureHeight); - pPoseStack.popPose(); - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + renderBackground(graphics); + graphics.pose().pushPose(); + graphics.blit(BACKGROUND, left, top, 0, 0, textureWidth, textureHeight); + graphics.pose().popPose(); + super.render(graphics, pMouseX, pMouseY, pPartialTick); } public record PresetColor(int color, Component name) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerWidget.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerWidget.java index b9b1fad64..caa37d614 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerWidget.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ColorPickerWidget.java @@ -1,13 +1,13 @@ package com.github.minecraftschurlimods.arsmagicalegacy.client.gui; -import com.github.minecraftschurlimods.arsmagicalegacy.client.AMShaders; +import com.github.minecraftschurlimods.arsmagicalegacy.client.AMRenderTypes; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.databinding.Listenable; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.narration.NarratedElementType; @@ -63,7 +63,7 @@ public int getHoveredColorRGB() { } @Override - public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) { Vec2 mouseRel = getMouseRel(mouseX, mouseY); float dist = mouseRel.length(); double angle = (float) Math.atan2(mouseRel.y, mouseRel.x); @@ -77,31 +77,20 @@ public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float part _hue = this.hue.get(); _saturation = this.saturation.get(); } - renderColorWheel(poseStack); + renderColorWheel(graphics); double v = hue.get() * TAU; int x = getX() + (int) radius + (int) (radius * saturation.get() * Math.cos(v)); int y = getY() + (int) radius + (int) (radius * saturation.get() * Math.sin(v)); - fill(poseStack, x - 1, y - 1, x + 1, y + 1, ColorUtil.chooseBW(ColorUtil.hsbToRgb(hue.get(), saturation.get(), _brightness)) | 0xFF000000); + graphics.fill(x - 1, y - 1, x + 1, y + 1, ColorUtil.chooseBW(ColorUtil.hsbToRgb(hue.get(), saturation.get(), _brightness)) | 0xFF000000); } - private void renderColorWheel(PoseStack poseStack) { + private void renderColorWheel(GuiGraphics graphics) { float cX = getX() + radius; float cY = getY() + radius; - poseStack.pushPose(); - RenderSystem.enableDepthTest(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - RenderSystem.setShader(AMShaders::getColorWheelShader); - AMShaders.setUniform("center", cX, cY); - AMShaders.setUniform("radius", radius); - AMShaders.setUniform("brightness", _brightness); - Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder builder = tesselator.getBuilder(); - builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - fillGradient(poseStack.last().pose(), builder, getX(), getY(), getX() + width, getY() + height, 0, 0xFFFFFFFF, 0xFFFFFFFF); - tesselator.end(); - RenderSystem.disableBlend(); - poseStack.popPose(); + graphics.pose().pushPose(); + AMRenderTypes.setColorWheel(cX, cY, radius, _brightness); + graphics.fillGradient(AMRenderTypes.COLOR_WHEEL, getX(), getY(), getX() + width, getY() + height, 0xFFFFFFFF, 0xFFFFFFFF, 0); + graphics.pose().popPose(); } @Override @@ -167,11 +156,11 @@ public BrightnessSlider brightnessSlider(int x, int y, int width, int height, Co } public Renderable hoverPreview(int x, int y, int width, int height) { - return (poseStack, mouseX, mouseY, partialTick) -> fill(poseStack, x, y, x + width, y + height, getHoveredColorRGB()); + return (graphics, mouseX, mouseY, partialTick) -> graphics.fill(x, y, x + width, y + height, getHoveredColorRGB()); } public Renderable selectionPreview(int x, int y, int width, int height) { - return (poseStack, mouseX, mouseY, partialTick) -> fill(poseStack, x, y, x + width, y + height, color.get()); + return (graphics, mouseX, mouseY, partialTick) -> graphics.fill(x, y, x + width, y + height, color.get()); } public PresetColor presetColor(int x, int y, int width, int height, int color, Component name) { @@ -187,17 +176,17 @@ public PresetColor(int x, int y, int width, int height, int color, Component nam } @Override - public void renderWidget(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { + public void renderWidget(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { int x = getX(); int y = getY(); if (isHoveredOrFocused()) { - fill(pPoseStack, x - 1, y - 1, x + width + 1, y + height + 1, 0xFFFFFFFF); + graphics.fill(x - 1, y - 1, x + width + 1, y + height + 1, 0xFFFFFFFF); float[] hsb = ColorUtil.rgbToHsb(color); _hue = hsb[0]; _saturation = hsb[1]; _brightness = hsb[2]; } - fill(pPoseStack, x, y, x + width, y + height, color | 0xFF000000); + graphics.fill(x, y, x + width, y + height, color | 0xFF000000); } @Override @@ -223,36 +212,36 @@ public BrightnessSlider(int x, int y, int width, int height, Component message, @SuppressWarnings("DuplicatedCode") @Override - public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float partialTick) { - poseStack.pushPose(); + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) { + graphics.pose().pushPose(); int c1 = ColorUtil.hsbToRgb(_hue, _saturation, 0); int c2 = ColorUtil.hsbToRgb(_hue, _saturation, 1); int x = getX(); int y = getY(); - renderBar(poseStack, mouseX, mouseY, x, y, x + width, y + height, c1, c2); + renderBar(graphics, mouseX, mouseY, x, y, x + width, y + height, c1, c2); int color = ColorUtil.chooseBW(ColorUtil.hsbToRgb(_hue, _saturation, brightness.get())) | 0xFF000000; switch (orientation) { case BOTTOM_TO_TOP -> { int yTemp = (int) (y + brightness.get() * height); - fill(poseStack, x, yTemp, x + width, yTemp + 1, color); + graphics.fill(x, yTemp, x + width, yTemp + 1, color); } case TOP_TO_BOTTOM -> { int yTemp = (int) (y + (1 - brightness.get()) * height); - fill(poseStack, x, yTemp, x + width, yTemp + 1, color); + graphics.fill(x, yTemp, x + width, yTemp + 1, color); } case LEFT_TO_RIGHT -> { int xTemp = (int) (x + brightness.get() * width); - fill(poseStack, xTemp, y, xTemp + 1, y + height, color); + graphics.fill(xTemp, y, xTemp + 1, y + height, color); } case RIGHT_TO_LEFT -> { int xTemp = (int) (x + (1 - brightness.get()) * width); - fill(poseStack, xTemp, y, xTemp + 1, y + height, color); + graphics.fill(xTemp, y, xTemp + 1, y + height, color); } } - poseStack.popPose(); + graphics.pose().popPose(); } - private void renderBar(PoseStack poseStack, int mouseX, int mouseY, int x1, int y1, int x2, int y2, int c1, int c2) { + private void renderBar(GuiGraphics graphics, int mouseX, int mouseY, int x1, int y1, int x2, int y2, int c1, int c2) { RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.setShader(GameRenderer::getPositionColorShader); @@ -262,27 +251,27 @@ private void renderBar(PoseStack poseStack, int mouseX, int mouseY, int x1, int switch (orientation) { case BOTTOM_TO_TOP -> { _brightness = isHovered ? (mouseY - getY()) / (float) height : brightness.get(); - fillGradient(poseStack, bufferbuilder, x1, y1, x2, y2, c1, c1, c2, c2); + fillGradient(graphics, bufferbuilder, x1, y1, x2, y2, c1, c1, c2, c2); } case TOP_TO_BOTTOM -> { _brightness = isHovered ? 1 - (mouseY - getY()) / (float) height : brightness.get(); - fillGradient(poseStack, bufferbuilder, x1, y1, x2, y2, c2, c2, c1, c1); + fillGradient(graphics, bufferbuilder, x1, y1, x2, y2, c2, c2, c1, c1); } case LEFT_TO_RIGHT -> { _brightness = isHovered ? 1 - (mouseX - getX()) / (float) width : brightness.get(); - fillGradient(poseStack, bufferbuilder, x1, y1, x2, y2, c1, c2, c2, c1); + fillGradient(graphics, bufferbuilder, x1, y1, x2, y2, c1, c2, c2, c1); } case RIGHT_TO_LEFT -> { _brightness = isHovered ? (mouseX - getX()) / (float) width : brightness.get(); - fillGradient(poseStack, bufferbuilder, x1, y1, x2, y2, c2, c1, c1, c2); + fillGradient(graphics, bufferbuilder, x1, y1, x2, y2, c2, c1, c1, c2); } } tesselator.end(); RenderSystem.disableBlend(); } - private void fillGradient(PoseStack poseStack, BufferBuilder buffer, int x1, int y1, int x2, int y2, int c1, int c2, int c3, int c4) { - Matrix4f pose = poseStack.last().pose(); + private void fillGradient(GuiGraphics graphics, BufferBuilder buffer, int x1, int y1, int x2, int y2, int c1, int c2, int c3, int c4) { + Matrix4f pose = graphics.pose().last().pose(); float a1 = (c1 >> 24 & 255) / 255.0F; float r1 = (c1 >> 16 & 255) / 255.0F; float g1 = (c1 >> 8 & 255) / 255.0F; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ObeliskScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ObeliskScreen.java index 1248abcfa..9ea40a7e7 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ObeliskScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/ObeliskScreen.java @@ -3,7 +3,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.common.block.obelisk.ObeliskMenu; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -17,17 +17,17 @@ public ObeliskScreen(ObeliskMenu pMenu, Inventory pPlayerInventory, Component pT } @Override - protected void renderBg(PoseStack poseStack, float partialTick, int mouseX, int mouseY) { + protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY) { RenderSystem.setShaderTexture(0, LOCATION); - blit(poseStack, leftPos, topPos, 0, 0, imageWidth, imageHeight); + pGuiGraphics.blit(LOCATION, leftPos, topPos, 0, 0, imageWidth, imageHeight); if (menu.isLit()) { int k = menu.getLitProgress(); - blit(poseStack, leftPos + 80, topPos + 31 + 12 - k, 176, 12 - k, 14, k + 1); + pGuiGraphics.blit(LOCATION, leftPos + 80, topPos + 31 + 12 - k, 176, 12 - k, 14, k + 1); } } @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void render(GuiGraphics matrixStack, int mouseX, int mouseY, float partialTicks) { renderBackground(matrixStack); super.render(matrixStack, mouseX, mouseY, partialTicks); renderTooltip(matrixStack, mouseX, mouseY); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RenderUtil.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RenderUtil.java index afbd5c13d..57d8faa2c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RenderUtil.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RenderUtil.java @@ -4,10 +4,10 @@ import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferUploader; import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.util.RandomSource; import net.minecraft.world.level.Level; @@ -21,25 +21,25 @@ private RenderUtil() {} /** * Draws a gradient line between the given coordinates. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param color1 The first color, used near the start of the line. - * @param color2 The second color, used near the end of the line. - * @param width The width of the line. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param color1 The first color, used near the start of the line. + * @param color2 The second color, used near the end of the line. + * @param width The width of the line. */ - public static void gradientLine2d(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color1, int color2, float width) { + public static void gradientLine2d(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color1, int color2, float width) { if (ColorUtil.getAlpha(color1) == 0) { color1 = 0xFF000000 | color1; } if (ColorUtil.getAlpha(color2) == 0) { color2 = 0xFF000000 | color2; } - stack.pushPose(); - Matrix4f pose = stack.last().pose(); + graphics.pose().pushPose(); + Matrix4f pose = graphics.pose().last().pose(); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); //RenderSystem.disableTexture(); // fixme @@ -57,75 +57,75 @@ public static void gradientLine2d(PoseStack stack, float startX, float startY, f RenderSystem.depthMask(true); //RenderSystem.enableTexture(); // fixme RenderSystem.disableBlend(); - stack.popPose(); + graphics.pose().popPose(); } /** * Draws a gradient line between the given coordinates, with a width of 1px. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param color1 The first color, used near the start of the line. - * @param color2 The second color, used near the end of the line. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param color1 The first color, used near the start of the line. + * @param color2 The second color, used near the end of the line. */ - public static void gradientLine2d(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color1, int color2) { - gradientLine2d(stack, startX, startY, endX, endY, zLevel, color1, color2, 1f); + public static void gradientLine2d(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color1, int color2) { + gradientLine2d(graphics, startX, startY, endX, endY, zLevel, color1, color2, 1f); } /** * Draws a line between the given coordinates. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param color The color of the line. - * @param width The width of the line. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param color The color of the line. + * @param width The width of the line. */ - public static void line2d(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color, float width) { - gradientLine2d(stack, startX, startY, endX, endY, zLevel, color, color, width); + public static void line2d(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color, float width) { + gradientLine2d(graphics, startX, startY, endX, endY, zLevel, color, color, width); } /** * Draws a line between the given coordinates, with a width of 1px. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param color The color of the line. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param color The color of the line. */ - public static void line2d(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color) { - line2d(stack, startX, startY, endX, endY, zLevel, color, 1f); + public static void line2d(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color) { + line2d(graphics, startX, startY, endX, endY, zLevel, color, 1f); } /** * Draws a line between the given coordinates, with a width of 4px. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param color The color of the line. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param color The color of the line. */ - public static void lineThick2d(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color) { - line2d(stack, startX, startY, endX, endY, zLevel, color, 4f); + public static void lineThick2d(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color) { + line2d(graphics, startX, startY, endX, endY, zLevel, color, 4f); } /** * Draws a fractal line. * - * @param stack The pose stack to use. + * @param graphics The gui graphics to draw with. * @param startX The start x coordinate. * @param startY The start y coordinate. * @param endX The end x coordinate. @@ -135,14 +135,14 @@ public static void lineThick2d(PoseStack stack, float startX, float startY, floa * @param displace The displace value to use. * @param fractalDetail The fractal detail to use. */ - public static void fractalLine2dd(PoseStack stack, double startX, double startY, double endX, double endY, int zLevel, int color, float displace, float fractalDetail) { - fractalLine2df(stack, (float) startX, (float) startY, (float) endX, (float) endY, zLevel, color, displace, fractalDetail); + public static void fractalLine2dd(GuiGraphics graphics, double startX, double startY, double endX, double endY, int zLevel, int color, float displace, float fractalDetail) { + fractalLine2df(graphics, (float) startX, (float) startY, (float) endX, (float) endY, zLevel, color, displace, fractalDetail); } /** * Draws a fractal line. * - * @param stack The pose stack to use. + * @param graphics The gui graphics to draw with. * @param startX The start x coordinate. * @param startY The start y coordinate. * @param endX The end x coordinate. @@ -152,36 +152,36 @@ public static void fractalLine2dd(PoseStack stack, double startX, double startY, * @param displace The displace value to use. * @param fractalDetail The fractal detail to use. */ - public static void fractalLine2df(PoseStack stack, float startX, float startY, float endX, float endY, int zLevel, int color, float displace, float fractalDetail) { + public static void fractalLine2df(GuiGraphics graphics, float startX, float startY, float endX, float endY, int zLevel, int color, float displace, float fractalDetail) { if (displace < fractalDetail) { - line2d(stack, startX, startY, endX, endY, zLevel, color); + line2d(graphics, startX, startY, endX, endY, zLevel, color); } else { int mx = (int) ((endX + startX) / 2); int my = (int) ((endY + startY) / 2); RandomSource random = Optional.ofNullable(Minecraft.getInstance().level).map(Level::getRandom).orElseGet(RandomSource::create); mx += (random.nextFloat() - 0.5) * displace; my += (random.nextFloat() - 0.5) * displace; - fractalLine2df(stack, startX, startY, mx, my, zLevel, color, displace / 2f, fractalDetail); - fractalLine2df(stack, endX, endY, mx, my, zLevel, color, displace / 2f, fractalDetail); + fractalLine2df(graphics, startX, startY, mx, my, zLevel, color, displace / 2f, fractalDetail); + fractalLine2df(graphics, endX, endY, mx, my, zLevel, color, displace / 2f, fractalDetail); } } /** * Draws a box at the given position. * - * @param stack The pose stack to use. - * @param startX The start x coordinate. - * @param startY The start y coordinate. - * @param endX The end x coordinate. - * @param endY The end y coordinate. - * @param zLevel The z level to draw on. - * @param minU The min u texture coordinate. - * @param minV The min v texture coordinate. - * @param maxU The max u texture coordinate. - * @param maxV The max v texture coordinate. + * @param graphics The gui graphics to draw with. + * @param startX The start x coordinate. + * @param startY The start y coordinate. + * @param endX The end x coordinate. + * @param endY The end y coordinate. + * @param zLevel The z level to draw on. + * @param minU The min u texture coordinate. + * @param minV The min v texture coordinate. + * @param maxU The max u texture coordinate. + * @param maxV The max v texture coordinate. */ - public static void drawBox(PoseStack stack, float startX, float startY, float endX, float endY, float zLevel, float minU, float minV, float maxU, float maxV) { - Matrix4f pMatrix = stack.last().pose(); + public static void drawBox(GuiGraphics graphics, float startX, float startY, float endX, float endY, float zLevel, float minU, float minV, float maxU, float maxV) { + Matrix4f pMatrix = graphics.pose().last().pose(); RenderSystem.setShader(GameRenderer::getPositionTexShader); BufferBuilder bufferbuilder = Tesselator.getInstance().getBuilder(); bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RiftScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RiftScreen.java index a9eb426f4..f48177798 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RiftScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RiftScreen.java @@ -2,7 +2,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.magic.rift.RiftMenu; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.gui.screens.inventory.MenuAccess; import net.minecraft.client.renderer.GameRenderer; @@ -16,27 +16,25 @@ public class RiftScreen extends AbstractContainerScreen implements Men public RiftScreen(RiftMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); - passEvents = false; containerRows = pMenu.getRowCount(); imageHeight = 114 + containerRows * 18; inventoryLabelY = imageHeight - 94; } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - renderBackground(pPoseStack); - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); - renderTooltip(pPoseStack, pMouseX, pMouseY); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + renderBackground(graphics); + super.render(graphics, pMouseX, pMouseY, pPartialTick); + renderTooltip(graphics, pMouseX, pMouseY); } @Override - protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pX, int pY) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, CONTAINER_BACKGROUND); + protected void renderBg(GuiGraphics graphics, float pPartialTick, int pX, int pY) { int i = (width - imageWidth) / 2; int j = (height - imageHeight) / 2; - blit(pPoseStack, i, j, 0, 0, imageWidth, containerRows * 18 + 17); - blit(pPoseStack, i, j + containerRows * 18 + 17, 0, 126, imageWidth, 96); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + graphics.setColor(1.0F, 1.0F, 1.0F, 1.0F); + graphics.blit(CONTAINER_BACKGROUND, i, j, 0, 0, imageWidth, containerRows * 18 + 17); + graphics.blit(CONTAINER_BACKGROUND, i, j + containerRows * 18 + 17, 0, 126, imageWidth, 96); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RuneBagScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RuneBagScreen.java index e2a21553e..0e81a7c91 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RuneBagScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/RuneBagScreen.java @@ -2,8 +2,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.common.item.runebag.RuneBagMenu; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -23,15 +22,14 @@ public RuneBagScreen(RuneBagMenu pMenu, Inventory pPlayerInventory, Component pT } @Override - public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks) { - renderBackground(pMatrixStack); - super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks); - renderTooltip(pMatrixStack, pMouseX, pMouseY); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { + renderBackground(graphics); + super.render(graphics, pMouseX, pMouseY, pPartialTicks); + renderTooltip(graphics, pMouseX, pMouseY); } @Override - protected void renderBg(PoseStack pPoseStack, float pPartialTicks, int pMouseX, int pMouseY) { - RenderSystem.setShaderTexture(0, GUI); - blit(pPoseStack, (width - imageWidth) / 2, (height - imageHeight) / 2, 0, 0, imageWidth, imageHeight); + protected void renderBg(GuiGraphics graphics, float pPartialTicks, int pMouseX, int pMouseY) { + graphics.blit(GUI, (width - imageWidth) / 2, (height - imageHeight) / 2, 0, 0, imageWidth, imageHeight); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SelfClearingEditBox.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SelfClearingEditBox.java index c9dc58669..d2665f29b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SelfClearingEditBox.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SelfClearingEditBox.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.arsmagicalegacy.client.gui; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import net.minecraft.util.StringUtil; @@ -17,7 +17,7 @@ public SelfClearingEditBox(int x, int y, int width, int height, int maxTextLengt } @Override - public void renderWidget(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { if (isFocused()) { if (getValue().equals(getMessage().getString())) { setValue(""); @@ -27,6 +27,6 @@ public void renderWidget(PoseStack matrixStack, int mouseX, int mouseY, float pa setValue(getMessage().getString()); setTextColor(0x555555); } - super.renderWidget(matrixStack, mouseX, mouseY, partialTicks); + super.renderWidget(graphics, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellBookScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellBookScreen.java index 1999f14aa..927ddac95 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellBookScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellBookScreen.java @@ -2,8 +2,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.common.item.spellbook.SpellBookMenu; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextColor; @@ -24,26 +23,25 @@ public SpellBookScreen(SpellBookMenu menu, Inventory playerInventory, Component } @Override - protected void renderBg(PoseStack poseStack, float partialTick, int mouseX, int mouseY) { - renderBackground(poseStack); - RenderSystem.setShaderTexture(0, GUI); - blit(poseStack, (width - imageWidth) >> 1, (height - imageHeight) >> 1, 0, 0, imageWidth, imageHeight); + protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int mouseY) { + renderBackground(graphics); + graphics.blit(GUI, (width - imageWidth) >> 1, (height - imageHeight) >> 1, 0, 0, imageWidth, imageHeight); } @Override - public void render(final PoseStack pPoseStack, final int pMouseX, final int pMouseY, final float pPartialTick) { - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); - this.renderTooltip(pPoseStack, pMouseX, pMouseY); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + super.render(graphics, pMouseX, pMouseY, pPartialTick); + this.renderTooltip(graphics, pMouseX, pMouseY); } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics graphics, int pMouseX, int pMouseY) { for (int i = 0; i < 8; i++) { Slot slot = menu.slots.get(i); ItemStack item = slot.getItem(); if (item.isEmpty()) continue; Component name = item.getHoverName(); - font.draw(pPoseStack, name, 37, 5 + i * 18, Optional.ofNullable(name.getStyle().getColor()).orElse(TextColor.fromRgb(0x000000)).getValue()); + graphics.drawString(font, name, 37, 5 + i * 18, Optional.ofNullable(name.getStyle().getColor()).orElse(TextColor.fromRgb(0x000000)).getValue(), false); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellCustomizationScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellCustomizationScreen.java index 189e5eb4c..3ecc9973d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellCustomizationScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellCustomizationScreen.java @@ -6,9 +6,9 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.github.minecraftschurlimods.arsmagicalegacy.network.SpellIconSelectPacket; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.narration.NarrationElementOutput; @@ -17,7 +17,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.client.gui.ScreenUtils; import net.minecraftforge.client.gui.widget.ScrollPanel; import org.jetbrains.annotations.Nullable; @@ -58,11 +57,10 @@ protected void init() { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - renderBackground(pPoseStack); - RenderSystem.setShaderTexture(0, BACKGROUND); - blit(pPoseStack, xStart, yStart, 0, 0, imageWidth, imageHeight); - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + renderBackground(graphics); + graphics.blit(BACKGROUND, xStart, yStart, 0, 0, imageWidth, imageHeight); + super.render(graphics, pMouseX, pMouseY, pPartialTick); } @Override @@ -94,9 +92,9 @@ public SpellIconSelector(int x, int y, int width, int height, @Nullable SpellIco } @Override - public void render(PoseStack matrix, int mouseX, int mouseY, float partialTicks) { - drawGradientRect(matrix, left, top, right, bottom, 0x80000000, 0x80000000); - super.render(matrix, mouseX, mouseY, partialTicks); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { + drawGradientRect(graphics, left, top, right, bottom, 0x80000000, 0x80000000); + super.render(graphics, mouseX, mouseY, partialTicks); } @Nullable @@ -128,7 +126,7 @@ protected boolean clickPanel(double mouseX, double mouseY, int button) { } @Override - protected void drawPanel(PoseStack mStack, int entryRight, int relativeY, Tesselator tess, int mouseX, int mouseY) { + protected void drawPanel(GuiGraphics graphics, int entryRight, int relativeY, Tesselator tess, int mouseX, int mouseY) { int i = 0; ResourceLocation hovered = getHovered(mouseX - left - 2 * ICON_MARGIN, mouseY - top + (int) scrollDistance - 2 * ICON_MARGIN); RenderSystem.setShaderTexture(0, SpellIconAtlas.SPELL_ICON_ATLAS); @@ -141,11 +139,11 @@ protected void drawPanel(PoseStack mStack, int entryRight, int relativeY, Tessel y += relativeY * ICON_MARGIN; if (y > 0 && y < bottom) { if (icon.equals(selected)) { - ScreenUtils.drawGradientRect(mStack.last().pose(), 1, x - ICON_MARGIN, y - ICON_MARGIN, x + ICON_SIZE + ICON_MARGIN, y + ICON_SIZE + ICON_MARGIN, 0xffffff00, 0xffffff00); + graphics.fillGradient(x - ICON_MARGIN, y - ICON_MARGIN, x + ICON_SIZE + ICON_MARGIN, y + ICON_SIZE + ICON_MARGIN, 0xffffff00, 0xffffff00); } else if (icon.equals(hovered)) { - ScreenUtils.drawGradientRect(mStack.last().pose(), 1, x - ICON_MARGIN, y - ICON_MARGIN, x + ICON_SIZE + ICON_MARGIN, y + ICON_SIZE + ICON_MARGIN, 0xffffffff, 0xffffffff); + graphics.fillGradient(x - ICON_MARGIN, y - ICON_MARGIN, x + ICON_SIZE + ICON_MARGIN, y + ICON_SIZE + ICON_MARGIN, 0xffffffff, 0xffffffff); } - blit(mStack, x, y, 2, ICON_SIZE, ICON_SIZE, SpellIconAtlas.instance().getSprite(icon)); + graphics.blit(x, y, 2, ICON_SIZE, ICON_SIZE, SpellIconAtlas.instance().getSprite(icon)); } i++; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellRecipeScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellRecipeScreen.java index 9f858d0ea..55d12bb8f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellRecipeScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/SpellRecipeScreen.java @@ -15,10 +15,10 @@ import com.github.minecraftschurlimods.arsmagicalegacy.network.SetLecternPagePacket; import com.github.minecraftschurlimods.arsmagicalegacy.network.TakeSpellRecipeFromLecternPacket; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Pair; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.PageButton; @@ -81,24 +81,23 @@ public SpellRecipeScreen(ItemStack stack, boolean playTurnSound, int startPage, } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - renderBackground(pPoseStack); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + renderBackground(graphics); RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1f, 1f, 1f, 1f); - RenderSystem.setShaderTexture(0, BACKGROUND); - blit(pPoseStack, xPos, 2, 0, 0, WIDTH, HEIGHT); + graphics.setColor(1f, 1f, 1f, 1f); + graphics.blit(BACKGROUND, xPos, 2, 0, 0, WIDTH, HEIGHT); Font font = Minecraft.getInstance().font; SpellRecipePage page = pages.get(currentPage); String title = page.getTitle().getString(); - font.draw(pPoseStack, title, xPos + 93 - font.width(title) / 2f, 18, 0); - page.render(pPoseStack, xPos + 36, 32); + graphics.drawString(font, title, xPos + 93 - font.width(title) / 2, 18, 0, false); + page.render(graphics, xPos + 36, 32); if (cachedPage != currentPage) { cachedPage = currentPage; } - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + super.render(graphics, pMouseX, pMouseY, pPartialTick); List tooltip = page.getTooltip(pMouseX - xPos - 36, pMouseY - 32); if (!tooltip.isEmpty()) { - this.renderTooltip(pPoseStack, tooltip, Optional.empty(), pMouseX, pMouseY); + graphics.renderTooltip(font, tooltip, Optional.empty(), pMouseX, pMouseY); } } @@ -168,7 +167,7 @@ private boolean setPage(int pPageNum) { private static abstract class SpellRecipePage { protected abstract Component getTitle(); - protected abstract void render(PoseStack poseStack, int x, int y); + protected abstract void render(GuiGraphics graphics, int x, int y); protected abstract List getTooltip(int mouseX, int mouseY); @@ -219,9 +218,9 @@ protected Component getTitle() { } @Override - protected void render(PoseStack poseStack, int x, int y) { + protected void render(GuiGraphics graphics, int x, int y) { for (int i = 0; i < spellParts.size(); i++) { - ClientHelper.drawSpellPart(poseStack, spellParts.get(i), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), SIZE, SIZE); + ClientHelper.drawSpellPart(graphics, spellParts.get(i), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), SIZE, SIZE); } } @@ -252,9 +251,9 @@ protected Component getTitle() { } @Override - protected void render(PoseStack poseStack, int x, int y) { + protected void render(GuiGraphics graphics, int x, int y) { for (int i = 0; i < spellParts.size(); i++) { - ClientHelper.drawSpellPart(poseStack, spellParts.get(i), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), SIZE, SIZE); + ClientHelper.drawSpellPart(graphics, spellParts.get(i), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), SIZE, SIZE); } } @@ -285,10 +284,10 @@ protected Component getTitle() { } @Override - protected void render(PoseStack poseStack, int x, int y) { + protected void render(GuiGraphics graphics, int x, int y) { for (int i = 0; i < ingredients.size(); i++) { ISpellIngredient ingredient = ingredients.get(i); - ISpellIngredientRenderer.getFor(ingredient.getType()).renderInGui(ingredient, poseStack, x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), 0, 0); + ISpellIngredientRenderer.getFor(ingredient.getType()).renderInGui(ingredient, graphics, x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING), 0, 0); } } @@ -318,9 +317,9 @@ protected Component getTitle() { } @Override - protected void render(PoseStack poseStack, int x, int y) { + protected void render(GuiGraphics graphics, int x, int y) { for (int i = 0; i < reagents.size(); i++) { - ClientHelper.drawItemStack(poseStack, AMUtil.getByTick(reagents.get(i), Objects.requireNonNull(ClientHelper.getLocalPlayer()).tickCount / 20).copy(), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING)); + ClientHelper.drawItemStack(graphics, AMUtil.getByTick(reagents.get(i), Objects.requireNonNull(ClientHelper.getLocalPlayer()).tickCount / 20).copy(), x + X_OFFSET + i % MAX_PER_LINE * (SIZE + SPACING), y + Y_OFFSET + i / MAX_PER_LINE * (SIZE + SPACING)); } } @@ -355,13 +354,13 @@ protected Component getTitle() { } @Override - protected void render(PoseStack poseStack, int x, int y) { + protected void render(GuiGraphics graphics, int x, int y) { var helper = ArsMagicaAPI.get().getAffinityHelper(); for (int i = 0; i < affinities.size(); i++) { Pair pair = affinities.get(i); Affinity affinity = pair.getFirst(); - ClientHelper.drawItemStack(poseStack, helper.getEssenceForAffinity(affinity), x + X_OFFSET, y + Y_OFFSET + i * (SIZE + SPACING)); - Minecraft.getInstance().font.draw(poseStack, "%.3f".formatted(pair.getSecond()), x + X_OFFSET + SIZE + SPACING, y + Y_OFFSET + 4 + i * (SIZE + SPACING), affinity.color()); + ClientHelper.drawItemStack(graphics, helper.getEssenceForAffinity(affinity), x + X_OFFSET, y + Y_OFFSET + i * (SIZE + SPACING)); + graphics.drawString(Minecraft.getInstance().font, "%.3f".formatted(pair.getSecond()), x + X_OFFSET + SIZE + SPACING, y + Y_OFFSET + 4 + i * (SIZE + SPACING), affinity.color(), false); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/InscriptionTableScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/InscriptionTableScreen.java index 5db65eccd..a64ee963d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/InscriptionTableScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/InscriptionTableScreen.java @@ -14,9 +14,9 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ComponentPath; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -86,32 +86,32 @@ protected void init() { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - renderBackground(pPoseStack); - super.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) { + renderBackground(guiGraphics); + super.render(guiGraphics, pMouseX, pMouseY, pPartialTick); for (DragArea area : dragAreas) { - area.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + area.render(guiGraphics, pMouseX, pMouseY, pPartialTick); } if (dragged != null) { - dragged.render(pPoseStack, pMouseX - SpellPartDraggable.SIZE / 2, pMouseY - SpellPartDraggable.SIZE / 2, pPartialTick); + dragged.render(guiGraphics, pMouseX - SpellPartDraggable.SIZE / 2, pMouseY - SpellPartDraggable.SIZE / 2, pPartialTick); } else { SpellPartDraggable part = getHoveredElement(pMouseX, pMouseY); if (part != null) { - renderTooltip(pPoseStack, part.getTranslationKey(), pMouseX, pMouseY); + guiGraphics.renderTooltip(getMinecraft().font, part.getTranslationKey(), pMouseX, pMouseY); } } - renderTooltip(pPoseStack, pMouseX, pMouseY); + renderTooltip(guiGraphics, pMouseX, pMouseY); } @Override - protected void renderBg(PoseStack pPoseStack, float pPartialTick, int pMouseX, int pMouseY) { + protected void renderBg(GuiGraphics pGuiGraphics, float pPartialTick, int pMouseX, int pMouseY) { RenderSystem.setShaderTexture(0, GUI); - blit(pPoseStack, leftPos, topPos, 0, 0, imageWidth, imageHeight); - blit(pPoseStack, leftPos + (Objects.requireNonNull(getMinecraft().player).isCreative() ? 47 : 101), topPos + 73, 220, 0, 18, 18); + pGuiGraphics.blit(GUI, leftPos, topPos, 0, 0, imageWidth, imageHeight); + pGuiGraphics.blit(GUI, leftPos + (Objects.requireNonNull(getMinecraft().player).isCreative() ? 47 : 101), topPos + 73, 220, 0, 18, 18); } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics pPoseStack, int pMouseX, int pMouseY) { } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupArea.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupArea.java index 22ba0a3fd..e7251ada2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupArea.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupArea.java @@ -5,9 +5,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellShape; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.dragndrop.DragTargetArea; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.AMUtil; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; @@ -69,20 +67,19 @@ public boolean canDrop(SpellPartDraggable draggable, int mouseX, int mouseY) { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { - RenderSystem.setShaderTexture(0, GUI); - GuiComponent.blit(pPoseStack, x, y, 5, 220, 18, WIDTH, HEIGHT, 256, 256); + public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) { + guiGraphics.blit(GUI, x, y, 5, 220, 18, WIDTH, HEIGHT, 256, 256); if (lockState == LockState.ALL) { - pPoseStack.pushPose(); - pPoseStack.translate(0, 0, 10); - GuiComponent.fill(pPoseStack, x, y, x + WIDTH, y + HEIGHT, 0x7f000000); - pPoseStack.popPose(); + guiGraphics.pose().pushPose(); + guiGraphics.pose().translate(0, 0, 10); + guiGraphics.fill(x, y, x + WIDTH, y + HEIGHT, 0x7f000000); + guiGraphics.pose().popPose(); } for (int i = 0; i < ROWS; i++) { for (int j = 0; j < COLUMNS; j++) { int index = i * COLUMNS + j; if (index >= contents.size()) return; - contents.get(index).render(pPoseStack, x + j * SpellPartDraggable.SIZE + X_PADDING, y + i * SpellPartDraggable.SIZE + Y_PADDING, pPartialTick); + contents.get(index).render(guiGraphics, x + j * SpellPartDraggable.SIZE + X_PADDING, y + i * SpellPartDraggable.SIZE + Y_PADDING, pPartialTick); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupListArea.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupListArea.java index c5bd237df..709d0d0b7 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupListArea.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/ShapeGroupListArea.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.arsmagicalegacy.client.gui.inscriptiontable; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.dragndrop.DragTargetArea; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import org.apache.logging.log4j.util.TriConsumer; import org.jetbrains.annotations.Nullable; @@ -75,9 +75,9 @@ public boolean canStore() { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { + public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) { for (ShapeGroupArea area : shapeGroups) { - area.render(pPoseStack, pMouseX, pMouseY, pPartialTick); + area.render(guiGraphics, pMouseX, pMouseY, pPartialTick); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellGrammarArea.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellGrammarArea.java index 62a486664..bab2ce227 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellGrammarArea.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellGrammarArea.java @@ -2,7 +2,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellPart; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.dragndrop.DragTargetArea; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import org.jetbrains.annotations.Nullable; import java.util.function.BiConsumer; @@ -35,9 +35,9 @@ public boolean canDrop(SpellPartDraggable draggable, int mouseX, int mouseY) { } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { + public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) { for (int i = 0; i < contents.size(); i++) { - contents.get(i).render(pPoseStack, x + i * SpellPartDraggable.SIZE + X_PADDING, y, pPartialTick); + contents.get(i).render(guiGraphics, x + i * SpellPartDraggable.SIZE + X_PADDING, y, pPartialTick); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartDraggable.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartDraggable.java index d95d0f220..43882afd9 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartDraggable.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartDraggable.java @@ -1,12 +1,11 @@ package com.github.minecraftschurlimods.arsmagicalegacy.client.gui.inscriptiontable; +import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.Skill; import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellPart; import com.github.minecraftschurlimods.arsmagicalegacy.client.SkillIconAtlas; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.dragndrop.Draggable; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.Util; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -26,8 +25,8 @@ public class SpellPartDraggable extends Draggable { protected SpellPartDraggable(ISpellPart content) { super(SIZE, SIZE, content); ResourceLocation id = content.getId(); - this.sprite = SkillIconAtlas.instance().getSprite(id); - this.translationKey = Component.translatable("skill." + id.getNamespace() + "." + id.getPath() + ".name"); + sprite = SkillIconAtlas.instance().getSprite(id); + translationKey = Component.translatable(Util.makeDescriptionId(Skill.SKILL, id) + ".name"); } public ISpellPart getPart() { @@ -39,13 +38,10 @@ public Component getTranslationKey() { } @Override - public void render(PoseStack poseStack, int x, int y, float partialTicks) { - poseStack.pushPose(); - if (RenderSystem.getShaderTexture(0) != Minecraft.getInstance().getTextureManager().getTexture(sprite.atlasLocation()).getId()) { - RenderSystem.setShaderTexture(0, sprite.atlasLocation()); - } - GuiComponent.blit(poseStack, x, y, 10, width, height, sprite); - poseStack.popPose(); + public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) { + pGuiGraphics.pose().pushPose(); + pGuiGraphics.blit(pMouseX, pMouseY, 10, width, height, sprite); + pGuiGraphics.pose().popPose(); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartSourceArea.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartSourceArea.java index 280f8bc46..c8c99b445 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartSourceArea.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/inscriptiontable/SpellPartSourceArea.java @@ -3,9 +3,9 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellPart; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.dragndrop.DragSourceArea; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Pair; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import java.util.ArrayList; import java.util.List; @@ -52,10 +52,10 @@ public SpellPartDraggable elementAt(int mouseX, int mouseY) { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { for (Pair> pair : cachedContents) { Pair xy = pair.getSecond(); - pair.getFirst().render(poseStack, xy.getFirst(), xy.getSecond(), partialTicks); + pair.getFirst().render(graphics, xy.getFirst(), xy.getSecond(), partialTicks); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusAffinityTabRenderer.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusAffinityTabRenderer.java index a838a3eed..b1d41f8fe 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusAffinityTabRenderer.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusAffinityTabRenderer.java @@ -8,14 +8,15 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.RenderUtil; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.advancements.critereon.MinMaxBounds; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import java.text.NumberFormat; import java.util.ArrayList; @@ -31,13 +32,13 @@ public OcculusAffinityTabRenderer(OcculusTab occulusTab, Screen parent) { } @Override - protected void renderBg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks) { + protected void renderBg(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { RenderSystem.setShaderTexture(0, occulusTab.background(getMinecraft().getConnection().registryAccess())); - RenderUtil.drawBox(pMatrixStack, 0, 0, width, height, 0, 0, 0, 1, 1); + RenderUtil.drawBox(graphics, 0, 0, width, height, 0, 0, 0, 1, 1); } @Override - protected void renderFg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks) { + protected void renderFg(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { var api = ArsMagicaAPI.get(); var helper = api.getAffinityHelper(); var registry = api.getAffinityRegistry(); @@ -71,61 +72,62 @@ protected void renderFg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float currentID++; int displace = (int) ((Math.max(affStartX1, affStartX2) - Math.min(affStartX1, affStartX2) + Math.max(affStartY1, affStartY2) - Math.min(affStartY1, affStartY2)) / 2); if (depth > 0.01F) { - RenderUtil.fractalLine2dd(pMatrixStack, affStartX1 + cX, affStartY1 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 0.8F); - RenderUtil.fractalLine2dd(pMatrixStack, affStartX2 + cX, affStartY2 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 0.8F); - RenderUtil.fractalLine2dd(pMatrixStack, affStartX1 + cX, affStartY1 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 1.1F); - RenderUtil.fractalLine2dd(pMatrixStack, affStartX2 + cX, affStartY2 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 1.1F); + RenderUtil.fractalLine2dd(graphics, affStartX1 + cX, affStartY1 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 0.8F); + RenderUtil.fractalLine2dd(graphics, affStartX2 + cX, affStartY2 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 0.8F); + RenderUtil.fractalLine2dd(graphics, affStartX1 + cX, affStartY1 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 1.1F); + RenderUtil.fractalLine2dd(graphics, affStartX2 + cX, affStartY2 + cY, affEndX + cX, affEndY + cY, 0, aff.color(), displace, 1.1F); } else { - RenderUtil.line2d(pMatrixStack, (float) affStartX1 + cX, (float) affStartY1 + cY, (float) affEndX + cX, (float) affEndY + cY, 0, aff.color()); - RenderUtil.line2d(pMatrixStack, (float) affStartX2 + cX, (float) affStartY2 + cY, (float) affEndX + cX, (float) affEndY + cY, 0, aff.color()); + RenderUtil.line2d(graphics, (float) affStartX1 + cX, (float) affStartY1 + cY, (float) affEndX + cX, (float) affEndY + cY, 0, aff.color()); + RenderUtil.line2d(graphics, (float) affStartX2 + cX, (float) affStartY2 + cY, (float) affEndX + cX, (float) affEndY + cY, 0, aff.color()); } - drawString(pMatrixStack, getFont(), "%.2f".formatted(depth), (int) ((affDrawTextX * 0.9) + cX), (int) ((affDrawTextY * 0.9) + cY), aff.color()); + graphics.drawString(getFont(), "%.2f".formatted(depth), (int) ((affDrawTextX * 0.9) + cX), (int) ((affDrawTextY * 0.9) + cY), aff.color()); int xMovement = affDrawTextX > 0 ? 5 : -5; xMovement = affDrawTextX == 0 ? 0 : xMovement; int yMovement = affDrawTextY > 0 ? 5 : -5; yMovement = affDrawTextY == 0 ? 0 : yMovement; int drawX = (int) ((affDrawTextX * 1.1) + cX + xMovement); int drawY = (int) ((affDrawTextY * 1.1) + cY + yMovement); - getItemRenderer().renderAndDecorateFakeItem(pMatrixStack, helper.getEssenceForAffinity(aff), drawX, drawY); - if (pMouseX > drawX && pMouseX < drawX + 16 && pMouseY > drawY && pMouseY < drawY + 16) { - drawString.add(aff.getDisplayName().copy().withStyle(style -> style.withColor(aff.color()))); - abilityRegistry.stream() - .filter(ability -> aff.getId().equals(ability.affinity().getId())) - .sorted((o1, o2) -> (int) ((Objects.requireNonNullElse(o1.bounds().getMin(), 0D) * 100) - (Objects.requireNonNullElse(o2.bounds().getMin(), 0D) * 100))) - .forEach(ability -> { - boolean test = ability.test(player); - MutableComponent component = ability.getDisplayName(registryAccess).copy().withStyle(test ? ChatFormatting.GREEN : ChatFormatting.DARK_RED); - if (Screen.hasShiftDown()) { - MinMaxBounds.Doubles range = ability.bounds(); - Double lower = range.getMin(); - Double upper = range.getMax(); - if (lower != null || upper != null) { - MutableComponent cmp = Component.literal(" ("); - if (lower != null) { - cmp.append(Component.translatable(TranslationConstants.RANGE_LOWER, RANGE_FORMAT.format(lower).replace("\u00A0", ""))); + ItemStack essenceForAffinity = helper.getEssenceForAffinity(aff); + graphics.renderFakeItem(essenceForAffinity, drawX, drawY); + graphics.renderItemDecorations(getFont(), essenceForAffinity, drawX, drawY); + if (pMouseX <= drawX || pMouseX >= drawX + 16 || pMouseY <= drawY || pMouseY >= drawY + 16) continue; + drawString.add(aff.getDisplayName().copy().withStyle(style -> style.withColor(aff.color()))); + abilityRegistry.stream() + .filter(ability -> aff.getId().equals(ability.affinity().getId())) + .sorted((o1, o2) -> (int) ((Objects.requireNonNullElse(o1.bounds().getMin(), 0D) * 100) - (Objects.requireNonNullElse(o2.bounds().getMin(), 0D) * 100))) + .forEach(ability -> { + boolean test = ability.test(player); + MutableComponent component = ability.getDisplayName(registryAccess).copy().withStyle(test ? ChatFormatting.GREEN : ChatFormatting.DARK_RED); + if (Screen.hasShiftDown()) { + MinMaxBounds.Doubles range = ability.bounds(); + Double lower = range.getMin(); + Double upper = range.getMax(); + if (lower != null || upper != null) { + MutableComponent cmp = Component.literal(" ("); + if (lower != null) { + cmp.append(Component.translatable(TranslationConstants.RANGE_LOWER, RANGE_FORMAT.format(lower).replace("\u00A0", ""))); + if (upper != null) { + cmp.append(", "); + } + } if (upper != null) { - cmp.append(", "); + cmp.append(Component.translatable(TranslationConstants.RANGE_UPPER, RANGE_FORMAT.format(upper).replace("\u00A0", ""))); } + cmp.append(")"); + component.append(cmp); } - if (upper != null) { - cmp.append(Component.translatable(TranslationConstants.RANGE_UPPER, RANGE_FORMAT.format(upper).replace("\u00A0", ""))); - } - cmp.append(")"); - component.append(cmp); } - } - drawString.add(component); - }); - } + drawString.add(component); + }); } if (!drawString.isEmpty()) { if (!Screen.hasShiftDown()) { drawString.add(Component.translatable(TranslationConstants.HOLD_SHIFT_FOR_DETAILS).withStyle(ChatFormatting.GRAY)); } - pMatrixStack.pushPose(); - pMatrixStack.translate(-posX, -posY, 0); - parent.renderTooltip(pMatrixStack, drawString, Optional.empty(), pMouseX + posX, pMouseY + posY, getFont()); - pMatrixStack.popPose(); + graphics.pose().pushPose(); + graphics.pose().translate(-posX, -posY, 0); + graphics.renderTooltip(getFont(), drawString, Optional.empty(), pMouseX + posX, pMouseY + posY); + graphics.pose().popPose(); } RenderSystem.setShaderFogColor(1, 1, 1); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusScreen.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusScreen.java index 6da54e9b5..488a63d9b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusScreen.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusScreen.java @@ -3,8 +3,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.api.client.OcculusTabRenderer; import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.OcculusTab; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.Screen; @@ -55,7 +54,7 @@ protected void init() { prevPage = addRenderableWidget(Button.builder(Component.literal("<"), this::prevPage).pos(-15, -21).size(20, 20).build()); nextPage.active = page < maxPage; prevPage.active = false; - addRenderableWidget(new SkillPointPanel()).init(getMinecraft(), GUI_WIDTH, GUI_HEIGHT); + addRenderableWidget(new SkillPointPanel(getMinecraft().player, font, GUI_WIDTH, 0, 0, GUI_HEIGHT)); if (activeTab == null) { setActiveTab(activeTabIndex); } @@ -63,20 +62,19 @@ protected void init() { } @Override - public void render(PoseStack stack, int pMouseX, int pMouseY, float pPartialTicks) { - renderBackground(stack); - stack.pushPose(); - stack.translate(posX, posY, 0); - RenderSystem.setShaderTexture(0, OVERLAY); - blit(stack, 0, 0, 0, 0, 0, GUI_WIDTH, GUI_HEIGHT, 256, 256); - blit(stack, 7 + activeTabIndex % 8 * 24, -15, 0, 0, GUI_HEIGHT, 22, 22, 256, 256); - super.render(stack, pMouseX, pMouseY, pPartialTicks); + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { + renderBackground(graphics); + graphics.pose().pushPose(); + graphics.pose().translate(posX, posY, 0); + graphics.blit(OVERLAY, 0, 0, 0, 0, 0, GUI_WIDTH, GUI_HEIGHT, 256, 256); + graphics.blit(OVERLAY, 7 + activeTabIndex % 8 * 24, -15, 0, 0, GUI_HEIGHT, 22, 22, 256, 256); + super.render(graphics, pMouseX, pMouseY, pPartialTicks); for (OcculusTabButton button : buttons) { if (button.isHovered()) { - renderTooltip(stack, button.getDisplayName(minecraft.level.registryAccess()), pMouseX - posX, pMouseY - posY); + graphics.renderTooltip(getMinecraft().font, button.getDisplayName(minecraft.level.registryAccess()), pMouseX - posX, pMouseY - posY); } } - stack.popPose(); + graphics.pose().popPose(); } private void prevPage(Button button) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusSkillTreeTabRenderer.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusSkillTreeTabRenderer.java index 2ea39638d..381943ecd 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusSkillTreeTabRenderer.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusSkillTreeTabRenderer.java @@ -13,8 +13,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.github.minecraftschurlimods.arsmagicalegacy.network.LearnSkillPacket; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -61,7 +61,7 @@ protected void init() { } @Override - protected void renderBg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks) { + protected void renderBg(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTicks) { RenderSystem.setShaderTexture(0, occulusTab.background(ClientHelper.getRegistryAccess())); float scaledOffsetX = offsetX * SCALE; float scaledOffsetY = offsetY * SCALE; @@ -71,7 +71,7 @@ protected void renderBg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float float minV = Mth.clamp(scaledOffsetY, 0, textureHeight - scaledHeight) / textureHeight; float maxU = Mth.clamp(scaledOffsetX + scaledWidth, scaledWidth, textureWidth) / textureWidth; float maxV = Mth.clamp(scaledOffsetY + scaledHeight, scaledHeight, textureHeight) / textureHeight; - RenderUtil.drawBox(pMatrixStack, 0, 0, width, height, 0, minU, minV, maxU, maxV); + RenderUtil.drawBox(graphics, 0, 0, width, height, 0, minU, minV, maxU, maxV); if (isDragging()) { offsetX = Mth.clamp(offsetX - (pMouseX - lastMouseX), 0, textureWidth - scaledWidth); offsetY = Mth.clamp(offsetY - (pMouseY - lastMouseY), 0, textureHeight - scaledHeight); @@ -81,7 +81,7 @@ protected void renderBg(PoseStack pMatrixStack, int pMouseX, int pMouseY, float } @Override - protected void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTicks) { + protected void renderFg(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { Player player = ClientHelper.getLocalPlayer(); if (player == null) return; var api = ArsMagicaAPI.get(); @@ -91,9 +91,9 @@ protected void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTi var helper = api.getSkillHelper(); Set skills = skillRegistry.stream().filter(skill -> Objects.equals(occulusTabRegistry.getKey(occulusTab), skill.occulusTab())).collect(Collectors.toSet()); skills.removeIf(skill -> skill.hidden() && !helper.knows(player, skill.getId(registryAccess))); - stack.pushPose(); - stack.translate(-offsetX, -offsetY, 0); - stack.scale(SCALE, SCALE, 0); + graphics.pose().pushPose(); + graphics.pose().translate(-offsetX, -offsetY, 0); + graphics.pose().scale(SCALE, SCALE, 0); mouseX += offsetX; mouseY += offsetY; mouseX *= SCALE; @@ -125,33 +125,32 @@ protected void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTi offset = 0; } if (cX != parentCX) { - RenderUtil.lineThick2d(stack, parentCX, cY, cX, cY, offset, color); + RenderUtil.lineThick2d(graphics, parentCX, cY, cX, cY, offset, color); } if (cY != parentCY) { - RenderUtil.lineThick2d(stack, parentCX, parentCY, parentCX, cY, offset, color); + RenderUtil.lineThick2d(graphics, parentCX, parentCY, parentCX, cY, offset, color); } } } - RenderSystem.setShaderTexture(0, SkillIconAtlas.SKILL_ICON_ATLAS); for (Skill skill : skills) { boolean knows = helper.knows(player, skill, registryAccess); boolean hasPrereq = helper.canLearn(player, skill) || knows; if (!hasPrereq) { - RenderSystem.setShaderColor(0.5F, 0.5F, 0.5F, 1); + graphics.setColor(0.5F, 0.5F, 0.5F, 1); } else if (!knows) { int c = getColorForSkill(skill); float red = Math.max(ColorUtil.getRed(c), 0.6F) * multiplier; float green = Math.max(ColorUtil.getGreen(c), 0.6F) * multiplier; float blue = Math.max(ColorUtil.getBlue(c), 0.6F) * multiplier; - RenderSystem.setShaderColor(red, green, blue, 1); + graphics.setColor(red, green, blue, 1); } RenderSystem.enableBlend(); - blit(stack, skill.x(), skill.y(), 16, (int) SKILL_SIZE, (int) SKILL_SIZE, SkillIconAtlas.instance().getSprite(skillRegistry.getKey(skill))); + graphics.blit(skill.x(), skill.y(), 16, (int) SKILL_SIZE, (int) SKILL_SIZE, SkillIconAtlas.instance().getSprite(skillRegistry.getKey(skill))); RenderSystem.disableBlend(); - RenderSystem.setShaderColor(1, 1, 1, 1); + graphics.setColor(1, 1, 1, 1); } RenderSystem.disableScissor(); - stack.popPose(); + graphics.pose().popPose(); if (!(mouseX > offsetX && mouseX < offsetX + width && mouseY > offsetY && mouseY < offsetY + height)) return; for (Skill skill : skills) { if (mouseX >= skill.x() && mouseX <= skill.x() + SKILL_SIZE && mouseY >= skill.y() && mouseY <= skill.y() + SKILL_SIZE) { @@ -162,10 +161,10 @@ protected void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTi } else { list.add(MISSING_REQUIREMENTS); } - stack.pushPose(); - stack.translate(0, -1, 0); - parent.renderTooltip(stack, list, Optional.empty(), (int) (mouseX / SCALE - offsetX), (int) (mouseY / SCALE - offsetY), getFont()); - stack.popPose(); + graphics.pose().pushPose(); + graphics.pose().translate(0, -1, 0); + graphics.renderTooltip(getFont(), list, Optional.empty(), (int) (mouseX / SCALE - offsetX), (int) (mouseY / SCALE - offsetY)); + graphics.pose().popPose(); hoverItem = skill; isHoveringSkill = true; } @@ -177,19 +176,19 @@ protected void renderFg(PoseStack stack, int mouseX, int mouseY, float partialTi @Override public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) { - if (mouseButton == 0 && mouseX > 0 && mouseX < width && mouseY > 0 && mouseY < height) { - var helper = ArsMagicaAPI.get().getSkillHelper(); - Player player = getMinecraft().player; - var registryAccess = getMinecraft().getConnection().registryAccess(); - if (player != null && hoverItem != null && !helper.knows(player, hoverItem, registryAccess)) { - if (helper.canLearn(player, hoverItem) || player.isCreative()) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToServer(new LearnSkillPacket(hoverItem.getId(getMinecraft().getConnection().registryAccess()))); - } - } else { - setDragging(true); + if (mouseButton != 0 || !(mouseX > 0) || !(mouseX < width) || !(mouseY > 0) || !(mouseY < height)) { + return super.mouseClicked(mouseX, mouseY, mouseButton); + } + var helper = ArsMagicaAPI.get().getSkillHelper(); + Player player = getMinecraft().player; + var registryAccess = getMinecraft().getConnection().registryAccess(); + if (player != null && hoverItem != null && !helper.knows(player, hoverItem, registryAccess)) { + if (helper.canLearn(player, hoverItem) || player.isCreative()) { + ArsMagicaLegacy.NETWORK_HANDLER.sendToServer(new LearnSkillPacket(hoverItem.getId(getMinecraft().getConnection().registryAccess()))); } - return true; + } else { + setDragging(true); } - return super.mouseClicked(mouseX, mouseY, mouseButton); + return true; } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusTabButton.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusTabButton.java index 1c03f48a8..942e1cacd 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusTabButton.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/OcculusTabButton.java @@ -5,7 +5,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.ClientHelper; import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.RenderUtil; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; @@ -27,13 +27,13 @@ public OcculusTabButton(int index, int x, int y, int xOffset, int yOffset, Occul } @Override - public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) { + public void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { if (!visible) return; float f = 1f / 0x100; RenderSystem.setShaderTexture(0, new ResourceLocation(ArsMagicaAPI.MOD_ID, "textures/gui/occulus/overlay.png")); - RenderUtil.drawBox(pPoseStack, getX(), getY(), SIZE, SIZE, 0, 0, 210 * f, SIZE * f, 210 * f + SIZE * f); + RenderUtil.drawBox(graphics, getX(), getY(), SIZE, SIZE, 0, 0, 210 * f, SIZE * f, 210 * f + SIZE * f); RenderSystem.setShaderTexture(0, tab.icon(ClientHelper.getRegistryAccess())); - RenderUtil.drawBox(pPoseStack, getX() + 2f, getY() + 2f, 18, 18, 0, 0, 0, 1, 1); + RenderUtil.drawBox(graphics, getX() + 2f, getY() + 2f, 18, 18, 0, 0, 0, 1, 1); pMouseX -= xOffset; pMouseY -= yOffset; isHovered = pMouseX >= getX() && pMouseY >= getY() && pMouseX < getX() + width && pMouseY < getY() + height; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/SkillPointPanel.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/SkillPointPanel.java index 74676a008..ea966a4e3 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/SkillPointPanel.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/gui/occulus/SkillPointPanel.java @@ -2,79 +2,80 @@ import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMSkillPoints; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.datafixers.util.Pair; -import net.minecraft.client.gui.narration.NarratableEntry; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.Style; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; import java.util.List; +import java.util.stream.Collectors; -public class SkillPointPanel extends Screen implements NarratableEntry { +public class SkillPointPanel extends AbstractWidget { private static final ResourceLocation SKILL_POINT_BG = new ResourceLocation(ArsMagicaAPI.MOD_ID, "textures/gui/occulus/skill_points.png"); + private final Font font; + private final List skillPointText; - protected SkillPointPanel() { - super(Component.empty()); + protected SkillPointPanel(Player player, Font font, int x, int y, int width, int height) { + super(x, y, width, height, Component.empty()); + this.font = font; + ArsMagicaAPI api = ArsMagicaAPI.get(); + this.skillPointText = api.getSkillPointRegistry() + .getValues() + .stream() + .filter(e -> e != AMSkillPoints.NONE.get()) + .map(point -> { + int skillPoint = api.getSkillHelper().getSkillPoint(player, point); + return point.getDisplayName().copy().append(" : " + skillPoint).withStyle(Style.EMPTY.withColor(point.color())); + }).collect(Collectors.toList()); + this.setWidth(skillPointText.stream().mapToInt(font::width).max().orElse(0) + 6); } @Override - public void render(PoseStack stack, int pMouseX, int pMouseY, float pPartialTicks) { - LocalPlayer player = getMinecraft().player; - if (player == null) return; - stack.pushPose(); - stack.translate(width, 0, -1); - var api = ArsMagicaAPI.get(); - List> skillPoints = api.getSkillPointRegistry().getValues().stream().filter(e -> e != AMSkillPoints.NONE.get()).map(point -> Pair.of(point.getDisplayName().copy().append(Component.literal(" : " + api.getSkillHelper().getSkillPoint(player, point))), point.color())).toList(); - int maxSize = skillPoints.stream().map(Pair::getFirst).mapToInt(font::width).max().orElse(0) + 6; - RenderSystem.setShaderTexture(0, SKILL_POINT_BG); - blit(stack, maxSize, 0, -1, 252, 0, 4, 4, 256, 256); - blit(stack, maxSize, height - 4, -1, 252, 252, 4, 4, 256, 256); - int w = maxSize; + protected void renderWidget(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) { + graphics.pose().pushPose(); + graphics.pose().translate(getX(), getY(), 0); + graphics.blit(SKILL_POINT_BG, width, 0, 0, 252, 0, 4, 4, 256, 256); + graphics.blit(SKILL_POINT_BG, width, height - 4, 0, 252, 252, 4, 4, 256, 256); + int w = width; int h = height - 8; while (w > 0) { int x = Math.min(w, 252); while (h > 0) { int y = Math.min(h, 248); - blit(stack, w - x, 4 + h - y, -1, 4, 4, x, y, 256, 256); + graphics.blit(SKILL_POINT_BG, w - x, 4 + h - y, 0, 4, 4, x, y, 256, 256); h -= y; } w -= x; } - w = maxSize; + w = width; h = height - 8; while (w > 0) { int x = Math.min(w, 252); - blit(stack, w - x, 0, -1, 4, 0, x, 4, 256, 256); - blit(stack, w - x, height - 4, -1, 4, 252, x, 4, 256, 256); + graphics.blit(SKILL_POINT_BG, w - x, 0, 0, 4, 0, x, 4, 256, 256); + graphics.blit(SKILL_POINT_BG, w - x, height - 4, 0, 4, 252, x, 4, 256, 256); w -= x; } while (h > 0) { int y = Math.min(h, 248); - blit(stack, maxSize, 4 + h - y, -1, 252, 4, 4, y, 256, 256); + graphics.blit(SKILL_POINT_BG, width, 4 + h - y, 0, 252, 4, 4, y, 256, 256); h -= y; } int pointOffsetY = 5; - stack.pushPose(); - stack.translate(0, 0, 1); - for (Pair point : skillPoints) { - font.draw(stack, point.getFirst(), 4, pointOffsetY, point.getSecond() | 0xFF000000); + graphics.pose().pushPose(); + graphics.pose().translate(0, 0, 1); + for (Component point : skillPointText) { + graphics.drawString(font, point, 4, pointOffsetY, point.getStyle().getColor().getValue() | 0xFF000000); pointOffsetY += 12; } - stack.popPose(); - stack.popPose(); + graphics.pose().popPose(); + graphics.pose().popPose(); } @Override - public NarrationPriority narrationPriority() { - return NarrationPriority.NONE; - } - - @Override - public void updateNarration(NarrationElementOutput pNarrationElementOutput) { + protected void updateWidgetNarration(NarrationElementOutput pNarrationElementOutput) { } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/AbstractHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/AbstractHUD.java index 23effd68b..3a806cb91 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/AbstractHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/AbstractHUD.java @@ -5,7 +5,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.gui.ColorUtil; import com.github.minecraftschurlimods.betterhudlib.HUDElement; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.ForgeConfigSpec.EnumValue; import net.minecraftforge.common.ForgeConfigSpec.IntValue; @@ -28,7 +28,7 @@ protected AbstractHUD(EnumValue anchorX, EnumValue anchorY, In /** * Renders a bar. * - * @param mStack The pose stack to use. + * @param graphics The gui graphics to render with. * @param x The x coordinate to draw the bar at. * @param y The y coordinate to draw the bar at. * @param width The width to use. @@ -37,25 +37,24 @@ protected AbstractHUD(EnumValue anchorX, EnumValue anchorY, In * @param maxValue The max value of the bar. * @param color The bar color. */ - protected void renderBar(PoseStack mStack, int x, int y, int width, int height, double value, double maxValue, int color) { + protected void renderBar(GuiGraphics graphics, int x, int y, int width, int height, double value, double maxValue, int color) { int relWidth = 0; if (maxValue != 0) { relWidth = (int) Math.ceil(Math.max(width * (value / maxValue), 0)); } - mStack.pushPose(); + graphics.pose().pushPose(); RenderSystem.enableBlend(); - RenderSystem.setShaderTexture(0, BAR_TEXTURE); - blit(mStack, x, y, 0, 0, width + 1, height - 1); + graphics.blit(BAR_TEXTURE, x, y, 0, 0, width + 1, height - 1); float r = ColorUtil.getRed(color); float g = ColorUtil.getGreen(color); float b = ColorUtil.getBlue(color); - RenderSystem.setShaderColor(r, g, b, 1); + graphics.setColor(r, g, b, 1); RenderSystem.setShaderFogColor(r, g, b); - blit(mStack, x + 2, y + 2, 2, height + 1, relWidth - 1, height - 3); + graphics.blit(BAR_TEXTURE, x + 2, y + 2, 2, height + 1, relWidth - 1, height - 3); RenderSystem.setShaderFogColor(1, 1, 1, 1); - RenderSystem.setShaderColor(1, 1, 1, 1); + graphics.setColor(1, 1, 1, 1); RenderSystem.disableBlend(); - mStack.popPose(); + graphics.pose().popPose(); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/BurnoutHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/BurnoutHUD.java index 0bb75332e..119fe5678 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/BurnoutHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/BurnoutHUD.java @@ -2,8 +2,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.Config; import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.entity.player.Player; import net.minecraftforge.client.gui.overlay.ForgeGui; @@ -13,7 +13,7 @@ public BurnoutHUD() { } @Override - public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTick) { + public void draw(ForgeGui forgeGui, GuiGraphics graphics, float partialTick) { Player player = Minecraft.getInstance().player; var api = ArsMagicaAPI.get(); if (player == null || !api.getMagicHelper().knowsMagic(player)) return; @@ -25,7 +25,7 @@ public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTick) { maxBurnout = burnoutHelper.getMaxBurnout(player); } if (maxBurnout > 0) { - renderBar(poseStack, 0, 0, getWidth(), getHeight(), burnout, maxBurnout, 0x880000); + renderBar(graphics, 0, 0, getWidth(), getHeight(), burnout, maxBurnout, 0x880000); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ManaHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ManaHUD.java index c743af7d9..c1934541e 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ManaHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ManaHUD.java @@ -3,8 +3,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.Config; import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; import com.github.minecraftschurlimods.arsmagicalegacy.api.magic.IManaHelper; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.entity.player.Player; import net.minecraftforge.client.gui.overlay.ForgeGui; @@ -14,7 +14,7 @@ public ManaHUD() { } @Override - public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTick) { + public void draw(ForgeGui forgeGui, GuiGraphics graphics, float partialTick) { Player player = Minecraft.getInstance().player; var api = ArsMagicaAPI.get(); if (player == null || !api.getMagicHelper().knowsMagic(player)) return; @@ -26,7 +26,7 @@ public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTick) { maxMana = manaHelper.getMaxMana(player); } if (maxMana > 0) { - renderBar(poseStack, 0, 0, getWidth(), getHeight(), mana, maxMana, 0x99FFFF); + renderBar(graphics, 0, 0, getWidth(), getHeight(), mana, maxMana, 0x99FFFF); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ShapeGroupHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ShapeGroupHUD.java index 840d10390..de1ff643b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ShapeGroupHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/ShapeGroupHUD.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.arsmagicalegacy.client.hud; import com.github.minecraftschurlimods.betterhudlib.HUDElement; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraftforge.client.gui.overlay.ForgeGui; public final class ShapeGroupHUD extends HUDElement { @@ -10,7 +10,7 @@ public ShapeGroupHUD() { } @Override - public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTicks) { + public void draw(ForgeGui forgeGui, GuiGraphics graphics, float partialTicks) { // TODO } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/SpellBookHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/SpellBookHUD.java index beedb71f4..2ac41fad9 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/SpellBookHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/SpellBookHUD.java @@ -5,9 +5,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.ClientHelper; import com.github.minecraftschurlimods.arsmagicalegacy.common.item.spellbook.SpellBookItem; import com.github.minecraftschurlimods.betterhudlib.HUDElement; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.SimpleContainer; @@ -23,15 +22,15 @@ public SpellBookHUD() { } @Override - public void draw(ForgeGui forgeGui, PoseStack poseStack, float partialTicks) { + public void draw(ForgeGui forgeGui, GuiGraphics graphics, float partialTicks) { Player player = ClientHelper.getLocalPlayer(); if (player == null || Minecraft.getInstance().options.hideGui) return; ItemStack mainHand = player.getItemInHand(InteractionHand.MAIN_HAND); ItemStack offHand = player.getItemInHand(InteractionHand.OFF_HAND); if (mainHand.getItem() instanceof SpellBookItem) { - renderSpellBookHUD(forgeGui, poseStack, mainHand); + renderSpellBookHUD(forgeGui, graphics, mainHand); } else if (offHand.getItem() instanceof SpellBookItem) { - renderSpellBookHUD(forgeGui, poseStack, offHand); + renderSpellBookHUD(forgeGui, graphics, offHand); } } @@ -48,28 +47,27 @@ protected void save() { Config.CLIENT.save(); } - private void renderSpellBookHUD(ForgeGui gui, PoseStack mStack, ItemStack spellBook) { + private void renderSpellBookHUD(ForgeGui gui, GuiGraphics graphics, ItemStack spellBook) { SimpleContainer active = SpellBookItem.getContainer(spellBook).active(); final int selected = SpellBookItem.getSelectedSlot(spellBook); if (selected != -1) { - mStack.pushPose(); - mStack.scale(0.75f, 0.75f, 0.75f); - mStack.pushPose(); - RenderSystem.setShaderTexture(0, TEXTURE); - blit(mStack, 0, 0, 0, 0, 0, 148, 22, 256, 256); - mStack.popPose(); + graphics.pose().pushPose(); + graphics.pose().scale(0.75f, 0.75f, 0.75f); + graphics.pose().pushPose(); + graphics.blit(TEXTURE, 0, 0, 0, 0, 0, 148, 22, 256, 256); + graphics.pose().popPose(); for (int i = 0; i < active.getContainerSize(); i++) { ItemStack spell = active.getItem(i); - mStack.pushPose(); - mStack.translate(i * 18f, 2f, 0); - Minecraft.getInstance().getItemRenderer().renderGuiItem(mStack, spell, 3, 1); - mStack.popPose(); + graphics.pose().pushPose(); + graphics.pose().translate(i * 18f, 2f, 0); + graphics.renderItem(spell, 3, 1); + graphics.renderItemDecorations(gui.getFont(), spell, 3, 1); + graphics.pose().popPose(); } - mStack.pushPose(); - RenderSystem.setShaderTexture(0, TEXTURE); - blit(mStack, selected * 18 + 1, 1, 0, 148, 0, 20, 20, 256, 256); - mStack.popPose(); - mStack.popPose(); + graphics.pose().pushPose(); + graphics.blit(TEXTURE, selected * 18 + 1, 1, 0, 148, 0, 20, 20, 256, 256); + graphics.pose().popPose(); + graphics.pose().popPose(); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/XpHUD.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/XpHUD.java index b3a9e8b7c..ce94ebab7 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/XpHUD.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/hud/XpHUD.java @@ -2,9 +2,9 @@ import com.github.minecraftschurlimods.arsmagicalegacy.Config; import com.github.minecraftschurlimods.arsmagicalegacy.api.ArsMagicaAPI; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.entity.player.Player; import net.minecraftforge.client.gui.overlay.ForgeGui; @@ -14,7 +14,7 @@ public XpHUD() { } @Override - public void draw(ForgeGui forgeGui, PoseStack poseStack, float v) { + public void draw(ForgeGui forgeGui, GuiGraphics graphics, float v) { Player player = Minecraft.getInstance().player; var api = ArsMagicaAPI.get(); if (player == null || !api.getMagicHelper().knowsMagic(player)) return; @@ -27,15 +27,15 @@ public void draw(ForgeGui forgeGui, PoseStack poseStack, float v) { xp = helper.getXp(player); xpForNextLevel = helper.getXpForNextLevel(level); } - renderBar(poseStack, 0, 0, getWidth(), getHeight(), xp, xpForNextLevel, 0x7777FF); + renderBar(graphics, 0, 0, getWidth(), getHeight(), xp, xpForNextLevel, 0x7777FF); String s = String.valueOf(level); Font font = Minecraft.getInstance().font; int i1 = 40 - font.width(s) / 2; int j1 = -10; - font.draw(poseStack, s, (float) (i1 + 1), (float) j1, 0); - font.draw(poseStack, s, (float) (i1 - 1), (float) j1, 0); - font.draw(poseStack, s, (float) i1, (float) (j1 + 1), 0); - font.draw(poseStack, s, (float) i1, (float) (j1 - 1), 0); - font.draw(poseStack, s, (float) i1, (float) j1, 0x7777FF); + graphics.drawString(font, s, (i1 + 1), j1, 0); + graphics.drawString(font, s, (i1 - 1), j1, 0); + graphics.drawString(font, s, i1, (j1 + 1), 0); + graphics.drawString(font, s, i1, (j1 - 1), 0); + graphics.drawString(font, s, i1, j1, 0x7777FF); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/renderer/spell/BeamRenderer.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/renderer/spell/BeamRenderer.java index 49796203a..eb93eb199 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/renderer/spell/BeamRenderer.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/client/renderer/spell/BeamRenderer.java @@ -79,7 +79,7 @@ public static void drawBeam(PoseStack stack, Entity entity, Vec3 target, Interac MultiBufferSource.BufferSource buffer = mc.renderBuffers().bufferSource(); Vec3 view = mc.gameRenderer.getMainCamera().getPosition(); Vec3 origin = firstPerson ? entity.getEyePosition(ticks) : entity.getPosition(ticks).add(0, height, 0); - long time = entity.getLevel().getGameTime(); + long time = entity.level().getGameTime(); float v = -0.02f * time; float distance = (float) Math.max(1, origin.subtract(target).length()); float r = ColorUtil.getRed(color), g = ColorUtil.getGreen(color), b = ColorUtil.getBlue(color); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/OcculusBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/OcculusBlock.java index 4a16a51ea..5d126f542 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/OcculusBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/OcculusBlock.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -81,7 +80,7 @@ public class OcculusBlock extends HorizontalDirectionalBlock { ); public OcculusBlock() { - super(Properties.of(Material.STONE).explosionResistance(5).destroyTime(3)); + super(Properties.of().explosionResistance(5).destroyTime(3)); registerDefaultState(getStateDefinition().any().setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/WizardsChalkBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/WizardsChalkBlock.java index ef278ac8d..e744cfc7e 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/WizardsChalkBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/WizardsChalkBlock.java @@ -15,7 +15,6 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.shapes.CollisionContext; @@ -27,7 +26,7 @@ public class WizardsChalkBlock extends Block { private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 0.1, 14); public WizardsChalkBlock() { - super(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().sound(SoundType.GRAVEL)); + super(BlockBehaviour.Properties.of().noCollission().sound(SoundType.GRAVEL)); registerDefaultState(getStateDefinition().any().setValue(VARIANT, 0).setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarCoreBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarCoreBlock.java index 2f0934e5e..1b7f77ba2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarCoreBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarCoreBlock.java @@ -12,13 +12,13 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MapColor; public class AltarCoreBlock extends Block implements EntityBlock { public static final BooleanProperty FORMED = BooleanProperty.create("formed"); public AltarCoreBlock() { - super(BlockBehaviour.Properties.of(Material.METAL).strength(3)); + super(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3)); registerDefaultState(getStateDefinition().any().setValue(FORMED, false)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarViewBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarViewBlock.java index 18dbd9191..e2f664f1c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarViewBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/altar/AltarViewBlock.java @@ -6,11 +6,10 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; public class AltarViewBlock extends AirBlock implements EntityBlock { public AltarViewBlock() { - super(BlockBehaviour.Properties.of(Material.AIR).noCollission().noLootTable().air()); + super(BlockBehaviour.Properties.of().noCollission().noLootTable().air()); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/blackaurem/BlackAuremBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/blackaurem/BlackAuremBlock.java index 6e31890c0..fbae1fce5 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/blackaurem/BlackAuremBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/blackaurem/BlackAuremBlock.java @@ -13,8 +13,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; +import net.minecraft.world.level.material.MapColor; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -29,7 +28,7 @@ public class BlackAuremBlock extends BaseEntityBlock implements ITierCheckingBlo private static final BiPredicate PILLAR4 = PatchouliCompat.getMultiblockMatcher(PatchouliCompat.BLACK_AUREM_PILLAR4); public BlackAuremBlock() { - super(BlockBehaviour.Properties.of(Material.AIR).color(MaterialColor.COLOR_RED).lightLevel(value -> 2).noOcclusion().noCollission()); + super(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).lightLevel(value -> 2).noOcclusion().noCollission()); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/celestialprism/CelestialPrismBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/celestialprism/CelestialPrismBlock.java index ef1242bc1..4c9fbdffa 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/celestialprism/CelestialPrismBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/celestialprism/CelestialPrismBlock.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -38,7 +37,7 @@ public class CelestialPrismBlock extends BaseEntityBlock implements ITierCheckin public final BiPredicate PILLAR4 = PatchouliCompat.getMultiblockMatcher(PatchouliCompat.CELESTIAL_PRISM_PILLAR4); public CelestialPrismBlock() { - super(BlockBehaviour.Properties.of(Material.AMETHYST).lightLevel(value -> 1).noOcclusion().emissiveRendering((p_61036_, p_61037_, p_61038_) -> true)); + super(BlockBehaviour.Properties.of().lightLevel(value -> 1).noOcclusion().emissiveRendering((p_61036_, p_61037_, p_61038_) -> true)); registerDefaultState(getStateDefinition().any().setValue(HALF, DoubleBlockHalf.LOWER)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/flower/WakebloomBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/flower/WakebloomBlock.java index 921107386..3a1f40bbd 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/flower/WakebloomBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/flower/WakebloomBlock.java @@ -2,14 +2,14 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMMobEffects; import net.minecraft.core.BlockPos; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.FluidTags; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.FlowerBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.level.material.Material; public class WakebloomBlock extends FlowerBlock { public WakebloomBlock() { @@ -18,7 +18,7 @@ public WakebloomBlock() { @Override protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) { - return (level.getFluidState(pos).getType() == Fluids.WATER || state.getMaterial() == Material.ICE) && level.getFluidState(pos.above()).getType() == Fluids.EMPTY; + return (level.getFluidState(pos).is(FluidTags.WATER) || state.is(BlockTags.ICE)) && level.getFluidState(pos.above()).isEmpty(); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlock.java index 4861b2390..86b7617e2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlock.java @@ -27,7 +27,6 @@ import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; @@ -49,7 +48,7 @@ public class InscriptionTableBlock extends Block implements EntityBlock { private static final String TIER_KEY = "tier"; public InscriptionTableBlock() { - super(BlockBehaviour.Properties.of(Material.WOOD).strength(2).lightLevel(state -> 1).noOcclusion()); + super(BlockBehaviour.Properties.of().strength(2).lightLevel(state -> 1).noOcclusion()); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlockEntity.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlockEntity.java index 933c6584c..58b6763d3 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlockEntity.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableBlockEntity.java @@ -192,7 +192,7 @@ public void setItem(int pIndex, ItemStack pStack) { @Override public boolean stillValid(Player player) { BlockPos pos = getBlockPos(); - return player.level.getBlockEntity(pos) == this && player.distanceToSqr(Vec3.atCenterOf(pos)) <= 64D; + return player.level().getBlockEntity(pos) == this && player.distanceToSqr(Vec3.atCenterOf(pos)) <= 64D; } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableMenu.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableMenu.java index f6a0be8ac..8bcfdda11 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableMenu.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/inscriptiontable/InscriptionTableMenu.java @@ -51,7 +51,7 @@ public InscriptionTableMenu(int pContainerId, Inventory inventory, InscriptionTa } public InscriptionTableMenu(int id, Inventory inv, FriendlyByteBuf data) { - this(id, inv, ((InscriptionTableBlockEntity) Objects.requireNonNull(inv.player.level.getBlockEntity(data.readBlockPos())))); + this(id, inv, ((InscriptionTableBlockEntity) Objects.requireNonNull(inv.player.level().getBlockEntity(data.readBlockPos())))); } @Override @@ -157,7 +157,7 @@ public boolean mayPlace(ItemStack stack) { @Override public Optional tryRemove(int p_150642_, int p_150643_, Player player) { if (table.getSpellRecipe() != null && !table.getSpellRecipe().isValid()) return super.tryRemove(p_150642_, p_150643_, player); - player.getLevel().playSound(null, table.getBlockPos().getX(), table.getBlockPos().getY(), table.getBlockPos().getZ(), AMSounds.INSCRIPTION_TABLE_TAKE_BOOK.get(), SoundSource.BLOCKS, 1f, 1f); + player.level().playSound(null, table.getBlockPos().getX(), table.getBlockPos().getY(), table.getBlockPos().getZ(), AMSounds.INSCRIPTION_TABLE_TAKE_BOOK.get(), SoundSource.BLOCKS, 1f, 1f); return super.tryRemove(p_150642_, p_150643_, player).flatMap(stack -> stack.getItem() instanceof ISpellItem ? Optional.of(stack) : table.saveRecipe(stack)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/spellrune/SpellRuneBlock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/spellrune/SpellRuneBlock.java index 1d557729c..88b07ec4f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/spellrune/SpellRuneBlock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/block/spellrune/SpellRuneBlock.java @@ -14,7 +14,6 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -34,7 +33,7 @@ public class SpellRuneBlock extends Block implements EntityBlock { ); public SpellRuneBlock() { - super(BlockBehaviour.Properties.of(Material.AIR).noCollission().air()); + super(BlockBehaviour.Properties.of().noCollission().air()); registerDefaultState(getStateDefinition().any().setValue(FACE, Direction.DOWN)); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/IlluminationEffect.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/IlluminationEffect.java index 05204fb83..f30625322 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/IlluminationEffect.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/IlluminationEffect.java @@ -12,8 +12,8 @@ public IlluminationEffect() { @Override public void applyEffectTick(LivingEntity pLivingEntity, int pAmplifier) { - if (pLivingEntity.getLevel().getBrightness(LightLayer.BLOCK, pLivingEntity.blockPosition()) == 0) { - pLivingEntity.getLevel().setBlock(pLivingEntity.blockPosition(), Blocks.LIGHT.defaultBlockState(), 3); + if (pLivingEntity.level().getBrightness(LightLayer.BLOCK, pLivingEntity.blockPosition()) == 0) { + pLivingEntity.level().setBlock(pLivingEntity.blockPosition(), Blocks.LIGHT.defaultBlockState(), 3); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/ScrambleSynapsesEffect.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/ScrambleSynapsesEffect.java index 9dfd05d91..9f3cf55b1 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/ScrambleSynapsesEffect.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/effect/ScrambleSynapsesEffect.java @@ -11,8 +11,8 @@ public ScrambleSynapsesEffect() { @Override public void applyEffectTick(LivingEntity pLivingEntity, int pAmplifier) { - if (pLivingEntity.getLevel().getRandom().nextInt(80) < 10) { - Direction direction = Direction.from2DDataValue(pLivingEntity.getLevel().getRandom().nextInt(4)); + if (pLivingEntity.level().getRandom().nextInt(80) < 10) { + Direction direction = Direction.from2DDataValue(pLivingEntity.level().getRandom().nextInt(4)); pLivingEntity.setDeltaMovement(pLivingEntity.getDeltaMovement().add(direction.getStepX() / 2f, direction.getStepY() / 2f, direction.getStepZ() / 2f)); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractBoss.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractBoss.java index aeebe7dfb..aa09447a2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractBoss.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractBoss.java @@ -153,7 +153,7 @@ public void aiStep() { super.aiStep(); if (bossEvent != null) { bossEvent.setProgress(getHealth() / getMaxHealth()); - if (!level.isClientSide()) { + if (!level().isClientSide()) { bossEvent.setVisible(isAlive()); if (ticksSinceLastPlayerScan++ >= 20) { updatePlayers(); @@ -178,13 +178,13 @@ public void handleEntityEvent(byte pId) { public boolean hurt(DamageSource pSource, float pAmount) { if (pSource.getEntity() instanceof AbstractBoss) return false; if (pSource.is(DamageTypes.IN_WALL)) { - if (!level.isClientSide()) { + if (!level().isClientSide()) { int width = Math.round(getBbWidth()); int height = Math.round(getBbHeight()); for (int x = -width; x < width; x++) { for (int y = 0; y < height; y++) { for (int z = -width; z < width; z++) { - level.destroyBlock(BlockPos.containing(getX() + x, getY() + y, getZ() + z), true, this); + level().destroyBlock(BlockPos.containing(getX() + x, getY() + y, getZ() + z), true, this); } } } @@ -193,7 +193,7 @@ public boolean hurt(DamageSource pSource, float pAmount) { } SoundEvent sound = getHurtSound(pSource); if (sound != null) { - level.playSound(null, this, sound, SoundSource.HOSTILE, 1f, 0.5f + random.nextFloat() * 0.5f); + level().playSound(null, this, sound, SoundSource.HOSTILE, 1f, 0.5f + random.nextFloat() * 0.5f); } return super.hurt(pSource, pAmount); } @@ -250,7 +250,7 @@ public Action getAction() { public void setAction(Action action) { this.action = action; ticksInAction = 0; - level.broadcastEntityEvent(this, action.id); + level().broadcastEntityEvent(this, action.id); } /** @@ -261,19 +261,18 @@ public int getTicksInAction() { } private void updatePlayers() { - if (!level.isClientSide()) { - Set newSet = new HashSet<>(); - for (ServerPlayer player : ((ServerLevel) level).getPlayers(EntitySelector.ENTITY_STILL_ALIVE.and(EntitySelector.withinDistance(0, 128, 0, 192)))) { - bossEvent.addPlayer(player); - startSeenByPlayer(player); - newSet.add(player); - } - Set oldSet = Sets.newHashSet(bossEvent.getPlayers()); - oldSet.removeAll(newSet); - for (ServerPlayer player : oldSet) { - bossEvent.removePlayer(player); - stopSeenByPlayer(player); - } + if (level().isClientSide()) return; + Set newSet = new HashSet<>(); + for (ServerPlayer player : ((ServerLevel) level()).getPlayers(EntitySelector.ENTITY_STILL_ALIVE.and(EntitySelector.withinDistance(0, 128, 0, 192)))) { + bossEvent.addPlayer(player); + startSeenByPlayer(player); + newSet.add(player); + } + Set oldSet = Sets.newHashSet(bossEvent.getPlayers()); + oldSet.removeAll(newSet); + for (ServerPlayer player : oldSet) { + bossEvent.removePlayer(player); + stopSeenByPlayer(player); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractSpellEntity.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractSpellEntity.java index 9896421b2..edb27f029 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractSpellEntity.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/AbstractSpellEntity.java @@ -70,7 +70,7 @@ protected static boolean tryReflect(Entity e) { protected void forAllInRange(float radius, boolean skipOwner, Consumer consumer) { double x = getX(), y = getY(), z = getZ(); - for (Entity e : level.getEntities(this, new AABB(x - radius, y - radius, z - radius, x + radius, y + radius, z + radius))) { + for (Entity e : level().getEntities(this, new AABB(x - radius, y - radius, z - radius, x + radius, y + radius, z + radius))) { if (e == this) continue; if (e instanceof PartEntity part) { e = part.getParent(); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ArcaneGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ArcaneGuardian.java index 4a1113a27..b82a8d504 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ArcaneGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ArcaneGuardian.java @@ -54,7 +54,7 @@ public SoundEvent getAttackSound() { protected void registerGoals() { super.registerGoals(); goalSelector.addGoal(1, new HealGoal<>(this)); - Registry prefabSpells = level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); + Registry prefabSpells = level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); goalSelector.addGoal(1, new ExecuteRandomSpellGoal<>(this, List.of( prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "water_bolt")).spell(), prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "fire_bolt")).spell(), diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Blizzard.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Blizzard.java index b3df904ad..33c85513e 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Blizzard.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Blizzard.java @@ -58,14 +58,14 @@ protected void addAdditionalSaveData(CompoundTag pCompound) { @Override public void tick() { super.tick(); - if (level.isClientSide() || tickCount % 5 != 0) return; + if (level().isClientSide() || tickCount % 5 != 0) return; float damage = getDamage(); forAllInRange(getRadius(), true, e -> { e.hurt(damageSources().freeze(), damage); e.addEffect(new MobEffectInstance(AMMobEffects.FROST.get(), 50)); }); if (tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } } @@ -81,7 +81,7 @@ public void setDuration(int duration) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity living ? living : null; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Dryad.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Dryad.java index 3cabcb769..ae64d4b6b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Dryad.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Dryad.java @@ -48,16 +48,16 @@ protected void registerGoals() { @Override public void aiStep() { super.aiStep(); - if (!(level instanceof ServerLevel serverLevel)) return; + if (!(level() instanceof ServerLevel serverLevel)) return; timer--; if (timer > 0) return; timer = Config.SERVER.DRYAD_BONEMEAL_TIMER.get(); - if (level.random.nextDouble() >= Config.SERVER.DRYAD_BONEMEAL_CHANCE.get()) return; + if (level().random.nextDouble() >= Config.SERVER.DRYAD_BONEMEAL_CHANCE.get()) return; int radius = Config.SERVER.DRYAD_BONEMEAL_RADIUS.get(); for (final BlockPos pos : BlockPos.betweenClosed(blockPosition().offset(-radius, -radius, -radius), blockPosition().offset(radius, radius, radius))) { - BlockState state = level.getBlockState(pos); + BlockState state = level().getBlockState(pos); if (!(state.getBlock() instanceof BonemealableBlock bonemealableBlock)) continue; - if (!bonemealableBlock.isValidBonemealTarget(level, pos, state, false)) continue; + if (!bonemealableBlock.isValidBonemealTarget(level(), pos, state, false)) continue; if (bonemealableBlock.isBonemealSuccess(serverLevel, serverLevel.random, pos, state)) { bonemealableBlock.performBonemeal(serverLevel, serverLevel.random, pos, state); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/EnderGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/EnderGuardian.java index c6eb3a2b0..3d82df113 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/EnderGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/EnderGuardian.java @@ -59,7 +59,7 @@ protected void registerGoals() { super.registerGoals(); goalSelector.addGoal(1, new EnderRushGoal(this)); goalSelector.addGoal(1, new ShadowstepGoal(this)); - Registry prefabSpells = level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); + Registry prefabSpells = level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "ender_bolt")).spell(), 10)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "ender_wave")).spell(), 10)); goalSelector.addGoal(1, new EnderTorrentGoal(this)); @@ -69,11 +69,11 @@ protected void registerGoals() { @Override public void aiStep() { if (tickCount % 10 == 0) { - level.playSound(null, this, AMSounds.ENDER_GUARDIAN_FLAP.get(), SoundSource.HOSTILE, 1f, 1f); + level().playSound(null, this, AMSounds.ENDER_GUARDIAN_FLAP.get(), SoundSource.HOSTILE, 1f, 1f); } if (getAction() == Action.LONG_CAST) { if (getTicksInAction() == 20) { - level.playSound(null, this, AMSounds.ENDER_GUARDIAN_ROAR.get(), SoundSource.HOSTILE, 1f, 1f); + level().playSound(null, this, AMSounds.ENDER_GUARDIAN_ROAR.get(), SoundSource.HOSTILE, 1f, 1f); } } super.aiStep(); @@ -82,7 +82,7 @@ public void aiStep() { @Override public boolean hurt(DamageSource pSource, float pAmount) { if (pSource.getEntity() instanceof EnderMan) { - pSource.getEntity().hurt(damageSources().outOfWorld(), 5000); + pSource.getEntity().hurt(damageSources().fellOutOfWorld(), 5000); heal(10); return false; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FallingStar.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FallingStar.java index 1f67c7ecf..938c1b470 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FallingStar.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FallingStar.java @@ -67,24 +67,24 @@ public void tick() { if (timeSinceImpact == -1) { setDeltaMovement(getDeltaMovement().x(), getDeltaMovement().y() > -1f ? -1f : getDeltaMovement().y() - 0.1f, getDeltaMovement().z()); moveTo(position().add(getDeltaMovement())); - if (!level.isClientSide() && tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + if (!level().isClientSide() && tickCount > 0) { + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } - HitResult result = ArsMagicaAPI.get().getSpellHelper().trace(this, level, 0.01, true, false); + HitResult result = ArsMagicaAPI.get().getSpellHelper().trace(this, level(), 0.01, true, false); if (result.getType() == HitResult.Type.MISS) return; Vec3 vec = result.getLocation(); if (result.getType() == HitResult.Type.BLOCK) { - while (level.getBlockState(BlockPos.containing(vec)).getMaterial().isSolid()) { + while (level().getBlockState(BlockPos.containing(vec)).isSolid()) { vec = vec.add(0, 1, 0); } moveTo(vec); } } timeSinceImpact++; - if (!level.isClientSide() && timeSinceImpact < 2) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + if (!level().isClientSide() && timeSinceImpact < 2) { + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } - for (Entity e : level.getEntities(this, getBoundingBox().inflate(timeSinceImpact, 1, timeSinceImpact), e -> e instanceof LivingEntity living && !damaged.contains(living))) { + for (Entity e : level().getEntities(this, getBoundingBox().inflate(timeSinceImpact, 1, timeSinceImpact), e -> e instanceof LivingEntity living && !damaged.contains(living))) { if (e instanceof Player player && player.isCreative()) continue; e.hurt(damageSource, getDamage()); damaged.add((LivingEntity) e); @@ -97,7 +97,7 @@ public void tick() { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity living ? living : null; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireGuardian.java index 1201fd9f0..aabf91049 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireGuardian.java @@ -59,7 +59,7 @@ protected void registerGoals() { super.registerGoals(); goalSelector.addGoal(1, new FireRainGoal(this)); goalSelector.addGoal(1, new FlamethrowerGoal(this)); - Registry prefabSpells = level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); + Registry prefabSpells = level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "fire_bolt")).spell(), 20)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "strong_fire_bolt")).spell(), 20)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "melt_armor")).spell(), 20)); @@ -68,13 +68,13 @@ protected void registerGoals() { @Override public void aiStep() { if (tickCount % 30 == 0) { - if (level.getRandom().nextInt(10) == 0) { - level.playSound(null, this, AMSounds.FIRE_GUARDIAN_NOVA.get(), SoundSource.HOSTILE, 0.1f, 0.5f + level.getRandom().nextFloat() * 0.5f); + if (level().getRandom().nextInt(10) == 0) { + level().playSound(null, this, AMSounds.FIRE_GUARDIAN_NOVA.get(), SoundSource.HOSTILE, 0.1f, 0.5f + level().getRandom().nextFloat() * 0.5f); } - if (level.isClientSide()) { + if (level().isClientSide()) { // Particles } else { - for (LivingEntity e : level.getEntitiesOfClass(LivingEntity.class, getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(0, 3, 0), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : level().getEntitiesOfClass(LivingEntity.class, getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(0, 3, 0), e -> !(e instanceof AbstractBoss))) { e.hurt(damageSources().onFire(), 5); } } @@ -83,10 +83,10 @@ public void aiStep() { if (getTarget() != null) { lookAt(getTarget(), 10, 10); } - level.playSound(null, this, AMSounds.FIRE_GUARDIAN_FLAMETHROWER.get(), SoundSource.HOSTILE, 1f, 0.5f + level.getRandom().nextFloat() * 0.5f); + level().playSound(null, this, AMSounds.FIRE_GUARDIAN_FLAMETHROWER.get(), SoundSource.HOSTILE, 1f, 0.5f + level().getRandom().nextFloat() * 0.5f); flamethrower(); } - for (Player p : level.players()) { + for (Player p : level().players()) { if (distanceToSqr(p) < 9) { p.hurt(damageSources().onFire(), 8); } @@ -120,12 +120,12 @@ public boolean fireImmune() { public void flamethrower() { Vec3 look = getLookAngle(); - if (level.isClientSide()) { + if (level().isClientSide()) { for (int i = 0; i < 20; i++) { - level.addParticle(ParticleTypes.FLAME, getRandomX(1), getRandomY() + 1.5, getRandomZ(1), look.x, look.y, look.z); + level().addParticle(ParticleTypes.FLAME, getRandomX(1), getRandomY() + 1.5, getRandomZ(1), look.x, look.y, look.z); } } else { - for (LivingEntity e : level.getEntitiesOfClass(LivingEntity.class, getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(look.x * 3, 0, look.z * 3), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : level().getEntitiesOfClass(LivingEntity.class, getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(look.x * 3, 0, look.z * 3), e -> !(e instanceof AbstractBoss))) { e.hurt(damageSources().onFire(), 8); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireRain.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireRain.java index abef5ad43..d455521f2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireRain.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/FireRain.java @@ -56,13 +56,13 @@ protected void addAdditionalSaveData(CompoundTag pCompound) { @Override public void tick() { super.tick(); - if (level.isClientSide() || tickCount % 5 != 0) return; + if (level().isClientSide() || tickCount % 5 != 0) return; forAllInRange(getRadius(), true, e -> { e.hurt(damageSources().inFire(), getDamage()); e.setRemainingFireTicks(50); }); if (tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } } @@ -78,7 +78,7 @@ public void setDuration(int duration) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity living ? living : null; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/IceGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/IceGuardian.java index d1a63fb3d..5a4107cf9 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/IceGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/IceGuardian.java @@ -58,7 +58,7 @@ protected void registerGoals() { @Override public void aiStep() { if (this.tickCount % 100 == 0) { - for (LivingEntity e : level.getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(0, -3, 0), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : level().getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(2.5, 2.5, 2.5).expandTowards(0, -3, 0), e -> !(e instanceof AbstractBoss))) { e.hurt(damageSources().freeze(), 4); } } @@ -101,12 +101,12 @@ public void handleEntityEvent(byte pId) { public void launchArm() { arms--; - level.broadcastEntityEvent(this, (byte) (arms - 8)); + level().broadcastEntityEvent(this, (byte) (arms - 8)); } public void returnArm() { arms++; - level.broadcastEntityEvent(this, (byte) (arms - 8)); + level().broadcastEntityEvent(this, (byte) (arms - 8)); } public boolean canLaunchArm() { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LifeGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LifeGuardian.java index 4a70e004b..d528d9871 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LifeGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LifeGuardian.java @@ -74,14 +74,14 @@ protected void registerGoals() { entity.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Items.IRON_AXE)); return entity; }, EntityType.WITCH::create))); - goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "nausea")).spell(), 30)); + goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "nausea")).spell(), 30)); goalSelector.addGoal(1, new HealGoal<>(this)); } @Override public void aiStep() { super.aiStep(); - if (!level.isClientSide()) { + if (!level().isClientSide()) { minions.removeIf(Objects::isNull); Set toRemove = new HashSet<>(); for (LivingEntity e : minions) { @@ -90,7 +90,7 @@ public void aiStep() { toRemove.add(e); } if (e.isDeadOrDying() && !toRemove.contains(e)) { - hurt(damageSources().outOfWorld(), e.getMaxHealth()); + hurt(damageSources().fellOutOfWorld(), e.getMaxHealth()); toRemove.add(e); } } @@ -105,7 +105,7 @@ public boolean hurt(DamageSource pSource, float pAmount) { e.setLastHurtByMob((LivingEntity) pSource.getEntity()); } } - return pSource.is(DamageTypes.OUT_OF_WORLD) && super.hurt(pSource, pAmount); + return pSource.is(DamageTypes.FELL_OUT_OF_WORLD) && super.hurt(pSource, pAmount); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LightningGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LightningGuardian.java index 187ff42fd..2a767f419 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LightningGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/LightningGuardian.java @@ -54,7 +54,7 @@ protected void registerGoals() { super.registerGoals(); goalSelector.addGoal(1, new LightningRodGoal(this)); goalSelector.addGoal(1, new StaticGoal(this)); - Registry prefabSpells = level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); + Registry prefabSpells = level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "lightning_bolt")).spell(), 10)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "strong_lightning_bolt")).spell(), 10)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "area_lightning")).spell(), 10)); @@ -64,7 +64,7 @@ protected void registerGoals() { @Override public void aiStep() { - if (level.isClientSide()) { + if (level().isClientSide()) { // Particles } super.aiStep(); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaCreeper.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaCreeper.java index e1c92135e..5b7db9184 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaCreeper.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaCreeper.java @@ -21,8 +21,8 @@ public static AttributeSupplier.Builder createAttributes() { @Override protected void explodeCreeper() { super.explodeCreeper(); - ManaVortex entity = Objects.requireNonNull(AMEntities.MANA_VORTEX.get().create(level)); + ManaVortex entity = Objects.requireNonNull(AMEntities.MANA_VORTEX.get().create(level())); entity.moveTo(position()); - level.addFreshEntity(entity); + level().addFreshEntity(entity); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaVortex.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaVortex.java index 5a0ddf9aa..9a698355f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaVortex.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ManaVortex.java @@ -28,7 +28,7 @@ public ManaVortex(EntityType type, Level level) { @Override protected void defineSynchedData() { - entityData.define(DURATION, 50 + level.getRandom().nextInt(250)); + entityData.define(DURATION, 50 + level().getRandom().nextInt(250)); entityData.define(MANA, 0f); } @@ -60,6 +60,7 @@ public Packet getAddEntityPacket() { public void tick() { super.tick(); tickCount++; + Level level = level(); if (level.isClientSide()) return; int duration = getDuration(); if (duration - tickCount > 30) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureGuardian.java index 3197435ea..e82264c35 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureGuardian.java @@ -97,6 +97,6 @@ public boolean hasScythe() { public void setHasScythe(boolean hasScythe) { this.hasScythe = hasScythe; - level.broadcastEntityEvent(this, (byte) (hasScythe ? -9 : -8)); + level().broadcastEntityEvent(this, (byte) (hasScythe ? -9 : -8)); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureScythe.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureScythe.java index 2e435e4a7..806c684f7 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureScythe.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/NatureScythe.java @@ -98,7 +98,7 @@ public void tick() { @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity ? (LivingEntity) entity : null; } @@ -127,8 +127,8 @@ private void returnToOwner() { if (owner instanceof NatureGuardian guardian) { guardian.setHasScythe(true); } else if (owner instanceof Player player && !player.addItem(getStack())) { - ItemEntity item = new ItemEntity(level, player.getX(), player.getY(), player.getZ(), getStack()); - level.addFreshEntity(item); + ItemEntity item = new ItemEntity(level(), player.getX(), player.getY(), player.getZ(), getStack()); + level().addFreshEntity(item); } remove(RemovalReason.KILLED); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Projectile.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Projectile.java index 1b4c8d2cb..859302334 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Projectile.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Projectile.java @@ -87,6 +87,7 @@ protected void addAdditionalSaveData(CompoundTag pCompound) { public void tick() { super.tick(); HitResult result = AMUtil.getHitResult(position(), position().add(getDeltaMovement()), this, getTargetNonSolid() ? ClipContext.Block.OUTLINE : ClipContext.Block.COLLIDER, getTargetNonSolid() ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE); + Level level = level(); LivingEntity owner = getOwner(); int index = getIndex(); ISpell spell = getSpell(); @@ -189,7 +190,7 @@ public void setPierces(int pierces) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity ? (LivingEntity) entity : null; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Shockwave.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Shockwave.java index 51d56847a..a190acbfc 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Shockwave.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Shockwave.java @@ -53,6 +53,7 @@ public Packet getAddEntityPacket() { @Override public void tick() { super.tick(); + Level level = level(); if (!level.isClientSide() && tickCount > 60) { kill(); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ThrownRock.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ThrownRock.java index 90407dd56..40949099d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ThrownRock.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ThrownRock.java @@ -70,7 +70,7 @@ public void tick() { if (hit.getType() != HitResult.Type.MISS) { newPos = hit.getLocation(); } - if (hit.getType() == HitResult.Type.ENTITY && !level.isClientSide()) { + if (hit.getType() == HitResult.Type.ENTITY && !level().isClientSide()) { Entity entity = ((EntityHitResult) hit).getEntity(); if (entity instanceof LivingEntity living && entity != getOwner()) { if (!living.isBlocking()) { @@ -79,7 +79,7 @@ public void tick() { player.stopUsingItem(); if (random.nextFloat() < 0.25f) { player.getCooldowns().addCooldown(Items.SHIELD, 100); - level.broadcastEntityEvent(player, (byte) 30); + level().broadcastEntityEvent(player, (byte) 30); } } setRemoved(RemovalReason.KILLED); @@ -90,7 +90,7 @@ public void tick() { @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity ? (LivingEntity) entity : null; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wall.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wall.java index 783081e1b..adae38af3 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wall.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wall.java @@ -68,7 +68,7 @@ protected void addAdditionalSaveData(CompoundTag pCompound) { @Override public void tick() { super.tick(); - if (level.isClientSide() || tickCount % 5 != 0) return; + if (level().isClientSide() || tickCount % 5 != 0) return; LivingEntity owner = getOwner(); int index = getIndex(); float radius = getRadius(); @@ -83,7 +83,7 @@ public void tick() { double maxX = getX() + radius; double maxY = getY() + 3; double maxZ = getZ() + radius; - for (Entity e : level.getEntities(this, new AABB(minX, minY, minZ, maxX, maxY, maxZ))) { + for (Entity e : level().getEntities(this, new AABB(minX, minY, minZ, maxX, maxY, maxZ))) { if (e == this) continue; if (e instanceof PartEntity part) { e = part.getParent(); @@ -91,11 +91,11 @@ public void tick() { Vec3 closest = AMUtil.closestPointOnLine(e.position(), a, b); closest = new Vec3(closest.x, getY(), closest.z); if (tryReflect(e) && closest.distanceTo(e.position()) < 0.75 && Math.abs(getY() - e.getY()) < 2) { - ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level, new EntityHitResult(e), tickCount, index, true); + ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level(), new EntityHitResult(e), tickCount, index, true); } } if (tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } } @@ -128,8 +128,8 @@ public void setIndex(int index) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); - return entity instanceof LivingEntity ? (LivingEntity) entity : null; + Entity entity = level().getEntity(entityData.get(OWNER)); + return entity instanceof LivingEntity living ? living : null; } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WaterGuardian.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WaterGuardian.java index b38bb7215..021d91085 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WaterGuardian.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WaterGuardian.java @@ -100,7 +100,7 @@ public void travel(Vec3 pTravelVector) { @Override public void aiStep() { - if (!level.isClientSide() && isClone() && (master == null || tickCount > 400)) { + if (!level().isClientSide() && isClone() && (master == null || tickCount > 400)) { remove(RemovalReason.KILLED); } super.aiStep(); @@ -128,7 +128,7 @@ protected void registerGoals() { super.registerGoals(); goalSelector.addGoal(1, new CloneGoal(this)); goalSelector.addGoal(1, new SpinGoal<>(this)); - Registry prefabSpells = level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); + Registry prefabSpells = level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "water_bolt")).spell(), 40)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "strong_water_bolt")).spell(), 40)); goalSelector.addGoal(1, new ExecuteBossSpellGoal<>(this, prefabSpells.get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "chaos_water_bolt")).spell(), 40)); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wave.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wave.java index 55c154f3c..474174dfb 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wave.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Wave.java @@ -85,12 +85,12 @@ public void tick() { super.tick(); float speed = getSpeed(); setPos(getX() + getDeltaMovement().x() * speed / 10f, getY() + getDeltaMovement().y() * speed / 10f, getZ() + getDeltaMovement().z() * speed / 10f); - if (level.isClientSide() || tickCount % 5 != 0) return; + if (level().isClientSide() || tickCount % 5 != 0) return; LivingEntity owner = getOwner(); int index = getIndex(); float radius = getRadius(); ISpell spell = getSpell(); - forAllInRange(radius, false, e -> ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level, new EntityHitResult(e), tickCount, index, true)); + forAllInRange(radius, false, e -> ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level(), new EntityHitResult(e), tickCount, index, true)); List list = new ArrayList<>(); for (int x = (int) Math.rint(-radius); x <= (int) Math.rint(radius); x++) { for (int y = (int) Math.rint(-radius); y <= (int) Math.rint(radius); y++) { @@ -101,10 +101,10 @@ public void tick() { } for (Vec3 vec : list) { HitResult result = AMUtil.getHitResult(vec, vec.add(getDeltaMovement()), this, getTargetNonSolid() ? ClipContext.Block.OUTLINE : ClipContext.Block.COLLIDER, getTargetNonSolid() ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE); - ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level, result, tickCount, index, true); + ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level(), result, tickCount, index, true); } if (tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } } @@ -145,8 +145,8 @@ public void setIndex(int index) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); - return entity instanceof LivingEntity ? (LivingEntity) entity : null; + Entity entity = level().getEntity(entityData.get(OWNER)); + return entity instanceof LivingEntity living ? living : null; } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Whirlwind.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Whirlwind.java index 16b0d4b58..5cd430f5d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Whirlwind.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Whirlwind.java @@ -48,7 +48,7 @@ public Packet getAddEntityPacket() { @Override public void tick() { super.tick(); - if (!level.isClientSide() && tickCount > 140) { + if (!level().isClientSide() && tickCount > 140) { kill(); } cooldowns.replaceAll((k, v) -> Math.max(v - 1, 0)); @@ -58,21 +58,21 @@ public void tick() { @Override public void playerTouch(Player pPlayer) { super.playerTouch(pPlayer); - if (level.isClientSide() || pPlayer.isCreative()) return; + if (level().isClientSide() || pPlayer.isCreative()) return; Integer cd = cooldowns.get(pPlayer); if (cd == null || cd <= 0) { - if (!level.isClientSide && level.getRandom().nextInt(100) < 10) { - int slot = pPlayer.getInventory().items.size() + level.getRandom().nextInt(4); + if (!level().isClientSide && level().getRandom().nextInt(100) < 10) { + int slot = pPlayer.getInventory().items.size() + level().getRandom().nextInt(4); ItemStack stack = pPlayer.getInventory().getItem(slot).copy(); pPlayer.getInventory().setItem(slot, ItemStack.EMPTY); if (!pPlayer.getInventory().add(stack)) { - ItemEntity item = new ItemEntity(level, pPlayer.getX(), pPlayer.getY(), pPlayer.getZ(), stack); - item.setDeltaMovement(level.getRandom().nextDouble() * 0.2 - 0.1, level.getRandom().nextDouble() * 0.2 - 0.1, level.getRandom().nextDouble() * 0.2 - 0.1); - level.addFreshEntity(item); + ItemEntity item = new ItemEntity(level(), pPlayer.getX(), pPlayer.getY(), pPlayer.getZ(), stack); + item.setDeltaMovement(level().getRandom().nextDouble() * 0.2 - 0.1, level().getRandom().nextDouble() * 0.2 - 0.1, level().getRandom().nextDouble() * 0.2 - 0.1); + level().addFreshEntity(item); } } pPlayer.hurt(AMDamageSources.wind(this), 6); - pPlayer.setDeltaMovement(getDeltaMovement().x() + level.getRandom().nextFloat() * 0.2f, getDeltaMovement().y() + 0.8, getDeltaMovement().z() + level.getRandom().nextFloat() * 0.2f); + pPlayer.setDeltaMovement(getDeltaMovement().x() + level().getRandom().nextFloat() * 0.2f, getDeltaMovement().y() + 0.8, getDeltaMovement().z() + level().getRandom().nextFloat() * 0.2f); pPlayer.fallDistance = 0f; cooldowns.put(pPlayer, 20); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WintersGrasp.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WintersGrasp.java index 74e3cf170..dbf79cde3 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WintersGrasp.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/WintersGrasp.java @@ -100,7 +100,7 @@ public void tick() { @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); + Entity entity = level().getEntity(entityData.get(OWNER)); return entity instanceof LivingEntity ? (LivingEntity) entity : null; } @@ -130,8 +130,8 @@ private void returnToOwner() { if (owner instanceof IceGuardian guardian) { guardian.returnArm(); } else if (owner instanceof Player player && !player.addItem(getStack())) { - ItemEntity item = new ItemEntity(level, player.getX(), player.getY(), player.getZ(), getStack()); - level.addFreshEntity(item); + ItemEntity item = new ItemEntity(level(), player.getX(), player.getY(), player.getZ(), getStack()); + level().addFreshEntity(item); } remove(RemovalReason.KILLED); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Zone.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Zone.java index 69edaa9e8..49ef621a4 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Zone.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/Zone.java @@ -82,12 +82,12 @@ protected void addAdditionalSaveData(CompoundTag pCompound) { public void tick() { super.tick(); setPos(getX(), getY() - getGravity(), getZ()); - if (level.isClientSide() || tickCount % 5 != 0) return; + if (level().isClientSide() || tickCount % 5 != 0) return; LivingEntity owner = getOwner(); int index = getIndex(); float radius = getRadius(); ISpell spell = getSpell(); - forAllInRange(radius, false, e -> ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level, new EntityHitResult(e), tickCount, index, true)); + forAllInRange(radius, false, e -> ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level(), new EntityHitResult(e), tickCount, index, true)); List list = new ArrayList<>(); for (int x = (int) Math.rint(-radius); x <= (int) Math.rint(radius); x++) { for (int y = (int) Math.rint(-getBbHeight()); y <= (int) Math.rint(getBbHeight()); y++) { @@ -98,10 +98,10 @@ public void tick() { } for (Vec3 vec : list) { HitResult result = AMUtil.getHitResult(vec, vec.add(getDeltaMovement()), this, getTargetNonSolid() ? ClipContext.Block.OUTLINE : ClipContext.Block.COLLIDER, getTargetNonSolid() ? ClipContext.Fluid.ANY : ClipContext.Fluid.NONE); - ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level, result, tickCount, index, true); + ArsMagicaAPI.get().getSpellHelper().invoke(spell, owner, level(), result, tickCount, index, true); } if (tickCount > 0) { - ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level, blockPosition(), 128); + ArsMagicaLegacy.NETWORK_HANDLER.sendToAllAround(new SpawnAMParticlesPacket(this), level(), blockPosition(), 128); } } @@ -142,8 +142,8 @@ public void setIndex(int index) { @Override @Nullable public LivingEntity getOwner() { - Entity entity = level.getEntity(entityData.get(OWNER)); - return entity instanceof LivingEntity ? (LivingEntity) entity : null; + Entity entity = level().getEntity(entityData.get(OWNER)); + return entity instanceof LivingEntity living ? living : null; } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/AbstractBossGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/AbstractBossGoal.java index 671b57cdb..88d5feaba 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/AbstractBossGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/AbstractBossGoal.java @@ -37,7 +37,7 @@ public boolean requiresUpdateEveryTick() { @Override public boolean canUse() { - return boss.getAction() == AbstractBoss.Action.IDLE && boss.getTarget() != null && !boss.getTarget().isDeadOrDying() && boss.canAttack(boss.getTarget()) && boss.getLevel().getRandom().nextBoolean(); + return boss.getAction() == AbstractBoss.Action.IDLE && boss.getTarget() != null && !boss.getTarget().isDeadOrDying() && boss.canAttack(boss.getTarget()) && boss.level().getRandom().nextBoolean(); } @Override @@ -72,7 +72,7 @@ public void tick() { if (ticks == duration) { SoundEvent sound = getAttackSound(); if (sound != null) { - boss.getLevel().playSound(null, boss, sound, SoundSource.HOSTILE, 1f, 0.5f + boss.getLevel().getRandom().nextFloat()); + boss.level().playSound(null, boss, sound, SoundSource.HOSTILE, 1f, 0.5f + boss.level().getRandom().nextFloat()); } perform(); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/CloneGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/CloneGoal.java index 749d89888..038890090 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/CloneGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/CloneGoal.java @@ -20,10 +20,10 @@ public void perform() { } private WaterGuardian spawnClone() { - WaterGuardian clone = new WaterGuardian(AMEntities.WATER_GUARDIAN.get(), boss.getLevel()); + WaterGuardian clone = new WaterGuardian(AMEntities.WATER_GUARDIAN.get(), boss.level()); clone.setMaster(boss); clone.setPos(boss.getX(), boss.getY(), boss.getZ()); - boss.getLevel().addFreshEntity(clone); + boss.level().addFreshEntity(clone); return clone; } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/DispelGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/DispelGoal.java index 875edccf0..8876698f9 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/DispelGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/DispelGoal.java @@ -8,7 +8,7 @@ public class DispelGoal extends ExecuteSpellGoal { public DispelGoal(T caster) { - super(caster, caster.level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "dispel")).spell(), 0); + super(caster, caster.level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "dispel")).spell(), 0); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/EnderTorrentGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/EnderTorrentGoal.java index 7d56af932..647ae65b3 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/EnderTorrentGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/EnderTorrentGoal.java @@ -10,7 +10,7 @@ public class EnderTorrentGoal extends ExecuteBossSpellGoal { public EnderTorrentGoal(EnderGuardian caster) { - super(caster, caster.level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "ender_bolt")).spell(), 10); + super(caster, caster.level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "ender_bolt")).spell(), 10); } @Override @@ -19,9 +19,9 @@ public void tick() { if (caster.getTarget() != null) { caster.getLookControl().setLookAt(caster.getTarget(), 30, 30); if (caster.getTicksInAction() % 2 == 0) { - ArsMagicaAPI.get().getSpellHelper().invoke(spell, caster, caster.getLevel(), new EntityHitResult(caster), caster.getTicksInAction(), 0, false); + ArsMagicaAPI.get().getSpellHelper().invoke(spell, caster, caster.level(), new EntityHitResult(caster), caster.getTicksInAction(), 0, false); } else if (caster.getTicksInAction() == 10) { - caster.getLevel().playSound(null, caster, AMSounds.ENDER_GUARDIAN_ATTACK.get(), SoundSource.HOSTILE, 1.0f, (float) (0.5 + caster.getRandom().nextDouble() * 0.5f)); + caster.level().playSound(null, caster, AMSounds.ENDER_GUARDIAN_ATTACK.get(), SoundSource.HOSTILE, 1.0f, (float) (0.5 + caster.getRandom().nextDouble() * 0.5f)); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteRandomSpellGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteRandomSpellGoal.java index d9580e841..df504d714 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteRandomSpellGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteRandomSpellGoal.java @@ -17,6 +17,6 @@ public ExecuteRandomSpellGoal(T caster, List spells, int duration) { @Override @Nullable protected ISpell getSpell(T caster) { - return spells.get(caster.getLevel().getRandom().nextInt(spells.size())); + return spells.get(caster.level().getRandom().nextInt(spells.size())); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteSpellGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteSpellGoal.java index 70afa13f8..5e1ff5eba 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteSpellGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ExecuteSpellGoal.java @@ -66,9 +66,9 @@ public void tick() { if (ticks >= duration) { SoundEvent sound = getAttackSound(); if (sound != null) { - caster.getLevel().playSound(null, caster, sound, SoundSource.HOSTILE, 1f, 0.5f + caster.getLevel().getRandom().nextFloat()); + caster.level().playSound(null, caster, sound, SoundSource.HOSTILE, 1f, 0.5f + caster.level().getRandom().nextFloat()); } - Objects.requireNonNull(getSpell(caster)).cast(caster, caster.getLevel(), 0, false, false); + Objects.requireNonNull(getSpell(caster)).cast(caster, caster.level(), 0, false, false); ticks = 0; stop(); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/FireRainGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/FireRainGoal.java index 1d2186036..3a73ccd3d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/FireRainGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/FireRainGoal.java @@ -14,14 +14,14 @@ public FireRainGoal(FireGuardian boss) { @Override public void perform() { - if (!boss.getLevel().isClientSide()) { - FireRain fireRain = Objects.requireNonNull(AMEntities.FIRE_RAIN.get().create(boss.getLevel())); + if (!boss.level().isClientSide()) { + FireRain fireRain = Objects.requireNonNull(AMEntities.FIRE_RAIN.get().create(boss.level())); fireRain.setPos((boss.getTarget() != null ? boss.getTarget().position() : boss.position()).add(0, 1.5, 0)); fireRain.setDuration(200); fireRain.setOwner(boss); fireRain.setDamage(2); fireRain.setRadius(2); - boss.getLevel().addFreshEntity(fireRain); + boss.level().addFreshEntity(fireRain); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HealGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HealGoal.java index ba29aff8e..f59df28d0 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HealGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HealGoal.java @@ -10,7 +10,7 @@ public class HealGoal extends ExecuteBossSpellGoal { public HealGoal(T caster) { - super(caster, caster.level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "heal_self")).spell(), 20); + super(caster, caster.level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "heal_self")).spell(), 20); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HurricaneGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HurricaneGoal.java index bd7505d41..a55528f7f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HurricaneGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/HurricaneGoal.java @@ -22,7 +22,7 @@ public boolean canUse() { @Override public void tick() { - Level level = boss.getLevel(); + Level level = boss.level(); if (!level.isClientSide()) { for (int x = -1; x <= 1; x++) { for (int z = -1; z <= 1; z++) { @@ -40,7 +40,7 @@ public void tick() { @Override public void perform() { - Level level = boss.getLevel(); + Level level = boss.level(); for (Entity e : level.getEntitiesOfClass(Entity.class, boss.getBoundingBox().inflate(6, 3, 6), e -> !(e instanceof AbstractBoss))) { if (!level.isClientSide() && e instanceof Whirlwind) { e.remove(Entity.RemovalReason.KILLED); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/LightningRodGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/LightningRodGoal.java index a34a6bebe..1842a75ab 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/LightningRodGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/LightningRodGoal.java @@ -7,6 +7,7 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; public class LightningRodGoal extends AbstractBossGoal { @@ -44,24 +45,25 @@ public void tick() { super.tick(); LivingEntity target = boss.getTarget(); if (target == null) return; - if (!boss.getLevel().isClientSide() && ticks % 20 == 0) { - boss.getLevel().playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_LIGHTNING_ROD.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); + Level level = boss.level(); + if (!level.isClientSide() && ticks % 20 == 0) { + level.playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_LIGHTNING_ROD.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); } if (ticks <= 10) { startPos = new Vec3((float) target.getX(), (float) target.getY(), (float) target.getZ()); } else if (ticks <= 40) { target.moveTo(startPos.x(), startPos.y() + (ticks - 10) * 0.2, startPos.z()); target.fallDistance = 0; - if (!boss.getLevel().isClientSide() && ticks == 30) { - boss.getLevel().playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_LIGHTNING_ROD.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); + if (!level.isClientSide() && ticks == 30) { + level.playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_LIGHTNING_ROD.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); } } else if (ticks <= 80) { target.moveTo(startPos.x(), startPos.y() + 6, startPos.z()); if (ticks > 50) { target.hurt(target.damageSources().lightningBolt(), 20); } - if (!boss.getLevel().isClientSide() && ticks % 20 == 0) { - boss.getLevel().playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_AMBIENT.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); + if (!level.isClientSide() && ticks % 20 == 0) { + level.playSound(null, boss, AMSounds.LIGHTNING_GUARDIAN_AMBIENT.get(), SoundSource.HOSTILE, 1.0f, boss.getRandom().nextFloat() * 0.5f + 0.5f); } } else if (ticks <= 90 && !hasThrown) { hasThrown = true; @@ -69,9 +71,9 @@ public void tick() { target.fallDistance = 8; } else if (ticks <= 100 && !hasBolted) { hasBolted = true; - LightningBolt bolt = new LightningBolt(EntityType.LIGHTNING_BOLT, boss.getLevel()); + LightningBolt bolt = new LightningBolt(EntityType.LIGHTNING_BOLT, level); bolt.setPos(target.getX(), target.getY(), target.getZ()); - boss.getLevel().addFreshEntity(bolt); + level.addFreshEntity(bolt); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/OtherworldlyRoarGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/OtherworldlyRoarGoal.java index 758f1581e..cb021c4e2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/OtherworldlyRoarGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/OtherworldlyRoarGoal.java @@ -9,7 +9,7 @@ public class OtherworldlyRoarGoal extends ExecuteBossSpellGoal { public OtherworldlyRoarGoal(EnderGuardian caster) { - super(caster, caster.level.registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "otherworldly_roar")).spell(), 10); + super(caster, caster.level().registryAccess().registryOrThrow(PrefabSpell.REGISTRY_KEY).get(new ResourceLocation(ArsMagicaAPI.MOD_ID, "otherworldly_roar")).spell(), 10); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SmashGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SmashGoal.java index 344e33f60..0604e28af 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SmashGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SmashGoal.java @@ -4,6 +4,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.Shockwave; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMEntities; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import java.util.Objects; @@ -20,16 +21,17 @@ public boolean canUse() { @Override public void perform() { - for (LivingEntity e : boss.getLevel().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(4, 2, 4), e -> !(e instanceof AbstractBoss))) { + Level level = boss.level(); + for (LivingEntity e : level.getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(4, 2, 4), e -> !(e instanceof AbstractBoss))) { e.hurt(boss.damageSources().mobAttack(boss), 4); } - if (!boss.getLevel().isClientSide()) { + if (!level.isClientSide()) { for (int i = -20; i <= 20; i++) { - Shockwave entity = Objects.requireNonNull(AMEntities.SHOCKWAVE.get().create(boss.getLevel())); + Shockwave entity = Objects.requireNonNull(AMEntities.SHOCKWAVE.get().create(level)); Vec3 movement = boss.getLookAngle().yRot((float) (Math.PI / 180 * i)); entity.setDeltaMovement(movement.x(), 0, movement.z()); entity.setPos(boss.getX() + movement.x(), boss.getY(), boss.getZ() + movement.z()); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SpinGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SpinGoal.java index ba837f88c..34ab2e93c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SpinGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SpinGoal.java @@ -15,7 +15,7 @@ public boolean canUse() { @Override public void performTick() { - for (LivingEntity e : boss.getLevel().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(2, 2, 2), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : boss.level().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(2, 2, 2), e -> !(e instanceof AbstractBoss))) { e.hurt(boss.damageSources().mobAttack(boss), 4); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StaticGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StaticGoal.java index 3441d1e6b..d86822a0b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StaticGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StaticGoal.java @@ -18,7 +18,7 @@ protected SoundEvent getAttackSound() { @Override public void perform() { - for (LivingEntity e : boss.getLevel().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(8, 3, 8), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : boss.level().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().inflate(8, 3, 8), e -> !(e instanceof AbstractBoss))) { e.hurt(boss.damageSources().lightningBolt(), 20); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StrikeGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StrikeGoal.java index 6b92a228b..9874609dc 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StrikeGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/StrikeGoal.java @@ -15,7 +15,7 @@ public boolean canUse() { @Override public void perform() { - for (LivingEntity e : boss.getLevel().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().expandTowards(Math.cos(boss.getYRot()) * 2, 0, Math.sin(boss.getYRot()) * 2).inflate(2.5, 2, 2.5), e -> !(e instanceof AbstractBoss))) { + for (LivingEntity e : boss.level().getEntitiesOfClass(LivingEntity.class, boss.getBoundingBox().expandTowards(Math.cos(boss.getYRot()) * 2, 0, Math.sin(boss.getYRot()) * 2).inflate(2.5, 2, 2.5), e -> !(e instanceof AbstractBoss))) { e.hurt(boss.damageSources().mobAttack(boss), 6); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SummonAlliesGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SummonAlliesGoal.java index 19069ea6d..cad0493ca 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SummonAlliesGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/SummonAlliesGoal.java @@ -29,20 +29,21 @@ public SummonAlliesGoal(LifeGuardian boss, List> @Override public void perform() { if (boss.minions.size() > 1) return; + Level level = boss.level(); for (int i = 0; i < 3; i++) { - Mob entity = list.get(boss.getLevel().getRandom().nextInt(list.size())).apply(boss.getLevel()); + Mob entity = list.get(level.getRandom().nextInt(list.size())).apply(level); if (entity == null) continue; - BlockPos pos = BlockPos.containing(boss.getX() + boss.getLevel().getRandom().nextDouble() * 4 - 2, boss.getY() + boss.getLevel().getRandom().nextDouble() * 4 - 2, boss.getZ() + boss.getLevel().getRandom().nextDouble() * 4 - 2); - for (int j = 0; j <= 100 && !boss.getLevel().getBlockState(pos).isValidSpawn(boss.getLevel(), pos, entity.getType()); j++) { - pos = BlockPos.containing(boss.getX() + boss.getLevel().getRandom().nextDouble() * 4 - 2, boss.getY() + boss.getLevel().getRandom().nextDouble() * 4 - 2, boss.getZ() + boss.getLevel().getRandom().nextDouble() * 4 - 2); + BlockPos pos = BlockPos.containing(boss.getX() + level.getRandom().nextDouble() * 4 - 2, boss.getY() + level.getRandom().nextDouble() * 4 - 2, boss.getZ() + level.getRandom().nextDouble() * 4 - 2); + for (int j = 0; j <= 100 && !level.getBlockState(pos).isValidSpawn(level, pos, entity.getType()); j++) { + pos = BlockPos.containing(boss.getX() + level.getRandom().nextDouble() * 4 - 2, boss.getY() + level.getRandom().nextDouble() * 4 - 2, boss.getZ() + level.getRandom().nextDouble() * 4 - 2); } - entity.moveTo(boss.getX() + boss.getLevel().getRandom().nextDouble() * 2 - 1, boss.getY(), boss.getZ() + boss.getLevel().getRandom().nextDouble() * 2 - 1); + entity.moveTo(boss.getX() + level.getRandom().nextDouble() * 2 - 1, boss.getY(), boss.getZ() + level.getRandom().nextDouble() * 2 - 1); int amplifier = (int) Math.abs(2 * boss.getHealth() / boss.getMaxHealth() - 2); entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 10000, amplifier)); entity.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, 10000, amplifier)); entity.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 10000, amplifier)); entity.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 10000, amplifier)); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); boss.minions.add(entity); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowArmGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowArmGoal.java index b04d74eff..d2cac7e1d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowArmGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowArmGoal.java @@ -6,6 +6,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMEntities; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMSounds; import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.level.Level; import java.util.Objects; @@ -26,14 +27,15 @@ protected SoundEvent getAttackSound() { @Override public void perform() { - if (!boss.getLevel().isClientSide()) { - WintersGrasp entity = Objects.requireNonNull(AMEntities.WINTERS_GRASP.get().create(boss.getLevel())); + Level level = boss.level(); + if (!level.isClientSide()) { + WintersGrasp entity = Objects.requireNonNull(AMEntities.WINTERS_GRASP.get().create(level)); entity.moveTo(boss.position().add(0, 1, 0).add(boss.getLookAngle())); entity.setDeltaMovement(boss.getLookAngle()); entity.setXRot(boss.getXRot()); entity.setYRot(boss.getYRot()); entity.setOwner(boss); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); boss.launchArm(); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowRockGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowRockGoal.java index d8981abf5..389a696b0 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowRockGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowRockGoal.java @@ -4,6 +4,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.EarthGuardian; import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.ThrownRock; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMEntities; +import net.minecraft.world.level.Level; import java.util.Objects; @@ -20,17 +21,18 @@ public boolean canUse() { @Override public void performTick() { super.performTick(); - boss.getLevel().broadcastEntityEvent(boss, ticks > 2 && ticks < 16 ? (byte) -8 : (byte) -9); + boss.level().broadcastEntityEvent(boss, ticks > 2 && ticks < 16 ? (byte) -8 : (byte) -9); } @Override public void perform() { - if (!boss.getLevel().isClientSide()) { - ThrownRock entity = Objects.requireNonNull(AMEntities.THROWN_ROCK.get().create(boss.getLevel())); + Level level = boss.level(); + if (!level.isClientSide()) { + ThrownRock entity = Objects.requireNonNull(AMEntities.THROWN_ROCK.get().create(level)); entity.moveTo(boss.getEyePosition().add(boss.getLookAngle())); entity.setDeltaMovement(boss.getLookAngle()); entity.setOwner(boss); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowScytheGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowScytheGoal.java index b4e0e8aec..0688c32c1 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowScytheGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/ThrowScytheGoal.java @@ -4,6 +4,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.NatureGuardian; import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.NatureScythe; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMEntities; +import net.minecraft.world.level.Level; import java.util.Objects; @@ -19,14 +20,15 @@ public boolean canUse() { @Override public void perform() { - if (!boss.getLevel().isClientSide()) { - NatureScythe entity = Objects.requireNonNull(AMEntities.NATURE_SCYTHE.get().create(boss.getLevel())); + Level level = boss.level(); + if (!level.isClientSide()) { + NatureScythe entity = Objects.requireNonNull(AMEntities.NATURE_SCYTHE.get().create(level)); entity.moveTo(boss.position().add(0, 3, 0).add(boss.getLookAngle())); entity.setDeltaMovement(boss.getLookAngle()); entity.setXRot(boss.getXRot()); entity.setYRot(boss.getYRot()); entity.setOwner(boss); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); boss.setHasScythe(false); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/WhirlwindGoal.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/WhirlwindGoal.java index db3191cf1..bd70e0f5f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/WhirlwindGoal.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/entity/ai/WhirlwindGoal.java @@ -4,6 +4,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.AirGuardian; import com.github.minecraftschurlimods.arsmagicalegacy.common.entity.Whirlwind; import com.github.minecraftschurlimods.arsmagicalegacy.common.init.AMEntities; +import net.minecraft.world.level.Level; import java.util.Objects; @@ -19,11 +20,12 @@ public boolean canUse() { @Override public void perform() { - if (!boss.getLevel().isClientSide()) { - Whirlwind entity = Objects.requireNonNull(AMEntities.WHIRLWIND.get().create(boss.getLevel())); + Level level = boss.level(); + if (!level.isClientSide()) { + Whirlwind entity = Objects.requireNonNull(AMEntities.WHIRLWIND.get().create(level)); entity.moveTo(boss.getX(), boss.getY() + boss.getEyeHeight(), boss.getZ()); entity.setDeltaMovement(boss.getLookAngle()); - boss.getLevel().addFreshEntity(entity); + level.addFreshEntity(entity); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/AbilityHandler.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/AbilityHandler.java index ba6f8bd3e..02f0a1c60 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/AbilityHandler.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/AbilityHandler.java @@ -51,7 +51,7 @@ private static void livingDeath(LivingDeathEvent event) { var api = ArsMagicaAPI.get(); if (!api.getMagicHelper().knowsMagic(player)) return; var helper = api.getAffinityHelper(); - Ability ability = player.getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.NAUSEA); + Ability ability = player.level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.NAUSEA); if (ability != null && ability.test(player)) { player.addEffect(new MobEffectInstance(MobEffects.CONFUSION, (int) (600 * helper.getAffinityDepthOrElse(player, ability.affinity(), 0)))); } @@ -62,7 +62,7 @@ private static void livingHurt(LivingHurtEvent event) { LivingEntity entity = event.getEntity(); var api = ArsMagicaAPI.get(); var helper = api.getAffinityHelper(); - var abilityRegistry = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); + var abilityRegistry = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); if (event.getSource().getEntity() instanceof Player player) { Ability ability = abilityRegistry.get(AMAbilities.FIRE_PUNCH); if (ability != null && ability.test(player) && !entity.fireImmune()) { @@ -108,7 +108,7 @@ private static void livingJump(LivingEvent.LivingJumpEvent event) { if (entity instanceof Player player) { var api = ArsMagicaAPI.get(); if (!api.getMagicHelper().knowsMagic(player)) return; - var abilityRegistry = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); + var abilityRegistry = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); var helper = api.getAffinityHelper(); Ability ability = abilityRegistry.get(AMAbilities.JUMP_BOOST); if (ability != null && ability.test(player)) { @@ -123,7 +123,7 @@ private static void livingFall(LivingFallEvent event) { if (entity instanceof Player player) { var api = ArsMagicaAPI.get(); if (!api.getMagicHelper().knowsMagic(player)) return; - var abilityRegistry = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); + var abilityRegistry = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); var helper = api.getAffinityHelper(); Ability ability = abilityRegistry.get(AMAbilities.FEATHER_FALLING); if (ability != null && ability.test(player)) { @@ -140,14 +140,14 @@ private static void enderManAnger(EnderManAngerEvent event) { Player player = event.getPlayer(); var api = ArsMagicaAPI.get(); if (!api.getMagicHelper().knowsMagic(player)) return; - Ability ability = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.ENDERMAN_PUMPKIN); + Ability ability = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.ENDERMAN_PUMPKIN); if (ability != null && ability.test(player)) { event.setCanceled(true); } } private static void potionApplicable(MobEffectEvent.Applicable event) { - Ability ability = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.POISON_RESISTANCE); + Ability ability = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.POISON_RESISTANCE); if (ability != null && event.getEntity() instanceof Player player && event.getEffectInstance().getEffect() == MobEffects.POISON && ability.test(player)) { event.setResult(Event.Result.DENY); } @@ -157,7 +157,7 @@ private static void manaCostPre(SpellEvent.ManaCost.Pre event) { LivingEntity caster = event.getEntity(); if (caster instanceof Player player) { var api = ArsMagicaAPI.get(); - Ability ability = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.MANA_REDUCTION); + Ability ability = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.MANA_REDUCTION); if (ability != null && ability.test(player)) { event.setBase(event.getBase() * (float) (1 - (api.getAffinityHelper().getAffinityDepthOrElse(player, ability.affinity(), 0)) * 0.5f)); } @@ -167,7 +167,7 @@ private static void manaCostPre(SpellEvent.ManaCost.Pre event) { @SuppressWarnings("DataFlowIssue") private static void affinityChangingPost(AffinityChangingEvent.Post event) { var api = ArsMagicaAPI.get(); - var abilityRegistry = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); + var abilityRegistry = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); var helper = api.getAffinityHelper(); Affinity affinity = event.affinity; Player player = event.getEntity(); @@ -221,8 +221,8 @@ private static void affinityChangingPost(AffinityChangingEvent.Post event) { private static void spellCastPost(SpellEvent.Cast.Post event) { if (event.getEntity() instanceof Player player) { - Ability ability = event.getEntity().getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.CLARITY); - if (ability != null && ability.test(player) && player.getLevel().getRandom().nextBoolean()) { + Ability ability = event.getEntity().level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY).get(AMAbilities.CLARITY); + if (ability != null && ability.test(player) && player.level().getRandom().nextBoolean()) { player.addEffect(new MobEffectInstance(AMMobEffects.CLARITY.get(), 1200)); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EffectHandler.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EffectHandler.java index 00a3d6898..846f00146 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EffectHandler.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EffectHandler.java @@ -70,7 +70,7 @@ private static void livingFall(LivingFallEvent event) { private static void livingHurt(LivingHurtEvent event) { LivingEntity entity = event.getEntity(); - if (!event.getSource().is(DamageTypes.OUT_OF_WORLD) && entity.hasEffect(AMMobEffects.MAGIC_SHIELD.get())) { + if (!event.getSource().is(DamageTypes.FELL_OUT_OF_WORLD) && entity.hasEffect(AMMobEffects.MAGIC_SHIELD.get())) { event.setAmount(event.getAmount() / (float) Objects.requireNonNull(entity.getEffect(AMMobEffects.MAGIC_SHIELD.get())).getAmplifier()); } if (event.getSource().getEntity() instanceof LivingEntity living && living.getAttributes().hasAttribute(AMAttributes.SCALE.get())) { @@ -105,19 +105,19 @@ private static void chorusFruitTeleport(EntityTeleportEvent.ChorusFruit event) { } private static void potionAdded(MobEffectEvent.Added event) { - if (!event.getEntity().level.isClientSide() && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { + if (!event.getEntity().level().isClientSide() && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { effect.startEffect(event.getEntity(), event.getEffectInstance()); } } private static void potionExpiry(MobEffectEvent.Expired event) { - if (!event.getEntity().level.isClientSide() && !(event.getEffectInstance() == null) && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { + if (!event.getEntity().level().isClientSide() && !(event.getEffectInstance() == null) && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { effect.stopEffect(event.getEntity(), event.getEffectInstance()); } } private static void potionRemove(MobEffectEvent.Remove event) { - if (!event.getEntity().level.isClientSide() && !(event.getEffectInstance() == null) && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { + if (!event.getEntity().level().isClientSide() && !(event.getEffectInstance() == null) && event.getEffectInstance().getEffect() instanceof AMMobEffect effect) { effect.stopEffect(event.getEntity(), event.getEffectInstance()); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EventHandler.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EventHandler.java index 728e69e98..7374c72c1 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EventHandler.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/EventHandler.java @@ -56,6 +56,7 @@ import com.github.minecraftschurlimods.arsmagicalegacy.network.OpenSpellRecipeGuiInLecternPacket; import com.github.minecraftschurlimods.codeclib.CodecCapabilityProvider; import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundSource; @@ -89,7 +90,6 @@ import net.minecraftforge.common.crafting.PartialNBTIngredient; import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.event.AttachCapabilitiesEvent; -import net.minecraftforge.event.CreativeModeTabEvent; import net.minecraftforge.event.entity.EntityAttributeCreationEvent; import net.minecraftforge.event.entity.EntityAttributeModificationEvent; import net.minecraftforge.event.entity.EntityJoinLevelEvent; @@ -103,6 +103,7 @@ import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.registries.RegisterEvent; import net.minecraftforge.registries.RegistryObject; import org.jetbrains.annotations.ApiStatus.Internal; @@ -158,47 +159,56 @@ private static void setup(FMLCommonSetupEvent event) { CompatManager.init(event); } - private static void registerCreativeTabs(CreativeModeTabEvent.Register event) { - event.registerCreativeModeTab(ArsMagicaAPI.MAIN_CREATIVE_TAB, List.of(), List.of(CreativeModeTabs.SPAWN_EGGS), EventHandler::buildMainCreativeTab); - event.registerCreativeModeTab(ArsMagicaAPI.PREFAB_SPELLS_CREATIVE_TAB, List.of(), List.of(ArsMagicaAPI.MAIN_CREATIVE_TAB), EventHandler::buildPrefabSpellsCreativeTab); + private static void registerCreativeTabs(RegisterEvent event) { + if (!event.getRegistryKey().equals(Registries.CREATIVE_MODE_TAB)) return; + event.register(Registries.CREATIVE_MODE_TAB, ArsMagicaAPI.MAIN_CREATIVE_TAB, EventHandler::buildMainCreativeTab); + event.register(Registries.CREATIVE_MODE_TAB, ArsMagicaAPI.PREFAB_SPELLS_CREATIVE_TAB, EventHandler::buildPrefabSpellsCreativeTab); } - private static void buildMainCreativeTab(CreativeModeTab.Builder builder) { - builder.icon(() -> ArsMagicaAPI.get().getBookStack()) - .title(Component.translatable(TranslationConstants.MAIN_CREATIVE_TAB)) - .displayItems((params, output) -> { - List list = new ArrayList<>(); - var api = ArsMagicaAPI.get(); - for (RegistryObject o : AMRegistries.ITEMS.getEntries()) { - if (!o.isPresent()) continue; - Item item = o.get(); - if (item instanceof ISkillPointItem skillPointItem) { - for (SkillPoint point : api.getSkillPointRegistry().getValues()) { - if (point != AMSkillPoints.NONE.get()) { + private static CreativeModeTab buildMainCreativeTab() { + return CreativeModeTab + .builder() + .withTabsBefore(CreativeModeTabs.SPAWN_EGGS, CreativeModeTabs.OP_BLOCKS) + .withTabsAfter(ArsMagicaAPI.PREFAB_SPELLS_CREATIVE_TAB) + .icon(() -> ArsMagicaAPI.get().getBookStack()) + .title(Component.translatable(TranslationConstants.MAIN_CREATIVE_TAB)) + .displayItems((params, output) -> { + List list = new ArrayList<>(); + var api = ArsMagicaAPI.get(); + for (RegistryObject o : AMRegistries.ITEMS.getEntries()) { + if (!o.isPresent()) continue; + Item item = o.get(); + if (item instanceof ISkillPointItem skillPointItem) { + for (SkillPoint point : api.getSkillPointRegistry().getValues()) { + if (point != AMSkillPoints.NONE.get()) { list.add(skillPointItem.setSkillPoint(new ItemStack(item), point)); } - } - continue; - } - if (item instanceof IAffinityItem affinityItem) { - for (Affinity affinity : api.getAffinityRegistry()) { - if (Affinity.NONE.equals(affinity.getId())) continue; - list.add(affinityItem.setAffinity(new ItemStack(item), affinity)); - } - continue; - } - if (!AMItems.HIDDEN_ITEMS.contains(o)) { - list.add(new ItemStack(item)); - } - } + } + continue; + } + if (item instanceof IAffinityItem affinityItem) { + for (Affinity affinity : api.getAffinityRegistry()) { + if (Affinity.NONE.equals(affinity.getId())) continue; + list.add(affinityItem.setAffinity(new ItemStack(item), affinity)); + } + continue; + } + if (!AMItems.HIDDEN_ITEMS.contains(o)) { + list.add(new ItemStack(item)); + } + } output.acceptAll(list); - }); + }).build(); } - private static void buildPrefabSpellsCreativeTab(CreativeModeTab.Builder builder) { - builder.icon(() -> AMItems.SPELL_PARCHMENT.map(ItemStack::new).orElse(ItemStack.EMPTY)) - .title(Component.translatable(TranslationConstants.PREFAB_SPELL_CREATIVE_TAB)) - .displayItems((params, output) -> AMUtil.getRegistry(PrefabSpell.REGISTRY_KEY).stream().map(PrefabSpell::makeSpell).forEach(output::accept)); + private static CreativeModeTab buildPrefabSpellsCreativeTab() { + return CreativeModeTab + .builder() + .withTabsBefore(ArsMagicaAPI.MAIN_CREATIVE_TAB) + .icon(() -> AMItems.SPELL_PARCHMENT.map(ItemStack::new).orElse(ItemStack.EMPTY)) + .title(Component.translatable(TranslationConstants.PREFAB_SPELL_CREATIVE_TAB)) + .displayItems((params, output) -> AMUtil.getRegistry(PrefabSpell.REGISTRY_KEY).stream().map(PrefabSpell::makeSpell).forEach(output::accept)) + .build(); } private static void registerSpawnPlacements(SpawnPlacementRegisterEvent evt) { @@ -409,7 +419,7 @@ private static void playerLevelUp(PlayerLevelUpEvent event) { if (minEarnLevel < 0 || levelsForPoint < 0) continue; if (level >= minEarnLevel && (level - minEarnLevel) % levelsForPoint == 0) { api.getSkillHelper().addSkillPoint(player, skillPoint); - event.getEntity().getLevel().playSound(null, event.getEntity().getX(), event.getEntity().getY(), event.getEntity().getZ(), AMSounds.GET_KNOWLEDGE_POINT.get(), SoundSource.PLAYERS, 1f, 1f); + event.getEntity().level().playSound(null, event.getEntity().getX(), event.getEntity().getY(), event.getEntity().getZ(), AMSounds.GET_KNOWLEDGE_POINT.get(), SoundSource.PLAYERS, 1f, 1f); } } float newMaxMana = Config.SERVER.MANA_BASE.get().floatValue() + Config.SERVER.MANA_MULTIPLIER.get().floatValue() * (level - 1); @@ -434,6 +444,6 @@ private static void playerLevelUp(PlayerLevelUpEvent event) { if (burnoutRegenAttr != null) { burnoutRegenAttr.setBaseValue(newMaxMana * Config.SERVER.BURNOUT_REGEN_MULTIPLIER.get() ); } - event.getEntity().getLevel().playSound(null, event.getEntity().getX(), event.getEntity().getY(), event.getEntity().getZ(), AMSounds.MAGIC_LEVEL_UP.get(), SoundSource.PLAYERS, 1f, 1f); + event.getEntity().level().playSound(null, event.getEntity().getX(), event.getEntity().getY(), event.getEntity().getZ(), AMSounds.MAGIC_LEVEL_UP.get(), SoundSource.PLAYERS, 1f, 1f); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/TickHandler.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/TickHandler.java index dc785e18f..28c1dcfb8 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/TickHandler.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/handler/TickHandler.java @@ -104,7 +104,7 @@ private static void manaAndBurnoutRegen(final Player player) { private static void handleAbilities(final Player player) { if (player.isDeadOrDying()) return; var api = ArsMagicaAPI.get(); - var manager = player.getLevel().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); + var manager = player.level().registryAccess().registryOrThrow(Ability.REGISTRY_KEY); var helper = api.getAffinityHelper(); try { if (!(boolean) CAP_PROVIDER_VALID.get(player)) return; @@ -113,21 +113,22 @@ private static void handleAbilities(final Player player) { } Ability ability; if (!player.isCreative()) { + // todo use custom damage types ability = manager.get(AMAbilities.WATER_DAMAGE_FIRE); if (ability != null && ability.test(player) && player.isInWater() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { - player.hurt(player.damageSources().outOfWorld(), 1); + player.hurt(player.damageSources().fellOutOfWorld(), 1); } ability = manager.get(AMAbilities.WATER_DAMAGE_LIGHTNING); if (ability != null && ability.test(player) && player.isInWater() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { - player.hurt(player.damageSources().outOfWorld(), 1); + player.hurt(player.damageSources().fellOutOfWorld(), 1); } ability = manager.get(AMAbilities.NETHER_DAMAGE_WATER); - if (ability != null && ability.test(player) && player.getLevel().dimensionType().ultraWarm() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { - player.hurt(player.damageSources().outOfWorld(), 1); + if (ability != null && ability.test(player) && player.level().dimensionType().ultraWarm() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { + player.hurt(player.damageSources().fellOutOfWorld(), 1); } ability = manager.get(AMAbilities.NETHER_DAMAGE_NATURE); - if (ability != null && ability.test(player) && player.getLevel().dimensionType().ultraWarm() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { - player.hurt(player.damageSources().outOfWorld(), 1); + if (ability != null && ability.test(player) && player.level().dimensionType().ultraWarm() && player.tickCount % 20 == 0 && (player.getHealth() - 1) / player.getMaxHealth() >= 0.75) { + player.hurt(player.damageSources().fellOutOfWorld(), 1); } } ability = manager.get(AMAbilities.SATURATION); @@ -144,7 +145,7 @@ private static void handleAbilities(final Player player) { } ability = manager.get(AMAbilities.FROST_WALKER); if (ability != null && ability.test(player)) { - FrostWalkerEnchantment.onEntityMoved(player, player.getLevel(), player.blockPosition(), 1); + FrostWalkerEnchantment.onEntityMoved(player, player.level(), player.blockPosition(), 1); } AttributeMap attributes = player.getAttributes(); AttributeInstance maxHealth = attributes.getInstance(Attributes.MAX_HEALTH); @@ -153,7 +154,7 @@ private static void handleAbilities(final Player player) { Ability lightHealthReduction = manager.get(AMAbilities.LIGHT_HEALTH_REDUCTION); Ability waterHealthReduction = manager.get(AMAbilities.WATER_HEALTH_REDUCTION); if ((lightHealthReduction != null - && player.getLevel().getBrightness(LightLayer.SKY, player.blockPosition()) == 15 + && player.level().getBrightness(LightLayer.SKY, player.blockPosition()) == 15 && lightHealthReduction.test(player)) || (waterHealthReduction != null && player.isInWaterOrBubble() diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMBlocks.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMBlocks.java index 890badd66..a14bee3bd 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMBlocks.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMBlocks.java @@ -24,7 +24,6 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -53,8 +52,7 @@ import net.minecraft.world.level.block.WallTorchBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; +import net.minecraft.world.level.material.MapColor; import net.minecraftforge.registries.RegistryObject; import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.ApiStatus.NonExtendable; @@ -63,52 +61,52 @@ @NonExtendable public interface AMBlocks { - BlockBehaviour.Properties FLOWER_POT = BlockBehaviour.Properties.of(Material.DECORATION).instabreak().noOcclusion(); + BlockBehaviour.Properties FLOWER_POT = BlockBehaviour.Properties.of().instabreak().noOcclusion(); RegistryObject OCCULUS = BLOCKS.register("occulus", OcculusBlock::new); RegistryObject INSCRIPTION_TABLE = BLOCKS.register("inscription_table", InscriptionTableBlock::new); RegistryObject ALTAR_CORE = BLOCKS.register("altar_core", AltarCoreBlock::new); RegistryObject ALTAR_VIEW = BLOCKS.register("altar_view", AltarViewBlock::new); - RegistryObject MAGIC_WALL = BLOCKS.register("magic_wall", () -> new GlassBlock(BlockBehaviour.Properties.of(Material.ICE).strength(3F).noOcclusion().noOcclusion().isValidSpawn(AMBlocks::never).isRedstoneConductor(AMBlocks::never).isSuffocating(AMBlocks::never).isViewBlocking(AMBlocks::never))); + RegistryObject MAGIC_WALL = BLOCKS.register("magic_wall", () -> new GlassBlock(BlockBehaviour.Properties.of().strength(3F).noOcclusion().noOcclusion().isValidSpawn(AMBlocks::never).isRedstoneConductor(AMBlocks::never).isSuffocating(AMBlocks::never).isViewBlocking(AMBlocks::never))); RegistryObject OBELISK = BLOCKS.register("obelisk", ObeliskBlock::new); RegistryObject CELESTIAL_PRISM = BLOCKS.register("celestial_prism", CelestialPrismBlock::new); RegistryObject BLACK_AUREM = BLOCKS.register("black_aurem", BlackAuremBlock::new); RegistryObject WIZARDS_CHALK = BLOCKS.register("wizards_chalk", WizardsChalkBlock::new); RegistryObject SPELL_RUNE = BLOCKS.register("spell_rune", SpellRuneBlock::new); - RegistryObject CHIMERITE_ORE = BLOCKS.register("chimerite_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject DEEPSLATE_CHIMERITE_ORE = BLOCKS.register("deepslate_chimerite_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); - RegistryObject CHIMERITE_BLOCK = BLOCKS.register("chimerite_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_PINK).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject TOPAZ_ORE = BLOCKS.register("topaz_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject DEEPSLATE_TOPAZ_ORE = BLOCKS.register("deepslate_topaz_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); - RegistryObject TOPAZ_BLOCK = BLOCKS.register("topaz_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.DIAMOND).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject VINTEUM_ORE = BLOCKS.register("vinteum_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject DEEPSLATE_VINTEUM_ORE = BLOCKS.register("deepslate_vinteum_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); - RegistryObject VINTEUM_BLOCK = BLOCKS.register("vinteum_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.LAPIS).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject MOONSTONE_ORE = BLOCKS.register("moonstone_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject DEEPSLATE_MOONSTONE_ORE = BLOCKS.register("deepslate_moonstone_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F))); - RegistryObject MOONSTONE_BLOCK = BLOCKS.register("moonstone_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_BLUE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject SUNSTONE_ORE = BLOCKS.register("sunstone_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50F, 1200F))); - RegistryObject SUNSTONE_BLOCK = BLOCKS.register("sunstone_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(3F, 3F))); - RegistryObject WITCHWOOD_LOG = BLOCKS.register("witchwood_log", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, s -> s.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MaterialColor.TERRACOTTA_LIGHT_BLUE : MaterialColor.TERRACOTTA_BLUE).strength(2F).sound(SoundType.WOOD))); - RegistryObject WITCHWOOD = BLOCKS.register("witchwood", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.TERRACOTTA_BLUE).strength(2F).sound(SoundType.WOOD))); - RegistryObject STRIPPED_WITCHWOOD_LOG = BLOCKS.register("stripped_witchwood_log", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); - RegistryObject STRIPPED_WITCHWOOD = BLOCKS.register("stripped_witchwood", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); - RegistryObject WITCHWOOD_LEAVES = BLOCKS.register("witchwood_leaves", () -> new LeavesBlock(BlockBehaviour.Properties.of(Material.LEAVES, MaterialColor.QUARTZ).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn((a, b, c, d) -> d == EntityType.OCELOT || d == EntityType.PARROT).isSuffocating(AMBlocks::never).isViewBlocking(AMBlocks::never))); + RegistryObject CHIMERITE_ORE = BLOCKS.register("chimerite_ore", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject DEEPSLATE_CHIMERITE_ORE = BLOCKS.register("deepslate_chimerite_ore", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); + RegistryObject CHIMERITE_BLOCK = BLOCKS.register("chimerite_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject TOPAZ_ORE = BLOCKS.register("topaz_ore", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject DEEPSLATE_TOPAZ_ORE = BLOCKS.register("deepslate_topaz_ore", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); + RegistryObject TOPAZ_BLOCK = BLOCKS.register("topaz_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DIAMOND).requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject VINTEUM_ORE = BLOCKS.register("vinteum_ore", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject DEEPSLATE_VINTEUM_ORE = BLOCKS.register("deepslate_vinteum_ore", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F).sound(SoundType.DEEPSLATE))); + RegistryObject VINTEUM_BLOCK = BLOCKS.register("vinteum_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.LAPIS).requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject MOONSTONE_ORE = BLOCKS.register("moonstone_ore", () -> new Block(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject DEEPSLATE_MOONSTONE_ORE = BLOCKS.register("deepslate_moonstone_ore", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).requiresCorrectToolForDrops().strength(4.5F, 3F))); + RegistryObject MOONSTONE_BLOCK = BLOCKS.register("moonstone_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject SUNSTONE_ORE = BLOCKS.register("sunstone_ore", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(50F, 1200F))); + RegistryObject SUNSTONE_BLOCK = BLOCKS.register("sunstone_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).requiresCorrectToolForDrops().strength(3F, 3F))); + RegistryObject WITCHWOOD_LOG = BLOCKS.register("witchwood_log", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(s -> s.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MapColor.TERRACOTTA_LIGHT_BLUE : MapColor.TERRACOTTA_BLUE).strength(2F).sound(SoundType.WOOD))); + RegistryObject WITCHWOOD = BLOCKS.register("witchwood", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLUE).strength(2F).sound(SoundType.WOOD))); + RegistryObject STRIPPED_WITCHWOOD_LOG = BLOCKS.register("stripped_witchwood_log", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); + RegistryObject STRIPPED_WITCHWOOD = BLOCKS.register("stripped_witchwood", () -> new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); + RegistryObject WITCHWOOD_LEAVES = BLOCKS.register("witchwood_leaves", () -> new LeavesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.QUARTZ).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn((a, b, c, d) -> d == EntityType.OCELOT || d == EntityType.PARROT).isSuffocating(AMBlocks::never).isViewBlocking(AMBlocks::never))); RegistryObject WITCHWOOD_SAPLING = BLOCKS.register("witchwood_sapling", () -> new SaplingBlock(new WitchwoodTreeGrower(), BlockBehaviour.Properties.copy(Blocks.OAK_SAPLING))); RegistryObject POTTED_WITCHWOOD_SAPLING = flowerPot(WITCHWOOD_SAPLING); - RegistryObject WITCHWOOD_PLANKS = BLOCKS.register("witchwood_planks", () -> new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); - RegistryObject WITCHWOOD_SLAB = BLOCKS.register("witchwood_slab", () -> new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD))); + RegistryObject WITCHWOOD_PLANKS = BLOCKS.register("witchwood_planks", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_LIGHT_BLUE).strength(2F).sound(SoundType.WOOD))); + RegistryObject WITCHWOOD_SLAB = BLOCKS.register("witchwood_slab", () -> new SlabBlock(BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD))); RegistryObject WITCHWOOD_STAIRS = BLOCKS.register("witchwood_stairs", () -> new StairBlock(() -> AMBlocks.WITCHWOOD_PLANKS.get().defaultBlockState(), BlockBehaviour.Properties.copy(AMBlocks.WITCHWOOD_PLANKS.get()))); - RegistryObject WITCHWOOD_FENCE = BLOCKS.register("witchwood_fence", () -> new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD))); - RegistryObject WITCHWOOD_FENCE_GATE = BLOCKS.register("witchwood_fence_gate", () -> new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD), SoundEvents.FENCE_GATE_CLOSE, SoundEvents.FENCE_GATE_OPEN)); - RegistryObject WITCHWOOD_DOOR = BLOCKS.register("witchwood_door", () -> new DoorBlock(BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).strength(3.0F).sound(SoundType.WOOD).noOcclusion(), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); - RegistryObject WITCHWOOD_TRAPDOOR = BLOCKS.register("witchwood_trapdoor", () -> new TrapDoorBlock(BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).strength(3.0F).sound(SoundType.WOOD).noOcclusion().isValidSpawn(AMBlocks::never), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); - RegistryObject WITCHWOOD_BUTTON = BLOCKS.register("witchwood_button", () -> new ButtonBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().strength(0.5F).sound(SoundType.WOOD), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE, 30, true)); - RegistryObject WITCHWOOD_PRESSURE_PLATE = BLOCKS.register("witchwood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD, AMBlocks.WITCHWOOD_PLANKS.get().defaultMaterialColor()).noCollission().strength(0.5F).sound(SoundType.WOOD), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); + RegistryObject WITCHWOOD_FENCE = BLOCKS.register("witchwood_fence", () -> new FenceBlock(BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD))); + RegistryObject WITCHWOOD_FENCE_GATE = BLOCKS.register("witchwood_fence_gate", () -> new FenceGateBlock(BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD), SoundEvents.FENCE_GATE_CLOSE, SoundEvents.FENCE_GATE_OPEN)); + RegistryObject WITCHWOOD_DOOR = BLOCKS.register("witchwood_door", () -> new DoorBlock(BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).strength(3.0F).sound(SoundType.WOOD).noOcclusion(), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); + RegistryObject WITCHWOOD_TRAPDOOR = BLOCKS.register("witchwood_trapdoor", () -> new TrapDoorBlock(BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).strength(3.0F).sound(SoundType.WOOD).noOcclusion().isValidSpawn(AMBlocks::never), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); + RegistryObject WITCHWOOD_BUTTON = BLOCKS.register("witchwood_button", () -> new ButtonBlock(BlockBehaviour.Properties.of().noCollission().strength(0.5F).sound(SoundType.WOOD), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE, 30, true)); + RegistryObject WITCHWOOD_PRESSURE_PLATE = BLOCKS.register("witchwood_pressure_plate", () -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of().mapColor(AMBlocks.WITCHWOOD_PLANKS.get().defaultMapColor()).noCollission().strength(0.5F).sound(SoundType.WOOD), AMWoodTypes.WITCHWOOD_BLOCK_SET_TYPE)); RegistryObject WITCHWOOD_SIGN = BLOCKS.register("witchwood_sign", () -> new CustomStandingSignBlock(BlockBehaviour.Properties.copy(AMBlocks.WITCHWOOD_PLANKS.get()).noCollission().strength(1.0F), AMWoodTypes.WITCHWOOD)); RegistryObject WITCHWOOD_WALL_SIGN = BLOCKS.register("witchwood_wall_sign", () -> new CustomWallSignBlock(BlockBehaviour.Properties.copy(AMBlocks.WITCHWOOD_PLANKS.get()).noCollission().strength(1.0F).lootFrom(WITCHWOOD_SIGN), AMWoodTypes.WITCHWOOD)); - RegistryObject WITCHWOOD_HANGING_SIGN = BLOCKS.register("witchwood_hanging_sign", () -> new CustomCeilingHangingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, WITCHWOOD_LOG.get().defaultMaterialColor()).noCollission().strength(1.0F).sound(SoundType.HANGING_SIGN).requiredFeatures(FeatureFlags.UPDATE_1_20), AMWoodTypes.WITCHWOOD)); - RegistryObject WITCHWOOD_WALL_HANGING_SIGN = BLOCKS.register("witchwood_wall_hanging_sign", () -> new CustomWallHangingSignBlock(BlockBehaviour.Properties.of(Material.WOOD, WITCHWOOD_LOG.get().defaultMaterialColor()).noCollission().strength(1.0F).sound(SoundType.HANGING_SIGN).requiredFeatures(FeatureFlags.UPDATE_1_20).lootFrom(WITCHWOOD_HANGING_SIGN), AMWoodTypes.WITCHWOOD)); + RegistryObject WITCHWOOD_HANGING_SIGN = BLOCKS.register("witchwood_hanging_sign", () -> new CustomCeilingHangingSignBlock(BlockBehaviour.Properties.of().mapColor(WITCHWOOD_LOG.get().defaultMapColor()).noCollission().strength(1.0F).sound(SoundType.HANGING_SIGN), AMWoodTypes.WITCHWOOD)); + RegistryObject WITCHWOOD_WALL_HANGING_SIGN = BLOCKS.register("witchwood_wall_hanging_sign", () -> new CustomWallHangingSignBlock(BlockBehaviour.Properties.of().mapColor(WITCHWOOD_LOG.get().defaultMapColor()).noCollission().strength(1.0F).sound(SoundType.HANGING_SIGN).lootFrom(WITCHWOOD_HANGING_SIGN), AMWoodTypes.WITCHWOOD)); RegistryObject AUM = BLOCKS.register("aum", () -> new FlowerBlock(AMMobEffects.MANA_REGEN, 7, BlockBehaviour.Properties.copy(Blocks.POPPY))); RegistryObject CERUBLOSSOM = BLOCKS.register("cerublossom", () -> new FlowerBlock(() -> MobEffects.LEVITATION, 7, BlockBehaviour.Properties.copy(Blocks.POPPY))); RegistryObject DESERT_NOVA = BLOCKS.register("desert_nova", DesertNovaBlock::new); @@ -119,12 +117,12 @@ public interface AMBlocks { RegistryObject POTTED_DESERT_NOVA = flowerPot(DESERT_NOVA); RegistryObject POTTED_TARMA_ROOT = flowerPot(TARMA_ROOT); RegistryObject POTTED_WAKEBLOOM = flowerPot(WAKEBLOOM); - RegistryObject VINTEUM_TORCH = BLOCKS.register("vinteum_torch", () -> new TorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel((p_50886_) -> 14).sound(SoundType.WOOD), ParticleTypes.SMOKE)); - RegistryObject VINTEUM_WALL_TORCH = BLOCKS.register("vinteum_wall_torch", () -> new WallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION).noCollission().instabreak().lightLevel((p_50886_) -> 14).sound(SoundType.WOOD), ParticleTypes.SMOKE)); + RegistryObject VINTEUM_TORCH = BLOCKS.register("vinteum_torch", () -> new TorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel((p_50886_) -> 14).sound(SoundType.WOOD), ParticleTypes.SMOKE)); + RegistryObject VINTEUM_WALL_TORCH = BLOCKS.register("vinteum_wall_torch", () -> new WallTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel((p_50886_) -> 14).sound(SoundType.WOOD), ParticleTypes.SMOKE)); RegistryObject IRON_INLAY = BLOCKS.register("iron_inlay", () -> new InlayBlock(BlockBehaviour.Properties.copy(Blocks.RAIL))); RegistryObject REDSTONE_INLAY = BLOCKS.register("redstone_inlay", () -> new InlayBlock(BlockBehaviour.Properties.copy(Blocks.RAIL))); RegistryObject GOLD_INLAY = BLOCKS.register("gold_inlay", () -> new InlayBlock(BlockBehaviour.Properties.copy(Blocks.RAIL))); - RegistryObject LIQUID_ESSENCE = BLOCKS.register("liquid_essence", () -> new LiquidBlock(AMFluids.LIQUID_ESSENCE, BlockBehaviour.Properties.of(Material.WATER).noCollission().strength(100.0F).noLootTable().lightLevel((state) -> 5))); + RegistryObject LIQUID_ESSENCE = BLOCKS.register("liquid_essence", () -> new LiquidBlock(AMFluids.LIQUID_ESSENCE, BlockBehaviour.Properties.of().noCollission().strength(100.0F).noLootTable().lightLevel((state) -> 5))); private static RegistryObject flowerPot(RegistryObject flower) { RegistryObject register = BLOCKS.register("potted_" + flower.getId().getPath(), () -> new FlowerPotBlock(() -> ((FlowerPotBlock) Blocks.FLOWER_POT), flower, FLOWER_POT)); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMDamageSources.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMDamageSources.java index eb47f61bd..ce8e51001 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMDamageSources.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/init/AMDamageSources.java @@ -23,22 +23,22 @@ private static Holder type(RegistryAccess access, ResourceKey codec() { @NotNull protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { if (tables.contains(context.getQueriedLootTableId())) { - context.getLootTable(source).getRandomItemsRaw(context, generatedLoot::add); + context.getResolver().getLootTable(source).getRandomItemsRaw(context, generatedLoot::add); } return generatedLoot; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/ContingencyHelper.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/ContingencyHelper.java index 2feece8f8..4893aed4f 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/ContingencyHelper.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/ContingencyHelper.java @@ -56,7 +56,7 @@ public void triggerContingency(LivingEntity entity, ResourceLocation type) { entity.getCapability(CONTINGENCY).ifPresent(contingency -> { IForgeRegistry registry = ArsMagicaAPI.get().getContingencyTypeRegistry(); if (!registry.containsKey(type) || !Objects.equals(contingency.type, type)) return; - contingency.execute(entity.level, entity); + contingency.execute(entity.level(), entity); contingency.clear(); }); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/rift/RiftMenu.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/rift/RiftMenu.java index 2a756b084..3bc504a94 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/rift/RiftMenu.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/magic/rift/RiftMenu.java @@ -22,7 +22,7 @@ private RiftMenu(int id, Inventory inv, Container container, int rows) { * @return A rift menu. */ public static RiftMenu rift(int windowId, Inventory inv, FriendlyByteBuf buf) { - return rift(windowId, inv, inv.player.level.getPlayerByUUID(buf.readUUID()), buf.readInt()); + return rift(windowId, inv, inv.player.level().getPlayerByUUID(buf.readUUID()), buf.readInt()); } /** diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/EntityDeathTrigger.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/EntityDeathTrigger.java index e4845e4b5..0b83ae717 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/EntityDeathTrigger.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/EntityDeathTrigger.java @@ -24,7 +24,7 @@ public record EntityDeathTrigger(EntityPredicate predicate) implements RitualTri @Override public void register(Ritual ritual) { MinecraftForge.EVENT_BUS.addListener((LivingDeathEvent event) -> { - if (!(event.getEntity().getLevel() instanceof ServerLevel serverLevel)) return; + if (!(event.getEntity().level() instanceof ServerLevel serverLevel)) return; if (event.getSource().getEntity() instanceof Player player) { ritual.perform(player, serverLevel, event.getEntity().blockPosition(), new Context.MapContext(Map.of("entity", event.getEntity()))); } else { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/ItemDropRitualTrigger.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/ItemDropRitualTrigger.java index c3fd14ef1..d118ec635 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/ItemDropRitualTrigger.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/ItemDropRitualTrigger.java @@ -79,7 +79,7 @@ public void register(final Ritual ritual) { MinecraftForge.EVENT_BUS.addListener((TickEvent.PlayerTickEvent t) -> { if ((t.side != LogicalSide.SERVER && !t.player.getGameProfile().getName().equals("test-mock-player")) || t.phase != TickEvent.Phase.START) return; - if (!(t.player.level instanceof ServerLevel serverLevel)) return; + if (!(t.player.level() instanceof ServerLevel serverLevel)) return; for (final ItemEntity item : serverLevel.getEntitiesOfClass(ItemEntity.class, AABB.ofSize(t.player.position(), 5, 5, 5), itemEntity -> ingredients.stream().anyMatch(ingredient -> ingredient.test(itemEntity.getItem())))) { if (ritual.perform(t.player, serverLevel, item.getOnPos(), Context.EMPTY)) return; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/SpellComponentCastRitualTrigger.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/SpellComponentCastRitualTrigger.java index 52a70aea6..1098efeeb 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/SpellComponentCastRitualTrigger.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/ritual/trigger/SpellComponentCastRitualTrigger.java @@ -41,7 +41,7 @@ public SpellComponentCastRitualTrigger(List components) { @Override public void register(Ritual ritual) { MinecraftForge.EVENT_BUS.addListener((SpellEvent.Cast.Component evt) -> { - if (evt.getEntity() instanceof Player player && player.getLevel() instanceof ServerLevel level && components.contains(evt.getComponent())) { + if (evt.getEntity() instanceof Player player && player.level() instanceof ServerLevel level && components.contains(evt.getComponent())) { HitResult target = evt.getTarget(); if (target == null) return; BlockPos pos = switch (target.getType()) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/skill/SkillHelper.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/skill/SkillHelper.java index 072ccf5d9..885aa7483 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/skill/SkillHelper.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/skill/SkillHelper.java @@ -45,13 +45,6 @@ public final class SkillHelper implements ISkillHelper { private SkillHelper() {} - /** - * @return The only instance of this class. - */ - public static SkillHelper instance() { - return INSTANCE.get(); - } - /** * @return The knowledge capability. */ @@ -59,8 +52,11 @@ public static Capability getCapability() { return KNOWLEDGE; } - private static void handleSync(KnowledgeHolder holder, NetworkEvent.Context context) { - context.enqueueWork(() -> Minecraft.getInstance().player.getCapability(KNOWLEDGE).ifPresent(cap -> cap.onSync(holder))); + /** + * @return The only instance of this class. + */ + public static SkillHelper instance() { + return INSTANCE.get(); } @Override @@ -269,6 +265,10 @@ public void syncToPlayer(Player player) { runIfPresent(player, holder -> ArsMagicaLegacy.NETWORK_HANDLER.sendToPlayer(new SkillSyncPacket(holder), player)); } + private static void handleSync(KnowledgeHolder holder, NetworkEvent.Context context) { + context.enqueueWork(() -> Minecraft.getInstance().player.getCapability(KNOWLEDGE).ifPresent(cap -> cap.onSync(holder))); + } + private void runIfPresent(Player player, Consumer consumer) { getKnowledgeHolder(player).ifPresent(consumer::accept); } @@ -309,9 +309,12 @@ protected Codec codec() { public record KnowledgeHolder(Set skills, Map skillPoints) { //@formatter:off public static final Codec CODEC = RecordCodecBuilder.create(inst -> inst.group( - CodecHelper.setOf(ResourceLocation.CODEC).fieldOf("skills").forGetter(KnowledgeHolder::skills), + CodecHelper.setOf(ResourceLocation.CODEC) + .>xmap(HashSet::new, Function.identity()) + .fieldOf("skills") + .forGetter(KnowledgeHolder::skills), Codec.unboundedMap(ResourceLocation.CODEC, Codec.INT) - .>xmap(HashMap::new, Function.identity()) + .>xmap(HashMap::new, Function.identity()) .fieldOf("skill_points") .forGetter(KnowledgeHolder::skillPoints) ).apply(inst, KnowledgeHolder::new)); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/EtheriumSpellIngredient.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/EtheriumSpellIngredient.java index ee3713b15..a9e1011b2 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/EtheriumSpellIngredient.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/EtheriumSpellIngredient.java @@ -17,6 +17,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; @@ -107,12 +108,12 @@ public void renderInWorld(EtheriumSpellIngredient ingredient, PoseStack poseStac } @Override - public void renderInGui(EtheriumSpellIngredient ingredient, PoseStack poseStack, int x, int y, int mouseX, int mouseY) { + public void renderInGui(EtheriumSpellIngredient ingredient, GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { EtheriumType type = AMUtil.getByTick(ingredient.types().toArray(new EtheriumType[0]), Objects.requireNonNull(ClientHelper.getLocalPlayer()).tickCount / 20); ItemStack stack = new ItemStack(AMItems.ETHERIUM_PLACEHOLDER.get()); ArsMagicaAPI.get().getEtheriumHelper().setEtheriumType(stack, type); stack.setCount(ingredient.getCount()); - ClientHelper.drawItemStack(poseStack, stack, x, y); + ClientHelper.drawItemStack(graphics, stack, x, y); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/IngredientSpellIngredient.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/IngredientSpellIngredient.java index 9f33a4f5c..fa76e92ad 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/IngredientSpellIngredient.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/IngredientSpellIngredient.java @@ -12,6 +12,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.model.BakedModel; @@ -100,10 +101,10 @@ public void renderInWorld(IngredientSpellIngredient ingredient, PoseStack poseSt } @Override - public void renderInGui(IngredientSpellIngredient ingredient, PoseStack poseStack, int x, int y, int mouseX, int mouseY) { + public void renderInGui(IngredientSpellIngredient ingredient, GuiGraphics graphics, int x, int y, int mouseX, int mouseY) { ItemStack stack = AMUtil.getByTick(ingredient.ingredient().getItems(), Objects.requireNonNull(ClientHelper.getLocalPlayer()).tickCount / 20).copy(); stack.setCount(ingredient.getCount()); - ClientHelper.drawItemStack(poseStack, stack, x, y); + ClientHelper.drawItemStack(graphics, stack, x, y); } } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Attract.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Attract.java index f6da580d3..84a9cf221 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Attract.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Attract.java @@ -25,7 +25,7 @@ public Attract() { private static SpellCastResult performAttract(@Nullable Entity targetEntity, AABB aabb, LivingEntity caster, Vec3 targetPos, List modifiers, ISpell spell, HitResult target, int index) { boolean success = false; - for (Entity e : caster.level.getEntities(targetEntity, aabb)) { + for (Entity e : caster.level().getEntities(targetEntity, aabb)) { if (e == caster) continue; if (e instanceof AbstractSpellEntity effect && effect.getOwner() != null && effect.getOwner().is(e)) continue; success = true; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeDrain.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeDrain.java index e71beb465..7b1124943 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeDrain.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeDrain.java @@ -21,7 +21,7 @@ public LifeDrain() { public SpellCastResult invoke(ISpell spell, LivingEntity caster, Level level, List modifiers, EntityHitResult target, int index, int ticksUsed) { if (target.getEntity() instanceof LivingEntity living) { float damage = ArsMagicaAPI.get().getSpellHelper().getModifiedStat(2, living.isInvertedHealAndHarm() ? SpellPartStats.HEALING : SpellPartStats.DAMAGE, modifiers, spell, caster, target, index) * 2; - if (living.hurt(level.damageSources().outOfWorld(), damage)) { + if (living.hurt(level.damageSources().fellOutOfWorld(), damage)) { caster.heal(damage); } return SpellCastResult.SUCCESS; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeTap.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeTap.java index 4b4d1047e..f7c06f7c8 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeTap.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/LifeTap.java @@ -22,7 +22,7 @@ public SpellCastResult invoke(ISpell spell, LivingEntity caster, Level level, Li if (target.getEntity() instanceof LivingEntity living) { var api = ArsMagicaAPI.get(); float damage = api.getSpellHelper().getModifiedStat(2, living.isInvertedHealAndHarm() ? SpellPartStats.HEALING : SpellPartStats.DAMAGE, modifiers, spell, caster, target, index) * 2; - if (living.hurt(level.damageSources().outOfWorld(), damage)) { + if (living.hurt(level.damageSources().fellOutOfWorld(), damage)) { api.getManaHelper().increaseMana(caster, damage * api.getManaHelper().getMaxMana(caster) * 0.01f); } return SpellCastResult.SUCCESS; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Repel.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Repel.java index 64a45f373..dc6d99eaa 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Repel.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/component/Repel.java @@ -25,7 +25,7 @@ public Repel() { private static SpellCastResult performRepel(@Nullable Entity targetEntity, AABB aabb, LivingEntity caster, Vec3 targetPos, List modifiers, ISpell spell, HitResult target, final int index) { boolean success = false; - for (Entity e : caster.level.getEntities(targetEntity, aabb)) { + for (Entity e : caster.level().getEntities(targetEntity, aabb)) { if (e == caster) continue; if (e instanceof AbstractSpellEntity effect && effect.getOwner() != null && effect.getOwner().is(e)) continue; success = true; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Lunar.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Lunar.java index cc666781b..93e4842c0 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Lunar.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Lunar.java @@ -11,12 +11,12 @@ public class Lunar extends GenericSpellModifier { private static final float MULTIPLIER = 1.625f; //1 + 15000 / 24000 public Lunar() { - addStatModifier(DAMAGE, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level.getDayTime()) * 2.5f); - addStatModifier(DURATION, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level.getDayTime()) * 5); - addStatModifier(HEALING, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level.getDayTime()) * 2); - addStatModifier(RANGE, (base, modified, spell, caster, target, componentIndex) -> modified + 2 * (caster.level.getDayTime() % 24000 > 13500 && caster.level.getDayTime() % 24000 < 22500 ? 1 + getMoonPhaseMultiplier(caster.level.getMoonPhase()) : 1)); + addStatModifier(DAMAGE, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level().getDayTime()) * 2.5f); + addStatModifier(DURATION, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level().getDayTime()) * 5); + addStatModifier(HEALING, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level().getDayTime()) * 2); + addStatModifier(RANGE, (base, modified, spell, caster, target, componentIndex) -> modified + 2 * (caster.level().getDayTime() % 24000 > 13500 && caster.level().getDayTime() % 24000 < 22500 ? 1 + getMoonPhaseMultiplier(caster.level().getMoonPhase()) : 1)); addStatModifier(SIZE, modifiers.get(RANGE)); - addStatModifier(SPEED, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level.getDayTime()) * 0.5f); + addStatModifier(SPEED, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level().getDayTime()) * 0.5f); } private static float getMoonPhaseMultiplier(long phase) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Solar.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Solar.java index 5a182eef6..cbefe92ca 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Solar.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/modifier/Solar.java @@ -11,12 +11,12 @@ public class Solar extends GenericSpellModifier { private static final float MULTIPLIER = 1.375f; //1 + 9000 / 24000 public Solar() { - addStatModifier(DAMAGE, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level.getDayTime()) * 2.5f); - addStatModifier(DURATION, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level.getDayTime()) * 5); - addStatModifier(HEALING, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level.getDayTime()) * 2); - addStatModifier(RANGE, (base, modified, spell, caster, target, componentIndex) -> modified + 1.5f * (caster.level.getDayTime() % 24000 < 13500 || caster.level.getDayTime() % 24000 > 22500 ? 1 + getMoonPhaseMultiplier(caster.level.getMoonPhase()) : 1)); + addStatModifier(DAMAGE, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level().getDayTime()) * 2.5f); + addStatModifier(DURATION, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level().getDayTime()) * 5); + addStatModifier(HEALING, (base, modified, spell, caster, target, componentIndex) -> modified * getTimeBasedMultiplier(caster.level().getDayTime()) * 2); + addStatModifier(RANGE, (base, modified, spell, caster, target, componentIndex) -> modified + 1.5f * (caster.level().getDayTime() % 24000 < 13500 || caster.level().getDayTime() % 24000 > 22500 ? 1 + getMoonPhaseMultiplier(caster.level().getMoonPhase()) : 1)); addStatModifier(SIZE, modifiers.get(RANGE)); - addStatModifier(SPEED, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level.getDayTime()) * 0.5f); + addStatModifier(SPEED, (base, modified, spell, caster, target, componentIndex) -> modified + getTimeBasedMultiplier(caster.level().getDayTime()) * 0.5f); } private static float getMoonPhaseMultiplier(long phase) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/shape/Chain.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/shape/Chain.java index 313df426d..477fb175b 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/shape/Chain.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/spell/shape/Chain.java @@ -56,7 +56,7 @@ public static List getEntities(Entity initial, double range, Entity... i Entity castFrom = initial; Entity temp = null; for (int i = 0; i < 4; i++) { - for (Entity e : initial.getLevel().getEntities(castFrom, new AABB(castFrom.position().subtract(range, range, range), castFrom.position().add(range, range, range)))) { + for (Entity e : initial.level().getEntities(castFrom, new AABB(castFrom.position().subtract(range, range, range), castFrom.position().add(range, range, range)))) { if (list.contains(e) || Arrays.stream(ignore).anyMatch(p -> p == e)) continue; if (e instanceof LivingEntity living && living.isDeadOrDying()) continue; if (temp != null && temp.getType() != e.getType()) continue; @@ -65,7 +65,7 @@ public static List getEntities(Entity initial, double range, Entity... i } } if (temp == null) { - for (Entity e : initial.getLevel().getEntities(castFrom, new AABB(castFrom.position().subtract(range, range, range), castFrom.position().add(range, range, range)))) { + for (Entity e : initial.level().getEntities(castFrom, new AABB(castFrom.position().subtract(range, range, range), castFrom.position().add(range, range, range)))) { if (list.contains(e) || Arrays.stream(ignore).anyMatch(p -> p == e)) continue; if (e instanceof LivingEntity living && living.isDeadOrDying()) continue; if (temp == null || temp.distanceTo(castFrom) > e.distanceTo(castFrom)) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/util/AMUtil.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/util/AMUtil.java index 6a9a5a411..f5b6078b4 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/util/AMUtil.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/common/util/AMUtil.java @@ -20,10 +20,10 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.ClipContext; -import net.minecraft.world.level.ItemLike; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec2; import net.minecraft.world.phys.Vec3; @@ -104,7 +104,7 @@ public static List combineSpellIngredients(List T getByTick(T[] array, int tick) { * @return The hit result (ray trace result). */ public static HitResult getHitResult(Vec3 from, Vec3 to, Entity entity, ClipContext.Block blockContext, ClipContext.Fluid fluidContext) { - HitResult hitResult = entity.level.clip(new ClipContext(from, to, blockContext, fluidContext, entity)); + HitResult hitResult = entity.level().clip(new ClipContext(from, to, blockContext, fluidContext, entity)); if (hitResult.getType() != HitResult.Type.MISS) { to = hitResult.getLocation(); } - HitResult entityHitResult = ProjectileUtil.getEntityHitResult(entity.level, entity, from, to, entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(1), e -> true); + HitResult entityHitResult = ProjectileUtil.getEntityHitResult(entity.level(), entity, from, to, entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(1), e -> true); if (entityHitResult != null) { hitResult = entityHitResult; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/AltarComponentProvider.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/AltarComponentProvider.java index f58c83bca..afdf5fad4 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/AltarComponentProvider.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/AltarComponentProvider.java @@ -7,9 +7,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.IServerDataProvider; @@ -19,7 +16,7 @@ import java.util.Arrays; import java.util.List; -class AltarComponentProvider implements IBlockComponentProvider, IServerDataProvider { +class AltarComponentProvider implements IBlockComponentProvider, IServerDataProvider { private static final ResourceLocation ID = new ResourceLocation(ArsMagicaAPI.MOD_ID, "altar"); private static final String POWER = "power"; private static final String POSITIONS = "positions"; @@ -51,8 +48,8 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi } @Override - public void appendServerData(CompoundTag compoundTag, ServerPlayer serverPlayer, Level level, BlockEntity blockEntity, boolean b) { - if (blockEntity instanceof AltarCoreBlockEntity altar) { + public void appendServerData(CompoundTag compoundTag, BlockAccessor accessor) { + if (accessor.getBlockEntity() instanceof AltarCoreBlockEntity altar) { compoundTag.putLongArray(POSITIONS, altar.getBoundPositions().stream().map(BlockPos::asLong).toList()); compoundTag.putInt(POWER, altar.getPowerLevel()); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/EtheriumComponentProvider.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/EtheriumComponentProvider.java index 7a00236a4..df96d6f56 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/EtheriumComponentProvider.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jade/EtheriumComponentProvider.java @@ -7,16 +7,13 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.IServerDataProvider; import snownee.jade.api.ITooltip; import snownee.jade.api.config.IPluginConfig; -class EtheriumComponentProvider implements IBlockComponentProvider, IServerDataProvider { +class EtheriumComponentProvider implements IBlockComponentProvider, IServerDataProvider { private static final ResourceLocation ID = new ResourceLocation(ArsMagicaAPI.MOD_ID, "etherium"); private static final String ETHERIUM = "etherium"; private static final String MAX_ETHERIUM = "max_etherium"; @@ -42,11 +39,11 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi } @Override - public void appendServerData(CompoundTag compoundTag, ServerPlayer serverPlayer, Level level, BlockEntity blockEntity, boolean b) { - BlockPos pos = blockEntity.getBlockPos(); - int tier = blockEntity.getBlockState().getBlock() instanceof ITierCheckingBlock tierBlock ? tierBlock.getTier(level, pos) : -1; + public void appendServerData(CompoundTag compoundTag, BlockAccessor accessor) { + BlockPos pos = accessor.getPosition(); + int tier = accessor.getBlockState().getBlock() instanceof ITierCheckingBlock tierBlock ? tierBlock.getTier(accessor.getLevel(), pos) : -1; compoundTag.putInt(TIER, tier); - ArsMagicaAPI.get().getEtheriumHelper().getEtheriumProvider(level, pos).ifPresent(provider -> { + ArsMagicaAPI.get().getEtheriumHelper().getEtheriumProvider(accessor.getLevel(), pos).ifPresent(provider -> { compoundTag.putInt(ETHERIUM, provider.getAmount()); compoundTag.putInt(MAX_ETHERIUM, provider.getMax()); }); diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillCategory.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillCategory.java index 21b664ade..7732bbe2c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillCategory.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillCategory.java @@ -13,7 +13,6 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.spell.IngredientSpellIngredient; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.AMUtil; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; -import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; @@ -24,6 +23,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -128,26 +128,26 @@ public void setRecipe(IRecipeLayoutBuilder builder, Recipe recipe, IFocusGroup f } @Override - public void draw(Recipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { + public void draw(Recipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics graphics, double mouseX, double mouseY) { Font font = Minecraft.getInstance().font; - drawCentered(stack, font, recipe.skill().getDisplayName(ClientHelper.getRegistryAccess()), 0); + drawCentered(graphics, font, recipe.skill().getDisplayName(ClientHelper.getRegistryAccess()), 0); int y = SLOT_SIZE * 2 + TEXT_BOTTOM_PADDING; - drawCentered(stack, font, Component.translatable(TranslationConstants.SKILL_INGREDIENTS), y); + drawCentered(graphics, font, Component.translatable(TranslationConstants.SKILL_INGREDIENTS), y); y += (recipe.recipe.size() / INGREDIENT_COLUMNS + 1) * SLOT_SIZE + font.lineHeight + TEXT_BOTTOM_PADDING; if (!recipe.affinityShifts.isEmpty()) { y += SLOT_SIZE - font.lineHeight; - drawCentered(stack, font, Component.translatable(TranslationConstants.SKILL_AFFINITY_BREAKDOWN), y); + drawCentered(graphics, font, Component.translatable(TranslationConstants.SKILL_AFFINITY_BREAKDOWN), y); y += font.lineHeight + font.lineHeight / 2 + TEXT_BOTTOM_PADDING; int x = getAffinityValueAnchor(font, recipe.affinityShifts) + 9; for (Affinity affinity : recipe.affinityShifts.keySet().stream().sorted().toList()) { - font.draw(stack, String.valueOf(recipe.affinityShifts.get(affinity)), x, y, affinity.color()); + graphics.drawString(font, String.valueOf(recipe.affinityShifts.get(affinity)), x, y, affinity.color()); y += SLOT_SIZE - 2; } y += 2 - font.lineHeight / 2 + TEXT_BOTTOM_PADDING; } if (!recipe.modifiers.isEmpty()) { y += SLOT_SIZE - font.lineHeight; - drawCentered(stack, font, Component.translatable(TranslationConstants.SKILL_MODIFIED_BY), y); + drawCentered(graphics, font, Component.translatable(TranslationConstants.SKILL_MODIFIED_BY), y); } } @@ -161,8 +161,8 @@ public static Recipe of(Skill skill) { } } - private static void drawCentered(PoseStack stack, Font font, Component component, int y) { - font.draw(stack, component, (WIDTH - font.getSplitter().stringWidth(component.getString())) / 2, y, 0x404040); + private static void drawCentered(GuiGraphics graphics, Font font, Component component, int y) { + graphics.drawString(font, component, (int) ((WIDTH - font.getSplitter().stringWidth(component.getString())) / 2), y, 0x404040); } private static int getAffinityValueAnchor(Font font, Map affinityShifts) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillIngredient.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillIngredient.java index fcb187c69..6e0f3e05c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillIngredient.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/jei/SkillIngredient.java @@ -5,12 +5,11 @@ import com.github.minecraftschurlimods.arsmagicalegacy.client.SkillIconAtlas; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.AMUtil; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.ingredients.IIngredientHelper; import mezz.jei.api.ingredients.IIngredientRenderer; import mezz.jei.api.ingredients.IIngredientType; import mezz.jei.api.ingredients.subtypes.UidContext; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.TooltipFlag; @@ -55,9 +54,9 @@ public String getErrorInfo(@Nullable Skill ingredient) { public static class Renderer implements IIngredientRenderer { @Override - public void render(PoseStack stack, Skill ingredient) { + public void render(GuiGraphics graphics, Skill ingredient) { RenderSystem.setShaderTexture(0, SkillIconAtlas.SKILL_ICON_ATLAS); - GuiComponent.blit(stack, 0, 0, 0, 16, 16, SkillIconAtlas.instance().getSprite(ingredient.getId(ClientHelper.getRegistryAccess()))); + graphics.blit(0, 0, 0, 16, 16, SkillIconAtlas.instance().getSprite(ingredient.getId(ClientHelper.getRegistryAccess()))); } @Override diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/patchouli/SpellPartPage.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/patchouli/SpellPartPage.java index 9583fa2b3..4da47ef54 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/patchouli/SpellPartPage.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/compat/patchouli/SpellPartPage.java @@ -13,10 +13,8 @@ import com.github.minecraftschurlimods.arsmagicalegacy.common.util.AMUtil; import com.github.minecraftschurlimods.arsmagicalegacy.common.util.TranslationConstants; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiComponent; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; @@ -44,28 +42,27 @@ public void build(int x, int y, int page) { } @Override - public void render(PoseStack poseStack, IComponentRenderContext context, float partialTicks, int mouseX, int mouseY) { + public void render(GuiGraphics graphics, IComponentRenderContext context, float partialTicks, int mouseX, int mouseY) { int cx = x + 50; int cy = y + 70; - poseStack.pushPose(); + graphics.pose().pushPose(); List modifiers = AMUtil.getModifiersForPart(_part); if (modifiers.isEmpty()) cy -= 16; else cy += ((modifiers.size() / 7) * 16) + 8; - renderRecipe(poseStack, context, cx, cy, mouseX, mouseY); + renderRecipe(graphics, context, cx, cy, mouseX, mouseY); RenderSystem.enableBlend(); ResourceLocation registryName = this._part.getId(); RegistryAccess registryAccess = ClientHelper.getRegistryAccess(); Skill skill = registryAccess.registryOrThrow(Skill.REGISTRY_KEY).get(registryName); TextureAtlasSprite sprite = SkillIconAtlas.instance().getSprite(Objects.requireNonNull(skill).getId(registryAccess)); - RenderSystem.setShaderTexture(0, SkillIconAtlas.SKILL_ICON_ATLAS); RenderSystem.setShaderFogColor(1, 1, 1, 1); - GuiComponent.blit(poseStack, cx - 2, cy - 2, 0, 20, 20, sprite); + graphics.blit(cx - 2, cy - 2, 0, 20, 20, sprite); if (context.isAreaHovered(mouseX, mouseY, cx - 2, cy - 2, 20, 20)) { context.setHoverTooltipComponents(List.of(skill.getDisplayName(registryAccess), skill.getDescription(registryAccess))); } - renderModifiers(poseStack, context, x, y, mouseX, mouseY, modifiers); + renderModifiers(graphics, context, x, y, mouseX, mouseY, modifiers); RenderSystem.disableBlend(); - poseStack.popPose(); + graphics.pose().popPose(); } @Override @@ -73,15 +70,14 @@ public void onVariablesAvailable(UnaryOperator lookup) { part = lookup.apply(IVariable.wrap(part)).asString(); } - private void renderModifiers(PoseStack stack, IComponentRenderContext context, int posX, int posY, int mouseX, int mouseY, List modifiers) { + private void renderModifiers(GuiGraphics graphics, IComponentRenderContext context, int posX, int posY, int mouseX, int mouseY, List modifiers) { if (modifiers.isEmpty()) return; Component shapeName = Component.translatable(_part.getType() == ISpellPart.SpellPartType.MODIFIER ? TranslationConstants.SPELL_PART_MODIFIES : TranslationConstants.SPELL_PART_MODIFIED_BY); Font font = context.getGui().getMinecraft().font; - font.draw(stack, shapeName, posX + 58 - (font.width(shapeName) / 2f), posY, 0); + graphics.drawString(font, shapeName, (int)(posX + 58 - (font.width(shapeName) / 2f)), posY, 0, false); RenderSystem.setShaderFogColor(1.0f, 1.0f, 1.0f); int startX = 0; int yOffset = -6; - RenderSystem.setShaderTexture(0, SkillIconAtlas.SKILL_ICON_ATLAS); RegistryAccess registryAccess = ClientHelper.getRegistryAccess(); Registry skillRegistry = AMUtil.getRegistry(Skill.REGISTRY_KEY); for (int i = 0; i < modifiers.size(); i++) { @@ -94,7 +90,7 @@ private void renderModifiers(PoseStack stack, IComponentRenderContext context, i yOffset += 16; } RenderSystem.enableBlend(); - Screen.blit(stack, posX + startX, posY + yOffset, 0, 16, 16, SkillIconAtlas.instance().getSprite(registryName)); + graphics.blit(posX + startX, posY + yOffset, 0, 16, 16, SkillIconAtlas.instance().getSprite(registryName)); RenderSystem.disableBlend(); if (context.isAreaHovered(mouseX, mouseY, posX + startX, posY + yOffset, 16, 16)) { context.setHoverTooltipComponents(List.of(skill.getDisplayName(registryAccess), skill.getDescription(registryAccess))); @@ -103,7 +99,7 @@ private void renderModifiers(PoseStack stack, IComponentRenderContext context, i } } - private void renderRecipe(PoseStack poseStack, IComponentRenderContext context, int cx, int cy, int mousex, int mousey) { + private void renderRecipe(GuiGraphics graphics, IComponentRenderContext context, int cx, int cy, int mousex, int mousey) { if (this._part == null) return; ISpellPartData data = ArsMagicaAPI.get().getSpellDataManager().getDataForPart(this._part); if (data == null) return; @@ -118,13 +114,13 @@ private void renderRecipe(PoseStack poseStack, IComponentRenderContext context, float angle = (lastAngle + angleStep) % 360f; float x = (float) (cx - (Math.cos(Math.toRadians(angle)) * dist)); float y = (float) (cy - (Math.sin(Math.toRadians(angle)) * dist)); - RenderUtil.line2d(poseStack, x + 8, y + 8, cx + 8, cy + 8, 0, 0x0000DD, 2f); - RenderUtil.gradientLine2d(poseStack, lastX + 8, lastY + 8, x + 8, y + 8, 0, 0x0000DD, 0xDD00DD, 2f); + RenderUtil.line2d(graphics, x + 8, y + 8, cx + 8, cy + 8, 0, 0x0000DD, 2f); + RenderUtil.gradientLine2d(graphics, lastX + 8, lastY + 8, x + 8, y + 8, 0, 0x0000DD, 0xDD00DD, 2f); if (i < recipe.size()) { - poseStack.pushPose(); - poseStack.translate(x - (int) x, y - (int) y, 0); - renderCraftingComponent(poseStack, context, recipe.get(i), (int) x, (int) y, mousex, mousey); - poseStack.popPose(); + graphics.pose().pushPose(); + graphics.pose().translate(x - (int) x, y - (int) y, 0); + renderCraftingComponent(graphics, context, recipe.get(i), (int) x, (int) y, mousex, mousey); + graphics.pose().popPose(); } lastX = x; lastY = y; @@ -132,8 +128,8 @@ private void renderRecipe(PoseStack poseStack, IComponentRenderContext context, } } - private void renderCraftingComponent(PoseStack poseStack, IComponentRenderContext context, ISpellIngredient craftingComponent, int sx, int sy, int mousex, int mousey) { - ISpellIngredientRenderer.getFor(craftingComponent.getType()).renderInGui(craftingComponent, poseStack, sx, sy, mousex, mousey); + private void renderCraftingComponent(GuiGraphics graphics, IComponentRenderContext context, ISpellIngredient craftingComponent, int sx, int sy, int mousex, int mousey) { + ISpellIngredientRenderer.getFor(craftingComponent.getType()).renderInGui(craftingComponent, graphics, sx, sy, mousex, mousey); if (context.isAreaHovered(mousex, mousey, sx, sy, 16, 16)) { context.setHoverTooltipComponents(craftingComponent.getTooltip()); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/mixin/SummonedEntityTriggerMixin.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/mixin/SummonedEntityTriggerMixin.java index 1d8a7527a..76ed57aa9 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/mixin/SummonedEntityTriggerMixin.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/mixin/SummonedEntityTriggerMixin.java @@ -21,14 +21,14 @@ public class SummonedEntityTriggerMixin { @Inject(method = "trigger", at = @At("HEAD")) private void trigger(ServerPlayer player, Entity entity, CallbackInfo ci) { if (PROCESSED_ENTITY_IDS.containsKey(entity.getId())) { - if (PROCESSED_ENTITY_IDS.get(entity.getId()) > entity.level.getGameTime()) return; + if (PROCESSED_ENTITY_IDS.get(entity.getId()) > entity.level().getGameTime()) return; PROCESSED_ENTITY_IDS.remove(entity.getId()); } - for (Ritual ritual : player.level.registryAccess().registryOrThrow(Ritual.REGISTRY_KEY)) { + for (Ritual ritual : player.level().registryAccess().registryOrThrow(Ritual.REGISTRY_KEY)) { if (!(ritual.trigger() instanceof EntitySummonTrigger trigger)) continue; if (!trigger.predicate().matches(player, entity)) continue; - if (ritual.perform(player, player.getLevel(), entity.blockPosition(), new Context.MapContext(Map.of("entity", entity)))) { - PROCESSED_ENTITY_IDS.put(entity.getId(), entity.level.getGameTime() + 200); + if (ritual.perform(player, player.serverLevel(), entity.blockPosition(), new Context.MapContext(Map.of("entity", entity)))) { + PROCESSED_ENTITY_IDS.put(entity.getId(), entity.level().getGameTime() + 200); return; } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableCreateSpellPacket.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableCreateSpellPacket.java index 6897de936..6c600a2c6 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableCreateSpellPacket.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableCreateSpellPacket.java @@ -27,6 +27,6 @@ public void serialize(FriendlyByteBuf friendlyByteBuf) { @Override public void handle(NetworkEvent.Context context) { - context.enqueueWork(() -> ((InscriptionTableBlockEntity) context.getSender().getLevel().getBlockEntity(pos)).createSpell(context.getSender())); + context.enqueueWork(() -> ((InscriptionTableBlockEntity) context.getSender().level().getBlockEntity(pos)).createSpell(context.getSender())); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableSyncPacket.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableSyncPacket.java index 64f1ce36d..86fae03a8 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableSyncPacket.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/InscriptionTableSyncPacket.java @@ -31,6 +31,6 @@ public void serialize(FriendlyByteBuf buf) { @Override public void handle(NetworkEvent.Context context) { - context.enqueueWork(() -> ((InscriptionTableBlockEntity) context.getSender().getLevel().getBlockEntity(blockPos)).onSync(name.getString().length() == 0 ? null : name, spell)); + context.enqueueWork(() -> ((InscriptionTableBlockEntity) context.getSender().level().getBlockEntity(blockPos)).onSync(name.getString().length() == 0 ? null : name, spell)); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/LearnSkillPacket.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/LearnSkillPacket.java index a8f296ff5..4668aa2ed 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/LearnSkillPacket.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/LearnSkillPacket.java @@ -35,7 +35,7 @@ public void handle(NetworkEvent.Context ctx) { ServerPlayer sender = ctx.getSender(); assert sender != null; if (!sender.isCreative()) { - Skill skill = sender.getLevel().registryAccess().registryOrThrow(Skill.REGISTRY_KEY).get(skill()); + Skill skill = sender.level().registryAccess().registryOrThrow(Skill.REGISTRY_KEY).get(skill()); assert skill != null; Map cost = skill.cost(); for (Map.Entry entry : cost.entrySet()) { diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/SetLecternPagePacket.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/SetLecternPagePacket.java index 68baf3c59..cf8902089 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/SetLecternPagePacket.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/SetLecternPagePacket.java @@ -32,7 +32,7 @@ public void serialize(FriendlyByteBuf friendlyByteBuf) { @Override public void handle(NetworkEvent.Context context) { context.enqueueWork(() -> { - BlockEntity blockEntity = Objects.requireNonNull(context.getSender()).getLevel().getBlockEntity(pos); + BlockEntity blockEntity = Objects.requireNonNull(context.getSender()).level().getBlockEntity(pos); if (blockEntity instanceof LecternBlockEntity lectern) { lectern.setPage(page); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/TakeSpellRecipeFromLecternPacket.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/TakeSpellRecipeFromLecternPacket.java index 574faabde..8f12e629c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/TakeSpellRecipeFromLecternPacket.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/network/TakeSpellRecipeFromLecternPacket.java @@ -29,6 +29,6 @@ public void serialize(FriendlyByteBuf friendlyByteBuf) { @Override public void handle(NetworkEvent.Context context) { - context.enqueueWork(() -> SpellRecipeItem.takeFromLectern(Objects.requireNonNull(context.getSender()), context.getSender().getLevel(), pos, context.getSender().getLevel().getBlockState(pos))); + context.enqueueWork(() -> SpellRecipeItem.takeFromLectern(Objects.requireNonNull(context.getSender()), context.getSender().level(), pos, context.getSender().level().getBlockState(pos))); } } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/NatureGuardianSpawnHandler.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/NatureGuardianSpawnHandler.java index fe2e44fa1..1e6d3a6a7 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/NatureGuardianSpawnHandler.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/NatureGuardianSpawnHandler.java @@ -17,7 +17,7 @@ public final class NatureGuardianSpawnHandler { private static final Map dryadKills = new HashMap<>(); static void dryadDeath(LivingDeathEvent event) { - if (!(event.getEntity().getLevel() instanceof ServerLevel serverLevel)) return; + if (!(event.getEntity().level() instanceof ServerLevel serverLevel)) return; long cooldown = Config.SERVER.DRYAD_KILL_COOLDOWN.get(); if (cooldown == 0) return; if (event.getEntity().getType() != AMEntities.DRYAD.get()) return; diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/AffinityCommand.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/AffinityCommand.java index 8dcbd5583..4f08a4b61 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/AffinityCommand.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/AffinityCommand.java @@ -103,9 +103,9 @@ private static int addAffinity(Collection players, Affinity affini } } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(AFFINITY_ADD_SINGLE, affinity.getDisplayName(), players.iterator().next().getDisplayName(), amount), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_ADD_SINGLE, affinity.getDisplayName(), players.iterator().next().getDisplayName(), amount), true); } else { - context.getSource().sendSuccess(Component.translatable(AFFINITY_ADD_MULTIPLE, affinity.getDisplayName(), players.size(), amount), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_ADD_MULTIPLE, affinity.getDisplayName(), players.size(), amount), true); } return players.size(); } @@ -130,9 +130,9 @@ private static int setAffinity(Collection players, Affinity affini } } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(AFFINITY_SET_SINGLE, affinity.getDisplayName(), players.iterator().next().getDisplayName(), amount), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_SET_SINGLE, affinity.getDisplayName(), players.iterator().next().getDisplayName(), amount), true); } else { - context.getSource().sendSuccess(Component.translatable(AFFINITY_SET_MULTIPLE, affinity.getDisplayName(), players.size(), amount), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_SET_MULTIPLE, affinity.getDisplayName(), players.size(), amount), true); } return players.size(); } @@ -155,9 +155,9 @@ private static int resetAffinities(Collection players, CommandCont } } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(AFFINITY_RESET_SINGLE, players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_RESET_SINGLE, players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(AFFINITY_RESET_MULTIPLE, players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_RESET_MULTIPLE, players.size()), true); } return players.size(); } @@ -171,7 +171,7 @@ private static int getAffinity(CommandContext context) throw } private static int getAffinity(ServerPlayer player, Affinity affinity, CommandContext context) { - context.getSource().sendSuccess(Component.translatable(AFFINITY_GET, affinity.getDisplayName(), player.getDisplayName(), ArsMagicaAPI.get().getAffinityHelper().getAffinityDepthOrElse(player, affinity, 0)), true); + context.getSource().sendSuccess(() -> Component.translatable(AFFINITY_GET, affinity.getDisplayName(), player.getDisplayName(), ArsMagicaAPI.get().getAffinityHelper().getAffinityDepthOrElse(player, affinity, 0)), true); return Command.SINGLE_SUCCESS; } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/MagicXpCommand.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/MagicXpCommand.java index fd5531e0b..3a8619d5c 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/MagicXpCommand.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/MagicXpCommand.java @@ -101,9 +101,9 @@ private static int addMagicXp(CommandSourceStack source, Collection Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_ADD_POINTS_SINGLE : MAGIC_XP_ADD_LEVELS_SINGLE, amount, players.iterator().next().getDisplayName()), true); } else { - source.sendSuccess(Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_ADD_POINTS_MULTIPLE : MAGIC_XP_ADD_LEVELS_MULTIPLE, amount, players.size()), true); + source.sendSuccess(() -> Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_ADD_POINTS_MULTIPLE : MAGIC_XP_ADD_LEVELS_MULTIPLE, amount, players.size()), true); } return players.size(); } @@ -129,9 +129,9 @@ private static int setMagicXp(CommandSourceStack source, Collection Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_SET_POINTS_SINGLE : MAGIC_XP_SET_LEVELS_SINGLE, amount, players.iterator().next().getDisplayName()), true); } else { - source.sendSuccess(Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_SET_POINTS_MULTIPLE : MAGIC_XP_SET_LEVELS_MULTIPLE, amount, players.size()), true); + source.sendSuccess(() -> Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_SET_POINTS_MULTIPLE : MAGIC_XP_SET_LEVELS_MULTIPLE, amount, players.size()), true); } return players.size(); } @@ -154,7 +154,7 @@ private static int getMagicXpLevels(CommandContext context) private static int getMagicXp(CommandSourceStack source, ServerPlayer player, MagicXpCommandType type) { Number i = type.get.apply(player); - source.sendSuccess(Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_GET_POINTS : MAGIC_XP_GET_LEVELS, player.getDisplayName(), i), true); + source.sendSuccess(() -> Component.translatable(type == MagicXpCommandType.POINTS ? MAGIC_XP_GET_POINTS : MAGIC_XP_GET_LEVELS, player.getDisplayName(), i), true); return i.intValue(); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillCommand.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillCommand.java index 7803e7688..41bc2f4cb 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillCommand.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillCommand.java @@ -93,7 +93,7 @@ public static void register(LiteralArgumentBuilder builder) } private static int listAllSkills(CommandContext context) { - context.getSource().sendSuccess(createSkillListComponent(context.getSource().registryAccess().registryOrThrow(Skill.REGISTRY_KEY).stream(), context.getSource().registryAccess()), true); + context.getSource().sendSuccess(() -> createSkillListComponent(context.getSource().registryAccess().registryOrThrow(Skill.REGISTRY_KEY).stream(), context.getSource().registryAccess()), true); return Command.SINGLE_SUCCESS; } @@ -118,7 +118,7 @@ private static int listUnknownSkills(ServerPlayer player, CommandContext knowledgeHelper.knows(player, skill, registryAccess)), registryAccess), true); + context.getSource().sendSuccess(() -> createSkillListComponent(skillRegistry.stream().filter(skill -> knowledgeHelper.knows(player, skill, registryAccess)), registryAccess), true); return Command.SINGLE_SUCCESS; } @@ -127,7 +127,7 @@ private static int listKnownSkills(ServerPlayer player, CommandContext Optional.ofNullable(skillRegistry.get(skill)).stream()), registryAccess), true); + context.getSource().sendSuccess(() -> createSkillListComponent(knowledgeHelper.getKnownSkills(player).stream().flatMap(skill -> Optional.ofNullable(skillRegistry.get(skill)).stream()), registryAccess), true); return Command.SINGLE_SUCCESS; } @@ -144,9 +144,9 @@ private static int forgetAllSkills(Collection players, CommandCont ArsMagicaAPI.get().getSkillHelper().forgetAll(player); } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_FORGET_ALL_SINGLE, players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_FORGET_ALL_SINGLE, players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_FORGET_ALL_MULTIPLE, players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_FORGET_ALL_MULTIPLE, players.size()), true); } return players.size(); } @@ -174,9 +174,9 @@ private static int forgetSkill(Collection players, CommandContext< helper.forget(player, skill, registryAccess); } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_FORGET_SINGLE, skill.getDisplayName(), players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_FORGET_SINGLE, skill.getDisplayName(), players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_FORGET_MULTIPLE, skill.getDisplayName(), players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_FORGET_MULTIPLE, skill.getDisplayName(), players.size()), true); } return players.size(); } @@ -194,9 +194,9 @@ private static int learnAllSkills(Collection players, CommandConte ArsMagicaAPI.get().getSkillHelper().learnAll(player, context.getSource().registryAccess()); } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_LEARN_ALL_SINGLE, players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_LEARN_ALL_SINGLE, players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_LEARN_ALL_MULTIPLE, players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_LEARN_ALL_MULTIPLE, players.size()), true); } return players.size(); } @@ -224,9 +224,9 @@ private static int learnSkill(Collection players, CommandContext Component.translatable(SKILL_LEARN_SINGLE, skill.getDisplayName(registryAccess), players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_LEARN_MULTIPLE, skill.getDisplayName(registryAccess), players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_LEARN_MULTIPLE, skill.getDisplayName(registryAccess), players.size()), true); } return players.size(); } diff --git a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillPointCommand.java b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillPointCommand.java index 0cdb6b5a1..6b12f140d 100644 --- a/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillPointCommand.java +++ b/src/main/java/com/github/minecraftschurlimods/arsmagicalegacy/server/commands/SkillPointCommand.java @@ -117,9 +117,9 @@ private static int addSkillPoint(Collection players, SkillPoint sk ArsMagicaAPI.get().getSkillHelper().addSkillPoint(player, skillPoint, amount); } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_ADD_SINGLE, amount, skillPoint.getDisplayName(), players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_ADD_SINGLE, amount, skillPoint.getDisplayName(), players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_ADD_MULTIPLE, amount, skillPoint.getDisplayName(), players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_ADD_MULTIPLE, amount, skillPoint.getDisplayName(), players.size()), true); } return players.size(); } @@ -146,9 +146,9 @@ private static int consumeSkillPoint(Collection players, SkillPoin helper.consumeSkillPoint(player, skillPoint, Math.min(amount, helper.getSkillPoint(player, skillPoint))); } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_CONSUME_SINGLE, amount, skillPoint.getDisplayName(), players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_CONSUME_SINGLE, amount, skillPoint.getDisplayName(), players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_CONSUME_MULTIPLE, amount, skillPoint.getDisplayName(), players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_CONSUME_MULTIPLE, amount, skillPoint.getDisplayName(), players.size()), true); } return players.size(); } @@ -172,9 +172,9 @@ private static int setSkillPoint(Collection players, SkillPoint sk } } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_SET_SINGLE, players.iterator().next().getDisplayName(), amount, skillPoint.getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_SET_SINGLE, players.iterator().next().getDisplayName(), amount, skillPoint.getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_SET_MULTIPLE, players.size(), amount, skillPoint.getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_SET_MULTIPLE, players.size(), amount, skillPoint.getDisplayName()), true); } return players.size(); } @@ -197,9 +197,9 @@ private static int clearSkillPoints(Collection players, CommandCon } } if (players.size() == 1) { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_RESET_SINGLE, players.iterator().next().getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_RESET_SINGLE, players.iterator().next().getDisplayName()), true); } else { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_RESET_MULTIPLE, players.size()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_RESET_MULTIPLE, players.size()), true); } return players.size(); } @@ -214,7 +214,7 @@ private static int getSkillPoint(CommandContext context) thr private static int getSkillPoint(Collection players, SkillPoint skillPoint, CommandContext context) { for (ServerPlayer player : players) { - context.getSource().sendSuccess(Component.translatable(SKILL_POINT_GET, player.getDisplayName(), ArsMagicaAPI.get().getSkillHelper().getSkillPoint(player, skillPoint), skillPoint.getDisplayName()), true); + context.getSource().sendSuccess(() -> Component.translatable(SKILL_POINT_GET, player.getDisplayName(), ArsMagicaAPI.get().getSkillHelper().getSkillPoint(player, skillPoint), skillPoint.getDisplayName()), true); } return players.size(); } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index e88dfd2cd..7fd4a7787 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -6,3 +6,5 @@ public net.minecraft.world.level.block.entity.LecternBlockEntity m_59532_(I)V # protected net.minecraft.client.resources.TextureAtlasHolder f_118884_ # textureAtlas public net.minecraft.client.renderer.texture.TextureAtlas f_118264_ # texturesByName public net.minecraft.gametest.framework.GameTestHelper f_127595_ # testInfo +public net.minecraft.client.renderer.RenderStateShard f_110139_ # TRANSLUCENT_TRANSPARENCY +public net.minecraft.client.renderer.RenderStateShard f_110113_ # LEQUAL_DEPTH_TEST