Skip to content

Commit 89107e0

Browse files
millennIumAMbiguitymillennIumAMbiguity
authored
Merge pull request #361 from ValkyrienSkies/revert-360-1.20.1/main
Revert "Merged 1.19.2 into 1.20.1"
2 parents a518295 + 4a7017b commit 89107e0

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

+274
-442
lines changed

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

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

‎build.gradle

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

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

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

‎common/build.gradle

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

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

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

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

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

21-
@Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
21+
@SuppressWarnings("unchecked")
22+
@Inject(method = "setupAnim", at = @At(value = "HEAD"))
2223
public void setupAnim(final T livingEntity,
2324
final float swing,
2425
final float g,
@@ -28,7 +29,7 @@ public void setupAnim(final T livingEntity,
2829
final CallbackInfo info) {
2930
final Entity vehicle = livingEntity.getVehicle();
3031
if (vehicle instanceof ShipMountingEntity) {
31-
if (vehicle.level().getBlockState(vehicle.blockPosition()).isAir()) {
32+
if (vehicle.level.getBlockState(vehicle.blockPosition()).isAir()) {
3233
this.riding = false;
3334
}
3435
}

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ 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
86
import net.minecraft.util.datafix.fixes.References
97
import net.minecraft.world.level.block.Block
108
import net.minecraft.world.level.block.entity.BlockEntity
@@ -17,7 +15,7 @@ import org.valkyrienskies.eureka.registry.RegistrySupplier
1715

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

2220
val SHIP_HELM = setOf(
2321
EurekaBlocks.OAK_SHIP_HELM,

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

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

3-
import net.minecraft.core.registries.Registries
3+
import net.minecraft.core.Registry
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.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
11+
import net.minecraft.world.level.material.Material
12+
import net.minecraft.world.level.material.MaterialColor
13+
import org.valkyrienskies.eureka.block.*
1914
import org.valkyrienskies.eureka.registry.DeferredRegister
2015
import org.valkyrienskies.mod.common.hooks.VSGameEvents
2116

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

2621
val ANCHOR = BLOCKS.register("anchor", ::AnchorBlock)
2722
val ENGINE = BLOCKS.register("engine", ::EngineBlock)
@@ -31,49 +26,49 @@ object EurekaBlocks {
3126
// region Ship Helms
3227
val OAK_SHIP_HELM = BLOCKS.register("oak_ship_helm") {
3328
ShipHelmBlock(
34-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
29+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
3530
WoodType.OAK
3631
)
3732
}
3833
val SPRUCE_SHIP_HELM = BLOCKS.register("spruce_ship_helm") {
3934
ShipHelmBlock(
40-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
35+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
4136
WoodType.SPRUCE
4237
)
4338
}
4439
val BIRCH_SHIP_HELM = BLOCKS.register("birch_ship_helm") {
4540
ShipHelmBlock(
46-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
41+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
4742
WoodType.BIRCH
4843
)
4944
}
5045
val JUNGLE_SHIP_HELM = BLOCKS.register("jungle_ship_helm") {
5146
ShipHelmBlock(
52-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
47+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
5348
WoodType.JUNGLE
5449
)
5550
}
5651
val ACACIA_SHIP_HELM = BLOCKS.register("acacia_ship_helm") {
5752
ShipHelmBlock(
58-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
53+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
5954
WoodType.ACACIA
6055
)
6156
}
6257
val DARK_OAK_SHIP_HELM = BLOCKS.register("dark_oak_ship_helm") {
6358
ShipHelmBlock(
64-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
59+
BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
6560
WoodType.DARK_OAK
6661
)
6762
}
6863
val CRIMSON_SHIP_HELM = BLOCKS.register("crimson_ship_helm") {
6964
ShipHelmBlock(
70-
BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
65+
BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
7166
WoodType.CRIMSON
7267
)
7368
}
7469
val WARPED_SHIP_HELM = BLOCKS.register("warped_ship_helm") {
7570
ShipHelmBlock(
76-
BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
71+
BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
7772
WoodType.WARPED
7873
)
7974
}
@@ -82,87 +77,87 @@ object EurekaBlocks {
8277
// region Balloons
8378
val BALLOON = BLOCKS.register("balloon") {
8479
BalloonBlock(
85-
BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
80+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
8681
)
8782
}
8883
val WHITE_BALLOON = BLOCKS.register("white_balloon") {
8984
BalloonBlock(
90-
BlockBehaviour.Properties.of().mapColor(MapColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
85+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
9186
)
9287
}
9388
val LIGHT_GRAY_BALLOON = BLOCKS.register("light_gray_balloon") {
9489
BalloonBlock(
95-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
90+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
9691
)
9792
}
9893
val GRAY_BALLOON = BLOCKS.register("gray_balloon") {
9994
BalloonBlock(
100-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
95+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
10196
)
10297
}
10398
val BLACK_BALLOON = BLOCKS.register("black_balloon") {
10499
BalloonBlock(
105-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
100+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
106101
)
107102
}
108103
val RED_BALLOON = BLOCKS.register("red_balloon") {
109104
BalloonBlock(
110-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
105+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
111106
)
112107
}
113108
val ORANGE_BALLOON = BLOCKS.register("orange_balloon") {
114109
BalloonBlock(
115-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
110+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
116111
)
117112
}
118113
val YELLOW_BALLOON = BLOCKS.register("yellow_balloon") {
119114
BalloonBlock(
120-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
115+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
121116
)
122117
}
123118
val LIME_BALLOON = BLOCKS.register("lime_balloon") {
124119
BalloonBlock(
125-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
120+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
126121
)
127122
}
128123
val GREEN_BALLOON = BLOCKS.register("green_balloon") {
129124
BalloonBlock(
130-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
125+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
131126
)
132127
}
133128
val LIGHT_BLUE_BALLOON = BLOCKS.register("light_blue_balloon") {
134129
BalloonBlock(
135-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
130+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
136131
)
137132
}
138133
val CYAN_BALLOON = BLOCKS.register("cyan_balloon") {
139134
BalloonBlock(
140-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
135+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
141136
)
142137
}
143138
val BLUE_BALLOON = BLOCKS.register("blue_balloon") {
144139
BalloonBlock(
145-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
140+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
146141
)
147142
}
148143
val PURPLE_BALLOON = BLOCKS.register("purple_balloon") {
149144
BalloonBlock(
150-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
145+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
151146
)
152147
}
153148
val MAGENTA_BALLOON = BLOCKS.register("magenta_balloon") {
154149
BalloonBlock(
155-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
150+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
156151
)
157152
}
158153
val PINK_BALLOON = BLOCKS.register("pink_balloon") {
159154
BalloonBlock(
160-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
155+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
161156
)
162157
}
163158
val BROWN_BALLOON = BLOCKS.register("brown_balloon") {
164159
BalloonBlock(
165-
BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
160+
BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
166161
)
167162
}
168163
// endregion
@@ -214,7 +209,7 @@ object EurekaBlocks {
214209
// aka all blocks
215210
fun registerItems(items: DeferredRegister<Item>) {
216211
BLOCKS.forEach {
217-
items.register(it.name) { BlockItem(it.get(), Item.Properties()) }
212+
items.register(it.name) { BlockItem(it.get(), Item.Properties().tab(EurekaItems.TAB)) }
218213
}
219214
}
220215
}

‎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.registries.Registries
5+
import net.minecraft.core.Registry
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, Registries.ENTITY_TYPE)
25+
private val ENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registry.ENTITY_TYPE_REGISTRY)
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

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

3-
import net.minecraft.core.registries.Registries
4-
import net.minecraft.resources.ResourceKey
3+
import net.minecraft.core.Registry
54
import net.minecraft.resources.ResourceLocation
65
import net.minecraft.world.item.CreativeModeTab
76
import net.minecraft.world.item.Item
7+
import net.minecraft.world.item.ItemStack
8+
import org.valkyrienskies.eureka.registry.CreativeTabs
89
import org.valkyrienskies.eureka.registry.DeferredRegister
910

1011
@Suppress("unused")
1112
object EurekaItems {
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"))
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()) }
1520

1621
fun register() {
1722
EurekaBlocks.registerItems(ITEMS)

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

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

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

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

1817
val SHIP_HELM = ShipHelmScreenMenu.factory withName "ship_helm"
1918
val ENGINE = EngineScreenMenu.factory withName "engine"
@@ -23,5 +22,5 @@ object EurekaScreens {
2322
}
2423

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

‎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.MapColor
16+
import net.minecraft.world.level.material.Material
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().mapColor(MapColor.METAL).strength(5.0f, 6.0f).sound(SoundType.ANVIL)) {
27+
HorizontalDirectionalBlock(Properties.of(Material.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.MapColor
11+
import net.minecraft.world.level.material.Material
1212

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

0 commit comments

Comments
 (0)