Skip to content

Commit a518295

Browse files
millennIumAMbiguitymillennIumAMbiguity
authored
Merge pull request #360 from ValkyrienSkies/1.20.1/main
Merged 1.19.2 into 1.20.1
2 parents 99b6129 + 0044230 commit a518295

Some content is hidden

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

42 files changed

+442
-274
lines changed

‎.github/workflows/build-1.18.x.yml ‎.github/workflows/build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
branches:
55
- '1.18.x/*'
6+
- '1.19.2/*'
7+
- '1.20.1/*'
68
pull_request:
79
types: [ opened, synchronize, reopened ]
810
jobs:

‎build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ subprojects {
4646
name = "ParchmentMC"
4747
url = "https://maven.parchmentmc.org"
4848
}
49+
maven {
50+
name = "Modrinth"
51+
url = "https://api.modrinth.com/maven"
52+
}
4953
}
5054

5155
dependencies {
5256
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
5357
// The following line declares the mojmap mappings, you may use other mappings as well
54-
mappings(loom.layered {
55-
officialMojangMappings()
56-
parchment("org.parchmentmc.data:parchment-1.18.2:2022.09.04@zip")
57-
})
58+
mappings loom.officialMojangMappings()
5859

5960
implementation("org.joml:joml:1.10.4") { transitive = false }
6061
implementation("org.joml:joml-primitives:1.10.0") { transitive = false }
@@ -108,7 +109,6 @@ allprojects {
108109
maven {
109110
name = 'Kotlin for Forge'
110111
url = 'https://thedarkcolour.github.io/KotlinForForge/'
111-
content { includeGroup "thedarkcolour" }
112112
}
113113
maven {
114114
name = "Valkyrien Skies Internal"

‎common/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ loom {
77
}
88

99
dependencies {
10+
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixin_extras_version"))
11+
1012
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
1113
// Do NOT use other classes from fabric loader
1214
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
1315
// Remove the next line if you don't want to depend on the API
1416
// modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
15-
modApi("org.valkyrienskies:valkyrienskies-118-common:${rootProject.vs2_version}")
17+
modApi("org.valkyrienskies:valkyrienskies-120-common:${rootProject.vs2_version}")
1618

1719
compileOnly("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
1820
compileOnly("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")

‎common/src/main/java/org/valkyrienskies/eureka/mixin/client/PlayerEntityModelMixin.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public PlayerEntityModelMixin(final ModelPart model) {
1818
super(model);
1919
}
2020

21-
@SuppressWarnings("unchecked")
22-
@Inject(method = "setupAnim", at = @At(value = "HEAD"))
21+
@Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
2322
public void setupAnim(final T livingEntity,
2423
final float swing,
2524
final float g,
@@ -29,7 +28,7 @@ public void setupAnim(final T livingEntity,
2928
final CallbackInfo info) {
3029
final Entity vehicle = livingEntity.getVehicle();
3130
if (vehicle instanceof ShipMountingEntity) {
32-
if (vehicle.level.getBlockState(vehicle.blockPosition()).isAir()) {
31+
if (vehicle.level().getBlockState(vehicle.blockPosition()).isAir()) {
3332
this.riding = false;
3433
}
3534
}

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlockEntities.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package org.valkyrienskies.eureka
33
import net.minecraft.Util
44
import net.minecraft.core.BlockPos
55
import net.minecraft.core.Registry
6+
import net.minecraft.core.registries.BuiltInRegistries
7+
import net.minecraft.core.registries.Registries
68
import net.minecraft.util.datafix.fixes.References
79
import net.minecraft.world.level.block.Block
810
import net.minecraft.world.level.block.entity.BlockEntity
@@ -15,7 +17,7 @@ import org.valkyrienskies.eureka.registry.RegistrySupplier
1517

1618
@Suppress("unused")
1719
object EurekaBlockEntities {
18-
private val BLOCKENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registry.BLOCK_ENTITY_TYPE_REGISTRY)
20+
private val BLOCKENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registries.BLOCK_ENTITY_TYPE)
1921

2022
val SHIP_HELM = setOf(
2123
EurekaBlocks.OAK_SHIP_HELM,

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlocks.kt

+36-31
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
package org.valkyrienskies.eureka
22

3-
import net.minecraft.core.Registry
3+
import net.minecraft.core.registries.Registries
44
import net.minecraft.world.item.BlockItem
55
import net.minecraft.world.item.Item
66
import net.minecraft.world.level.block.Block
77
import net.minecraft.world.level.block.Blocks
88
import net.minecraft.world.level.block.FireBlock
99
import net.minecraft.world.level.block.SoundType
1010
import net.minecraft.world.level.block.state.BlockBehaviour
11-
import net.minecraft.world.level.material.Material
12-
import net.minecraft.world.level.material.MaterialColor
13-
import org.valkyrienskies.eureka.block.*
11+
import net.minecraft.world.level.material.MapColor
12+
import org.valkyrienskies.eureka.block.AnchorBlock
13+
import org.valkyrienskies.eureka.block.BallastBlock
14+
import org.valkyrienskies.eureka.block.BalloonBlock
15+
import org.valkyrienskies.eureka.block.EngineBlock
16+
import org.valkyrienskies.eureka.block.FloaterBlock
17+
import org.valkyrienskies.eureka.block.ShipHelmBlock
18+
import org.valkyrienskies.eureka.block.WoodType
1419
import org.valkyrienskies.eureka.registry.DeferredRegister
1520
import org.valkyrienskies.mod.common.hooks.VSGameEvents
1621

1722
@Suppress("unused")
1823
object EurekaBlocks {
19-
private val BLOCKS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.BLOCK_REGISTRY)
24+
internal val BLOCKS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.BLOCK)
2025

2126
val ANCHOR = BLOCKS.register("anchor", ::AnchorBlock)
2227
val ENGINE = BLOCKS.register("engine", ::EngineBlock)
@@ -26,49 +31,49 @@ object EurekaBlocks {
2631
// region Ship Helms
2732
val OAK_SHIP_HELM = BLOCKS.register("oak_ship_helm") {
2833
ShipHelmBlock(
29-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
34+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
3035
WoodType.OAK
3136
)
3237
}
3338
val SPRUCE_SHIP_HELM = BLOCKS.register("spruce_ship_helm") {
3439
ShipHelmBlock(
35-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
40+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
3641
WoodType.SPRUCE
3742
)
3843
}
3944
val BIRCH_SHIP_HELM = BLOCKS.register("birch_ship_helm") {
4045
ShipHelmBlock(
41-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
46+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
4247
WoodType.BIRCH
4348
)
4449
}
4550
val JUNGLE_SHIP_HELM = BLOCKS.register("jungle_ship_helm") {
4651
ShipHelmBlock(
47-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
52+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
4853
WoodType.JUNGLE
4954
)
5055
}
5156
val ACACIA_SHIP_HELM = BLOCKS.register("acacia_ship_helm") {
5257
ShipHelmBlock(
53-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
58+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
5459
WoodType.ACACIA
5560
)
5661
}
5762
val DARK_OAK_SHIP_HELM = BLOCKS.register("dark_oak_ship_helm") {
5863
ShipHelmBlock(
59-
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
64+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
6065
WoodType.DARK_OAK
6166
)
6267
}
6368
val CRIMSON_SHIP_HELM = BLOCKS.register("crimson_ship_helm") {
6469
ShipHelmBlock(
65-
BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
70+
BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
6671
WoodType.CRIMSON
6772
)
6873
}
6974
val WARPED_SHIP_HELM = BLOCKS.register("warped_ship_helm") {
7075
ShipHelmBlock(
71-
BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
76+
BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
7277
WoodType.WARPED
7378
)
7479
}
@@ -77,87 +82,87 @@ object EurekaBlocks {
7782
// region Balloons
7883
val BALLOON = BLOCKS.register("balloon") {
7984
BalloonBlock(
80-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
85+
BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
8186
)
8287
}
8388
val WHITE_BALLOON = BLOCKS.register("white_balloon") {
8489
BalloonBlock(
85-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
90+
BlockBehaviour.Properties.of().mapColor(MapColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
8691
)
8792
}
8893
val LIGHT_GRAY_BALLOON = BLOCKS.register("light_gray_balloon") {
8994
BalloonBlock(
90-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
95+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
9196
)
9297
}
9398
val GRAY_BALLOON = BLOCKS.register("gray_balloon") {
9499
BalloonBlock(
95-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
100+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
96101
)
97102
}
98103
val BLACK_BALLOON = BLOCKS.register("black_balloon") {
99104
BalloonBlock(
100-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
105+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
101106
)
102107
}
103108
val RED_BALLOON = BLOCKS.register("red_balloon") {
104109
BalloonBlock(
105-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
110+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
106111
)
107112
}
108113
val ORANGE_BALLOON = BLOCKS.register("orange_balloon") {
109114
BalloonBlock(
110-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
115+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
111116
)
112117
}
113118
val YELLOW_BALLOON = BLOCKS.register("yellow_balloon") {
114119
BalloonBlock(
115-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
120+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
116121
)
117122
}
118123
val LIME_BALLOON = BLOCKS.register("lime_balloon") {
119124
BalloonBlock(
120-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
125+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
121126
)
122127
}
123128
val GREEN_BALLOON = BLOCKS.register("green_balloon") {
124129
BalloonBlock(
125-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
130+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
126131
)
127132
}
128133
val LIGHT_BLUE_BALLOON = BLOCKS.register("light_blue_balloon") {
129134
BalloonBlock(
130-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
135+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
131136
)
132137
}
133138
val CYAN_BALLOON = BLOCKS.register("cyan_balloon") {
134139
BalloonBlock(
135-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
140+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
136141
)
137142
}
138143
val BLUE_BALLOON = BLOCKS.register("blue_balloon") {
139144
BalloonBlock(
140-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
145+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
141146
)
142147
}
143148
val PURPLE_BALLOON = BLOCKS.register("purple_balloon") {
144149
BalloonBlock(
145-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
150+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
146151
)
147152
}
148153
val MAGENTA_BALLOON = BLOCKS.register("magenta_balloon") {
149154
BalloonBlock(
150-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
155+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
151156
)
152157
}
153158
val PINK_BALLOON = BLOCKS.register("pink_balloon") {
154159
BalloonBlock(
155-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
160+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
156161
)
157162
}
158163
val BROWN_BALLOON = BLOCKS.register("brown_balloon") {
159164
BalloonBlock(
160-
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
165+
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
161166
)
162167
}
163168
// endregion
@@ -209,7 +214,7 @@ object EurekaBlocks {
209214
// aka all blocks
210215
fun registerItems(items: DeferredRegister<Item>) {
211216
BLOCKS.forEach {
212-
items.register(it.name) { BlockItem(it.get(), Item.Properties().tab(EurekaItems.TAB)) }
217+
items.register(it.name) { BlockItem(it.get(), Item.Properties()) }
213218
}
214219
}
215220
}

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaEntities.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.valkyrienskies.eureka
22

33
import net.minecraft.client.renderer.entity.EntityRendererProvider
44
import net.minecraft.client.renderer.entity.EntityRenderers
5-
import net.minecraft.core.Registry
5+
import net.minecraft.core.registries.Registries
66
import net.minecraft.world.entity.Entity
77
import net.minecraft.world.entity.EntityType
88
import net.minecraft.world.entity.MobCategory
@@ -22,7 +22,7 @@ private data class ToRegEntityRenderer<T : Entity>(
2222
}
2323

2424
object EurekaEntities {
25-
private val ENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registry.ENTITY_TYPE_REGISTRY)
25+
private val ENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registries.ENTITY_TYPE)
2626
private val ENTITY_RENDERERS = mutableListOf<ToRegEntityRenderer<*>>()
2727

2828
// val SEAT = ::SeatEntity category MobCategory.MISC byName "seat" registerRenderer ::EmptyRenderer

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaItems.kt

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
package org.valkyrienskies.eureka
22

3-
import net.minecraft.core.Registry
3+
import net.minecraft.core.registries.Registries
4+
import net.minecraft.resources.ResourceKey
45
import net.minecraft.resources.ResourceLocation
56
import net.minecraft.world.item.CreativeModeTab
67
import net.minecraft.world.item.Item
7-
import net.minecraft.world.item.ItemStack
8-
import org.valkyrienskies.eureka.registry.CreativeTabs
98
import org.valkyrienskies.eureka.registry.DeferredRegister
109

1110
@Suppress("unused")
1211
object EurekaItems {
13-
private val ITEMS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.ITEM_REGISTRY)
14-
val TAB: CreativeModeTab = CreativeTabs.create(
15-
ResourceLocation(
16-
EurekaMod.MOD_ID,
17-
"eureka_tab"
18-
)
19-
) { ItemStack(EurekaBlocks.OAK_SHIP_HELM.get()) }
12+
internal val ITEMS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.ITEM)
13+
val TAB: ResourceKey<CreativeModeTab> =
14+
ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation(EurekaMod.MOD_ID, "eureka_tab"))
2015

2116
fun register() {
2217
EurekaBlocks.registerItems(ITEMS)

‎common/src/main/kotlin/org/valkyrienskies/eureka/EurekaScreens.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.valkyrienskies.eureka
22

3-
import net.minecraft.core.Registry
3+
import net.minecraft.core.registries.Registries
44
import net.minecraft.world.entity.player.Inventory
5+
import net.minecraft.world.flag.FeatureFlags
56
import net.minecraft.world.inventory.AbstractContainerMenu
67
import net.minecraft.world.inventory.MenuType
78
import org.valkyrienskies.eureka.gui.engine.EngineScreenMenu
@@ -12,7 +13,7 @@ private typealias HFactory<T> = (syncId: Int, playerInv: Inventory) -> T
1213

1314
@Suppress("unused")
1415
object EurekaScreens {
15-
private val SCREENS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.MENU_REGISTRY)
16+
private val SCREENS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.MENU)
1617

1718
val SHIP_HELM = ShipHelmScreenMenu.factory withName "ship_helm"
1819
val ENGINE = EngineScreenMenu.factory withName "engine"
@@ -22,5 +23,5 @@ object EurekaScreens {
2223
}
2324

2425
private infix fun <T : AbstractContainerMenu> HFactory<T>.withName(name: String) =
25-
SCREENS.register(name) { MenuType(this) }
26+
SCREENS.register(name) { MenuType(this, FeatureFlags.VANILLA_SET) }
2627
}

‎common/src/main/kotlin/org/valkyrienskies/eureka/block/AnchorBlock.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import net.minecraft.world.level.block.SoundType
1313
import net.minecraft.world.level.block.state.BlockState
1414
import net.minecraft.world.level.block.state.StateDefinition
1515
import net.minecraft.world.level.block.state.properties.BlockStateProperties
16-
import net.minecraft.world.level.material.Material
16+
import net.minecraft.world.level.material.MapColor
1717
import net.minecraft.world.phys.shapes.CollisionContext
1818
import net.minecraft.world.phys.shapes.VoxelShape
1919
import org.valkyrienskies.core.api.ships.getAttachment
@@ -24,7 +24,7 @@ import org.valkyrienskies.mod.common.getShipManagingPos
2424
import org.valkyrienskies.mod.common.getShipObjectManagingPos
2525

2626
class AnchorBlock :
27-
HorizontalDirectionalBlock(Properties.of(Material.METAL).strength(5.0f, 6.0f).sound(SoundType.ANVIL)) {
27+
HorizontalDirectionalBlock(Properties.of().mapColor(MapColor.METAL).strength(5.0f, 6.0f).sound(SoundType.ANVIL)) {
2828

2929
val ANCHOR_BOTTOM = RotShapes.box(2.0, 2.0, 14.0, 14.0, 4.0, 16.0)
3030
val ANCHOR_ROD = RotShapes.box(7.0, 2.0, 14.0, 9.0, 24.0, 16.0)

‎common/src/main/kotlin/org/valkyrienskies/eureka/block/BallastBlock.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import net.minecraft.world.level.block.SoundType
88
import net.minecraft.world.level.block.state.BlockState
99
import net.minecraft.world.level.block.state.StateDefinition
1010
import net.minecraft.world.level.block.state.properties.BlockStateProperties.POWER
11-
import net.minecraft.world.level.material.Material
11+
import net.minecraft.world.level.material.MapColor
1212

1313
class BallastBlock : Block(
14-
Properties.of(Material.STONE)
14+
Properties.of().mapColor(MapColor.STONE)
1515
.sound(SoundType.STONE).strength(1.0f, 2.0f)
1616
) {
1717

0 commit comments

Comments
 (0)