Skip to content

Commit b27639a

Browse files
committed
Trashcan works.
1 parent 5066eb3 commit b27639a

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-4
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ object GenerationsCoreClient {
352352
consumer.register(GenerationsBlockEntities.GENERIC_SHRINE.get(), ::GeneralUseBlockEntityRenderer)
353353
consumer.register(GenerationsBlockEntities.GENERIC_DYED_VARIANT.get(), ::GeneralUseBlockEntityRenderer)
354354
consumer.register(GenerationsBlockEntities.GENERIC_MODEL_PROVIDING.get(), ::GeneralUseBlockEntityRenderer)
355+
consumer.register(GenerationsBlockEntities.TRASH_CAN.get(), ::GeneralUseBlockEntityRenderer)
355356
consumer.register(GenerationsBlockEntities.VENDING_MACHINE.get(), ::GeneralUseBlockEntityRenderer)
356357
consumer.register(GenerationsBlockEntities.BALL_DISPLAY.get(), ::GeneralUseBlockEntityRenderer)
357358
consumer.register(GenerationsBlockEntities.BALL_LOOT.get(), ::PokeLootRendrer)

common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/TrashCanContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import generations.gg.generations.core.generationscore.common.world.data.TrashIt
44
import net.minecraft.world.entity.player.Inventory
55
import net.minecraft.world.item.ItemStack
66

7-
class TrashCanContainer(id: Int, arg: Inventory) : SingleSlotContainer(GenerationsContainers.TRASHCAN.get(), id, TrashItemStorage()) {
7+
class TrashCanContainer(id: Int, arg: Inventory) : SingleSlotContainer(GenerationsContainers.TRASHCAN.get(), id, TrashItemStorage) {
88
init {
99
applyPlayerInventory(arg)
1010
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/data/TrashItemStorage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import net.minecraft.world.level.block.entity.BlockEntity
1818
import java.util.*
1919
import java.util.function.Predicate
2020

21-
class TrashItemStorage : CommonStorage<ItemResource>, UpdateManager<ItemStorageData> {
21+
object TrashItemStorage : CommonStorage<ItemResource>, UpdateManager<ItemStorageData> {
2222
val slot: StorageSlot<ItemResource> = object : StorageSlot<ItemResource>, ModifiableItemSlot {
2323
override fun insert(resource: ItemResource, count: Long, simulate: Boolean): Long = count
2424

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/GenerationsBlockEntities.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ object GenerationsBlockEntities {
114114

115115
@JvmField
116116
val GENERIC_MODEL_PROVIDING: RegistrySupplier<MutableBlockEntityType<GenericModelProvidingBlockEntity>> = registerMutable("generic_model_providing", ::GenericModelProvidingBlockEntity)
117+
val TRASH_CAN: RegistrySupplier<MutableBlockEntityType<TrashCanBlockEntity>> = registerMutable("generic_model_providing", ::TrashCanBlockEntity)
117118

118119
@JvmField
119120
val COUCH: RegistrySupplier<MutableBlockEntityType<CouchBlockEntity>> = registerMutable("couch", ::CouchBlockEntity)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package generations.gg.generations.core.generationscore.common.world.level.block.entities
2+
3+
import earth.terrarium.common_storage_lib.item.impl.noops.NoOpsItemContainer
4+
import earth.terrarium.common_storage_lib.item.util.ItemProvider
5+
import earth.terrarium.common_storage_lib.resources.item.ItemResource
6+
import earth.terrarium.common_storage_lib.storage.base.CommonStorage
7+
import generations.gg.generations.core.generationscore.common.world.data.TrashItemStorage
8+
import net.minecraft.core.BlockPos
9+
import net.minecraft.core.Direction
10+
import net.minecraft.world.level.block.state.BlockState
11+
12+
class TrashCanBlockEntity(pos: BlockPos, state: BlockState) : ModelProvidingBlockEntity(GenerationsBlockEntities.TRASH_CAN.get(), pos, state), ItemProvider.BlockEntity {
13+
override fun getItems(dir: Direction?): CommonStorage<ItemResource> = if(dir == Direction.UP) { TrashItemStorage } else NoOpsItemContainer.NO_OPS
14+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/utilityblocks/TrashCanBlock.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
77
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsVoxelShapes.generateDirectionVoxelShape
88
import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
99
import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntityModels
10+
import generations.gg.generations.core.generationscore.common.world.level.block.entities.TrashCanBlockEntity
1011
import generations.gg.generations.core.generationscore.common.world.level.block.entities.generic.GenericModelProvidingBlockEntity
1112
import generations.gg.generations.core.generationscore.common.world.level.block.generic.GenericRotatableModelBlock
1213
import net.minecraft.core.BlockPos
@@ -29,9 +30,9 @@ import net.minecraft.world.phys.shapes.CollisionContext
2930
import net.minecraft.world.phys.shapes.Shapes
3031
import net.minecraft.world.phys.shapes.VoxelShape
3132

32-
class TrashCanBlock(props: Properties) : GenericRotatableModelBlock<GenericModelProvidingBlockEntity>(
33+
class TrashCanBlock(props: Properties) : GenericRotatableModelBlock<TrashCanBlockEntity>(
3334
props,
34-
GenerationsBlockEntities.GENERIC_MODEL_PROVIDING,
35+
GenerationsBlockEntities.TRASH_CAN,
3536
model = GenerationsBlockEntityModels.TRASH_CAN
3637
) {
3738
public override fun getShape(

0 commit comments

Comments
 (0)