Skip to content

Commit 3f01480

Browse files
WaterpickerWaterpicker
committed
Depracted MutableBlockEntityType and purged breeder. This was unused every since we moved to cobblemon.
1 parent 90b228c commit 3f01480

File tree

24 files changed

+458
-498
lines changed

24 files changed

+458
-498
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ object GenerationsCoreClient {
343343
consumer.register(GenerationsBlockEntities.TAO_TRIO_SHRINE.get(), ::GeneralUseBlockEntityRenderer)
344344
consumer.register(GenerationsBlockEntities.TAPU_SHRINE.get(), ::GeneralUseBlockEntityRenderer)
345345
consumer.register(GenerationsBlockEntities.INTERACT_SHRINE.get(), ::GeneralUseBlockEntityRenderer)
346-
consumer.register(GenerationsBlockEntities.BREEDER.get(), ::BreederBlocEntityRenderer)
347-
348346
consumer.register(GenerationsBlockEntities.COOKING_POT.get(), ::CookingPotRenderer)
349347
consumer.register(GenerationsBlockEntities.WEATHER_TRIO.get(), ::GeneralUseBlockEntityRenderer)
350348
consumer.register(GenerationsBlockEntities.SIGN_BLOCK_ENTITIES.get(), ::SignRenderer)

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

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import net.minecraft.world.item.DyeColor
55
import net.minecraft.world.level.block.Block
66

77
@JvmRecord
8-
data class DyedGroup(@JvmField val block: Map<DyeColor, Holder<Block>>) {
9-
fun toArray(): Array<Block> = block.values.map { it.value() }.toTypedArray()
8+
data class DyedGroup(@JvmField val block: Map<DyeColor, Holder<out Block>>) {
9+
fun toArray(): Array<Holder<out Block>> = block.values.toTypedArray()
10+
fun toExposedArray(): Array<out Block> = block.values.map(Holder<out Block>::value).toTypedArray()
1011
}

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

Lines changed: 32 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -147,24 +147,12 @@ object GenerationsDecorationBlocks {
147147
val HDTV: RegistrySupplier<Block> =
148148
registerDecorationItem("hdtv") { HdTvBlock(of().sound(SoundType.WOOD).strength(.5f)) }
149149

150-
@JvmField
151-
val SHOP_DISPLAY_CASE_1: RegistrySupplier<Block> =
152-
registerDecorationItem("shop_display_case_1") { ShopDisplayBlock(of(), 1, 0, 0, "case_1") }
153-
@JvmField
154-
val SHOP_DISPLAY_CASE_2: RegistrySupplier<Block> =
155-
registerDecorationItem("shop_display_case_2") { ShopDisplayBlock(of(), 1, 0, 0, "case_2") }
156-
@JvmField
157-
val SHOP_DISPLAY_SMALL_1: RegistrySupplier<Block> =
158-
registerDecorationItem("shop_display_small_1") { ShopDisplayBlock(of(), 1, 1, 0, "round_1") }
159-
@JvmField
160-
val SHOP_DISPLAY_SMALL_2: RegistrySupplier<Block> =
161-
registerDecorationItem("shop_display_small_2") { ShopDisplayBlock(of(), 1, 1, 0, "round_2") }
162-
@JvmField
163-
val SHOP_DISPLAY_LARGE_SHELF_1: RegistrySupplier<Block> =
164-
registerDecorationItem("shop_display_large_shelf_1") { ShopDisplayBlock(of(), 1, 2, 0, "shelf_1") }
165-
@JvmField
166-
val SHOP_DISPLAY_LARGE_SHELF_2: RegistrySupplier<Block> =
167-
registerDecorationItem("shop_display_large_shelf_2") { ShopDisplayBlock(of(), 1, 2, 0, "shelf_2") }
150+
@JvmField val SHOP_DISPLAY_CASE_1: RegistrySupplier<Block> = registerDecorationItem("shop_display_case_1") { ShopDisplayBlock(of(), 1, 0, 0, "case_1") }
151+
@JvmField val SHOP_DISPLAY_CASE_2: RegistrySupplier<Block> = registerDecorationItem("shop_display_case_2") { ShopDisplayBlock(of(), 1, 0, 0, "case_2") }
152+
@JvmField val SHOP_DISPLAY_SMALL_1: RegistrySupplier<Block> = registerDecorationItem("shop_display_small_1") { ShopDisplayBlock(of(), 1, 1, 0, "round_1") }
153+
@JvmField val SHOP_DISPLAY_SMALL_2: RegistrySupplier<Block> = registerDecorationItem("shop_display_small_2") { ShopDisplayBlock(of(), 1, 1, 0, "round_2") }
154+
@JvmField val SHOP_DISPLAY_LARGE_SHELF_1: RegistrySupplier<Block> = registerDecorationItem("shop_display_large_shelf_1") { ShopDisplayBlock(of(), 1, 2, 0, "shelf_1") }
155+
@JvmField val SHOP_DISPLAY_LARGE_SHELF_2: RegistrySupplier<Block> = registerDecorationItem("shop_display_large_shelf_2") { ShopDisplayBlock(of(), 1, 2, 0, "shelf_2") }
168156

169157
//Cushion
170158
@JvmField
@@ -203,60 +191,33 @@ object GenerationsDecorationBlocks {
203191
* Decoration Blocks (Vending Machine)
204192
*/
205193
//Ball Displays
206-
@JvmField
207-
val EMPTY_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.EMPTY)
208-
@JvmField
209-
val POKE_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.POKE)
210-
@JvmField
211-
val GREAT_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.GREAT)
212-
@JvmField
213-
val ULTRA_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.ULTRA)
214-
@JvmField
215-
val MASTER_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.MASTER)
216-
@JvmField
217-
val CHERISH_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.CHERISH)
218-
@JvmField
219-
val DIVE_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.DIVE)
220-
@JvmField
221-
val DUSK_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.DUSK)
222-
@JvmField
223-
val FAST_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.FAST)
224-
@JvmField
225-
val FRIEND_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.FRIEND)
226-
194+
@JvmField val EMPTY_BALL_DISPLAY = registerBallDisplay(DisplayState.EMPTY)
195+
@JvmField val POKE_BALL_DISPLAY = registerBallDisplay(DisplayState.POKE)
196+
@JvmField val GREAT_BALL_DISPLAY = registerBallDisplay(DisplayState.GREAT)
197+
@JvmField val ULTRA_BALL_DISPLAY = registerBallDisplay(DisplayState.ULTRA)
198+
@JvmField val MASTER_BALL_DISPLAY = registerBallDisplay(DisplayState.MASTER)
199+
@JvmField val CHERISH_BALL_DISPLAY = registerBallDisplay(DisplayState.CHERISH)
200+
@JvmField val DIVE_BALL_DISPLAY = registerBallDisplay(DisplayState.DIVE)
201+
@JvmField val DUSK_BALL_DISPLAY = registerBallDisplay(DisplayState.DUSK)
202+
@JvmField val FAST_BALL_DISPLAY = registerBallDisplay(DisplayState.FAST)
203+
@JvmField val FRIEND_BALL_DISPLAY = registerBallDisplay(DisplayState.FRIEND)
204+
@JvmField val HEAVY_BALL_DISPLAY = registerBallDisplay(DisplayState.HEAVY)
205+
@JvmField val LEVEL_BALL_DISPLAY = registerBallDisplay(DisplayState.LEVEL)
206+
@JvmField val LOVE_BALL_DISPLAY = registerBallDisplay(DisplayState.LOVE)
207+
@JvmField val LURE_BALL_DISPLAY = registerBallDisplay(DisplayState.LURE)
208+
@JvmField val LUXURY_BALL_DISPLAY = registerBallDisplay(DisplayState.LUXURY)
209+
@JvmField val MOON_BALL_DISPLAY = registerBallDisplay(DisplayState.MOON)
210+
@JvmField val NEST_BALL_DISPLAY = registerBallDisplay(DisplayState.NEST)
211+
@JvmField val NET_BALL_DISPLAY = registerBallDisplay(DisplayState.NET)
212+
@JvmField val PARK_BALL_DISPLAY = registerBallDisplay(DisplayState.PARK)
213+
@JvmField val PREMIER_BALL_DISPLAY = registerBallDisplay(DisplayState.PREMIER)
214+
@JvmField val QUICK_BALL_DISPLAY = registerBallDisplay(DisplayState.QUICK)
215+
@JvmField val REPEAT_BALL_DISPLAY = registerBallDisplay(DisplayState.REPEAT)
216+
@JvmField val SAFARI_BALL_DISPLAY = registerBallDisplay(DisplayState.SAFARI)
217+
@JvmField val SPORT_BALL_DISPLAY = registerBallDisplay(DisplayState.SPORT)
218+
@JvmField val TIMER_BALL_DISPLAY = registerBallDisplay(DisplayState.TIMER)
219+
@JvmField val HEAL_BALL_DISPLAY = registerBallDisplay(DisplayState.HEAL)
227220
//public static final RegistrySupplier<BallDisplayBlock> GS_BALL_DISPLAY = registerBallDisplay(DisplayState.GS);
228-
@JvmField
229-
val HEAL_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.HEAL)
230-
@JvmField
231-
val HEAVY_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.HEAVY)
232-
@JvmField
233-
val LEVEL_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.LEVEL)
234-
@JvmField
235-
val LOVE_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.LOVE)
236-
@JvmField
237-
val LURE_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.LURE)
238-
@JvmField
239-
val LUXURY_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.LUXURY)
240-
@JvmField
241-
val MOON_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.MOON)
242-
@JvmField
243-
val NEST_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.NEST)
244-
@JvmField
245-
val NET_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.NET)
246-
@JvmField
247-
val PARK_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.PARK)
248-
@JvmField
249-
val PREMIER_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.PREMIER)
250-
@JvmField
251-
val QUICK_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.QUICK)
252-
@JvmField
253-
val REPEAT_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.REPEAT)
254-
@JvmField
255-
val SAFARI_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.SAFARI)
256-
@JvmField
257-
val SPORT_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.SPORT)
258-
@JvmField
259-
val TIMER_BALL_DISPLAY: RegistrySupplier<BallDisplayBlock> = registerBallDisplay(DisplayState.TIMER)
260221

261222
private fun registerBallDisplay(state: DisplayState): RegistrySupplier<BallDisplayBlock> =
262223
registerDecorationItem(state.name.lowercase(Locale.getDefault()) + "_ball_display") { BallDisplayBlock(state) }.also {

0 commit comments

Comments
 (0)