Skip to content

Commit

Permalink
Fixed ImGui natives (not the macOS one)
Browse files Browse the repository at this point in the history
  • Loading branch information
XyperCode committed Jan 20, 2024
1 parent 82ddfcc commit b4cf7d1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
id "org.jetbrains.kotlin.jvm" version "1.7.10"
}
repositories {
Expand Down Expand Up @@ -74,7 +74,9 @@ subprojects {
}

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}", {
transitive = false
}
// The following line declares the mojmap mappings, you may use other mappings as well
mappings loom.layered() {
officialMojangMappings()
Expand Down
11 changes: 0 additions & 11 deletions fabric/build/datagen/config/fabric_loader_dependencies.json

This file was deleted.

15 changes: 13 additions & 2 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,22 @@ dependencies {
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }

modImplementation "com.github.Ultreon.advanced-debug:advanced-debug-forge:$advanced_debug_version"
implementation "io.github.spair:imgui-java-binding:1.86.10" // FIXME make dep an api(...) in advanced debug.
modImplementation "com.github.Ultreon.advanced-debug:advanced-debug-forge:$advanced_debug_version", {
transitive = false
}
modImplementation "com.github.Ultreon.ultreonlib:ultreon-lib-forge:$ultreonlib_version"
forgeRuntimeLibrary "com.github.Ultreon.ultreonlib:ultreon-lib-forge:$ultreonlib_version"
forgeRuntimeLibrary "io.github.spair:imgui-java-binding:1.86.10" // FIXME make dep an api(...) in advanced debug.
forgeRuntimeLibrary "io.github.spair:imgui-java-lwjgl3:1.86.10" // FIXME make dep an api(...) in advanced debug.
implementation "io.github.spair:imgui-java-lwjgl3:1.86.10" // FIXME make dep an api(...) in advanced debug.
minecraftNatives "io.github.spair:imgui-java-natives-linux:1.86.10" // FIXME make dep an api(...) in advanced debug.
minecraftNatives "io.github.spair:imgui-java-natives-macos:1.86.10" // FIXME make dep an api(...) in advanced debug.
minecraftNatives "io.github.spair:imgui-java-natives-windows:1.86.10" // FIXME make dep an api(...) in advanced debug.

// forgeRuntimeLibrary "com.ultreon:ultranlang:0.1.0+6"
forgeRuntimeLibrary "com.jab125:apoint:1.0.0"
forgeRuntimeLibrary "com.google.code.gson:gson:2.10!!"
forgeRuntimeLibrary "org.lwjgl:lwjgl-glfw:3.3.1"

// implementation include("com.ultreon:ultranlang:0.1.0+6")
implementation include("com.jab125:apoint:1.0.0")
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ mod_version=0.8.2
mod_description=Adds working electronic devices into Minecraft!\\nCurseForge: https://curseforge.com/minecraft/mc-mods/devices-mod\\nModrinth: https://modrinth.com/mod/devices-mod\\nSource Code: https://github.com/Ultreon/devices-mod\\n\\nOriginal mod made by MrCrayfish called \\"MrCrayfish's Device Mod\\".\\nAvailable at: https://mrcrayfish.com/mods/cdm\\nSource Code: https://github.com/MrCrayfish/MrCrayfishDeviceMod

# Modloader related
fabric_loader_version=0.14.22
forge_version=47.1.3
fabric_loader_version=0.15.3
forge_version=47.2.17

# Geckolib
geckolib_version_fabric=4.2.1
Expand All @@ -22,7 +22,8 @@ geckolib_version_forge=4.2.1

# Dependency related
architectury_version=9.1.12
fabric_api_version=0.86.1+1.20.1
fabric_api_version=0.91.0+1.20.1

# Debugging and testing related
advanced_debug_version=64c6eed481
ultreonlib_version=1.5.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit b4cf7d1

Please sign in to comment.