Skip to content

Commit bc71f10

Browse files
WaterpickerWaterpicker
committed
fixed Neoforge errors.
1 parent fa57f62 commit bc71f10

File tree

8 files changed

+47
-47
lines changed

8 files changed

+47
-47
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object GenerationsArchitecturyEvents {
4343
GenerationsCore.CONFIG.blocks.scarecrowRadius.y,
4444
GenerationsCore.CONFIG.blocks.scarecrowRadius.z,
4545
1
46-
) { world, pos -> world.getBlockState(pos).`is`(SCARECROW) }
46+
) { world, pos -> world.getBlockState(pos).`is`(SCARECROW.value()) }
4747
if (list.isNotEmpty()) {
4848
it.cancel()
4949
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ object GenerationsUtils {
129129
deferredRegister: BlockPlatformRegistry,
130130
name: String,
131131
blockSupplier: () -> T
132-
): Holder<Block> {
132+
): Holder<T> {
133133
return deferredRegister.create(name, blockSupplier)
134134
}
135135

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ object GenerationsDecorationBlocks: BlockPlatformRegistry() {
159159
@JvmField val HEAL_BALL_DISPLAY = registerBallDisplay(DisplayState.HEAL)
160160
//public static final RegistrySupplier<BallDisplayBlock> GS_BALL_DISPLAY = registerBallDisplay(DisplayState.GS);
161161

162-
private fun registerBallDisplay(state: DisplayState): Holder<Block> = registerDecorationItem(state.name.lowercase(Locale.getDefault()) + "_ball_display", { BallDisplayBlock(state) }).also { BALL_DISPLAY_BLOCKS.add(it) }
162+
private fun registerBallDisplay(state: DisplayState): Holder<BallDisplayBlock> = registerDecorationItem(state.name.lowercase(Locale.getDefault()) + "_ball_display", { BallDisplayBlock(state) }).also { BALL_DISPLAY_BLOCKS.add(it as Holder<Block>) }
163163

164-
private fun <T : Block> registerDecorationItem(name: String, blockSupplier: () -> T): Holder<Block> = registerBlock(name, blockSupplier).also {
164+
private fun <T : Block> registerDecorationItem(name: String, blockSupplier: () -> T): Holder<T> = registerBlock(name, blockSupplier).also {
165165
register(name) { properties -> GenerationsBlockItem(it, properties) }
166166
}
167167

168-
private fun <T : Block> registerBlock(name: String, blockSupplier: () -> T): Holder<Block> = GenerationsUtils.registerBlock(this, name, blockSupplier)
168+
private fun <T : Block> registerBlock(name: String, blockSupplier: () -> T): Holder<T> = GenerationsUtils.registerBlock(this, name, blockSupplier)
169169

170170
private fun register(name: String, itemSupplier: (Item.Properties) -> Item): Holder<Item> = GenerationsItems.ITEMS.create(name, { itemSupplier.invoke(Item.Properties()) })
171171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ object GenerationsShrines: BlockPlatformRegistry() {
8080
val PRISON_BOTTLE = registerBlockItem("prison_bottle", { PrisonBottleBlock(BOTTLE_PROPERTIES) }, { block, properties -> PokemonInteractBlockItem(block, properties, "unbound") }, GenerationsItems.LEGENDARY_ITEMS)
8181

8282

83-
private fun <T : Block> registerBlockItem(name: String, blockSupplier: () -> T, function: (Holder<Block>, Item.Properties) -> Item, register: ItemPlatformRegistry): Holder<Block> {
83+
private fun <T : Block> registerBlockItem(name: String, blockSupplier: () -> T, function: (Holder<Block>, Item.Properties) -> Item, register: ItemPlatformRegistry): Holder<T> {
8484
val block = registerBlock(this, name, blockSupplier)
85-
register.create(name) { function.invoke(block, Item.Properties()) }
85+
register.create(name) { function.invoke(block as Holder<Block>, Item.Properties()) }
8686
return block
8787
}
8888

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,22 @@ object GenerationsUtilityBlocks: BlockPlatformRegistry() {
112112
itemSupplier: (Item.Properties) -> T
113113
): Holder<Item> = GenerationsItems.ITEMS.create(name) { itemSupplier.invoke(Item.Properties()) }
114114

115-
private fun <T : Block> registerBlockItem(name: String, blockSupplier: () -> T): Holder<Block> {
115+
private fun <T : Block> registerBlockItem(name: String, blockSupplier: () -> T): Holder<T> {
116116
val block = registerBlock(name, blockSupplier)
117117
register(name) { properties -> GenerationsBlockItem(block, properties) }
118118
return block
119119
}
120120

121-
private fun registerLoot(name: String, ball: PokeBall): Holder<Block> {
121+
private fun registerLoot(name: String, ball: PokeBall): Holder<out Block> {
122122
val properties = Properties.of().randomTicks().sound(SoundType.METAL).strength(-1.0f, 3600000.0f).noOcclusion().noLootTable()
123123

124124
val block = registerBlockItem(name + "_ball_loot") { BallLootBlock(properties, name, ball) }
125-
BALL_LOOTS.add(block)
125+
BALL_LOOTS.add(block as Holder<Block>)
126126
return block
127127
}
128128

129129

130-
private fun <T : Block> registerBlock(name: String, blockSupplier: () -> T): Holder<Block> {
130+
private fun <T : Block> registerBlock(name: String, blockSupplier: () -> T): Holder<T> {
131131
return registerBlock(this, name, blockSupplier)
132132
}
133133

@@ -137,7 +137,7 @@ private fun registerLoot(name: String, ball: PokeBall): Holder<Block> {
137137
val properName = dyeColor.serializedName + "_" + name
138138
val block = registerBlock(properName, { blockSupplier.invoke(dyeColor, dyeMap) })
139139
register(properName) { GenerationsBlockItem(block, it) }
140-
dyeMap[dyeColor] = block
140+
dyeMap[dyeColor] = block as Holder<Block>
141141
}
142142

143143
return DyedGroup(dyeMap)

‎neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/GenerationsBlockLoot.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,12 @@ internal class GenerationsBlockLoot(provider: HolderLookup.Provider) : BlockLoot
306306
)
307307
}
308308

309-
private fun createSignDrops(item: Holder<Item>, standingSignBlock: Holder<Block>, wallSignBlock: Holder<Block>) {
309+
private fun createSignDrops(item: Holder<out Item>, standingSignBlock: Holder<out Block>, wallSignBlock: Holder<out Block>) {
310310
createItemDropTable(item.value(), standingSignBlock.value())
311311
createItemDropTable(item.value(), wallSignBlock.value())
312312
}
313313

314-
private fun dropDisplayStandWithBall(block: Holder<Block>, item: Item) {
314+
private fun dropDisplayStandWithBall(block: Holder<out Block>, item: Item) {
315315
add(
316316
block.value(), LootTable
317317
.lootTable()
@@ -490,7 +490,7 @@ internal class GenerationsBlockLoot(provider: HolderLookup.Provider) : BlockLoot
490490
}
491491

492492
protected fun prisonBottleStem() {
493-
val block = GenerationsShrines.PRISON_BOTTLE_STEM.asValue<GenericRotatableModelBlock>()
493+
val block = GenerationsShrines.PRISON_BOTTLE_STEM.value()
494494
val statePropertiesPredicate: () -> StatePropertiesPredicate.Builder = {
495495
val builder = StatePropertiesPredicate.Builder.properties()
496496

‎neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/MachineDecorationsRecipeDatagen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ class MachineDecorationsRecipeDatagen(output: PackOutput, registries: Completabl
840840
.withPath { a: String -> a + "_dyed" })
841841
}
842842

843-
private fun buildPokeBallDisplayRecipes(consumer: RecipeOutput, pokeball: Item, display: Holder<Block>) {
843+
private fun buildPokeBallDisplayRecipes(consumer: RecipeOutput, pokeball: Item, display: Holder<out Block>) {
844844
ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, display.value())
845845
.requires(pokeball)
846846
.requires(GenerationsDecorationBlocks.EMPTY_BALL_DISPLAY)

‎neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/tags/TagsDatagen.kt‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -89,37 +89,37 @@ object TagsDatagen {
8989
}
9090

9191
mine_with_pickaxe.add(
92-
GenerationsUtilityBlocks.CHARGE_STONE_FURNACE,
93-
GenerationsUtilityBlocks.CHARGE_STONE_BLAST_FURNACE,
94-
GenerationsUtilityBlocks.CHARGE_STONE_SMOKER,
95-
GenerationsUtilityBlocks.VOLCANIC_STONE_FURNACE,
96-
GenerationsUtilityBlocks.VOLCANIC_STONE_BLAST_FURNACE,
97-
GenerationsUtilityBlocks.VOLCANIC_STONE_SMOKER,
98-
GenerationsShrines.PRISON_BOTTLE,
99-
GenerationsShrines.PRISON_BOTTLE_STEM,
100-
GenerationsUtilityBlocks.RKS_MACHINE,
101-
GenerationsUtilityBlocks.COOKING_POT,
102-
GenerationsUtilityBlocks.TABLE_PC,
103-
GenerationsUtilityBlocks.ROTOM_PC,
104-
GenerationsUtilityBlocks.TRASH_CAN,
105-
GenerationsUtilityBlocks.WHITE_ELEVATOR,
106-
GenerationsUtilityBlocks.LIGHT_GRAY_ELEVATOR,
107-
GenerationsUtilityBlocks.GRAY_ELEVATOR,
108-
GenerationsUtilityBlocks.BLACK_ELEVATOR,
109-
GenerationsUtilityBlocks.BROWN_ELEVATOR,
110-
GenerationsUtilityBlocks.RED_ELEVATOR,
111-
GenerationsUtilityBlocks.ORANGE_ELEVATOR,
112-
GenerationsUtilityBlocks.YELLOW_ELEVATOR,
113-
GenerationsUtilityBlocks.LIME_ELEVATOR,
114-
GenerationsUtilityBlocks.GREEN_ELEVATOR,
115-
GenerationsUtilityBlocks.CYAN_ELEVATOR,
116-
GenerationsUtilityBlocks.LIGHT_BLUE_ELEVATOR,
117-
GenerationsUtilityBlocks.BLUE_ELEVATOR,
118-
GenerationsUtilityBlocks.PURPLE_ELEVATOR,
119-
GenerationsUtilityBlocks.MAGENTA_ELEVATOR,
120-
GenerationsUtilityBlocks.PINK_ELEVATOR,
121-
GenerationsDecorationBlocks.DESK,
122-
GenerationsDecorationBlocks.FRIDGE
92+
GenerationsUtilityBlocks.CHARGE_STONE_FURNACE.value(),
93+
GenerationsUtilityBlocks.CHARGE_STONE_BLAST_FURNACE.value(),
94+
GenerationsUtilityBlocks.CHARGE_STONE_SMOKER.value(),
95+
GenerationsUtilityBlocks.VOLCANIC_STONE_FURNACE.value(),
96+
GenerationsUtilityBlocks.VOLCANIC_STONE_BLAST_FURNACE.value(),
97+
GenerationsUtilityBlocks.VOLCANIC_STONE_SMOKER.value(),
98+
GenerationsShrines.PRISON_BOTTLE.value(),
99+
GenerationsShrines.PRISON_BOTTLE_STEM.value(),
100+
GenerationsUtilityBlocks.RKS_MACHINE.value(),
101+
GenerationsUtilityBlocks.COOKING_POT.value(),
102+
GenerationsUtilityBlocks.TABLE_PC.value(),
103+
GenerationsUtilityBlocks.ROTOM_PC.value(),
104+
GenerationsUtilityBlocks.TRASH_CAN.value(),
105+
GenerationsUtilityBlocks.WHITE_ELEVATOR.value(),
106+
GenerationsUtilityBlocks.LIGHT_GRAY_ELEVATOR.value(),
107+
GenerationsUtilityBlocks.GRAY_ELEVATOR.value(),
108+
GenerationsUtilityBlocks.BLACK_ELEVATOR.value(),
109+
GenerationsUtilityBlocks.BROWN_ELEVATOR.value(),
110+
GenerationsUtilityBlocks.RED_ELEVATOR.value(),
111+
GenerationsUtilityBlocks.ORANGE_ELEVATOR.value(),
112+
GenerationsUtilityBlocks.YELLOW_ELEVATOR.value(),
113+
GenerationsUtilityBlocks.LIME_ELEVATOR.value(),
114+
GenerationsUtilityBlocks.GREEN_ELEVATOR.value(),
115+
GenerationsUtilityBlocks.CYAN_ELEVATOR.value(),
116+
GenerationsUtilityBlocks.LIGHT_BLUE_ELEVATOR.value(),
117+
GenerationsUtilityBlocks.BLUE_ELEVATOR.value(),
118+
GenerationsUtilityBlocks.PURPLE_ELEVATOR.value(),
119+
GenerationsUtilityBlocks.MAGENTA_ELEVATOR.value(),
120+
GenerationsUtilityBlocks.PINK_ELEVATOR.value(),
121+
GenerationsDecorationBlocks.DESK.value(),
122+
GenerationsDecorationBlocks.FRIDGE.value()
123123
).add(*GenerationsDecorationBlocks.STREET_LAMP.toArray())
124124
.add(*GenerationsUtilityBlocks.PC.toArray())
125125
.add(*GenerationsDecorationBlocks.BALL_DISPLAY_BLOCKS.toTypedArray())

0 commit comments

Comments
 (0)