Revert "Merged 1.19.2 into 1.20.1"

ValkyrienSkies · May 6, 2024 · 4a7017b · 4a7017b
1 parent a518295
commit 4a7017b
Show file tree

Hide file tree

Showing 42 changed files with 274 additions and 442 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build-1.18.x.yml b/.github/workflows/build.yml → .github/workflows/build-1.18.x.yml
@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - '1.18.x/*'
-      - '1.19.2/*'
-      - '1.20.1/*'
   pull_request:
     types: [ opened, synchronize, reopened ]
 jobs:

diff --git a/build.gradle b/build.gradle
@@ -46,16 +46,15 @@ subprojects {
             name = "ParchmentMC"
             url = "https://maven.parchmentmc.org"
         }
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-        }
     }
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings loom.officialMojangMappings()
+        mappings(loom.layered {
+            officialMojangMappings()
+            parchment("org.parchmentmc.data:parchment-1.18.2:2022.09.04@zip")
+        })
 
         implementation("org.joml:joml:1.10.4") { transitive = false }
         implementation("org.joml:joml-primitives:1.10.0") { transitive = false }
@@ -109,6 +108,7 @@ allprojects {
         maven {
             name = 'Kotlin for Forge'
             url = 'https://thedarkcolour.github.io/KotlinForForge/'
+            content { includeGroup "thedarkcolour" }
         }
         maven {
             name = "Valkyrien Skies Internal"

diff --git a/common/build.gradle b/common/build.gradle
@@ -7,14 +7,12 @@ loom {
 }
 
 dependencies {
-    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:$mixin_extras_version"))
-
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     // Remove the next line if you don't want to depend on the API
 //    modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
-    modApi("org.valkyrienskies:valkyrienskies-120-common:${rootProject.vs2_version}")
+    modApi("org.valkyrienskies:valkyrienskies-118-common:${rootProject.vs2_version}")
 
     compileOnly("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
     compileOnly("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")

diff --git a/common/src/main/java/org/valkyrienskies/eureka/mixin/client/PlayerEntityModelMixin.java b/common/src/main/java/org/valkyrienskies/eureka/mixin/client/PlayerEntityModelMixin.java
@@ -18,7 +18,8 @@ public PlayerEntityModelMixin(final ModelPart model) {
         super(model);
     }
 
-    @Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
+    @SuppressWarnings("unchecked")
+    @Inject(method = "setupAnim", at = @At(value = "HEAD"))
     public void setupAnim(final T livingEntity,
                           final float swing,
                           final float g,
@@ -28,7 +29,7 @@ public void setupAnim(final T livingEntity,
                           final CallbackInfo info) {
         final Entity vehicle = livingEntity.getVehicle();
         if (vehicle instanceof ShipMountingEntity) {
-            if (vehicle.level().getBlockState(vehicle.blockPosition()).isAir()) {
+            if (vehicle.level.getBlockState(vehicle.blockPosition()).isAir()) {
                 this.riding = false;
             }
         }

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlockEntities.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlockEntities.kt
@@ -3,8 +3,6 @@ package org.valkyrienskies.eureka
 import net.minecraft.Util
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
 import net.minecraft.util.datafix.fixes.References
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.entity.BlockEntity
@@ -17,7 +15,7 @@ import org.valkyrienskies.eureka.registry.RegistrySupplier
 
 @Suppress("unused")
 object EurekaBlockEntities {
-    private val BLOCKENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registries.BLOCK_ENTITY_TYPE)
+    private val BLOCKENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registry.BLOCK_ENTITY_TYPE_REGISTRY)
 
     val SHIP_HELM = setOf(
         EurekaBlocks.OAK_SHIP_HELM,

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlocks.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaBlocks.kt
@@ -1,27 +1,22 @@
 package org.valkyrienskies.eureka
 
-import net.minecraft.core.registries.Registries
+import net.minecraft.core.Registry
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.Item
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.FireBlock
 import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockBehaviour
-import net.minecraft.world.level.material.MapColor
-import org.valkyrienskies.eureka.block.AnchorBlock
-import org.valkyrienskies.eureka.block.BallastBlock
-import org.valkyrienskies.eureka.block.BalloonBlock
-import org.valkyrienskies.eureka.block.EngineBlock
-import org.valkyrienskies.eureka.block.FloaterBlock
-import org.valkyrienskies.eureka.block.ShipHelmBlock
-import org.valkyrienskies.eureka.block.WoodType
+import net.minecraft.world.level.material.Material
+import net.minecraft.world.level.material.MaterialColor
+import org.valkyrienskies.eureka.block.*
 import org.valkyrienskies.eureka.registry.DeferredRegister
 import org.valkyrienskies.mod.common.hooks.VSGameEvents
 
 @Suppress("unused")
 object EurekaBlocks {
-    internal val BLOCKS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.BLOCK)
+    private val BLOCKS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.BLOCK_REGISTRY)
 
     val ANCHOR = BLOCKS.register("anchor", ::AnchorBlock)
     val ENGINE = BLOCKS.register("engine", ::EngineBlock)
@@ -31,49 +26,49 @@ object EurekaBlocks {
     // region Ship Helms
     val OAK_SHIP_HELM = BLOCKS.register("oak_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.OAK
         )
     }
     val SPRUCE_SHIP_HELM = BLOCKS.register("spruce_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.SPRUCE
         )
     }
     val BIRCH_SHIP_HELM = BLOCKS.register("birch_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.BIRCH
         )
     }
     val JUNGLE_SHIP_HELM = BLOCKS.register("jungle_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.JUNGLE
         )
     }
     val ACACIA_SHIP_HELM = BLOCKS.register("acacia_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.ACACIA
         )
     }
     val DARK_OAK_SHIP_HELM = BLOCKS.register("dark_oak_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.5F).sound(SoundType.WOOD),
+            BlockBehaviour.Properties.of(Material.WOOD).strength(2.5F).sound(SoundType.WOOD),
             WoodType.DARK_OAK
         )
     }
     val CRIMSON_SHIP_HELM = BLOCKS.register("crimson_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
+            BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
             WoodType.CRIMSON
         )
     }
     val WARPED_SHIP_HELM = BLOCKS.register("warped_ship_helm") {
         ShipHelmBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.NETHER).strength(2.5F).sound(SoundType.STEM),
