Regigias Shrine go brr.

Waterpicker · Waterpicker · commit f35c6fe03eff · 2025-06-05T07:26:59.000-05:00
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt
@@ -6,6 +6,7 @@ import earth.terrarium.common_storage_lib.item.util.ItemStorageData
 object GenerationsStorage {
     val registry = DataManagerRegistry(GenerationsCore.MOD_ID)
 
+    val REGI_ORBS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).networkSerializer(ItemStorageData.NETWORK_CODEC).buildAndRegister("regi_orbs")
     val ITEM_CONTENTS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("inventory")
     val IMBUED = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("imbued")
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/RegigigasShrineBlockEntityRenderer.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/RegigigasShrineBlockEntityRenderer.java
@@ -1,12 +1,15 @@
 package generations.gg.generations.core.generationscore.common.client.render.block.entity;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import generations.gg.generations.core.generationscore.common.GenerationsStorage;
 import generations.gg.generations.core.generationscore.common.util.GenerationsUtils;
+import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems;
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.RegigigasShrineBlockEntity;
 import net.minecraft.Util;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.core.particles.DustParticleOptions;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3f;
@@ -17,14 +20,12 @@
 import static java.lang.Math.*;
 
 public class RegigigasShrineBlockEntityRenderer extends GeneralUseBlockEntityRenderer<RegigigasShrineBlockEntity> {
-    public static final Map<Integer, Vector3f> map = Util.make(new HashMap<>(), m -> {
-        BiConsumer<Integer, Integer> colorToVector3f = (id, color) -> m.put(id, GenerationsUtils.rgbFromInt(color));
-
-        colorToVector3f.accept(0, 0x78AAC2);
-        colorToVector3f.accept(1, 0x976C83);
-        colorToVector3f.accept(2, 0x41382B);
-        colorToVector3f.accept(3, 0x9F8C82);
-        colorToVector3f.accept(4, 0x919191);
+    public static final Map<Item, Vector3f> map = Util.make(new HashMap<>(), m -> {
+        m.put(GenerationsItems.REGICE_ORB.get(), GenerationsUtils.rgbFromInt(0x78AAC2));
+        m.put(GenerationsItems.REGIROCK_ORB.get(), GenerationsUtils.rgbFromInt(0XC7412B));
+        m.put(GenerationsItems.REGISTEEL_ORB.get(), GenerationsUtils.rgbFromInt(0X79797B));
+        m.put(GenerationsItems.REGIDRAGO_ORB.get(), GenerationsUtils.rgbFromInt(0x851534));
+        m.put(GenerationsItems.REGIELEKI_ORB.get(), GenerationsUtils.rgbFromInt(0XE0E731));
     });
 
     public RegigigasShrineBlockEntityRenderer(BlockEntityRendererProvider.Context ctx) {
@@ -41,13 +42,18 @@ public static void processOrbs(RegigigasShrineBlockEntity shrineBlock) {
 
         List<Vector3f> colors = new ArrayList<>();
 
-        for (int i = 0; i < 5; i++) {
-            if(!shrineBlock.getContainer().get(i).isEmpty()) {
-                colors.add(map.get(i));
-            }
+        var list = GenerationsStorage.INSTANCE.getREGI_ORBS().get(shrineBlock);
+
+        for (int i = 0; i < list.stacks().size(); i++) {
+            var color = map.get(list.stacks().get(i).resource().getItem());
+
+            if(color != null) colors.add(color);
         }
 
         if(colors.isEmpty()) return;
+        else {
+            System.out.println(colors);
+        }
 
         Vec3 center = new Vec3(shrineBlock.getBlockPos().getX() + 0.5d, shrineBlock.getBlockPos().getY() + 0.5d, shrineBlock.getBlockPos().getZ() + 0.5d);
         double theta = (((Objects.requireNonNull(shrineBlock.getLevel()).getGameTime() % (double) 100) / (double) 100) * 2 * PI);
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsDecorationBlocks.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsDecorationBlocks.kt
@@ -7,8 +7,8 @@ import generations.gg.generations.core.generationscore.common.client.render.rare
 import generations.gg.generations.core.generationscore.common.util.GenerationsItemUtils
 import generations.gg.generations.core.generationscore.common.util.GenerationsUtils
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
-import generations.gg.generations.core.generationscore.common.world.level.block.de.WorkDeskBlock
-import generations.gg.generations.core.generationscore.common.world.level.block.deco.ShelfBlock
+import generations.gg.generations.core.generationscore.common.world.level.block.decorations.WorkDeskBlock
+import generations.gg.generations.core.generationscore.common.world.level.block.decorations.ShelfBlock
 import generations.gg.generations.core.generationscore.common.world.level.block.decorations.*
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.*
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.BallDisplayBlock.DisplayState
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/RksMachineBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/RksMachineBlock.kt
@@ -74,15 +74,9 @@ class RksMachineBlock(copy: Properties) : GenericRotatableModelBlock<RksMachineB
     ): BlockEntityTicker<T>? = createTickerHelper(blockEntityType, GenerationsBlockEntities.RKS_MACHINE.get(), RksMachineBlockEntity::serverTick)
 
     protected fun openContainer(level: Level, bpos: BlockPos, player: Player) {
-        val rksMachine = getAssoicatedBlockEntity(level, bpos).orElseThrow {
-            IllegalStateException(
-                "Our named container provider is missing!"
-            )
-        }
-        if (rksMachine != null) {
-            MenuRegistry.openMenu(player as ServerPlayer, rksMachine)
-            player.awardStat(Stats.INTERACT_WITH_FURNACE)
-        }
+        val rksMachine = getAssoicatedBlockEntity(level, bpos) ?: run { throw IllegalStateException("Our named container provider is missing!") }
+        MenuRegistry.openMenu(player as ServerPlayer, rksMachine)
+        player.awardStat(Stats.INTERACT_WITH_FURNACE)
     }
 
     override fun useWithoutItem(
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/decorations/ShelfBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/decorations/ShelfBlock.kt
@@ -1,4 +1,4 @@
-package generations.gg.generations.core.generationscore.common.world.level.block.deco
+package generations.gg.generations.core.generationscore.common.world.level.block.decorations
 
 import com.mojang.serialization.MapCodec
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsVoxelShapes.generateRotationalVoxelShape
@@ -9,7 +9,6 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.BaseEntityBlock
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/decorations/WorkDeskBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/decorations/WorkDeskBlock.kt
@@ -1,4 +1,4 @@
-package generations.gg.generations.core.generationscore.common.world.level.block.de
+package generations.gg.generations.core.generationscore.common.world.level.block.decorations
 
 import com.mojang.serialization.MapCodec
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsVoxelShapes
@@ -10,7 +10,6 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.BaseEntityBlock
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/shrines/RegigigasShrineBlockEntity.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/shrines/RegigigasShrineBlockEntity.kt
@@ -1,90 +1,19 @@
 package generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines
 
-import dev.architectury.registry.registries.RegistrySupplier
-import earth.terrarium.common_storage_lib.item.impl.SimpleItemSlot
-import earth.terrarium.common_storage_lib.item.util.ItemProvider
-import earth.terrarium.common_storage_lib.resources.item.ItemResource
-import earth.terrarium.common_storage_lib.storage.base.CommonStorage
+import earth.terrarium.common_storage_lib.item.impl.SimpleItemStorage
+import generations.gg.generations.core.generationscore.common.GenerationsStorage
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
-import generations.gg.generations.core.generationscore.common.util.ExtendedsimpleItemContainer
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import generations.gg.generations.core.generationscore.common.world.item.legends.RegiOrbItem
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
 import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.Item
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
-import java.util.*
 
-class RegigigasShrineBlockEntity(pos: BlockPos, state: BlockState) : InteractShrineBlockEntity(GenerationsBlockEntities.REGIGIGAS_SHRINE.get(), pos, state), ItemProvider.Block {
-    val container: RegigigasItemStackHandler
-
-    init {
-        container = RegigigasItemStackHandler()
-    }
-
-    override fun getItems(
-        level: Level,
-        blockPos: BlockPos,
-        blockState: BlockState?,
-        blockEntity: BlockEntity?,
-        direction: Direction?
-    ): CommonStorage<ItemResource> {
-        return container
-    }
-
-    private fun getRegiItem(index: Int): RegiOrbItem? {
-        return when (index) {
-                    0 -> GenerationsItems.REGICE_ORB
-                    1 -> GenerationsItems.REGIROCK_ORB
-                    2 -> GenerationsItems.REGISTEEL_ORB
-                    3 -> GenerationsItems.REGIDRAGO_ORB
-                    4 -> GenerationsItems.REGIELEKI_ORB
-                    else -> null
-                }?.get().instanceOrNull<RegiOrbItem>()
-    }
-
-    inner class RegigigasItemStackHandler :
-        ExtendedsimpleItemContainer(this@RegigigasShrineBlockEntity, 5) {
-        override fun isResourceValid(index: Int, resource: ItemResource): Boolean {
-            resource.item.instanceOrNull<RegiOrbItem>().run {
-                return@run getRegiItem(index) == this
-            }
-
-            return false
-        }
-
-        override fun getLimit(index: Int, resource: ItemResource): Long {
-            return 1
-        }
-
-        val isFull: Boolean
-            get() = this.slots.map(SimpleItemSlot::getResource).none(ItemResource::isBlank)
-
-        fun clear() { //TODO: work on
-//            getItems().clear();
-//            setChanged();
-        }
-
-        fun contains(item: Item): Boolean = this.slots.map { obj -> obj.resource }.any { stack: ItemResource -> stack.isOf(item) }
-    } //    @Override
-    //    public @NotNull CompoundTag getUpdateTag() {
-    //        return getContainer().serialize(super.getUpdateTag());
-    //    }
-
-    companion object {
-        @JvmStatic
-        fun getRegiOrbIndex(item: RegiOrbItem): Int {
-            return when (item.speciesId) {
-                "regice" -> 0
-                "regirock" -> 1
-                "registeel" -> 2
-                "regidrago" -> 3
-                "regieleki" -> 4
-                else -> -1
-            }
-        }
-    }
+class RegigigasShrineBlockEntity(pos: BlockPos, state: BlockState) : InteractShrineBlockEntity(GenerationsBlockEntities.REGIGIGAS_SHRINE.get(), pos, state) {
+    val container: SimpleItemStorage = SimpleItemStorage(this, GenerationsStorage.REGI_ORBS, 5)
+        .filter(0) { it.isOf(GenerationsItems.REGICE_ORB.get()) }
+        .filter(1) { it.isOf(GenerationsItems.REGIROCK_ORB.get()) }
+        .filter(2) { it.isOf(GenerationsItems.REGISTEEL_ORB.get()) }
+        .filter(3) { it.isOf(GenerationsItems.REGIDRAGO_ORB.get()) }
+        .filter(4) { it.isOf(GenerationsItems.REGIELEKI_ORB.get()) }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/generic/GenericModelBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/generic/GenericModelBlock.kt
@@ -83,13 +83,9 @@ abstract class GenericModelBlock<T> protected constructor(
         return Shapes.empty()
     }
 
-    fun getAssoicatedBlockEntity(level: BlockGetter, pos: BlockPos): Optional<T?> {
-        return blockEntityFunction.toOptional().map { a: MutableBlockEntityType<T> ->
-            a.getBlockEntity(
-                level,
-                getBaseBlockPos(pos, level.getBlockState(pos))
-            )
-        }
+    fun getAssoicatedBlockEntity(level: BlockGetter, pos: BlockPos): T? {
+        return blockEntityFunction.get()?.getBlockEntity(level, getBaseBlockPos(pos, level.getBlockState(pos)))
+
     }
 
     open fun computeRenderBoundingBox(level: Level, pos: BlockPos, state: BlockState): AABB {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/InteractShrineBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/InteractShrineBlock.kt
@@ -104,6 +104,8 @@ abstract class InteractShrineBlock<T : InteractShrineBlockEntity> : ShrineBlock<
         }
     }
 
+
+
     protected abstract fun interact(
         level: Level,
         pos: BlockPos,
@@ -117,7 +119,7 @@ abstract class InteractShrineBlock<T : InteractShrineBlockEntity> : ShrineBlock<
         if (waitToDeactivateTime() == 0) getAssoicatedBlockEntity(
             level,
             pos
-        ).ifPresent { obj: T -> obj.triggerCountDown() }
+        )?.triggerCountDown()
     }
 
     fun deactivate(level: Level, pos: BlockPos, state: BlockState) {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/PrisonBottleStemBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/PrisonBottleStemBlock.kt
@@ -96,7 +96,7 @@ class PrisonBottleStemBlock(materialIn: Properties) :
                 getAssoicatedBlockEntity(
                     world,
                     pos
-                ).ifPresent { obj: InteractShrineBlockEntity -> obj.triggerCountDown() }
+                )?.triggerCountDown()
             }
         }
         return true
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/RegigigasShrineBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/RegigigasShrineBlock.kt
@@ -1,6 +1,8 @@
 package generations.gg.generations.core.generationscore.common.world.level.block.shrines
 
 import com.mojang.serialization.MapCodec
+import earth.terrarium.common_storage_lib.item.impl.SimpleItemStorage
+import earth.terrarium.common_storage_lib.resources.item.ItemResource
 import generations.gg.generations.core.generationscore.common.config.LegendKeys
 import generations.gg.generations.core.generationscore.common.world.entity.block.PokemonUtil
 import generations.gg.generations.core.generationscore.common.world.item.legends.RegiOrbItem
@@ -9,11 +11,11 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntityModels
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.RegigigasShrineBlockEntity
-import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.RegigigasShrineBlockEntity.Companion.getRegiOrbIndex
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionHand
+import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
@@ -53,38 +55,51 @@ class RegigigasShrineBlock(materialIn: Properties) :
     ): Boolean {
         val stack = player.getItemInHand(hand)
 
-        val entity = getAssoicatedBlockEntity(level, pos).orElse(null) ?: return false
+        val entity = getAssoicatedBlockEntity(level, pos) ?: return false
 
         val handler = entity.container
 
         var succeeded = false
-//TODO: Fix this
-//        if (stack.item is RegiOrbItem && !handler.contains(item)) {
-//            player.setItemInHand(hand, handler.get(getRegiOrbIndex(item)).insertItem(OptionalInt.of(getRegiOrbIndex(item)).asInt, stack, false))
-//
-//            if (handler.isFull) {
-//                PokemonUtil.spawn(LegendKeys.REGIGIGAS.createProperties(70), level, pos.above())
-//                handler.clear()
-//            }
-//
-//            succeeded = true
-//        } else {
-//            for (i in 0..4) {
-//                if (!handler.get(i).isEmpty) {
-//                    player.inventory.placeItemBackInInventory(handler.extractItem(i, 1, false))
-//                    succeeded = true
-//                    break
-//                }
-//            }
-//        }
+
+        val item = stack.item
+
+        if(!handler.has(item) && handler.insert(stack.asResouce(), 1, false) > 0) {
+
+            stack.shrink(1)
+
+            if (handler.isFull()) {
+                PokemonUtil.spawn(LegendKeys.REGIGIGAS.createProperties(70), level, pos.above())
+                handler.clear()
+            }
+
+            handler.update()
+
+            succeeded = true
+        } else {
+            for (i in 0..4) {
+                val slot = handler.get(i).takeUnless { it.isEmpty } ?: continue
+
+                var resource = slot.resource
+
+                val extracted = handler.extract(resource, 1, false)
+
+                if(extracted > 0) {
+                    player.inventory.placeItemBackInInventory(resource.toStack(extracted.toInt()))
+
+                    handler.update()
+                    succeeded = true
+                    break
+                }
+            }
+        }
 
         if (succeeded) entity.sync()
 
         return succeeded
     }
 
     override fun isStackValid(stack: ItemStack): Boolean {
-        return stack.item is RegiOrbItem
+        return stack.item is RegiOrbItem || stack.isEmpty
     }
 
     override fun getVariant(blockState: BlockState): String? {
@@ -106,3 +121,13 @@ class RegigigasShrineBlock(materialIn: Properties) :
         }
     }
 }
+
+private fun SimpleItemStorage.clear() {
+    (0..< size()).map(this::get).forEach { it.resource =  ItemResource.BLANK }
+}
+
+private fun SimpleItemStorage.isFull(): Boolean = (0..< size()).map(this::getResource).none { it.isBlank }
+
+private fun ItemStack.asResouce(): ItemResource = ItemResource.of(this)
+
+private fun SimpleItemStorage.has(item: Item): Boolean = (0..< size()).map(this::getResource).any { it.isOf(item) }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/TimespaceAltarBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/TimespaceAltarBlock.kt
@@ -54,7 +54,7 @@ class TimespaceAltarBlock(properties: Properties) :
     ): Boolean {
         val stack = player.getItemInHand(hand)
 
-        val entity = getAssoicatedBlockEntity(level, pos).orElse(null) ?: return false
+        val entity = getAssoicatedBlockEntity(level, pos) ?: return false
 
         val handler = entity.container
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/WeatherTrioShrineBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/WeatherTrioShrineBlock.kt
@@ -49,7 +49,7 @@ class WeatherTrioShrineBlock(
         player.mainHandItem.shrink(1)
 
         toggleActive(level, pos)
-        getAssoicatedBlockEntity(level, pos).ifPresent { obj: WeatherTrioShrineBlockEntity -> obj.triggerCountDown() }
+        getAssoicatedBlockEntity(level, pos)?.triggerCountDown()
 
         //        ScheduledTask.schedule(() -> {
 //            PokemonUtil.spawn(getSpecies().createPokemon(70), level, pos, getAngle(state));

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ abstract class InteractShrineBlock<T : InteractShrineBlockEntity> : ShrineBlock<`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
	`107`	`+`
	`108`	`+`
`107`	`109`	`protected abstract fun interact(`
`108`	`110`	`level: Level,`
`109`	`111`	`pos: BlockPos,`
`@@ -117,7 +119,7 @@ abstract class InteractShrineBlock<T : InteractShrineBlockEntity> : ShrineBlock<`
`117`	`119`	`if (waitToDeactivateTime() == 0) getAssoicatedBlockEntity(`
`118`	`120`	`level,`
`119`	`121`	`pos`
`120`		`- ).ifPresent { obj: T -> obj.triggerCountDown() }`
	`122`	`+ )?.triggerCountDown()`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`fun deactivate(level: Level, pos: BlockPos, state: BlockState) {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class PrisonBottleStemBlock(materialIn: Properties) :`
`96`	`96`	`getAssoicatedBlockEntity(`
`97`	`97`	`world,`
`98`	`98`	`pos`
`99`		`- ).ifPresent { obj: InteractShrineBlockEntity -> obj.triggerCountDown() }`
	`99`	`+ )?.triggerCountDown()`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`return true`