Skip to content

Commit 9004691

Browse files
committed
made ball chests animate properly. Tweak textures so insides is black and not a flash bang
1 parent d852fec commit 9004691

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ import net.minecraft.world.entity.player.Player
1010
import net.minecraft.world.inventory.AbstractContainerMenu
1111
import net.minecraft.world.inventory.Slot
1212
import net.minecraft.world.item.ItemStack
13-
import java.io.Closeable
1413

1514
open class GenericChestContainer(
1615
containerId: Int,
1716
val playerInventory: Inventory,
18-
private val container: Container,
17+
val container: Container,
1918
val inventoryWidth: Int,
2019
val inventoryHeight: Int,
2120
lock: (Int) -> Boolean = { false }, val onClosed: () -> Unit = {}
@@ -30,6 +29,7 @@ open class GenericChestContainer(
3029
val playerInventoryX: Int
3130

3231
init {
32+
container.startOpen(playerInventory.player)
3333
populate(container, 8, 16, 0, inventoryHeight, inventoryWidth)
3434
this.playerInventoryX = guiWidth / 2 - 80
3535
populatePlayer(playerInventory, playerInventoryX, guiHeight - 82, 1, 3, 9, lock)
@@ -60,9 +60,9 @@ open class GenericChestContainer(
6060
}
6161
}
6262

63-
// fun close() {
64-
// container.instanceOrNull<CloseableContainer>()
65-
// }
63+
fun close() {
64+
container.instanceOrNull<CloseableContainer>()?.close()
65+
}
6666

6767
private fun addSlot(container: Container, slot: Int, x: Int, y: Int) {
6868
this.addSlot(Slot(container, slot, x, y))
@@ -102,7 +102,7 @@ open class GenericChestContainer(
102102
override fun removed(player: Player) {
103103
super.removed(player)
104104
onClosed.invoke()
105-
// container.stopOpen(player)
105+
container.stopOpen(player)
106106
}
107107

108108
open fun save(player: Player?) {}
@@ -116,7 +116,7 @@ open class GenericChestContainer(
116116
val row = buffer.readVarInt()
117117
val column = buffer.readVarInt()
118118

119-
return GenericChestContainer(containerId, playerInventory, SimpleContainer(row * column), row, column)
119+
return GenericChestContainer(containerId, playerInventory, SimpleContainer(row * column), row, column,)
120120
}
121121
}
122122
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@ object GenericContainer {
4444
object : ExtendedMenuProvider {
4545

4646
override fun createMenu(id: Int, inventory: Inventory, player: Player): AbstractContainerMenu {
47-
return GenericChestContainer(id, inventory, storage, width, height, if(lock != -1) { slot -> slot == lock } else { _ -> false }, onClose)
47+
return GenericChestContainer(
48+
id,
49+
inventory,
50+
storage,
51+
width,
52+
height,
53+
if(lock != -1) { slot -> slot == lock } else { _ -> false },
54+
onClose,
55+
)
4856
}
4957

5058
override fun getDisplayName(): Component {

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package generations.gg.generations.core.generationscore.common.world.level.block.entities.generic
22

33
import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
4-
import generations.gg.generations.core.generationscore.common.orFalse
54
import generations.gg.generations.core.generationscore.common.world.container.GenericChestContainer
65
import generations.gg.generations.core.generationscore.common.world.container.GenericContainer
76
import generations.gg.generations.core.generationscore.common.world.item.components.GenerationsDataComponents
@@ -17,7 +16,6 @@ import net.minecraft.network.chat.Component
1716
import net.minecraft.sounds.SoundEvent
1817
import net.minecraft.sounds.SoundEvents
1918
import net.minecraft.sounds.SoundSource
20-
import net.minecraft.world.CompoundContainer
2119
import net.minecraft.world.ContainerHelper
2220
import net.minecraft.world.entity.player.Inventory
2321
import net.minecraft.world.entity.player.Player
@@ -31,7 +29,7 @@ import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity
3129
import net.minecraft.world.level.block.state.BlockState
3230

3331
@Suppress("deprecation")
34-
class GenericChestBlockEntity @JvmOverloads constructor(
32+
open class GenericChestBlockEntity @JvmOverloads constructor(
3533
arg: BlockPos,
3634
arg2: BlockState,
3735
private var width: Int = 9,
@@ -54,9 +52,7 @@ class GenericChestBlockEntity @JvmOverloads constructor(
5452
}
5553

5654
override fun isOwnContainer(player: Player): Boolean {
57-
val container = player.containerMenu.instanceOrNull<GenericChestContainer>() ?: false
58-
59-
return container == this@GenericChestBlockEntity || container.instanceOrNull<CompoundContainer>().orFalse { it.contains(this@GenericChestBlockEntity) }
55+
return player.containerMenu.instanceOrNull<GenericChestContainer>()?.container == this@GenericChestBlockEntity
6056
}
6157
}
6258

@@ -129,11 +125,7 @@ class GenericChestBlockEntity @JvmOverloads constructor(
129125
}
130126

131127
override fun createMenu(containerId: Int, inventory: Inventory): AbstractContainerMenu {
132-
return GenericChestContainer(containerId, inventory, this, width, height)
133-
}
134-
135-
override fun setBlockState(blockState: BlockState) {
136-
super.setBlockState(blockState)
128+
return GenericChestContainer(containerId, inventory, this, width, height,)
137129
}
138130

139131
fun recheckOpen() {
-5 Bytes
Loading
-7 Bytes
Loading
-3 Bytes
Loading
-6 Bytes
Loading

0 commit comments

Comments
 (0)