Skip to content

Commit 30ae881

Browse files
DeftuDeftu
committed
OmniCore V1, cut versions, added 1.21.8
1 parent 5c3cf4d commit 30ae881

File tree

8 files changed

+31
-71
lines changed

8 files changed

+31
-71
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (mcData.isForge) {
2323

2424
toolkitLoomHelper {
2525
useOneConfig {
26-
version = "1.0.0-alpha.134"
26+
version = "1.0.0-alpha.151"
2727
loaderVersion = "1.1.0-alpha.48"
2828

2929
usePolyMixin = true
@@ -66,10 +66,6 @@ repositories {
6666
dependencies {
6767
implementation(includeOrShade("gs.mclo:api:3.0.1")!!)
6868
includeOrShade(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3")!!)!!)
69-
includeOrShade("io.github.llamalad7:mixinextras-common:0.5.0")
70-
if (mcData.isFabric) {
71-
includeOrShade(implementation("io.github.llamalad7:mixinextras-fabric:0.5.0")!!)
72-
}
7369
if (mcData.version >= MinecraftVersions.VERSION_1_16) {
7470
includeOrShade(implementation("com.github.bawnorton.mixinsquared:mixinsquared-${mcData.loader}:0.3.3")!!)
7571
data class CompatDependency(
@@ -98,16 +94,12 @@ dependencies {
9894

9995
val nec = mapOf(
10096
nec("1.16.5", "4.1.4"),
101-
nec("1.17.1", "4.1.4"),
102-
nec("1.18.2", "4.2.0"),
103-
nec("1.19.2", "5.0.0"),
104-
nec("1.19.4", "4.4.1"),
10597
nec("1.20.1", "4.4.9"),
10698
nec("1.20.4", "4.4.7"),
107-
nec("1.20.6", "4.4.7"),
10899
nec("1.21.1", "4.4.9"),
109100
nec("1.21.4", "4.4.8"),
110-
nec("1.21.5", "4.4.9")
101+
nec("1.21.5", "4.4.9"),
102+
nec("1.21.8", "4.4.9"),
111103
)
112104

113105
modImplementationCompat(nec[mcData.version.toString()])

‎root.gradle.kts‎

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,24 @@ preprocess {
1010
// "1.8.9-forge"(10809, "srg")
1111
// }
1212

13-
"1.21.5-fabric"(1_21_05, "yarn") {
14-
"1.21.5-neoforge"(1_21_05, "srg") {
15-
"1.21.4-neoforge"(1_21_04, "srg") {
16-
"1.21.4-fabric"(1_21_04, "yarn") {
17-
"1.21.1-fabric"(1_21_01, "yarn") {
18-
"1.21.1-neoforge"(1_21_01, "srg") {
19-
"1.20.6-neoforge"(1_20_06, "srg") {
20-
"1.20.6-fabric"(1_20_06, "yarn") {
13+
"1.21.8-fabric"(1_21_08, "yarn") {
14+
"1.21.8-neoforge"(1_21_08, "srg") {
15+
"1.21.5-neoforge"(1_21_05, "srg") {
16+
"1.21.5-fabric"(1_21_05, "yarn") {
17+
"1.21.4-fabric"(1_21_04, "yarn") {
18+
"1.21.4-neoforge"(1_21_04, "srg") {
19+
"1.21.1-neoforge"(1_21_01, "srg") {
20+
"1.21.1-fabric"(1_21_01, "yarn") {
2121
"1.20.4-fabric"(1_20_04, "yarn") {
2222
"1.20.4-forge"(1_20_04, "srg") {
2323
"1.20.1-forge"(1_20_01, "srg") {
2424
"1.20.1-fabric"(1_20_01, "yarn") {
25-
"1.19.4-fabric"(1_19_04, "yarn") {
26-
"1.19.4-forge"(1_19_04, "srg") {
27-
"1.19.2-forge"(1_19_02, "srg") {
28-
"1.19.2-fabric"(1_19_02, "yarn") {
29-
"1.18.2-fabric"(1_18_02, "yarn") {
30-
"1.18.2-forge"(1_18_02, "srg") {
31-
"1.17.1-forge"(1_17_01, "srg") {
32-
"1.17.1-fabric"(1_17_01, "yarn") {
33-
"1.16.5-fabric"(1_16_05, "yarn"){
34-
"1.16.5-forge"(1_16_05, "srg") {
35-
"1.12.2-forge"(1_12_02, "srg", rootProject.file("versions/1.16.5-1.8.9.txt")) {
36-
"1.12.2-fabric"(1_12_02, "yarn") {
37-
"1.8.9-fabric"(1_08_09, "yarn"){
38-
"1.8.9-forge"(1_08_09, "srg")
39-
}
40-
}
41-
}
42-
}
43-
}
44-
}
45-
}
46-
}
25+
"1.16.5-fabric"(1_16_05, "yarn") {
26+
"1.16.5-forge"(1_16_05, "srg") {
27+
"1.12.2-forge"(1_12_02, "srg", rootProject.file("versions/1.16.5-1.8.9.txt")) {
28+
"1.12.2-fabric"(1_12_02, "yarn") {
29+
"1.8.9-fabric"(1_08_09, "yarn") {
30+
"1.8.9-forge"(1_08_09, "srg")
4731
}
4832
}
4933
}
@@ -62,5 +46,6 @@ preprocess {
6246
}
6347
}
6448

49+
6550
strictExtraMappings.set(true)
66-
}
51+
}

‎settings.gradle.kts‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pluginManagement {
2424

2525
plugins {
2626
kotlin("jvm") version("2.0.0")
27-
id("dev.deftu.gradle.multiversion-root") version("2.49.0")
27+
id("dev.deftu.gradle.multiversion-root") version("2.52.0")
2828
}
2929
}
3030

@@ -49,35 +49,23 @@ listOf(
4949
"1.16.5-forge",
5050
"1.16.5-fabric",
5151

52-
"1.17.1-forge",
53-
"1.17.1-fabric",
54-
55-
"1.18.2-forge",
56-
"1.18.2-fabric",
57-
58-
"1.19.2-forge",
59-
"1.19.2-fabric",
60-
61-
"1.19.4-forge",
62-
"1.19.4-fabric",
63-
6452
"1.20.1-forge",
6553
"1.20.1-fabric",
6654

6755
"1.20.4-forge",
6856
"1.20.4-fabric",
6957

70-
"1.20.6-neoforge",
71-
"1.20.6-fabric",
72-
7358
"1.21.1-neoforge",
7459
"1.21.1-fabric",
7560

7661
"1.21.4-neoforge",
7762
"1.21.4-fabric",
7863

7964
"1.21.5-neoforge",
80-
"1.21.5-fabric"
65+
"1.21.5-fabric",
66+
67+
"1.21.8-neoforge",
68+
"1.21.8-fabric",
8169
).forEach { version ->
8270
include(":$version")
8371
project(":$version").apply {

‎src/main/java/org/polyfrost/crashpatch/mixin/MixinGuiConnecting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.polyfrost.crashpatch.mixin;
22

3-
import dev.deftu.omnicore.client.OmniDesktop;
3+
import dev.deftu.omnicore.api.client.OmniDesktop;
44
import dev.deftu.textile.minecraft.MCTextFormat;
55
import org.polyfrost.crashpatch.client.CrashPatchClient;
66
import org.polyfrost.crashpatch.hooks.MinecraftHook;

‎src/main/kotlin/org/polyfrost/crashpatch/CrashPatchConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.polyfrost.crashpatch
22

3-
import dev.deftu.omnicore.client.OmniDesktop
3+
import dev.deftu.omnicore.api.client.OmniDesktop
44
import org.polyfrost.oneconfig.api.config.v1.Config
55
import org.polyfrost.oneconfig.api.config.v1.annotations.*
66
import java.net.URI

‎src/main/kotlin/org/polyfrost/crashpatch/client/CrashPatchClient.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.polyfrost.crashpatch.client
22

3-
import dev.deftu.omnicore.client.OmniClientCommands
43
import dev.deftu.textile.minecraft.MCSimpleTextHolder
54
import dev.deftu.textile.minecraft.MCTextFormat
65
import org.apache.logging.log4j.LogManager
@@ -58,8 +57,6 @@ object CrashPatchClient {
5857
}
5958

6059
fun initialize() {
61-
OmniClientCommands.initialize()
62-
6360
CommandManager.register(with(CommandManager.literal(CrashPatchConstants.ID)) {
6461
executes {
6562
CrashPatchConfig.openUI()
@@ -73,8 +70,7 @@ object CrashPatchClient {
7370
MCSimpleTextHolder("[${CrashPatchConstants.NAME}] Failed to reload JSON file!").withFormatting(MCTextFormat.Companion.RED)
7471
}
7572

76-
ctx.source.displayMessage(text)
77-
1
73+
ctx.source.replyChat(text)
7874
})
7975

8076
then(CommandManager.literal("crash").executes { ctx ->

‎src/main/kotlin/org/polyfrost/crashpatch/gui/CrashUI.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.polyfrost.crashpatch.gui
22

33
import dev.deftu.clipboard.Clipboard
4-
import dev.deftu.omnicore.client.OmniDesktop
5-
import dev.deftu.omnicore.client.OmniScreen
4+
import dev.deftu.omnicore.api.client.OmniDesktop
5+
import dev.deftu.omnicore.api.client.screen.closeScreen
66
import net.minecraft.client.gui.GuiScreen
77
import net.minecraft.crash.CrashReport
88
import org.polyfrost.crashpatch.CrashPatchConstants
9-
import org.polyfrost.crashpatch.client.CrashPatchClient
109
import org.polyfrost.crashpatch.crashes.CrashScanStorage
1110
import org.polyfrost.crashpatch.crashes.CrashScan
1211
import org.polyfrost.crashpatch.hooks.CrashReportHook
@@ -247,7 +246,7 @@ class CrashUI @JvmOverloads constructor(
247246
if (type == GuiType.INIT) {
248247
shouldCrash = true
249248
} else {
250-
OmniScreen.closeScreen()
249+
closeScreen()
251250
}
252251
}.setPalette { brand.fg },
253252
Button(

‎versions/1.16.5-forge/src/main/java/org/polyfrost/crashpatch/mixin/MixinGuiConnecting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.polyfrost.crashpatch.mixin;
22

33
import com.mojang.blaze3d.vertex.PoseStack;
4-
import dev.deftu.omnicore.client.OmniDesktop;
4+
import dev.deftu.omnicore.api.client.OmniDesktop;
55
import dev.deftu.textile.minecraft.MCTextFormat;
66
import net.minecraft.network.chat.Component;
77
import net.minecraft.network.chat.FormattedText;

0 commit comments

Comments
 (0)