From c4a629633c34074138fd6c1d9336bacafde2f9b8 Mon Sep 17 00:00:00 2001 From: miyucomics Date: Sat, 3 Aug 2024 11:52:16 -0400 Subject: [PATCH] Changed versions to be compatible with Hexxypack --- build.gradle | 6 +++--- gradle.properties | 11 ++++++----- src/main/java/miyucomics/hexical/blocks/MageBlock.kt | 2 +- .../java/miyucomics/hexical/entities/MeshEntity.kt | 1 + .../java/miyucomics/hexical/entities/MeshRenderer.kt | 1 + .../java/miyucomics/hexical/entities/SpikeEntity.kt | 1 + src/main/resources/fabric.mod.json | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index ba03c859d..959a1a2c7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.6-SNAPSHOT" id "maven-publish" - id "org.jetbrains.kotlin.jvm" version "2.0.0" + id "org.jetbrains.kotlin.jvm" version "1.8.0" } version = project.mod_version @@ -37,9 +37,9 @@ repositories { dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings "net.fabricmc:yarn:${project.yarn_mappings}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" modImplementation "at.petra-k.paucal:paucal-common-$minecraft_version:$paucal_version" diff --git a/gradle.properties b/gradle.properties index 4af3ca48b..13ac74a11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,14 @@ org.gradle.jvmargs = -Xmx1G org.gradle.parallel = true +kotlin.stdlib.default.dependency = false + minecraft_version = 1.19.2 -yarn_mappings = 1.19.2+build.28 +yarn_mappings = 1.19.2+build.28:v2 loader_version = 0.15.11 -fabric_kotlin_version = 1.11.0+kotlin.2.0.0 +fabric_kotlin_version = 1.9.0+kotlin.1.8.0 +fabric_api_version = 0.77.0+1.19.2 hexcasting_version = 0.10.3 paucal_version = 0.5.0 patchouli_version = 77 @@ -15,6 +18,4 @@ satin_version = 1.9.0 mod_version = 1.3.0 maven_group = miyucomics.hexical -archives_base_name = hexical - -fabric_version = 0.77.0+1.19.2 \ No newline at end of file +archives_base_name = hexical \ No newline at end of file diff --git a/src/main/java/miyucomics/hexical/blocks/MageBlock.kt b/src/main/java/miyucomics/hexical/blocks/MageBlock.kt index 014fd8b79..1cb4c3eba 100644 --- a/src/main/java/miyucomics/hexical/blocks/MageBlock.kt +++ b/src/main/java/miyucomics/hexical/blocks/MageBlock.kt @@ -82,7 +82,7 @@ class MageBlock : BlockConjured( world.setBlockState(position, Blocks.AIR.defaultState) world.removeBlockEntity(position) if (tile.properties["volatile"]!!) { - for (offset in Direction.entries) { + for (offset in Direction.stream()) { val positionToTest = position.add(offset.vector) val otherState = world.getBlockState(positionToTest) val block = otherState.block diff --git a/src/main/java/miyucomics/hexical/entities/MeshEntity.kt b/src/main/java/miyucomics/hexical/entities/MeshEntity.kt index 4230efb71..5d9f73171 100644 --- a/src/main/java/miyucomics/hexical/entities/MeshEntity.kt +++ b/src/main/java/miyucomics/hexical/entities/MeshEntity.kt @@ -22,6 +22,7 @@ import net.minecraft.util.math.Vec3d import net.minecraft.util.math.Vec3f import net.minecraft.world.World +@OptIn(ExperimentalStdlibApi::class) class MeshEntity(entityType: EntityType, world: World) : Entity(entityType, world), Specklike { constructor(world: World) : this(HexicalEntities.MESH_ENTITY, world) diff --git a/src/main/java/miyucomics/hexical/entities/MeshRenderer.kt b/src/main/java/miyucomics/hexical/entities/MeshRenderer.kt index 2144e747c..b2c12b7b2 100644 --- a/src/main/java/miyucomics/hexical/entities/MeshRenderer.kt +++ b/src/main/java/miyucomics/hexical/entities/MeshRenderer.kt @@ -14,6 +14,7 @@ import net.minecraft.util.math.Vec3f import kotlin.math.cos import kotlin.math.sin +@OptIn(ExperimentalStdlibApi::class) class MeshRenderer(ctx: EntityRendererFactory.Context) : EntityRenderer(ctx) { private val sides = 6 private val angleIncrement = 2 * Math.PI / 6 diff --git a/src/main/java/miyucomics/hexical/entities/SpikeEntity.kt b/src/main/java/miyucomics/hexical/entities/SpikeEntity.kt index e8fa84d68..b4fbceabb 100644 --- a/src/main/java/miyucomics/hexical/entities/SpikeEntity.kt +++ b/src/main/java/miyucomics/hexical/entities/SpikeEntity.kt @@ -22,6 +22,7 @@ import net.minecraft.world.World import java.util.* import kotlin.math.pow +@OptIn(ExperimentalStdlibApi::class) class SpikeEntity(entityType: EntityType, world: World) : Entity(entityType, world) { private var timer = 0 private var conjurerUUID: UUID? = null diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e13e8ceff..264f6648a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,9 +27,9 @@ ], "depends": { "minecraft": ">=1.19.2", - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.14.21", "fabric-api": "*", - "fabric-language-kotlin": ">=1.11.0+kotlin.2.0.0", + "fabric-language-kotlin": ">=1.9.0+kotlin.1.8.0", "hexcasting": ">=0.10.3" } } \ No newline at end of file