Skip to content

Commit 666e5c8

Browse files
WaterpickerWaterpicker
committed
Remove CSL data usage and fixed chisels not openning editor
1 parent 4ff7f9e commit 666e5c8

File tree

17 files changed

+206
-214
lines changed

17 files changed

+206
-214
lines changed

‎common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ object GenerationsCore {
109109
)
110110

111111
GenerationsCoreEntityDataSerializers.init()
112-
GenerationsStorage.init()
113112
GenerationsResources.init()
114113
GenerationsIngredidents.init()
115114

‎common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/RegigigasShrineBlockEntityRenderer.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package generations.gg.generations.core.generationscore.common.client.render.block.entity
22

33
import com.mojang.blaze3d.vertex.PoseStack
4-
import generations.gg.generations.core.generationscore.common.GenerationsStorage.REGI_ORBS
54
import generations.gg.generations.core.generationscore.common.util.GenerationsUtils.rgbFromInt
65
import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
76
import generations.gg.generations.core.generationscore.common.world.item.id
@@ -43,10 +42,10 @@ class RegigigasShrineBlockEntityRenderer(ctx: BlockEntityRendererProvider.Contex
4342
fun processOrbs(shrineBlock: RegigigasShrineBlockEntity) {
4443
val colors: MutableList<Vector3f> = ArrayList()
4544

46-
val list = REGI_ORBS[shrineBlock]
45+
val list = shrineBlock.container
4746

48-
for (i in list.stacks().indices) {
49-
val color = map[list.stacks()[i].resource().item.builtInRegistryHolder().id]
47+
for (i in list.items.indices) {
48+
val color = map[list.items[i].item.builtInRegistryHolder().id]
5049

5150
if (color != null) colors.add(color)
5251
}

‎common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/statue/StatueEditorScreen.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ class StatueEditorScreen(val statue: StatueEntity) : Screen(Component.empty()) {
250250
poseStack.drawString(font, "Orientation: " + String.format("%.2f", statue.yRot), x + 11, y + 24, 0x5F5F60, false)
251251
}
252252

253+
override fun renderBlurredBackground(partialTick: Float) {
254+
}
255+
253256
override fun isPauseScreen(): Boolean {
254257
return false
255258
}

‎common/src/main/java/generations/gg/generations/core/generationscore/common/util/ExtendedsimpleItemContainer.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package generations.gg.generations.core.generationscore.common.util
22

33
import earth.terrarium.common_storage_lib.item.impl.SimpleItemStorage
4-
import generations.gg.generations.core.generationscore.common.GenerationsStorage.ITEM_CONTENTS
4+
import generations.gg.generations.core.generationscore.common.world.item.components.SimpleContainer
55
import net.minecraft.world.item.ItemStack
66
import net.minecraft.world.level.block.entity.BlockEntity
77
import java.util.function.Consumer
88

9-
open class ExtendedsimpleItemContainer(entity: BlockEntity, size: Int) : SimpleItemStorage(entity, ITEM_CONTENTS, size) {
9+
open class ExtendedsimpleItemContainer(size: Int) : SimpleContainer(size) {
1010
fun updateStack(index: Int, consumer: (ItemStack) -> Unit) {
11-
val slot = this[index]
11+
val stack = this.getItem(index)
1212

13-
val stack = slot.toItemStack()
1413
consumer.invoke(stack)
1514

16-
slot.set(stack)
15+
setItem(index, stack)
1716
}
1817
}

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/statue/StatueEntity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class StatueEntity(type: EntityType<StatueEntity> = GenerationsEntities.STATUE_E
228228
level().addFreshEntity(entity)
229229
stack.shrink(1)
230230
return InteractionResult.SUCCESS
231-
} else if (player.getItemInHand(hand).item == GenerationsItems.CHISEL) {
231+
} else if (stack.`is`(GenerationsItems.CHISEL)) {
232232
var canUse = player.isCreative
233233

234234
StatueEvents.CAN_USE_CHISEL.post(StatueEvents.CanUseChisel(player as ServerPlayer, player.isCreative()), then = { canUse = it.canUse })

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/CalyrexSteedItem.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private var ItemStack.carrotHolder: CarrotHolder
2626
container = ItemContainerContents.fromItems(value.items)
2727
}
2828

29-
class CalyrexSteedItem(name: String, arg: Properties, private val speices: SpeciesKey) : Item(arg.component(GenerationsDataComponents.CALYREX_CARROTS.value(), CarrotHolder())) {
29+
class CalyrexSteedItem(name: String, arg: Properties, private val speices: SpeciesKey) : Item(arg) {
3030
private val defaultTranslation = "container." + name + "_carrot"
3131

3232
// @Override

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/components/GenerationsDataComponents.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package generations.gg.generations.core.generationscore.common.world.item.compon
22

33
import com.cobblemon.mod.common.pokemon.Pokemon
44
import com.mojang.serialization.Codec
5-
import earth.terrarium.common_storage_lib.item.util.ItemStorageData
6-
import generations.gg.generations.core.generationscore.common.GenerationsStorage.registry
75
import generations.gg.generations.core.generationscore.common.util.DataKeys
86
import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
97
import generations.gg.generations.core.generationscore.common.util.StreamCodecs.asRegistryFriendly
@@ -53,12 +51,7 @@ object GenerationsDataComponents: PlatformRegistry<DataComponentType<*>>(Registr
5351
val PLAYING = register("playing", Codec.BOOL, ByteBufCodecs.BOOL.asRegistryFriendly())
5452
val CURRENT_SONG = register("current_song", JukeboxSong.DIRECT_CODEC, JukeboxSong.DIRECT_STREAM_CODEC)
5553

56-
// val WALKMON_DATA = register("walkmon_data", WalkmonData.CODEC, WalkmonData.STREAM_CODEC)
57-
// val DISCS = register("discs", DiscContainer.CODEC, DiscContainer.STREAM_CODEC)
58-
val CALYREX_CARROTS = register("calyrex_carrots", CarrotHolder.CODEC, CarrotHolder.STREAM_CODEC)
5954
val IMBUED = register("imbued", ItemStack.OPTIONAL_CODEC, ItemStack.OPTIONAL_STREAM_CODEC)
60-
val REGI_ORBS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).networkSerializer(
61-
ItemStorageData.NETWORK_CODEC).buildAndRegister("regi_orbs")
6255

6356

6457
val FISHED_SHARDS = register("fished_shards", RubyRodItem.FishedShards.CODEC)

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsBlocks.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ object GenerationsBlocks: BlockPlatformRegistry() {
408408
val MIRROR_GLASS_SET = GenerationsBlockSet("mirror_glass", BlockBehaviour.Properties.ofFullCopy(Blocks.GLASS).strength(.5f))
409409
val NORMAL_SANDSTONE_SET = GenerationsBlockSet("normal_sandstone", BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE))
410410
val BRIGHT_SANDSTONE_SET = GenerationsBlockSet("bright_sandstone", BlockBehaviour.Properties.ofFullCopy(Blocks.SANDSTONE).lightLevel { 15 })
411-
val MACHINE_BLOCK = registerBlockItem("machine_block", { MachineBlock(STONE_PROPERTY) })
411+
// val MACHINE_BLOCK = registerBlockItem("machine_block", { MachineBlock(STONE_PROPERTY) })
412412
val OCEAN_BLOCK_SET = GenerationsBlockSet("ocean_block")
413413
val WATER_QUARTZ_SET = GenerationsBlockSet("water_quartz", BlockBehaviour.Properties.ofFullCopy(Blocks.QUARTZ_BLOCK))
414414
val RUINS_SAND = registerBlockItem("ruins_sand", { ColoredFallingBlock(0xdbd3a0.rgba(), BlockBehaviour.Properties.ofFullCopy(Blocks.SAND)) })

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/MachineBlock.kt‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
package generations.gg.generations.core.generationscore.common.world.level.block
2-
3-
import com.mojang.serialization.MapCodec
4-
import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
5-
import generations.gg.generations.core.generationscore.common.world.level.block.entities.MachineBlockEntity
6-
import net.minecraft.core.BlockPos
7-
import net.minecraft.world.level.Level
8-
import net.minecraft.world.level.block.BaseEntityBlock
9-
import net.minecraft.world.level.block.RenderShape
10-
import net.minecraft.world.level.block.entity.BlockEntity
11-
import net.minecraft.world.level.block.entity.BlockEntityTicker
12-
import net.minecraft.world.level.block.entity.BlockEntityType
13-
import net.minecraft.world.level.block.state.BlockState
14-
15-
@Suppress("deprecation")
16-
class MachineBlock(properties: Properties) : BaseEntityBlock(properties) {
17-
override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? {
18-
return MachineBlockEntity(pos, state)
19-
}
20-
21-
override fun codec(): MapCodec<MachineBlock> = CODEC
22-
23-
// override fun useItemOn(
24-
// stack: ItemStack,
25-
// state: BlockState,
1+
//package generations.gg.generations.core.generationscore.common.world.level.block
2+
//
3+
//import com.mojang.serialization.MapCodec
4+
//import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
5+
//import generations.gg.generations.core.generationscore.common.world.level.block.entities.MachineBlockEntity
6+
//import net.minecraft.core.BlockPos
7+
//import net.minecraft.world.level.Level
8+
//import net.minecraft.world.level.block.BaseEntityBlock
9+
//import net.minecraft.world.level.block.RenderShape
10+
//import net.minecraft.world.level.block.entity.BlockEntity
11+
//import net.minecraft.world.level.block.entity.BlockEntityTicker
12+
//import net.minecraft.world.level.block.entity.BlockEntityType
13+
//import net.minecraft.world.level.block.state.BlockState
14+
//
15+
//@Suppress("deprecation")
16+
//class MachineBlock(properties: Properties) : BaseEntityBlock(properties) {
17+
// override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? {
18+
// return MachineBlockEntity(pos, state)
19+
// }
20+
//
21+
// override fun codec(): MapCodec<MachineBlock> = CODEC
22+
//
23+
//// override fun useItemOn(
24+
//// stack: ItemStack,
25+
//// state: BlockState,
26+
//// level: Level,
27+
//// pos: BlockPos,
28+
//// player: Player,
29+
//// hand: InteractionHand,
30+
//// hit: BlockHitResult
31+
//// ): ItemInteractionResult =
32+
//// if (!level.isClientSide() && level.getBlockEntity(pos).instanceOrNull<MachineBlockEntity>()?.also { player.openMenu(it) } != null) ItemInteractionResult.SUCCESS else super.useItemOn(stack, state, level, pos, player, hand, hit)
33+
//
34+
// public override fun getRenderShape(state: BlockState): RenderShape {
35+
// return RenderShape.MODEL
36+
// }
37+
//
38+
// override fun <T : BlockEntity?> getTicker(
2639
// level: Level,
27-
// pos: BlockPos,
28-
// player: Player,
29-
// hand: InteractionHand,
30-
// hit: BlockHitResult
31-
// ): ItemInteractionResult =
32-
// if (!level.isClientSide() && level.getBlockEntity(pos).instanceOrNull<MachineBlockEntity>()?.also { player.openMenu(it) } != null) ItemInteractionResult.SUCCESS else super.useItemOn(stack, state, level, pos, player, hand, hit)
33-
34-
public override fun getRenderShape(state: BlockState): RenderShape {
35-
return RenderShape.MODEL
36-
}
37-
38-
override fun <T : BlockEntity?> getTicker(
39-
level: Level,
40-
state: BlockState,
41-
blockEntityType: BlockEntityType<T>
42-
): BlockEntityTicker<T>? {
43-
return if (level.isClientSide) null else createTickerHelper(blockEntityType, GenerationsBlockEntities.MACHINE_BLOCK.asValue(), MachineBlockEntity.Companion::serverTick)
44-
}
45-
46-
val CODEC = simpleCodec(::MachineBlock)
47-
}
40+
// state: BlockState,
41+
// blockEntityType: BlockEntityType<T>
42+
// ): BlockEntityTicker<T>? {
43+
// return if (level.isClientSide) null else createTickerHelper(blockEntityType, GenerationsBlockEntities.MACHINE_BLOCK.asValue(), MachineBlockEntity.Companion::serverTick)
44+
// }
45+
//
46+
// val CODEC = simpleCodec(::MachineBlock)
47+
//}

0 commit comments

Comments
 (0)