+            BlockBehaviour.Properties.of(Material.NETHER_WOOD).strength(2.5F).sound(SoundType.STEM),
             WoodType.WARPED
         )
     }
@@ -82,87 +77,87 @@ object EurekaBlocks {
     // region Balloons
     val BALLOON = BLOCKS.register("balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.WOOL).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val WHITE_BALLOON = BLOCKS.register("white_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.SNOW).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val LIGHT_GRAY_BALLOON = BLOCKS.register("light_gray_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GRAY).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val GRAY_BALLOON = BLOCKS.register("gray_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GRAY).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val BLACK_BALLOON = BLOCKS.register("black_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLACK).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val RED_BALLOON = BLOCKS.register("red_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_RED).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val ORANGE_BALLOON = BLOCKS.register("orange_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_ORANGE).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val YELLOW_BALLOON = BLOCKS.register("yellow_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_YELLOW).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val LIME_BALLOON = BLOCKS.register("lime_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_GREEN).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val GREEN_BALLOON = BLOCKS.register("green_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_GREEN).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val LIGHT_BLUE_BALLOON = BLOCKS.register("light_blue_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_LIGHT_BLUE).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val CYAN_BALLOON = BLOCKS.register("cyan_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_CYAN).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val BLUE_BALLOON = BLOCKS.register("blue_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BLUE).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val PURPLE_BALLOON = BLOCKS.register("purple_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PURPLE).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val MAGENTA_BALLOON = BLOCKS.register("magenta_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_MAGENTA).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val PINK_BALLOON = BLOCKS.register("pink_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_PINK).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     val BROWN_BALLOON = BLOCKS.register("brown_balloon") {
         BalloonBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
+            BlockBehaviour.Properties.of(Material.WOOL, MaterialColor.COLOR_BROWN).strength(0.8F).sound(SoundType.WOOL)
         )
     }
     // endregion
@@ -214,7 +209,7 @@ object EurekaBlocks {
     // aka all blocks
     fun registerItems(items: DeferredRegister<Item>) {
         BLOCKS.forEach {
-            items.register(it.name) { BlockItem(it.get(), Item.Properties()) }
+            items.register(it.name) { BlockItem(it.get(), Item.Properties().tab(EurekaItems.TAB)) }
         }
     }
 }
diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaEntities.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaEntities.kt
@@ -2,7 +2,7 @@ package org.valkyrienskies.eureka
 
 import net.minecraft.client.renderer.entity.EntityRendererProvider
 import net.minecraft.client.renderer.entity.EntityRenderers
