Skip to content

Commit

Permalink
Changed versions to be compatible with Hexxypack
Browse files Browse the repository at this point in the history
  • Loading branch information
miyucomics committed Aug 3, 2024
1 parent 9fe144d commit c4a6296
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
archives_base_name = hexical
2 changes: 1 addition & 1 deletion src/main/java/miyucomics/hexical/blocks/MageBlock.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/main/java/miyucomics/hexical/entities/MeshEntity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<MeshEntity>, world: World) : Entity(entityType, world), Specklike {
constructor(world: World) : this(HexicalEntities.MESH_ENTITY, world)

Expand Down
1 change: 1 addition & 0 deletions src/main/java/miyucomics/hexical/entities/MeshRenderer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<MeshEntity>(ctx) {
private val sides = 6
private val angleIncrement = 2 * Math.PI / 6
Expand Down
1 change: 1 addition & 0 deletions src/main/java/miyucomics/hexical/entities/SpikeEntity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import net.minecraft.world.World
import java.util.*
import kotlin.math.pow

@OptIn(ExperimentalStdlibApi::class)
class SpikeEntity(entityType: EntityType<SpikeEntity>, world: World) : Entity(entityType, world) {
private var timer = 0
private var conjurerUUID: UUID? = null
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit c4a6296

Please sign in to comment.