Melotta, regigigas, regi shrine, Time space altar, tao trio shrine, and lunar shrine voxelshape.

Author: Waterpicker

common/src/main/generated/resources/assets/generations_core/lang/en_us.json

@@ -1,6 +1,6 @@
 {
   "badges.generations_core": "Badges",
-  "block.generations_core.abundant_shrine": "HINT: You need something to reveal the secrets within.",
+  "block.generations_core.abundant_shrine": "Abundant Shrine",
   "block.generations_core.aluminum_block": "Aluminum Block",
   "block.generations_core.aluminum_ore": "Aluminum Ore",
   "block.generations_core.arceus_doll": "Arceus Doll",
@@ -522,7 +522,7 @@
   "block.generations_core.love_ball_loot": "Love Ball Loot",
   "block.generations_core.lugia_doll": "Lugia Doll",
   "block.generations_core.lugia_shrine": "Lugia Shrine",
-  "block.generations_core.lunar_shrine": "HINT: It seems empty, strangely like the feeling of a heartache. A summoning ritual is to occur here. A deep malevolent cry is suddenly heard in your left ear- “Souls”. Almost immediately afterwards, a higher-pitched angelic-like cry is heard in your right- “Souls”. Creepy.",
+  "block.generations_core.lunar_shrine": "Lunar Shrine",
   "block.generations_core.lure_ball_display": "Lure Ball Display",
   "block.generations_core.lure_ball_loot": "Lure Ball Loot",
   "block.generations_core.luxury_ball_display": "Luxury Ball Display",

common/src/main/generated/resources/data/generations_core/tags/blocks/regi_stands.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "generations_core:castle_pillar",
+    "generations_core:ghost_pillar",
+    "generations_core:prismarine_pillar",
+    "generations_core:ice_pillar",
+    "generations_core:dark_prismarine_pillar"
+  ]
+}

common/src/main/java/generations/gg/generations/core/generationscore/tags/GenerationsBlockTags.java