-import net.minecraft.core.registries.Registries
+import net.minecraft.core.Registry
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.MobCategory
@@ -22,7 +22,7 @@ private data class ToRegEntityRenderer<T : Entity>(
 }
 
 object EurekaEntities {
-    private val ENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registries.ENTITY_TYPE)
+    private val ENTITIES = DeferredRegister.create(EurekaMod.MOD_ID, Registry.ENTITY_TYPE_REGISTRY)
     private val ENTITY_RENDERERS = mutableListOf<ToRegEntityRenderer<*>>()
 
     // val SEAT = ::SeatEntity category MobCategory.MISC byName "seat" registerRenderer ::EmptyRenderer

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaItems.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaItems.kt
@@ -1,17 +1,22 @@
 package org.valkyrienskies.eureka
 
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
+import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.CreativeModeTab
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
+import org.valkyrienskies.eureka.registry.CreativeTabs
 import org.valkyrienskies.eureka.registry.DeferredRegister
 
 @Suppress("unused")
 object EurekaItems {
-    internal val ITEMS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.ITEM)
-    val TAB: ResourceKey<CreativeModeTab> =
-        ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation(EurekaMod.MOD_ID, "eureka_tab"))
+    private val ITEMS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.ITEM_REGISTRY)
+    val TAB: CreativeModeTab = CreativeTabs.create(
+        ResourceLocation(
+            EurekaMod.MOD_ID,
+            "eureka_tab"
+        )
+    ) { ItemStack(EurekaBlocks.OAK_SHIP_HELM.get()) }
 
     fun register() {
         EurekaBlocks.registerItems(ITEMS)

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaScreens.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/EurekaScreens.kt
@@ -1,8 +1,7 @@
 package org.valkyrienskies.eureka
 
-import net.minecraft.core.registries.Registries
+import net.minecraft.core.Registry
 import net.minecraft.world.entity.player.Inventory
-import net.minecraft.world.flag.FeatureFlags
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.inventory.MenuType
 import org.valkyrienskies.eureka.gui.engine.EngineScreenMenu
@@ -13,7 +12,7 @@ private typealias HFactory<T> = (syncId: Int, playerInv: Inventory) -> T
 
 @Suppress("unused")
 object EurekaScreens {
-    private val SCREENS = DeferredRegister.create(EurekaMod.MOD_ID, Registries.MENU)
+    private val SCREENS = DeferredRegister.create(EurekaMod.MOD_ID, Registry.MENU_REGISTRY)
 
     val SHIP_HELM = ShipHelmScreenMenu.factory withName "ship_helm"
     val ENGINE = EngineScreenMenu.factory withName "engine"
@@ -23,5 +22,5 @@ object EurekaScreens {
     }
 
     private infix fun <T : AbstractContainerMenu> HFactory<T>.withName(name: String) =
-        SCREENS.register(name) { MenuType(this, FeatureFlags.VANILLA_SET) }
+        SCREENS.register(name) { MenuType(this) }
 }
diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/block/AnchorBlock.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/block/AnchorBlock.kt
@@ -13,7 +13,7 @@ import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.material.MapColor
+import net.minecraft.world.level.material.Material
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import org.valkyrienskies.core.api.ships.getAttachment
@@ -24,7 +24,7 @@ import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.getShipObjectManagingPos
 
 class AnchorBlock :
-    HorizontalDirectionalBlock(Properties.of().mapColor(MapColor.METAL).strength(5.0f, 6.0f).sound(SoundType.ANVIL)) {
+    HorizontalDirectionalBlock(Properties.of(Material.METAL).strength(5.0f, 6.0f).sound(SoundType.ANVIL)) {
 
     val ANCHOR_BOTTOM = RotShapes.box(2.0, 2.0, 14.0, 14.0, 4.0, 16.0)
     val ANCHOR_ROD = RotShapes.box(7.0, 2.0, 14.0, 9.0, 24.0, 16.0)

diff --git a/common/src/main/kotlin/org/valkyrienskies/eureka/block/BallastBlock.kt b/common/src/main/kotlin/org/valkyrienskies/eureka/block/BallastBlock.kt
@@ -8,10 +8,10 @@ import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.POWER
-import net.minecraft.world.level.material.MapColor
+import net.minecraft.world.level.material.Material
 
 class BallastBlock : Block(
-    Properties.of().mapColor(MapColor.STONE)
+    Properties.of(Material.STONE)
         .sound(SoundType.STONE).strength(1.0f, 2.0f)
 ) {