forked from Clones/Controlify
✏️ Re-add iris support with fat-jar.
This commit is contained in:
@ -1,5 +1,4 @@
|
|||||||
import com.github.breadmoirai.githubreleaseplugin.GithubReleaseTask
|
import com.github.breadmoirai.githubreleaseplugin.GithubReleaseTask
|
||||||
import org.gradle.jvm.tasks.Jar
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
@ -17,7 +16,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "dev.isxander"
|
group = "dev.isxander"
|
||||||
version = "1.2.0+1.19.4"
|
version = "1.3.0-beta.1+1.20"
|
||||||
|
val isBeta = "beta" in version.toString()
|
||||||
|
if (isBeta) println("Beta version detected.")
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@ -62,7 +63,7 @@ val minecraftVersion = libs.versions.minecraft.get()
|
|||||||
dependencies {
|
dependencies {
|
||||||
minecraft(libs.minecraft)
|
minecraft(libs.minecraft)
|
||||||
mappings(loom.layered {
|
mappings(loom.layered {
|
||||||
//mappings("org.quiltmc:quilt-mappings:$minecraftVersion+build.${libs.versions.quilt.mappings.get()}:intermediary-v2")
|
mappings("org.quiltmc:quilt-mappings:$minecraftVersion+build.${libs.versions.quilt.mappings.get()}:intermediary-v2")
|
||||||
officialMojangMappings()
|
officialMojangMappings()
|
||||||
})
|
})
|
||||||
modImplementation(libs.fabric.loader)
|
modImplementation(libs.fabric.loader)
|
||||||
@ -107,9 +108,10 @@ dependencies {
|
|||||||
// sodium compat
|
// sodium compat
|
||||||
modImplementation(libs.sodium)
|
modImplementation(libs.sodium)
|
||||||
// iris compat
|
// iris compat
|
||||||
|
modImplementation(files("libs/iris-b7bf8745.jar"))
|
||||||
// modImplementation(libs.iris)
|
// modImplementation(libs.iris)
|
||||||
// modRuntimeOnly("org.anarres:jcpp:1.4.14")
|
modRuntimeOnly("org.anarres:jcpp:1.4.14")
|
||||||
// modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre9")
|
modRuntimeOnly("io.github.douira:glsl-transformer:2.0.0-pre13")
|
||||||
// immediately-fast compat
|
// immediately-fast compat
|
||||||
// modImplementation(libs.immediately.fast)
|
// modImplementation(libs.immediately.fast)
|
||||||
// modRuntimeOnly("net.lenni0451:Reflect:1.1.0")
|
// modRuntimeOnly("net.lenni0451:Reflect:1.1.0")
|
||||||
@ -154,18 +156,6 @@ tasks {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
|
||||||
archiveClassifier.set("fabric-$minecraftVersion")
|
|
||||||
}
|
|
||||||
|
|
||||||
remapSourcesJar {
|
|
||||||
archiveClassifier.set("fabric-$minecraftVersion-sources")
|
|
||||||
}
|
|
||||||
|
|
||||||
named<Jar>("javadocJar") {
|
|
||||||
archiveClassifier.set("fabric-$minecraftVersion-javadoc")
|
|
||||||
}
|
|
||||||
|
|
||||||
register("releaseMod") {
|
register("releaseMod") {
|
||||||
group = "mod"
|
group = "mod"
|
||||||
|
|
||||||
@ -189,9 +179,9 @@ if (modrinthId.isNotEmpty()) {
|
|||||||
token.set(findProperty("modrinth.token")?.toString())
|
token.set(findProperty("modrinth.token")?.toString())
|
||||||
projectId.set(modrinthId)
|
projectId.set(modrinthId)
|
||||||
versionNumber.set("${project.version}")
|
versionNumber.set("${project.version}")
|
||||||
versionType.set("release")
|
versionType.set(if (isBeta) "beta" else "release")
|
||||||
uploadFile.set(tasks["remapJar"])
|
uploadFile.set(tasks["remapJar"])
|
||||||
gameVersions.set(listOf("1.19.4"))
|
gameVersions.set(listOf("1.20-pre2"))
|
||||||
loaders.set(listOf("fabric", "quilt"))
|
loaders.set(listOf("fabric", "quilt"))
|
||||||
changelog.set(changelogText)
|
changelog.set(changelogText)
|
||||||
syncBodyFrom.set(file(".github/README.md").readText())
|
syncBodyFrom.set(file(".github/README.md").readText())
|
||||||
@ -208,8 +198,8 @@ if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
id = curseforgeId
|
id = curseforgeId
|
||||||
releaseType = "release"
|
releaseType = if (isBeta) "beta" else "release"
|
||||||
addGameVersion("1.19.4")
|
addGameVersion("1.20-Snapshot")
|
||||||
addGameVersion("Fabric")
|
addGameVersion("Fabric")
|
||||||
addGameVersion("Java 17")
|
addGameVersion("Java 17")
|
||||||
|
|
||||||
@ -231,7 +221,7 @@ githubRelease {
|
|||||||
owner(split[0])
|
owner(split[0])
|
||||||
repo(split[1])
|
repo(split[1])
|
||||||
tagName("${project.version}")
|
tagName("${project.version}")
|
||||||
targetCommitish("1.19.x/dev")
|
targetCommitish("1.20.x/dev")
|
||||||
body(changelogText)
|
body(changelogText)
|
||||||
releaseAssets(tasks["remapJar"].outputs.files)
|
releaseAssets(tasks["remapJar"].outputs.files)
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ grgit = "5.0.+"
|
|||||||
blossom = "1.3.+"
|
blossom = "1.3.+"
|
||||||
|
|
||||||
minecraft = "1.20-pre2"
|
minecraft = "1.20-pre2"
|
||||||
#quilt_mappings = "10"
|
quilt_mappings = "1"
|
||||||
fabric_loader = "0.14.19"
|
fabric_loader = "0.14.19"
|
||||||
fabric_api = "0.81.2+1.20"
|
fabric_api = "0.81.2+1.20"
|
||||||
mixin_extras = "0.2.0-beta.7"
|
mixin_extras = "0.2.0-beta.7"
|
||||||
|
BIN
libs/iris-b7bf8745.jar
Normal file
BIN
libs/iris-b7bf8745.jar
Normal file
Binary file not shown.
@ -1,32 +1,32 @@
|
|||||||
package dev.isxander.controlify.mixins.compat.iris;
|
package dev.isxander.controlify.mixins.compat.iris;
|
||||||
|
|
||||||
//import dev.isxander.controlify.compatibility.iris.BaseOptionElementComponentProcessor;
|
import dev.isxander.controlify.compatibility.iris.BaseOptionElementComponentProcessor;
|
||||||
//import dev.isxander.controlify.screenop.ComponentProcessor;
|
import dev.isxander.controlify.screenop.ComponentProcessor;
|
||||||
//import dev.isxander.controlify.screenop.ComponentProcessorProvider;
|
import dev.isxander.controlify.screenop.ComponentProcessorProvider;
|
||||||
//import net.coderbot.iris.gui.NavigationController;
|
import net.coderbot.iris.gui.NavigationController;
|
||||||
//import net.coderbot.iris.gui.element.widget.BaseOptionElementWidget;
|
import net.coderbot.iris.gui.element.widget.BaseOptionElementWidget;
|
||||||
//import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
//import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
//import org.spongepowered.asm.mixin.Unique;
|
import org.spongepowered.asm.mixin.Unique;
|
||||||
//
|
|
||||||
//@Mixin(value = BaseOptionElementWidget.class, remap = false)
|
@Mixin(value = BaseOptionElementWidget.class, remap = false)
|
||||||
//public abstract class BaseOptionElementWidgetMixin implements ComponentProcessorProvider {
|
public abstract class BaseOptionElementWidgetMixin implements ComponentProcessorProvider {
|
||||||
// @Shadow public abstract boolean applyPreviousValue();
|
@Shadow public abstract boolean applyPreviousValue();
|
||||||
// @Shadow public abstract boolean applyNextValue();
|
@Shadow public abstract boolean applyNextValue();
|
||||||
//
|
|
||||||
// @Shadow protected NavigationController navigation;
|
@Shadow protected NavigationController navigation;
|
||||||
// @Unique private final BaseOptionElementComponentProcessor processor
|
@Unique private final BaseOptionElementComponentProcessor processor
|
||||||
// = new BaseOptionElementComponentProcessor(this::cycle);
|
= new BaseOptionElementComponentProcessor(this::cycle);
|
||||||
//
|
|
||||||
// @Override
|
@Override
|
||||||
// public ComponentProcessor componentProcessor() {
|
public ComponentProcessor componentProcessor() {
|
||||||
// return processor;
|
return processor;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// private void cycle(boolean reverse) {
|
private void cycle(boolean reverse) {
|
||||||
// boolean needsUpdate = reverse ? applyPreviousValue() : applyNextValue();
|
boolean needsUpdate = reverse ? applyPreviousValue() : applyNextValue();
|
||||||
// if (needsUpdate) {
|
if (needsUpdate) {
|
||||||
// navigation.refresh();
|
navigation.refresh();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
},
|
},
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"mixins": [
|
"mixins": [
|
||||||
// "compat.iris.BaseOptionElementWidgetMixin",
|
"compat.iris.BaseOptionElementWidgetMixin",
|
||||||
"compat.sodium.CycleControlElementMixin",
|
"compat.sodium.CycleControlElementMixin",
|
||||||
"compat.sodium.SliderControlElementMixin",
|
"compat.sodium.SliderControlElementMixin",
|
||||||
"compat.sodium.TickBoxControlElementMixin",
|
"compat.sodium.TickBoxControlElementMixin",
|
||||||
|
Reference in New Issue
Block a user