From 26c378d06d801bd443a7bb77c781d6fac561668a Mon Sep 17 00:00:00 2001 From: Zepalesque <60141811+Zepalesque@users.noreply.github.com> Date: Wed, 29 May 2024 13:34:40 -0400 Subject: [PATCH] feat: more stuff --- src/main/java/net/zepalesque/redux/Redux.java | 4 +- .../block/natural/AetherShortGrassBlock.java | 4 +- .../zepalesque/redux/client/ReduxColors.java | 2 +- .../redux/config/DataSerializableConfig.java | 34 ++++++++++ .../zepalesque/redux/config/ReduxConfig.java | 40 ++--------- .../net/zepalesque/redux/data/ReduxTags.java | 7 +- .../textures/block/natural/aurum.png | Bin 0 -> 206 bytes .../textures/block/natural/aurum_overlay.png | Bin 0 -> 213 bytes .../block/natural/enchanted_aurum.png | Bin 0 -> 251 bytes .../natural/enchanted_golden_clover_stem.png | Bin 0 -> 185 bytes .../block/natural/enchanted_medium_grass.png | Bin 0 -> 253 bytes .../block/natural/enchanted_short_grass.png | Bin 0 -> 218 bytes .../block/natural/enchanted_splitfern.png | Bin 0 -> 1178 bytes .../block/natural/enchanted_tall_grass.png | Bin 0 -> 263 bytes .../block/natural/enchanted_white_flower.png | Bin 0 -> 246 bytes .../block/natural/enchanted_zyatrix.png | Bin 0 -> 1179 bytes .../blockstates/aether_grass_block.json | 38 +++++++++++ .../models/block/aether_grass_block.json | 10 +++ .../models/block/potted_purple_flower.json | 8 +++ .../models/block/potted_white_flower.json | 8 +++ .../aether/models/block/purple_flower.json | 8 +++ .../aether/models/block/white_flower.json | 8 +++ .../ancient_aether/blockstates/sky_grass.json | 64 ++++++++++++++++++ .../ancient_aether/models/block/elevetia.json | 8 +++ .../models/block/highland_viola.json | 8 +++ .../models/block/potted_elevetia.json | 8 +++ .../models/block/potted_highland_viola.json | 8 +++ .../models/block/potted_sakura_blossoms.json | 8 +++ .../models/block/potted_sky_blues.json | 8 +++ .../models/block/potted_sunset_rose.json | 8 +++ .../models/block/potted_wynd_thistle.json | 8 +++ .../models/block/sakura_blossoms.json | 8 +++ .../models/block/sky_blues.json | 8 +++ .../models/block/sky_grass_medium.json | 7 ++ .../models/block/sky_grass_short.json | 7 ++ .../models/block/sky_grass_tall.json | 7 ++ .../models/block/sky_grass_very_short.json | 7 ++ .../models/block/sky_grass_very_tall.json | 7 ++ .../models/block/sunset_rose.json | 8 +++ .../models/block/trapped_sakura_blossoms.json | 8 +++ .../models/block/wynd_thistle.json | 8 +++ .../ancient_aether/models/item/elevetia.json | 7 ++ .../models/item/highland_viola.json | 7 ++ .../models/item/sakura_blossoms.json | 7 ++ .../ancient_aether/models/item/sky_blues.json | 7 ++ .../models/item/sunset_rose.json | 7 ++ .../models/item/trapped_sakura_blossoms.json | 7 ++ .../models/item/wynd_thistle.json | 7 ++ .../textures/block/elevetia.png | Bin 0 -> 194 bytes .../textures/block/elevetia_overlay.png | Bin 0 -> 218 bytes .../textures/block/highland_viola.png | Bin 0 -> 209 bytes .../textures/block/highland_viola_overlay.png | Bin 0 -> 220 bytes .../textures/block/sakura_blossoms.png | Bin 0 -> 214 bytes .../block/sakura_blossoms_overlay.png | Bin 0 -> 201 bytes .../textures/block/sky_blues.png | Bin 0 -> 205 bytes .../textures/block/sky_blues_overlay.png | Bin 0 -> 218 bytes .../textures/block/sky_grass_medium.png | Bin 0 -> 243 bytes .../block/sky_grass_medium_enchanted.png | Bin 0 -> 243 bytes .../textures/block/sky_grass_short.png | Bin 0 -> 235 bytes .../block/sky_grass_short_enchanted.png | Bin 0 -> 235 bytes .../textures/block/sky_grass_tall.png | Bin 0 -> 262 bytes .../block/sky_grass_tall_enchanted.png | Bin 0 -> 262 bytes .../textures/block/sky_grass_very_short.png | Bin 0 -> 216 bytes .../block/sky_grass_very_short_enchanted.png | Bin 0 -> 216 bytes .../textures/block/sky_grass_very_tall.png | Bin 0 -> 272 bytes .../block/sky_grass_very_tall_enchanted.png | Bin 0 -> 272 bytes .../textures/block/sunset_rose.png | Bin 0 -> 201 bytes .../textures/block/sunset_rose_overlay.png | Bin 0 -> 223 bytes .../block/trapped_sakura_blossoms.png | Bin 0 -> 217 bytes .../block/trapped_sakura_blossoms_overlay.png | Bin 0 -> 206 bytes .../textures/block/wynd_thistle.png | Bin 0 -> 193 bytes .../textures/block/wynd_thistle_overlay.png | Bin 0 -> 212 bytes .../deep_aether/models/block/aerlavender.json | 8 +++ .../deep_aether/models/block/echaisy.json | 8 +++ .../models/block/feather_grass.json | 8 +++ .../models/block/golden_aspess.json | 8 +++ .../deep_aether/models/block/iaspove.json | 8 +++ .../models/block/potted_aerlavender.json | 8 +++ .../models/block/potted_echaisy.json | 8 +++ .../models/block/potted_golden_aspess.json | 8 +++ .../models/block/potted_iaspove.json | 8 +++ .../models/block/potted_radiant_orchid.json | 8 +++ .../models/block/potted_sky_tulips.json | 8 +++ .../models/block/potted_tall_aerlavender.json | 8 +++ .../models/block/radiant_orchid.json | 8 +++ .../deep_aether/models/block/sky_tulips.json | 8 +++ .../models/block/tall_aerlavender.json | 8 +++ .../block/tall_feather_grass_bottom.json | 8 +++ .../models/block/tall_feather_grass_top.json | 8 +++ .../deep_aether/models/item/aerlavender.json | 7 ++ .../deep_aether/models/item/echaisy.json | 7 ++ .../models/item/feather_grass.json | 7 ++ .../models/item/golden_aspess.json | 7 ++ .../deep_aether/models/item/iaspove.json | 7 ++ .../models/item/radiant_orchid.json | 7 ++ .../deep_aether/models/item/sky_tulips.json | 7 ++ .../models/item/tall_aerlavender.json | 7 ++ .../models/item/tall_feather_grass.json | 7 ++ .../textures/block/aerlavender.png | Bin 0 -> 215 bytes .../textures/block/aerlavender_overlay.png | Bin 0 -> 227 bytes .../textures/block/aerlavender_pot.png | Bin 0 -> 212 bytes .../block/aerlavender_pot_overlay.png | Bin 0 -> 226 bytes .../deep_aether/textures/block/echaisy.png | Bin 0 -> 226 bytes .../textures/block/echaisy_overlay.png | Bin 0 -> 240 bytes .../textures/block/feather_grass.png | Bin 0 -> 239 bytes .../textures/block/feather_grass_overlay.png | Bin 0 -> 221 bytes .../textures/block/golden_aspess.png | Bin 0 -> 211 bytes .../textures/block/golden_aspess_overlay.png | Bin 0 -> 229 bytes .../deep_aether/textures/block/iaspove.png | Bin 0 -> 219 bytes .../textures/block/iaspove_overlay.png | Bin 0 -> 213 bytes .../textures/block/radiant_orchid.png | Bin 0 -> 210 bytes .../textures/block/radiant_orchid_overlay.png | Bin 0 -> 220 bytes .../deep_aether/textures/block/sky_tulips.png | Bin 0 -> 225 bytes .../textures/block/sky_tulips_overlay.png | Bin 0 -> 209 bytes .../textures/block/tall_aerlavender.png | Bin 0 -> 251 bytes .../block/tall_aerlavender_overlay.png | Bin 0 -> 261 bytes .../textures/block/tall_aerlavender_pot.png | Bin 0 -> 246 bytes .../block/tall_aerlavender_pot_overlay.png | Bin 0 -> 257 bytes .../block/tall_feather_grass_bottom.png | Bin 0 -> 267 bytes .../tall_feather_grass_bottom_overlay.png | Bin 0 -> 221 bytes .../textures/block/tall_feather_grass_top.png | Bin 0 -> 230 bytes .../block/tall_feather_grass_top_overlay.png | Bin 0 -> 230 bytes 122 files changed, 578 insertions(+), 44 deletions(-) create mode 100644 src/main/java/net/zepalesque/redux/config/DataSerializableConfig.java create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/aurum.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/aurum_overlay.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_aurum.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_golden_clover_stem.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_medium_grass.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_short_grass.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_splitfern.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_tall_grass.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_white_flower.png create mode 100644 src/main/resources/assets/aether_redux/textures/block/natural/enchanted_zyatrix.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/blockstates/aether_grass_block.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/models/block/aether_grass_block.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/models/block/potted_purple_flower.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/models/block/potted_white_flower.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/models/block/purple_flower.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/aether/models/block/white_flower.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/blockstates/sky_grass.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/elevetia.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/highland_viola.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_elevetia.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_highland_viola.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_sakura_blossoms.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_sky_blues.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_sunset_rose.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/potted_wynd_thistle.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sakura_blossoms.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_blues.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_grass_medium.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_grass_short.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_grass_tall.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_grass_very_short.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sky_grass_very_tall.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/sunset_rose.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/trapped_sakura_blossoms.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/block/wynd_thistle.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/elevetia.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/highland_viola.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/sakura_blossoms.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/sky_blues.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/sunset_rose.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/trapped_sakura_blossoms.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/models/item/wynd_thistle.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/elevetia.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/elevetia_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/highland_viola.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/highland_viola_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sakura_blossoms.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sakura_blossoms_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_blues.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_blues_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_medium.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_medium_enchanted.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short_enchanted.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall_enchanted.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_short.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_short_enchanted.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_tall.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_tall_enchanted.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/trapped_sakura_blossoms.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/trapped_sakura_blossoms_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/wynd_thistle.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/wynd_thistle_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/echaisy.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/feather_grass.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/golden_aspess.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/iaspove.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_echaisy.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_golden_aspess.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_iaspove.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_radiant_orchid.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_sky_tulips.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/potted_tall_aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/radiant_orchid.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/sky_tulips.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/tall_aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/tall_feather_grass_bottom.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/block/tall_feather_grass_top.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/echaisy.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/feather_grass.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/golden_aspess.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/iaspove.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/radiant_orchid.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/sky_tulips.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/tall_aerlavender.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/models/item/tall_feather_grass.json create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/echaisy.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/echaisy_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/feather_grass.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/feather_grass_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/golden_aspess.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/golden_aspess_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/radiant_orchid.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/radiant_orchid_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/sky_tulips.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/sky_tulips_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_pot.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_pot_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom_overlay.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_top.png create mode 100644 src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_top_overlay.png diff --git a/src/main/java/net/zepalesque/redux/Redux.java b/src/main/java/net/zepalesque/redux/Redux.java index 75bc84593..cc44e2753 100644 --- a/src/main/java/net/zepalesque/redux/Redux.java +++ b/src/main/java/net/zepalesque/redux/Redux.java @@ -87,8 +87,8 @@ public Redux(IEventBus bus, Dist dist) { ReduxConfigHandler.setup(bus); - ConfigCondition.registerSerializer("redux_server", new ConfigSerializer(ReduxConfig.Server::serialize, ReduxConfig.Server::deserialize)); - ConfigCondition.registerSerializer("redux_common", new ConfigSerializer(ReduxConfig.Common::serialize, ReduxConfig.Common::deserialize)); + ConfigCondition.registerSerializer("redux_server", new ConfigSerializer(ReduxConfig.SERVER::serialize, ReduxConfig.SERVER::deserialize)); + ConfigCondition.registerSerializer("redux_common", new ConfigSerializer(ReduxConfig.COMMON::serialize, ReduxConfig.COMMON::deserialize)); } private void commonSetup(final FMLCommonSetupEvent event) { diff --git a/src/main/java/net/zepalesque/redux/block/natural/AetherShortGrassBlock.java b/src/main/java/net/zepalesque/redux/block/natural/AetherShortGrassBlock.java index c8b450cfa..55904db28 100644 --- a/src/main/java/net/zepalesque/redux/block/natural/AetherShortGrassBlock.java +++ b/src/main/java/net/zepalesque/redux/block/natural/AetherShortGrassBlock.java @@ -75,7 +75,7 @@ public BlockState setValues(Level level, BlockPos pos, BlockState state) { GrassSize size = GrassSize.values()[i]; BlockState b = state.setValue(ReduxStates.GRASS_SIZE, size); BlockPos below = pos.below(); - if (level.getBlockState(below).is(AetherBlocks.ENCHANTED_AETHER_GRASS_BLOCK.get())) { + if (level.getBlockState(below).is(ReduxTags.Blocks.ENCHANTED_GRASS_BLOCKS)) { return b.setValue(ReduxStates.ENCHANTED, true); } return b; @@ -96,7 +96,7 @@ public BlockState updateShape(BlockState state, Direction facing, BlockState fac b = b.setValue(ReduxStates.GRASS_SIZE, size); } if (b.hasProperty(ReduxStates.ENCHANTED) && facing == Direction.DOWN) { - if (level.getBlockState(facingPos).is(AetherBlocks.ENCHANTED_AETHER_GRASS_BLOCK.get())) { + if (level.getBlockState(facingPos).is(ReduxTags.Blocks.ENCHANTED_GRASS_BLOCKS)) { return b.setValue(ReduxStates.ENCHANTED, true); } return b.setValue(ReduxStates.ENCHANTED, false); diff --git a/src/main/java/net/zepalesque/redux/client/ReduxColors.java b/src/main/java/net/zepalesque/redux/client/ReduxColors.java index 5c309915f..1d5a2dcd4 100644 --- a/src/main/java/net/zepalesque/redux/client/ReduxColors.java +++ b/src/main/java/net/zepalesque/redux/client/ReduxColors.java @@ -77,7 +77,7 @@ private static int getAverageColor(BlockAndTintGetter level, BlockPos blockPos, public static int getColor(BlockState state, @Nullable BlockAndTintGetter level, @Nullable BlockPos pos, int index, int indexGoal, boolean useBelowProperties) { if (index == indexGoal) { if (level != null && pos != null) { - if (level.getBlockState(pos.below()).is(ReduxTags.Blocks.SHORT_GRASS_BLIGHT_OVERRIDE) && useBelowProperties) { + if (level.getBlockState(pos.below()).is(ReduxTags.Blocks.BLIGHT_GRASS_BLOCKS) && useBelowProperties) { return Tints.BLIGHT_GRASS_COLOR; } else if (state.hasProperty(ReduxStates.ENCHANTED) && state.getValue(ReduxStates.ENCHANTED)) { return 0xFFFFFF; diff --git a/src/main/java/net/zepalesque/redux/config/DataSerializableConfig.java b/src/main/java/net/zepalesque/redux/config/DataSerializableConfig.java new file mode 100644 index 000000000..2244eb1db --- /dev/null +++ b/src/main/java/net/zepalesque/redux/config/DataSerializableConfig.java @@ -0,0 +1,34 @@ +package net.zepalesque.redux.config; + +import com.google.gson.JsonSyntaxException; +import net.neoforged.neoforge.common.ModConfigSpec; + +import java.util.Arrays; +import java.util.List; + +public class DataSerializableConfig { + + protected final ModConfigSpec spec; + + public DataSerializableConfig(ModConfigSpec spec) { + this.spec = spec; + } + + public String serialize(ModConfigSpec.ConfigValue config) { + try { + return config.getPath().toString(); + } catch (NullPointerException e) { + throw new JsonSyntaxException("Error loading config entry from JSON! Maybe the config key is incorrect?"); + } + } + + public ModConfigSpec.ConfigValue deserialize(String string) { + List path = Arrays.asList(string.replace("[", "").replace("]", "").split(", ")); + + return this.spec().getValues().get(path); + } + + public ModConfigSpec spec() { + return spec; + } +} diff --git a/src/main/java/net/zepalesque/redux/config/ReduxConfig.java b/src/main/java/net/zepalesque/redux/config/ReduxConfig.java index 294dd4b71..404ed3a34 100644 --- a/src/main/java/net/zepalesque/redux/config/ReduxConfig.java +++ b/src/main/java/net/zepalesque/redux/config/ReduxConfig.java @@ -1,68 +1,36 @@ package net.zepalesque.redux.config; -import com.google.gson.JsonSyntaxException; import net.neoforged.neoforge.common.ModConfigSpec; import org.apache.commons.lang3.tuple.Pair; -import java.util.Arrays; -import java.util.List; - public class ReduxConfig { - public static class Server { + public static class Server extends DataSerializableConfig { public final ModConfigSpec.ConfigValue placeholder; public Server(ModConfigSpec.Builder builder) { + super(SERVER_SPEC); builder.push("TODO"); placeholder = builder .comment("Temporary placeholder config, used") .define("Placeholder Config", true); builder.pop(); } - - public static String serialize(ModConfigSpec.ConfigValue config) { - try { - return config.getPath().toString(); - } catch (NullPointerException e) { - throw new JsonSyntaxException("Error loading config entry from JSON! Maybe the config key is incorrect?"); - } - } - - public static ModConfigSpec.ConfigValue deserialize(String string) { - List path = Arrays.asList(string.replace("[", "").replace("]", "").split(", ")); - ModConfigSpec.ConfigValue config = SERVER_SPEC.getValues().get(path); - - return config; - } } - public static class Common { + public static class Common extends DataSerializableConfig { public final ModConfigSpec.ConfigValue placeholder; public Common(ModConfigSpec.Builder builder) { + super(COMMON_SPEC); builder.push("TODO"); placeholder = builder .comment("Temporary placeholder config, used") .define("Placeholder Config", true); builder.pop(); } - - public static String serialize(ModConfigSpec.ConfigValue config) { - try { - return config.getPath().toString(); - } catch (NullPointerException e) { - throw new JsonSyntaxException("Error loading config entry from JSON! Maybe the config key is incorrect?"); - } - } - - public static ModConfigSpec.ConfigValue deserialize(String string) { - List path = Arrays.asList(string.replace("[", "").replace("]", "").split(", ")); - ModConfigSpec.ConfigValue config = COMMON_SPEC.getValues().get(path); - - return config; - } } public static class Client { diff --git a/src/main/java/net/zepalesque/redux/data/ReduxTags.java b/src/main/java/net/zepalesque/redux/data/ReduxTags.java index d8bdb7c71..f3c365b6b 100644 --- a/src/main/java/net/zepalesque/redux/data/ReduxTags.java +++ b/src/main/java/net/zepalesque/redux/data/ReduxTags.java @@ -3,7 +3,6 @@ import com.aetherteam.aether.api.AetherAdvancementSoundOverrides; import com.aetherteam.aether.api.registers.AdvancementSoundOverride; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.tags.TagKey; import net.minecraft.world.damagesource.DamageType; @@ -18,8 +17,10 @@ public class ReduxTags { public static class Blocks { - public static final TagKey SHORT_GRASS_BLIGHT_OVERRIDE = tag("short_grass_blight_override"); - public static final TagKey SHORT_GRASS_COLORLESS_OVERRIDE = tag("short_grass_colorless_override"); + // Blocks that should override Short Aether Grass's color to be the blight color (blightmoss for instance) + public static final TagKey BLIGHT_GRASS_BLOCKS = tag("blight_grass_blocks"); + // Blocks that should make Short Aether Grass use its enchanted state + public static final TagKey ENCHANTED_GRASS_BLOCKS = tag("enchanted_grass_blocks"); public static TagKey tag(String name) { return TagKey.create(Registries.BLOCK, Redux.loc(name)); diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/aurum.png b/src/main/resources/assets/aether_redux/textures/block/natural/aurum.png new file mode 100644 index 0000000000000000000000000000000000000000..e591bec1577d07b7750107eaad61ae8147aa5147 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-ogZmCFUAd}j(qy2(i3q1$kh+o}zu^D>|1&sft^5Mya~60+7BevL z?FV5-3)Wy2prEyNS%G~10G|-o|5t*aue168rg>ML7Eo;AC$4osinS!jFZe$YF#O)e2QrAWz$3Dl zfq`#72s2u+2CD!C?L1u^Lo|Z7_Biq}C~zER`2OEqdqd)*yRo}W84pj^zQMu1Xm*P& y(>YtEkP{~scWwBTzqRdlpy*ty?;R)E8FRj8Gap_S#%KUEiNVv=&t;ucLK6U4Mnn4m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_aurum.png b/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_aurum.png new file mode 100644 index 0000000000000000000000000000000000000000..69d3a0aac06e47bd0816889e988464c6fb5b5cdf GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-o|5t*aue168rg>ML*43l&$F>EnnhsRNu<<(&3y|U{3Gxg64*?AK zn)gNm#W)K*B8wRq`1XS^qXlcQ3Q#b@)5S4FBRIAvT8u%F!^zb9+y2KN8!ub_WWK|6 zuvq*;ph(19wiCL;9Edi(JF!N;;lQ`lc`Q5$ b2@DL+rc1Uk-kNp>XflJRtDnm{r-UW|VNS%G}f0G|-o=XZMVUnn}ZEojFI*Q-b4S4{`1V3?SsdJ#ymmjw9*{|5sGDQ{*s zpb%$)M`SSr1K)lSX0%`pRsjmedAc};XaukAaTH>9NS%G|^0G|-o`xlCiZ40`3H2(RW-W@Akfx^~HWzPXAwvr&f;Qt`NuzCNI{Xh}U z0*}aI1_nMLn{Pj(1#7ShP|)7f#W6%9_^i)KK?Xw(r@nvDaXxh`6KowML@OUXcPl(s zz^kWt>Y7xT!P~3i2Lo(hy~+zY=)CneM@ezdq@-uellQSyS6`XF0caG1r>mdKI;Vst E0D{6ue*gdg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_splitfern.png b/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_splitfern.png new file mode 100644 index 0000000000000000000000000000000000000000..615d088f875faa329d730825984767c769f3f440 GIT binary patch literal 1178 zcmZ`&PfXKL7%xr?Vn9Ri0P)b&3o*2>+t9eC8yR%Mge}W9WW<CK|Gv2@LO!eaa&?I z9r>_$_GKyd^XuH_W%K?#eoa`6y^6PeC>c*}IE#3+cyAGB_8Ws^7D2QRIZs3T($Zss z@Z40=8I*|)bCRBCL|Gq)jGZ?ynjrXI+YqH3MC3TkDq4^#KVPIsMGjJ<$75{F=!cWa z;FJkdQ}MJkm6HN8)f;MQ=4}o$ln8W{_G@wWqf^tDB6HAc&x(Ue> z49l<-K2DOnDNk@o;Z*fFj)K%ALIwvwu~=k^envO5z#9kz0P6!jAB_>TbxA{_O>5TC z3Q3hlfR?9%{$}UdHRFb+Jg9*b<^y zRkN^dzon!>w=GCQts=#>QG_)BJ@%&x+mM{@s6-_*F^@dpa(j zS?&;oTXVv*FGF`{uCv-gDKbj0-u{7JG_;=cJb2^nnO?bu{yZ(uBk4xtLb=>=?BnIv fo==DG`1vcRd)L2t-nFeyr=5Y1M&d%L@BH*%b7+CZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_tall_grass.png b/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_tall_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..fb06fa5b05e3bea600d82b634e8df0d94078e8a3 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o`xlCy-|0QJEojFI*Q-b4S4{`1V0b2esR&51mjw9*{|5sGDQ{*s zpb%$)M`SSr1K)lSX0%`pRsjlTc)B=-Xax862J#(H;Ba0T^1l9wZNceDwZ1IgnTFq< z|54GnQ**$e#PaM(6%!rb(^WrK6^XBvnr|ArxA&!DmbKTjTmFqu>Wxfd5fyAQ w(c71r@};O$L&tft)`G61$;`Szr$t^e6~rFVdQ&MBb@08d9*)&Kwi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_white_flower.png b/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_white_flower.png new file mode 100644 index 0000000000000000000000000000000000000000..6476a501397ee5e3be11730b10a3611ceaa19568 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|-o|NsA=JbCi*y89ZJ6T-G@yGywq7aaQI4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_zyatrix.png b/src/main/resources/assets/aether_redux/textures/block/natural/enchanted_zyatrix.png new file mode 100644 index 0000000000000000000000000000000000000000..2a3155f80c8f4f55a4713271168cb431470e5680 GIT binary patch literal 1179 zcmZ`&PfXKL7%v$ZML`3Y5aiHQ50JRF8)#h94F{WSfz4$baWnp*w2x8OwN3k$RZKAA zMTk)ojp3k?=z)u3OhidMs4!%` z-EsfK)#X=@qH`}#zPPtMdS>BN^uyHc!1yIMdjDr;;yl{6z-TzOTv%A_uu)?s)j(3m zu(~euDXW{Ad5B@Qi()(h6QOQ~S283gD1Cr5GAcr27~5v39G?ad?*l1Ob`y(Fo)Wky zxQQeCLUc&&00UxRPy?~SaGW1Z^DcpC^Hf!`27?$f0CKpIkz}1Q+=NBUp#Nr?B5(@= z({3UWir^iJ2JrnPP0|E9j^nH*^fOW4p~7(#xrqS?RfeK+xg42mAr&n}Ib1FmMLQ{{ z(~b~!{j>}@!!GN)^CSftAJBPCRH3NIxJk?PDOu1Va#K|c)Vb}%G&t)Y@czR@uL%_Wn%qd!$ zrA!Ybv4kO?DrIG7O0A6%YnfIH_sAmjtQ`L*T|86rHJE}^am)Ml{%r`&ljYqkX}Wwv zTehQ)MiEOD$HR<@BL-wNR~j0iy{@V6X!wo=ecpIeEc+%|{S4n+9vM4&W9ioP-J!8- z)AO~%Uq{=n{HT50zL5M`9jWO$QPD7a?*3w8?#sxh_w&K){yp_1-s@}KR{yd2PVds} n&7|#DUE@2l{zCIk+wp@#NS%G}c0G|-o^z59b)>a^|i$55oh`A)lFZlm|hU=$zfod5z3p^r=85sBufiR<} zhF1en(Ad+(F+?LcIl+mUS%+bIgOP-!qKQ*m0|PVjEQSf}!JMH7k8mteOi~b9(agAn e`$Sq269e}e#`{j^PsIbZGkCiCxvXNS%G|>0G|+7H>=J3`31=5EbxddW?8eR=RL3d9V#}JL+(w;yr1_KVKv+wGk2X4za_^0Di`iG_KFFNYBO=Y-p>BZjE z8%hZeJ~wyiwrTBRO>KQBGJUEE%XOYk>0^g^br1h#$oa{%Zuar3u0SIhJYD@<);T3K F0RSlAMi>A9 literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/highland_viola.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/highland_viola.png new file mode 100644 index 0000000000000000000000000000000000000000..d7053bb7f598b91acd087211467110cc249965f6 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-oC5x9dwYH{b=Kuv-8)lk-)RhGJ1^@s5pTR+ENrO)QwVjcWP)!koQ41XYbeVKy5ZPNw6 vek&%$t}W_H1G3QDr*Ex9j~NS%G~10G|-o8)v?p-t%F}5NfZ_KxK9E721s;*b z3=DinK$vl=HlH+5(ACq$F+?MHYmXxzgCYmB=C}X()5LmCzPoAZVQeV;=R*+7g~uH+ zo=UGauFzhfEg0AAvQAiIS>O(XMb3ZyrGI9BG25Paf|uzU^EO-Ugg~Hy44$rjF6*2U Fng9UZN0k5o literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sakura_blossoms.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sakura_blossoms.png new file mode 100644 index 0000000000000000000000000000000000000000..202cb1f2083f3cf49e5977076e8b2d9848dc7352 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-orqNS%G|>0G|-ox99HM*mitp+ccm+#nj46Aax}{e!>6$|7UQ}TKNUY=PdAuEM{Qf zI|9OtQ?>b|fr4h9E{-7@!O013%*NS%G|>0G|-oC5x9dwYH{b=Kuv-8)lk-)RhGJ1^@s5pTR+ENS%G~10G|-oLsx#zTzk8rYkPL_OrThifo&3yVl4^s3;quT48OPWfehj-@Q5sC zVBk9f!i-b3`J{n@&YmugAsWGZdjk0w6gZp?@AyBH`Rn1zh8tTx^6*W!Yho6v{UqEG z$6I0hG~KNS%G}f0G|-oL;DWgK6hdLrcE;!FX@~-rLv_BDD%GT*F_-3UJ~RN{2vS$q`aBk zfI^%F9+AZi415Pbm@(^GCnr!a#M8wwL?d|XX>Xwe1{_QQB2WLh>mBnEziU3fvy$gR z`d`k^Zz>ee)mn;3NFSSEe7mh}PuaJ5HpxbF4#syXZE|DwTX~A<_Tg_`XHRYOJAQSY d-m;B~wpYVg4$NGBgAZsvgQu&X%Q~loCIIcFSLpx% literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_medium_enchanted.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_medium_enchanted.png new file mode 100644 index 0000000000000000000000000000000000000000..208d36834cdd3dd2c65bc37a5fbc23d88fcbe72b GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o`xlCy-|4-2H2&DOpdBk*S4{`1VAy>A88?t(FA4Gs{tpHWQr^sN zKq1ZokH}&M2EP3u%xJ+HtO67a@pN$v(Fopp+FR&=0S8ln$kTuBddGak@0!o=tmL_n z{+ILfn+nBqwU#0h(#Iwk-)?K$Q}%71O|sFPgYlh8o7|ZFR-R(IefV3~*;Cv6j$d7; dw``-L?bR@r12dQ3-~*b^;OXk;vd$@?2>`KGRg3@t literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea6e3837e35a0f8bd164652940181f77c07dfc4 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-oL;DWgK6hdLrcE;!FX@~-rLv_BDD%GT*F_-3UJ~RN{2vS$q`aBk zfI^%F9+AZi415Pbm@(^GCnr$Q$J50zL?ifU&vD)Z20YA>DR1pJovdL>X%twsyy@?Y z_z7RaMCDgsaN?e-Qqr7ytmz}unjMoZrv~malA1N=`HmBdm7lxLW69{NwJ}(`_h&xK V&+Ta~JAvjhc)I$ztaD0e0svJ|R7wB< literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short_enchanted.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_short_enchanted.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9bf97e67f7547a24efa3d95c011005cb9f25db GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o`xlCy-|4-2H2&DOpdBk*S4{`1VAy>A88?t(FA4Gs{tpHWQr^sN zKq1ZokH}&M2EP3u%xJ+HtO6AD@pN$v(Fi`;bDZ~p0S|Lz%3J$QCu^8e8UBvX2)d9se!wUq-M=|zT?DV<>#*RSTg!*Z4B1#{h815 Ub9-9LPN2CAp00i_>zopr04wNG?EnA( literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall.png new file mode 100644 index 0000000000000000000000000000000000000000..1649eb45a2fc05b11d9d8220d4526329dba3afba GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o+vhH<-?Zt_z5_ECFX@~-rLv_Br0teM5|Cmq3Gxg64+acU-pp=5 zAEalo5!~zJ$aL6%L&)*p|0fGy>sgx`b~xz#pS%5# zQlG4D`KkL>iP0ynay1qkt(}m-_UFXpw=ps{$&Fk$Y#2{G=it?Lk}~%c-?;IQt@(l{ v$Zv4ik_YY%@F^j>|GwR=fRx)_H`njxgN@xNA$x2yY literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall_enchanted.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_tall_enchanted.png new file mode 100644 index 0000000000000000000000000000000000000000..80f99e547193a2472eb304570f24ac3909f025cb GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o=XZLq9*w_$q3GDQpdBk*S4{`1V2JuTCl5%mmjw9*{|5sGDQ{*s zpb%$)M`SSr1K)lSX0%`pRsjm8d%8G=Xax8AI5HhJ;1F{B_y5Vl*Lv2bh8+$%|L1N$ zq|_&?TYl=kRbupst6Yu6Mr$V|u>CnP`E87hO>!gG4I9Q2&pCLtoute?#W!yJV{5+P vNwPGvSZmm{OHA$>u5<4Sx*NZ->HWi4W6Wak^o;s9pp^`su6{1-oD!MNS%G}f0G|-o+vhGE+IL|6rcE;!FX@~-rLv_BC^L<7+kYU%UJ~RN{2vS$q`aBk zfI^%F9+AZi415Pbm@(^GCnr$Q($mE;L?ifW*Fjze0}dwc6~FsquEd*bxG_EPv;CE` z;h_1g#&yegFw4ZWNSxRx+^lH!PJD%j>e;YZ=>*m+6WQyrKtmWjUHx3vIVCg!05P;h A6951J literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_short_enchanted.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_short_enchanted.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7570dac63cacc54867b2d49dd24a19031df2cf GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o=XZMVUnshIH2&DOpdBk*S4{`1U^uc%a0QTJFA4Gs{tpHWQr^sN zKq1ZokH}&M2EP3u%xJ+HtO69Y^mK6y(FnfUb&!|AfP;y9#qa)@EAi$UZcI=7Y=7l! zIB0&WaozGA%rY@85+^naH!GUG6JOz>dNwRpI)OFIMD}_t&=3YsS3j3^P6NS%G}f0G|-o^_w=`K6l~Jz5_ECFX@~-rLv_BD6@6_%Pt_rUJ~RN{2vS$q`aBk zfI^%F9+AZi415Pcm~qF%?6*L{LQfaR5RG8dUQVF{3LHnm*8R8N8M&oZP^u~G-gomW zpPw5s#|m7p_^W6;)lp_5L;H(uJx-0U9B&kr8YY-cJieU4@Tud*1okNnb3Sd!QIJr( zW@pW@GAiH?v()-p_UG$Lm^w8K6n2OBD%?DoQqQ>i>SsoN4(1h|F5S<8mNR&|`njxg HN@xNATee|L literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_tall_enchanted.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sky_grass_very_tall_enchanted.png new file mode 100644 index 0000000000000000000000000000000000000000..22ed8c847b7ef879f06ffd9553fb22dc4e29aded GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-ot4HIX-|4-7q3GDQpdBk*S4{`1V7M7p-V3DIOM?7@|APU8lsB^* zP>8d@BeIx*f$snaGiF`uhusg(8;pWMdddA&XKQr=kFt6xz>3$BhoWax8&t;uc GLK6TOeP34q literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose.png new file mode 100644 index 0000000000000000000000000000000000000000..4c572b8068296c8e251799586d2a8771c56cc3c2 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-o^z59b*48D9mjDIyBP3%%>PmwAg8%>j&)}f7@(Ym9S>O>_%)r2R z2!t6$HM|;tf@YpBjv*SsM|%!(G8phMnZDa!>@Cc*!{M*SaYd1z+z#vY1Q~63EcPz= lQP%wXWZ!PC{xWt~$(6952)IQ9Sl literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/sunset_rose_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..1a3b8fee29c16e4bad9511a804aa05e8f4b262d5 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-ot=ew4t$o{N&He|*0>y5HPLBjqtR+Ey!T*7P;rBK^kU^XU9+AZi z419+`m{C;2s{ttJ;pyTSq7l5b$B^%U0S}YnxBvHJm;*&iUrvx_5M=+-KAS1wj#a_h zNxL=9Wlt^ED>)~-mR;-1Ls!;sa+cG&-&7vuyjF1JLwJe(XLshsYhxdt0-DL->FVdQ I&MBb@0EL-G-T(jq literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/trapped_sakura_blossoms.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/trapped_sakura_blossoms.png new file mode 100644 index 0000000000000000000000000000000000000000..260f3b3bc291ca3db346d9990b7c822d4a5c1961 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-orqA$M>udLQ z9;vu#5myf|2v2ciROn4Fd(-sk1dH|UWsR|p#SPc%Uob@9SkQ9tGxPNS%_0Xy7BS}} xHYXi8o*#dJ%Ykbn^hZL*oDd literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/wynd_thistle.png b/src/main/resources/packs/resource/tintable_grass/assets/ancient_aether/textures/block/wynd_thistle.png new file mode 100644 index 0000000000000000000000000000000000000000..31af4fbc8bcbb5812a7220f3e5faabe6a07ff3af GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-orqNS%G|^0G|-osVj~w-F^Gw!(WAUliH`P0}9tz->CvpY$ZW{!T&*kVe|ea`+*{y z1s;*b3=DinK$vl=HlH+5(9+YzF+?LcIl-0Lh1ONS%G|^0G|-oL;DV_-?Zt<$*s^SG>2R#a^4W;zy9JK^%@1q*qK8K<3QY0NnCQ3z-bgQu&X%Q~loCIIxu BN{s*j literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..0041727368862235d92b606d9f6e1f1c396c91d4 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|EJ$ypLyf`swewu4gtj~wr<@9q*zOW{DS`j0mJWYd?1533p^r= z85sBugD~Uq{1qucK_5>S#}JL+t-ant2MjozM0fn3$*uO+=Ub{E&`biS-u~^YnWR7j^^9 OW$<+Mb6Mw<&;$U5cu+h5 literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot.png new file mode 100644 index 0000000000000000000000000000000000000000..d72f5db369feeadb61702d5f819fcd24fcf8e6b2 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-oL;DV_-?Zt<$Y978mM&vr9%F(_~_n?L{e|LK_(3&d4k^c_BUzDDob y)1!SBDcoI$R(>-+{K}78>F5eur_PkH!*Vn3u*_M$dHr{wAq<|belF{r5}E)i{z}FG literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/aerlavender_pot_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..bc26df6154826c1acf0abe92f0d0b75cede1d09e GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|EJ$ypLyf`swewu4gtj~wr<@9q*zOW{DS`j0mJWYd?1533p^r= z85sBugD~Uq{1qucL2pkN#}JL+tv%jC2NZamgdhA%*K_$T`8_pJ?nHpqm;8dm(qHyn zQu^}i^XY(QiST1vB=xtSYGsNS%G|^0G|-or7Kr;O`3e>%$bAx4pcNW0fj{bPBj84wvr&f;Qt`NuzCNI{Xh}U z0*}aI1_r*vAk26?e?NS%G}f0G|-oKi~I#yD@E1-ihOV59`BL$2r#mWi;Ca(|{CvNswRge=uN>@@94e z3UL;AL>4nJ@ErzW#^d=bQhjzSCy98B6*{@YtNc5h|xo*Nie>*4eI z|1}Yzba@R^k&Xk}4Fy?SgeGzwF~8L0xMNS%G|^0G|-o+vhGE+IL{ds@0v7r&PAI0fqH^PlL>4D+%%o{tp5SoA)o-4;0}n z@Q5sCVBk9p!i>lBSEK+1Lp)s^Lo|Zd_5|`BFyL@xWr`UVNS%G|>0G|-o)5i|JdHsCZyjehj+Wtawkh+o}zu^D>|1&sft^5Mya~60+7BevL z9R^{>S{m4}qo zvA#7-8q4OyhkCG=-ZtB*Ajy1=dACj5lC#D4;(k$@U*gTQV0&R%HPBQBPgg&e IbxsLQ0OWs2t^fc4 literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/golden_aspess.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/golden_aspess.png new file mode 100644 index 0000000000000000000000000000000000000000..fd76be43a85aae73762b7dfa8ac59ea35926e629 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-ou1S-Zu3U9+-+?n{&Qvrs0fl3&!YY6iTS<^#@P80s*t~zqexL|v zfk$L90|Vb-5N14{zaj-FXyNJN7@`q;_GBO*g8~OrfXdGQQ=Mb&OB+jszqPFUDZ5}s wkwRQSX7+*ujCvFL7=#(CW$hNS%G~10G|-oLzVUq7KMF3UC|q53>3?1-TVzmv6ck+1^)*EhTq%xKn8IZctjR6 zFz_7)VaDV6D^h@hex5FlAsWF;djt6nC~!DOpZa^=hU;9)pLLxdziM{H{8W5*kTFm2 zgoIS%gxKU*eZGw>?j@ot>rOhEHn{k%WW7?)VbfG(UR8hn>~ah56uZYt%!QAB%wPwa O%;4$j=d#Wzp$Pyum`jBK literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove.png new file mode 100644 index 0000000000000000000000000000000000000000..d197ec6359372deb5e6cb699f1692e411861a30d GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-oGiS~m+;?E<%2i#HCRa2x0fjm3wKahhTS<^#@P80s*t~zqevm|g zM`SSr1K(i~W;~w1A_XYu;OXKRq7i(whmns#frCl#%l~-4&0(*ZH(EYzQ;_@1KBJs@ z^Smp50k0M_FdX|dSK#av`#TFJY<}}{LcFZ%_nk^?JvuD&OC@H{2b#s;>FVdQ&MBb@ E0J6hKivR!s literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/iaspove_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..8052eb80be7173d60490239fa025ff111a158ae2 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-o{%wzQrydL|>hey`w(tfSk|t=q2uQJ&1o;L32LXo7`4nJ@ErzW#^d=bQhIpwQ2t2M4%}Qp00i_>zopr01o6tr2qf` literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/radiant_orchid.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/radiant_orchid.png new file mode 100644 index 0000000000000000000000000000000000000000..13da95bf5d2599940b582239c8b552f77313729b GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-or7Kq*+;^aB(&RH|&Qvrs0fo)(wif~^wvr&f;Qt`NuzCNI{Xh}U z0*}aI1_r*vAk26?e?NS%G}f0G|-o1*H!*P5fRNbtu}s_xq*o-)FA{%9u*tssvK(B|(0{|G|Jk%A45@ zD8yOd5n0T@z;_sg8IR|$NC67kdb&7#j+S3j3^P6NS%G|^0G|-oGiS~m+;^aB(&VKpS5-7L0fk+ZUt9uGY$ZW{!T&*kVe|ea`+*{y z1s;*b3=DjSL74G){)!Z!pqrNS%G~10G|-o2Vp6P?4x>(-M&{;0LAo;N`3<=){-E<;Qv6t@Ov8{$RN%FkH}&M z2EM}}%y>M1MG8>R%G1R$L?d`@S2P!cf&kOiZ~xNsJIhyqUo(emBq*22WQ%mvv4FO#q+-LInT- literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender.png new file mode 100644 index 0000000000000000000000000000000000000000..ee32db879c2e82a9839377fbefe330391c8ccf62 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o^_wM1MG8YDjOCb)pZ&yJ2~(1%bxHcPmN&^vdp6|&(;>Isz86ZT l(;Zb}d`zTouE{ya{K$pnw(Re=+dz95JYD@<);T3K0RZwDSZx3R literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..389c475678567ff20df328b9183879d396cffc97 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o|EJ%-U-jhr%p3b^4gtj?_B&4nQmiFGe!>5NfZ_KxK9E721s;*b z3=DjSL74G){)!Z!V4kOoV~9quYd@#Z0Rs*u*Ps7q@1C)&R86iU<5bzbbj>e|r{2)L z6qmxd`tcO4J~=4p-`#XSqo{W;gP;RnZ-hz(&H x0u!413h&Q(a;2omVbbo*?FE;+@B7!K*-!6gmRtVfz!IR%44$rjF6*2UngCw!VS)ev literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_pot.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_aerlavender_pot.png new file mode 100644 index 0000000000000000000000000000000000000000..5d070a68c2c7c0028a1758be4061f634dcb45376 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o^_wM1MG8XB?g;J8b;*NS%G~10G|-o|EJ%-U-jhr%p3b^4gtj?_B&4nQmiFGe!>5NfZ_KxK9E721s;*b z3=DjSL74G){)!Z!V3wzgV~9quYcHn|iy;S7^QZsj{)f}jS9H0vf4y<8da9ee?MdTB zb0#rm3r*2$v~Nn=IFD1{&OL`**~^lbAD!(xI&aHIwt#D!PI26x`Cg~x@P1ZhzL0ia tm1~Ln7r5$$H9V`=2mTVenJ literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ef301d24c9bad0b7f8cc78ffe9439db8bc8d0af5 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-oC975++IOIH@|4@>E>yO(0fm2c?EV3y*h+%@g8zd6!{+@<_5(#Y z3p^r=85sBugD~Uq{1quc!2(Yg#}JKR*Iq`UBL*Byq96aq?>k!ZEXVkel+W91-K(E5vjv@- z@(MFu44A?_mu}w~>)|J3Z=}s3znEL##FJvf_mk^i$1&TrtY)hP+RfnU>gTe~DWM4f D!sucf literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom_overlay.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_bottom_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..0001d03b734538e9dbfca9d5ee207fd402e02d3e GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|>0G|-oH?N6$|7UQ}TKNUY=PdAuEM{Qf zI}E~%$MaXD00q4~T^vI+g7@|`@*XhYImGev|MNy=-`xownFlqmD!n|jCXJ2#!;@`Z zI?sDT%XIi}aLz5^`n0W)Pa*igcD)WR9tF9Kuc8lD+aGwx?AyV#Ty1H^QlO~}p00i_ I>zopr04h^S3;+NC literal 0 HcmV?d00001 diff --git a/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_top.png b/src/main/resources/packs/resource/tintable_grass/assets/deep_aether/textures/block/tall_feather_grass_top.png new file mode 100644 index 0000000000000000000000000000000000000000..8672e27f42a49af57cab40be08fe3afef9633c3b GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-oL;DWgK6jyW@{}d3Rs+TS4o~g}QmiFGe!>5NfZ_KxK9E721s;*b z3=DjSL74G){)!Z!pueY!V~9p@@7dd22Mjov1N49X&yTxevF%Vo?TVKN0}dC~9STNS%G|>0G|-o)5i|JdHsCZyjehj+Wtawkh+o}zu^D>|1&sft^5Mya~60+7BevL z9R^{>