@@ -30,6 +30,7 @@ public class GenerationsBlockTags {
     public static final TagKey<Block> BALL_DISPLAY_BLOCKS = create("ball_display_blocks");
     public static final TagKey<Block> BALL_LOOTS = create("ball_loots");
     public static final TagKey<Block> POKEDOLLS = create("pokedolls");
+    public static final TagKey<Block> REGI_STANDS = create("regi_stands");
 
     private static TagKey<Block> create(String name) {
         return TagKey.create(Registries.BLOCK, GenerationsCore.id(name));

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/GenerationsShrines.java

@@ -38,8 +38,8 @@ public class GenerationsShrines {
 	public static final RegistrySupplier<Block> ABUNDANT_SHRINE = registerBlockItem("abundant_shrine", () -> new AbundantShrineBlock(SHRINE_PROPERTIES));
 	public static final RegistrySupplier<Block> CELESTIAL_ALTAR = registerBlockItem("celestial_altar", () -> new CelestialAltarBlock(SHRINE_PROPERTIES));
 	public static final RegistrySupplier<Block> LUNAR_SHRINE = registerBlockItem("lunar_shrine", () -> new LunarShrineBlock(SHRINE_PROPERTIES));
-	public static final RegistrySupplier<Block> LIGHT_CRYSTAL = registerBlockItem("light_crystal", () -> new GenericRotatableModelBlock<>(BlockBehaviour.Properties.of(), GenerationsBlockEntities.GENERIC_MODEL_PROVIDING, GenerationsBlockEntityModels.LIGHT_CRYSTAL, 0, 1, 0));
-	public static final RegistrySupplier<Block> DARK_CRYSTAL = registerBlockItem("dark_crystal", () -> new GenericRotatableModelBlock<>(BlockBehaviour.Properties.of(), GenerationsBlockEntities.GENERIC_MODEL_PROVIDING, GenerationsBlockEntityModels.DARK_CRYSTAL, 0, 1, 0));
+	public static final RegistrySupplier<Block> LIGHT_CRYSTAL = registerBlockItem("light_crystal", () -> new LunarCystalBlock(BlockBehaviour.Properties.of(), GenerationsBlockEntityModels.LIGHT_CRYSTAL));
+	public static final RegistrySupplier<Block> DARK_CRYSTAL = registerBlockItem("dark_crystal", () -> new LunarCystalBlock(BlockBehaviour.Properties.of(), GenerationsBlockEntityModels.DARK_CRYSTAL));
 
 	public static final RegistrySupplier<Block> MELOETTA_MUSIC_BOX = registerBlockItem("meloetta_music_box", () -> new MeloettaMusicBoxBlock(SHRINE_PROPERTIES));
 	public static final RegistrySupplier<Block> REGICE_SHRINE = registerBlockItem("regice_shrine", () -> new RegiShrineBlock(SHRINE_PROPERTIES, GenerationsBlockEntityModels.REGICE_SHRINE, LegendKeys.REGICE));

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/LunarCystalBlock.java

@@ -0,0 +1,27 @@
+package generations.gg.generations.core.generationscore.world.level.block;
+
+import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
+import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntityModels;
+import generations.gg.generations.core.generationscore.world.level.block.entities.ModelProvidingBlockEntity;
+import generations.gg.generations.core.generationscore.world.level.block.entities.generic.GenericModelProvidingBlockEntity;
+import generations.gg.generations.core.generationscore.world.level.block.generic.GenericRotatableModelBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+public class LunarCystalBlock extends GenericRotatableModelBlock<GenericModelProvidingBlockEntity> {
+    private static final VoxelShape SHAPE = Shapes.box(0.3125, 0, 0.3125, 0.6875, 1, 0.6875);
+    public LunarCystalBlock(BlockBehaviour.Properties properties, ResourceLocation model) {
+        super(properties, GenerationsBlockEntities.GENERIC_MODEL_PROVIDING, model);
+    }
+
+    @Override
+    public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+        return SHAPE;
+    }
+}

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/entities/shrines/LunarShrineBlockEntity.java

@@ -2,6 +2,7 @@
 
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntityModels;
+import generations.gg.generations.core.generationscore.world.level.block.shrines.LunarShrineBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
@@ -15,7 +16,6 @@ public LunarShrineBlockEntity(BlockPos pos, BlockState state) {
 
     @Override
     public ResourceLocation getModel() {
-        if (hasLevel() && Objects.requireNonNull(getLevel()).getLightEmission(getBlockPos()) >= 10) return GenerationsBlockEntityModels.LIGHT_MODEL;
-        return GenerationsBlockEntityModels.DARK_MODEL;
+        return getBlockState().getValue(LunarShrineBlock.IS_LIGHT) ? GenerationsBlockEntityModels.LIGHT_MODEL : GenerationsBlockEntityModels.DARK_MODEL;
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/shrines/LunarShrineBlock.java

@@ -1,42 +1,100 @@
 package generations.gg.generations.core.generationscore.world.level.block.shrines;
 
+import com.google.common.collect.ImmutableMap;
 import generations.gg.generations.core.generationscore.config.LegendKeys;
 import generations.gg.generations.core.generationscore.config.SpeciesKey;
 import generations.gg.generations.core.generationscore.world.entity.block.PokemonUtil;
 import generations.gg.generations.core.generationscore.world.level.block.GenerationsShrines;
+import generations.gg.generations.core.generationscore.world.level.block.GenerationsVoxelShapes;
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
 import generations.gg.generations.core.generationscore.world.level.block.entities.shrines.LunarShrineBlockEntity;
 import generations.gg.generations.core.generationscore.world.level.block.entities.shrines.ShrineBlockEntity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.ConduitBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.entity.ConduitBlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
+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.BooleanProperty;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
 
 public class LunarShrineBlock extends ShrineBlock<LunarShrineBlockEntity> {
+    private static final GenerationsVoxelShapes.DirectionalShapes LIGHT = GenerationsVoxelShapes.generateDirectionVoxelShape(Shapes.box(0, 0, 0.1875, 1, 0.4375, 0.8125));
+    private static final GenerationsVoxelShapes.DirectionalShapes DARK = GenerationsVoxelShapes.generateDirectionVoxelShape(Shapes.box(0, 0, 0, 1, 0.5625, 1));
+
+    public static final BooleanProperty IS_LIGHT = BooleanProperty.create("is_light");
 
     public LunarShrineBlock(BlockBehaviour.Properties properties) {
         super(properties, GenerationsBlockEntities.LUNAR_SHRINE, null);
     }
 
+    @Override
+    protected void createBlockStateDefinition(@NotNull StateDefinition.Builder<Block, BlockState> builder) {
+        super.createBlockStateDefinition(builder);
+        builder.add(IS_LIGHT);
+    }
+
+    @Override
+    protected BlockState createDefaultState() {
+        return super.createDefaultState().setValue(IS_LIGHT, false);
+    }
+
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> blockEntityType) {
+        return ConduitBlock.createTickerHelper(blockEntityType, GenerationsBlockEntities.LUNAR_SHRINE.get(), level.isClientSide ? (level1, blockPos, blockState, blockEntity) -> {} : (level12, pos, blockState, blockEntity) -> {
+            var state1 = level12.getBlockState(pos).setValue(IS_LIGHT, level12.getMaxLocalRawBrightness(pos) >= 10);
+            level12.setBlockAndUpdate(pos, state1);
+        });
+    }
+
+    @Override
+    public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+        state = state.setValue(IS_LIGHT, level.getMaxLocalRawBrightness(pos) >= 10);
+        level.setBlock(pos, state, 4);
+    }
+
+    @Override
+    public BlockState setSize(BlockState state, int x, int y, int z) {
+        return super.setSize(state, x, y, z);
+    }
+
     @Override
     public @NotNull InteractionResult use(@NotNull BlockState state, Level level, @NotNull BlockPos pos, @NotNull Player player, @NotNull InteractionHand hand, @NotNull BlockHitResult hit) {
         if (!level.isClientSide()) {
-            var key = getSpecies(level, pos);
+            var key = getSpecies(state);
 
             var block = (key == LegendKeys.CRESSELIA ? GenerationsShrines.LIGHT_CRYSTAL : GenerationsShrines.DARK_CRYSTAL).get();
 
-            var list = RegiShrineBlock.searchForBlock(level, pos, 15, 5, (level1, blockPos) -> level1.getBlockState(pos).is(block));
+            var list = RegiShrineBlock.searchForBlock(level, pos, 15, 5, (level1, blockPos) -> level1.getBlockState(blockPos).is(block));
 
             if (!list.isEmpty() && level.getBlockEntity(pos) instanceof ShrineBlockEntity shrine && !shrine.isActive()) {
                 if(list.size() == 5) {
                     shrine.toggleActive();
-                    list.forEach(a -> level.setBlockAndUpdate(a, Blocks.AIR.defaultBlockState()));
+                    list.forEach(a -> level.destroyBlock(a, false));
                     player.getItemInHand(hand).shrink(1);
                     PokemonUtil.spawn(key.createProperties(70), level, shrine.getBlockPos());
                     shrine.toggleActive();
@@ -49,7 +107,12 @@ public LunarShrineBlock(BlockBehaviour.Properties properties) {
         return super.use(state, level, pos, player, hand, hit);
     }
 
-    public SpeciesKey getSpecies(Level level, BlockPos pos) {
-        return level.getLightEmission(pos) > 10 ? LegendKeys.CRESSELIA : LegendKeys.DARKRAI;
+    public SpeciesKey getSpecies(BlockState state) {
+        return state.getValue(IS_LIGHT) ? LegendKeys.CRESSELIA : LegendKeys.DARKRAI;
+    }
+
+    @Override
+    public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+        return (state.getValue(IS_LIGHT) ? LIGHT : DARK).getShape(state);
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/shrines/MeloettaMusicBoxBlock.java

@@ -3,11 +3,22 @@
 import generations.gg.generations.core.generationscore.world.level.block.entities.MeloettaMusicBoxBlockEntity;
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntityModels;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class MeloettaMusicBoxBlock extends ShrineBlock<MeloettaMusicBoxBlockEntity> {
-
+    private static final VoxelShape SHAPE = Shapes.box(0.25f, 0f, 0.25f, 0.75f, 0.375f, 0.75f);
     public MeloettaMusicBoxBlock(BlockBehaviour.Properties properties) {
         super(properties, GenerationsBlockEntities.MELOETTA_MUSIC_BOX, GenerationsBlockEntityModels.MELOETTA_MUSIC_BOX);
     }
+
+    @Override
+    public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+        return SHAPE;
+    }
 }

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/shrines/RegiShrineBlock.java

@@ -3,6 +3,7 @@
 import dev.architectury.registry.registries.RegistrySupplier;
 import generations.gg.generations.core.generationscore.GenerationsCore;
 import generations.gg.generations.core.generationscore.config.SpeciesKey;
+import generations.gg.generations.core.generationscore.tags.GenerationsBlockTags;
 import generations.gg.generations.core.generationscore.world.entity.block.PokemonUtil;
 import generations.gg.generations.core.generationscore.world.item.legends.RegiKeyItem;
 import generations.gg.generations.core.generationscore.world.level.block.GenerationsBlocks;
@@ -70,7 +71,7 @@ private static String getSymbolSequence(Level world, Direction facing, BlockPos
                 List<BlockPos> list = checkForUnownSequence(level, blockPos.get(0));
                 if (!list.isEmpty() && level.getBlockEntity(pos) instanceof ShrineBlockEntity shrine && !shrine.isActive()) {
 //                    shrine.toggleActive();
-                    list.forEach(a -> level.setBlockAndUpdate(a.above(), Blocks.AIR.defaultBlockState()));
+                    list.forEach(a -> level.destroyBlock(a, false));
                     player.getItemInHand(hand).shrink(1);
                     PokemonUtil.spawn(species.createProperties(70), level, shrine.getBlockPos());
 //                    shrine.toggleActive();
@@ -139,7 +140,7 @@ private Optional<List<BlockPos>> checkIfInSequence(Direction.Axis axis, BlockPos
     }
 
     private static boolean isPillar(Level level, BlockPos pos) {
-        return level.getBlockState(pos).is(GenerationsBlocks.CASTLE_PILLAR.get()); //TODO convert into tag
+        return level.getBlockState(pos).is(GenerationsBlockTags.REGI_STANDS);
     }
 
     private static String getSymbol(Level level, BlockPos pos) {

common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/shrines/RegigigasShrineBlock.java

@@ -14,12 +14,13 @@
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
+import static net.minecraft.core.Direction.SOUTH;
 import static net.minecraft.world.phys.shapes.BooleanOp.OR;
 
 public class RegigigasShrineBlock extends InteractShrineBlock<RegigigasShrineBlockEntity> {
     private static final GenerationsVoxelShapes.DirectionalShapes SHAPE = GenerationsVoxelShapes.generateDirectionVoxelShape(
             Shapes.join(Shapes.box(0, 0, 0, 1, 0.3125, 1),
-                    Shapes.box(0.125, 0, 0.25, 0.875, 0.875, 0.75), OR));
+                    Shapes.box(0.125, 0, 0.25, 0.875, 0.875, 0.75), OR), SOUTH);
 
     @Override
     public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {