Skip to content

Commit 114ab18

Browse files
committed
I have seen Datagen... it is death
1 parent 27aead0 commit 114ab18

File tree

143 files changed

+8028
-7243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8028
-7243
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsArchitecturyEvents.kt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,42 @@ import com.cobblemon.mod.common.CobblemonEntities
44
import com.cobblemon.mod.common.api.dialogue.Dialogue
55
import com.cobblemon.mod.common.api.dialogue.Dialogues
66
import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
7-
import com.cobblemon.mod.common.util.asTranslated
87
import com.cobblemon.mod.common.util.openDialogue
98
import dev.architectury.event.EventResult
109
import dev.architectury.event.events.common.EntityEvent
1110
import dev.architectury.event.events.common.InteractionEvent
1211
import generations.gg.generations.core.generationscore.common.api.events.general.EntityEvents
13-
import generations.gg.generations.core.generationscore.common.tags.GenerationsBlockTags
12+
import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
1413
import generations.gg.generations.core.generationscore.common.world.entity.GenerationsEntities
15-
import generations.gg.generations.core.generationscore.common.world.entity.ZygardeCellEntity
1614
import generations.gg.generations.core.generationscore.common.world.item.GenerationsCobblemonInteractions
1715
import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
18-
import generations.gg.generations.core.generationscore.common.world.item.ZygardeCubeItem
1916
import generations.gg.generations.core.generationscore.common.world.level.block.ElevatorBlock
2017
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsShrines
2118
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsUtilityBlocks.SCARECROW
2219
import generations.gg.generations.core.generationscore.common.world.level.block.entities.VendingMachineBlock
2320
import generations.gg.generations.core.generationscore.common.world.level.block.shrines.RegiShrineBlock
24-
import generations.gg.generations.core.generationscore.common.world.sound.GenerationsSounds
2521
import net.minecraft.core.Direction
2622
import net.minecraft.server.level.ServerPlayer
27-
import net.minecraft.sounds.SoundSource
2823
import net.minecraft.world.InteractionHand
29-
import net.minecraft.world.entity.Entity
3024

3125
object GenerationsArchitecturyEvents {
3226

3327
@JvmStatic
3428
fun init() {
35-
EntityEvents.JUMP.register {
36-
if (it is ServerPlayer) it.level().getBlockState(it.blockPosition()).block.takeIf { it is ElevatorBlock }
37-
.let { it as? ElevatorBlock }?.takeElevator(it.level(), it.blockPosition().below(), it, Direction.UP)
29+
EntityEvents.JUMP.subscribe {
30+
val player = it.entity.instanceOrNull<ServerPlayer>() ?: return@subscribe
31+
player.serverLevel().getBlockState(player.blockPosition()).block.instanceOrNull<ElevatorBlock>()?.takeElevator(player.serverLevel(), player.blockPosition().below(), player, Direction.UP)
3832
}
3933

40-
EntityEvent.ADD.register { entity, level ->
34+
EntityEvent.ADD.register { entity, level -> //TODO: add exceptions and maybe a scarcrow tag
4135
if(entity.type == CobblemonEntities.POKEMON || entity.type == GenerationsEntities.ZYGARDE_CELL) {
4236

4337
val list = RegiShrineBlock.searchForBlock(
4438
level,
4539
entity.blockPosition(),
46-
GenerationsCore.CONFIG.blocks.scarecrowRadius.x,
47-
GenerationsCore.CONFIG.blocks.scarecrowRadius.y,
48-
GenerationsCore.CONFIG.blocks.scarecrowRadius.z,
40+
GenerationsCore.CONFIG!!.blocks.scarecrowRadius.x,
41+
GenerationsCore.CONFIG!!.blocks.scarecrowRadius.y,
42+
GenerationsCore.CONFIG!!.blocks.scarecrowRadius.z,
4943
1
5044
) { world, pos -> world.getBlockState(pos).`is`(SCARECROW.get()) }
5145
if (list.isNotEmpty()) {

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCobblemonEvents.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class GenerationsCobblemonEvents {
5454
)
5555

5656

57-
@JvmStatic
5857
fun init() {
5958
FORME_CHANGE.subscribe(Priority.NORMAL, {(a, b, c) -> GenerationsInstructionProcessor.processDetailsChange(a, b, c) })
6059

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ object GenerationsCore {
183183
fun onAnvilChange(
184184
left: ItemStack,
185185
right: ItemStack,
186-
player: Player?,
187-
output: Consumer<ItemStack?>,
186+
player: Player,
187+
output: Consumer<ItemStack>,
188188
cost: IntConsumer,
189189
materialCost: IntConsumer
190190
) {

common/src/main/java/generations/gg/generations/core/generationscore/common/api/events/general/CameraEvents.java

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package generations.gg.generations.core.generationscore.common.api.events.general
2+
3+
import com.cobblemon.mod.common.api.reactive.EventObservable
4+
import net.minecraft.server.level.ServerLevel
5+
import net.minecraft.server.level.ServerPlayer
6+
import net.minecraft.world.item.ItemStack
7+
8+
object CameraEvents {
9+
@JvmField val MODIFY_PHOTO: EventObservable<ModifyPhoto> = EventObservable()
10+
11+
class ModifyPhoto(val player: ServerPlayer, val level: ServerLevel, var photo: ItemStack)
12+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/api/events/general/EntityEvents.java

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package generations.gg.generations.core.generationscore.common.api.events.general
2+
3+
import com.cobblemon.mod.common.api.reactive.EventObservable
4+
import dev.architectury.event.Event
5+
import dev.architectury.event.EventFactory
6+
import net.minecraft.world.entity.Entity
7+
8+
object EntityEvents {
9+
@JvmStatic fun jump(entity: Entity) = JUMP.post(Jump(entity))
10+
11+
@JvmField val JUMP: EventObservable<Jump> = EventObservable()
12+
13+
class Jump(val entity: Entity)
14+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/api/events/general/StatueEvents.java

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package generations.gg.generations.core.generationscore.common.api.events.general
2+
3+
import com.cobblemon.mod.common.api.reactive.EventObservable
4+
import dev.architectury.event.Event
5+
import dev.architectury.event.EventFactory
6+
import net.minecraft.server.level.ServerPlayer
7+
import java.util.function.Function
8+
9+
object StatueEvents {
10+
@JvmField var CAN_USE_CHISEL: EventObservable<CanUseChisel> = EventObservable()
11+
12+
class CanUseChisel(val player: ServerPlayer, var canUse: Boolean)
13+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/ModelRegistry.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ object ModelRegistry {
9292
val forward: Direction = supplier.blockState.getValue(GenericRotatableModelBlock.FACING)
9393
val x: Int = block.getWidthValue(supplier.blockState)
9494
val z: Int = block.getLengthValue(supplier.blockState)
95-
val width: Float = block.width() * 0.5f - x
96-
val length: Float = block.length() * 0.5f - z
95+
val width: Float = block.width * 0.5f - x
96+
val length: Float = block.length * 0.5f - z
9797
when (forward) {
9898
Direction.SOUTH -> stack.translate(width, 0f, -length)
9999
Direction.EAST -> stack.translate(-length, 0f, -width)

0 commit comments

Comments
 (0)