From 7d25bc80d12be48e4b8666b55ec6195ca2deb253 Mon Sep 17 00:00:00 2001 From: Zepalesque <60141811+Zepalesque@users.noreply.github.com> Date: Sat, 1 Jun 2024 21:40:53 -0400 Subject: [PATCH] chore: datagen --- .../.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 | 6 +++--- .../.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c | 3 ++- .../data/aether_redux/tags/blocks/quicksoil_behavior.json | 5 +++++ .../aether_redux/worldgen/configured_feature/cloudbed.json | 2 +- .../worldgen/density_function/cloudbed_noise.json | 1 - .../zepalesque/redux/data/gen/tags/ReduxBlockTagsGen.java | 4 ++++ .../redux/mixin/mixins/common/QuicksoilMixin.java | 1 - src/main/resources/aether_redux.mixins.json | 3 +-- 8 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 src/generated/resources/data/aether_redux/tags/blocks/quicksoil_behavior.json diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index ca8c7182b..3105f7cc2 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,11 +1,11 @@ -// 1.20.4 2024-06-01T19:19:23.1935084 Registries +// 1.20.4 2024-06-01T21:40:31.0758028 Registries 1bf1e96a91388f7bf47c90dab07b1152d3861b11 data/aether/worldgen/configured_feature/crystal_tree.json b1924e11e2a4cc074084f391e61ba8b59b590874 data/aether_redux/neoforge/biome_modifier/add_cloudbed.json 44c7d1a0053c10f29c8dd8751ad8f66cad1c533e data/aether_redux/neoforge/biome_modifier/modify_music.json 9fd5c6b3838a4077681396bce3e604e3a83a5eb2 data/aether_redux/neoforge/biome_modifier/modify_sky_color.json 4a5be552b9f72acc559173e300fee91cca2aba4f data/aether_redux/neoforge/structure_modifier/remove_large_clouds.json -1c82d3ea23de6f5304553b504b789ac2a60a6e53 data/aether_redux/worldgen/configured_feature/cloudbed.json -c550ee9bf198e69beb565fb697a20ce9e526ecb3 data/aether_redux/worldgen/density_function/cloudbed_noise.json +4b381670c718154fb753a5dc522707259b926230 data/aether_redux/worldgen/configured_feature/cloudbed.json +15626864bc7c207008638ad249d0e3597d690a9b data/aether_redux/worldgen/density_function/cloudbed_noise.json 123716e2850a50ab2cec88cc5d642fe27e09e41f data/aether_redux/worldgen/density_function/cloudbed_y_offset.json 2e8ce4c531982cca5248401ec7558993018f12df data/aether_redux/worldgen/placed_feature/cloudbed.json d1c424fddd3d29564e7c4b5371fca645bb3170b9 data/aether_redux/zenith/condition/aether_genesis.json diff --git a/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c b/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c index d5789d983..d197b9a7d 100644 --- a/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c +++ b/src/generated/resources/.cache/9bb0d0a1b08b171b571281155e5d00494716cc5c @@ -1,5 +1,6 @@ -// 1.20.4 2024-05-27T19:01:00.3730106 Tags for minecraft:block mod id aether_redux +// 1.20.4 2024-06-01T21:40:31.0708064 Tags for minecraft:block mod id aether_redux ff76e071710735bec611ec58205f07d13cb675bd data/aether_redux/tags/blocks/crystal_logs.json +326897805dd0e252157208ee77d3437b3626f008 data/aether_redux/tags/blocks/quicksoil_behavior.json eb1ddd122f7ca012d425a54274500f1e589e180d data/forge/tags/blocks/bookshelves.json 49ad498cef1154d6380c5317f026c7a11b62238d data/minecraft/tags/blocks/fence_gates.json 5295d732f1c22a1f48681f9c064f14692726fdb3 data/minecraft/tags/blocks/logs.json diff --git a/src/generated/resources/data/aether_redux/tags/blocks/quicksoil_behavior.json b/src/generated/resources/data/aether_redux/tags/blocks/quicksoil_behavior.json new file mode 100644 index 000000000..788b4d8cf --- /dev/null +++ b/src/generated/resources/data/aether_redux/tags/blocks/quicksoil_behavior.json @@ -0,0 +1,5 @@ +{ + "values": [ + "aether:quicksoil" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_redux/worldgen/configured_feature/cloudbed.json b/src/generated/resources/data/aether_redux/worldgen/configured_feature/cloudbed.json index e106729f8..e905b2224 100644 --- a/src/generated/resources/data/aether_redux/worldgen/configured_feature/cloudbed.json +++ b/src/generated/resources/data/aether_redux/worldgen/configured_feature/cloudbed.json @@ -18,6 +18,6 @@ "type": "minecraft:matching_blocks", "blocks": "minecraft:air" }, - "y_level": 16 + "y_level": 8 } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_redux/worldgen/density_function/cloudbed_noise.json b/src/generated/resources/data/aether_redux/worldgen/density_function/cloudbed_noise.json index 487a16a02..7d33004e4 100644 --- a/src/generated/resources/data/aether_redux/worldgen/density_function/cloudbed_noise.json +++ b/src/generated/resources/data/aether_redux/worldgen/density_function/cloudbed_noise.json @@ -9,7 +9,6 @@ 1.0, 1.0, 1.0, - 1.0, 1.0 ], "firstOctave": 0 diff --git a/src/main/java/net/zepalesque/redux/data/gen/tags/ReduxBlockTagsGen.java b/src/main/java/net/zepalesque/redux/data/gen/tags/ReduxBlockTagsGen.java index 6bcc57d90..532d65868 100644 --- a/src/main/java/net/zepalesque/redux/data/gen/tags/ReduxBlockTagsGen.java +++ b/src/main/java/net/zepalesque/redux/data/gen/tags/ReduxBlockTagsGen.java @@ -1,9 +1,11 @@ package net.zepalesque.redux.data.gen.tags; +import com.aetherteam.aether.block.AetherBlocks; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.zepalesque.redux.Redux; +import net.zepalesque.redux.data.ReduxTags; import net.zepalesque.redux.data.prov.tags.ReduxBlockTagsProvider; import org.jetbrains.annotations.Nullable; @@ -20,5 +22,7 @@ protected void addTags(HolderLookup.Provider provider) { Redux.WOOD_SETS.forEach(set -> set.blockTagData(this)); Redux.STONE_SETS.forEach(set -> set.blockTagData(this)); + this.tag(ReduxTags.Blocks.QUICKSOIL_BEHAVIOR).add(AetherBlocks.QUICKSOIL.get()); + } } diff --git a/src/main/java/net/zepalesque/redux/mixin/mixins/common/QuicksoilMixin.java b/src/main/java/net/zepalesque/redux/mixin/mixins/common/QuicksoilMixin.java index e0cd93dcd..1c27b1c63 100644 --- a/src/main/java/net/zepalesque/redux/mixin/mixins/common/QuicksoilMixin.java +++ b/src/main/java/net/zepalesque/redux/mixin/mixins/common/QuicksoilMixin.java @@ -10,7 +10,6 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.zepalesque.redux.config.ReduxConfig; import net.zepalesque.redux.mixin.mixins.common.base.BlockBehaviorMixin; -import net.zepalesque.redux.mixin.mixins.common.base.BlockMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/resources/aether_redux.mixins.json b/src/main/resources/aether_redux.mixins.json index 06f6ba312..089eb096a 100644 --- a/src/main/resources/aether_redux.mixins.json +++ b/src/main/resources/aether_redux.mixins.json @@ -9,8 +9,7 @@ "common.QuicksoilMixin", "common.accessor.EntityAccessor", "common.accessor.WallBlockAccessor", - "common.base.BlockBehaviorMixin", - "common.base.BlockMixin" + "common.base.BlockBehaviorMixin" ], "client": [ "client.color.AetherColorResolversMixin"