Skip to content

Commit b4348dc

Browse files
committed
yes
1 parent deb0863 commit b4348dc

File tree

4 files changed

+20
-39
lines changed

4 files changed

+20
-39
lines changed

build.gradle

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id "net.kyori.blossom" version "1.3.0"
1010
}
1111

12-
version = "1.3.1"
12+
version = "1.3.2"
1313
group = "cc.woverflow"
1414
archivesBaseName = "CrashPatch"
1515

@@ -29,8 +29,7 @@ compileKotlin {
2929
loom {
3030
launchConfigs {
3131
client {
32-
property("fml.coreMods.load", "cc.woverflow.wcore.tweaker.WCoreTweaker")
33-
arg("--tweakClass", "gg.essential.loader.stage0.EssentialSetupTweaker")
32+
arg("--tweakClass", "cc.woverflow.onecore.tweaker.OneCoreTweaker")
3433
arg("--mixin", "mixin.crashpatch.json")
3534
}
3635
}
@@ -60,12 +59,9 @@ dependencies {
6059
minecraft("com.mojang:minecraft:1.8.9")
6160
mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
6261
forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
63-
include ('gg.essential:loader-launchwrapper:1.1.3') {
64-
transitive = false
65-
}
66-
compileOnly 'gg.essential:essential-1.8.9-forge:1788'
67-
implementation 'cc.woverflow:w-core:1.1.3'
68-
include ('cc.woverflow:w-core-tweaker:1.0.2') {
62+
compileOnly 'gg.essential:essential-1.8.9-forge:1933'
63+
compileOnly 'cc.woverflow:onecore:1.3.3'
64+
include ('cc.woverflow:onecore-tweaker:1.3.0') {
6965
transitive = false
7066
}
7167
compileOnly("org.spongepowered:mixin:0.8.5-SNAPSHOT")
@@ -95,12 +91,10 @@ jar {
9591

9692
manifest.attributes(
9793
"ModSide": "CLIENT",
98-
"TweakClass": "gg.essential.loader.stage0.EssentialSetupTweaker",
94+
"TweakClass": "cc.woverflow.onecore.tweaker.OneCoreTweaker",
9995
"TweakOrder": "0",
10096
"MixinConfigs": "mixin.crashpatch.json",
101-
'ForceLoadAsMod': true,
102-
"FMLCorePlugin": "cc.woverflow.wcore.tweaker.WCoreTweaker",
103-
"FMLCorePluginContainsFMLMod": true
97+
'ForceLoadAsMod': true
10498
)
10599
}
106100

src/main/java/cc/woverflow/crashpatch/tweaker/CrashPatchWCoreTweaker.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/kotlin/cc/woverflow/crashpatch/CrashPatch.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package cc.woverflow.crashpatch
22

33
import cc.woverflow.crashpatch.crashes.CrashHelper
4-
import cc.woverflow.wcore.utils.Updater
5-
import cc.woverflow.wcore.utils.command
4+
import cc.woverflow.crashpatch.crashes.DeobfuscatingRewritePolicy
5+
import cc.woverflow.onecore.utils.Updater
6+
import cc.woverflow.onecore.utils.command
67
import com.google.gson.JsonParser
78
import com.google.gson.stream.MalformedJsonException
89
import gg.essential.api.EssentialAPI
10+
import gg.essential.api.utils.Multithreading
911
import gg.essential.universal.ChatColor
1012
import net.minecraft.launchwrapper.Launch
1113
import net.minecraftforge.fml.common.Mod
@@ -54,6 +56,13 @@ object CrashPatch {
5456

5557
@Mod.EventHandler
5658
fun onPreInit(e: FMLPreInitializationEvent) {
59+
DeobfuscatingRewritePolicy.install()
60+
Multithreading.runAsync {
61+
logger.info("Is SkyClient: $isSkyclient")
62+
if (!CrashHelper.loadJson()) {
63+
logger.warn("CrashHelper failed to preload crash data JSON!")
64+
}
65+
}
5766
Updater.addToUpdater(e.sourceFile, NAME, MODID, VERSION, "W-OVERFLOW/$MODID")
5867
}
5968

src/main/kotlin/cc/woverflow/crashpatch/gui/GuiCrashMenu.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import cc.woverflow.crashpatch.gui.components.Button
66
import cc.woverflow.crashpatch.gui.components.TextButton
77
import cc.woverflow.crashpatch.hooks.CrashReportHook
88
import cc.woverflow.crashpatch.utils.InternetUtils
9-
import cc.woverflow.wcore.utils.browse
9+
import cc.woverflow.onecore.utils.browseURL
1010
import gg.essential.elementa.ElementaVersion
1111
import gg.essential.elementa.WindowScreen
1212
import gg.essential.elementa.components.ScrollComponent
@@ -90,7 +90,7 @@ class GuiCrashMenu @JvmOverloads constructor(val report: CrashReport, private va
9090
init {
9191
second.onLeftClick {
9292
if (CrashPatch.isSkyclient) {
93-
UDesktop.browse("https://discord.gg/eh7tNFezct")
93+
UDesktop.browseURL("https://discord.gg/eh7tNFezct")
9494
}
9595
}
9696
}

0 commit comments

Comments
 (0)