diff --git a/buildscript.properties b/buildscript.properties index 2fbdbbf2..b413f1df 100644 --- a/buildscript.properties +++ b/buildscript.properties @@ -33,7 +33,6 @@ debug_deda = false debug_avaritia = false debug_gtfo = false debug_jer = false -debug_bqu = false # Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you # restart Minecraft in development. Choose this dependent on your mod: diff --git a/dependencies.gradle b/dependencies.gradle index f4136a17..53ec2aa4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -62,15 +62,15 @@ dependencies { compileOnly "curse.maven:ctm-267602:2915363" // CTM 1.0.2.31 runtimeOnly "com.cleanroommc:modularui:2.4.3" // MUI 2.4.3 - // Debug GTWoodProcessing: 1.2.4 + // Debug GTWoodProcessing: 1.2.5 if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) { - runtimeOnly "curse.maven:gtwoodprocessing-1093753:6334967" + runtimeOnly "curse.maven:gtwoodprocessing-1093753:7691291" } - // Debug ImplosionNoBomb: 1.1.0 - compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") + // Debug ImplosionNoBomb: 1.1.1 + compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:7945769") if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) { - runtimeOnly "curse.maven:implosionnobomb-1094386:5731331" + runtimeOnly "curse.maven:implosionnobomb-1094386:7945769" } // Debug ExtraCells2 Additions @@ -130,15 +130,10 @@ dependencies { runtimeOnly rfg.deobf("curse.maven:draconicadditions-314515:3514704") } - // Debug BQu: 4.2.7 - compileOnly rfg.deobf("curse.maven:better-questing-unofficial-629629:7421294") - if (project.debug_all.toBoolean() || project.debug_bqu.toBoolean()) { - runtimeOnly rfg.deobf("curse.maven:better-questing-unofficial-629629:7421294") - } - - // Debug Avaritia: 3.3.0.47-hotfix1 + // Avaritia: 3.3.0.48-hotfix7 + compileOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:7939693") if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) { - runtimeOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:7186329") + runtimeOnly rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:7939693") } // Debug GTFO: 1.12.5 @@ -150,4 +145,9 @@ dependencies { if (project.debug_all.toBoolean() || project.debug_jer.toBoolean()) { runtimeOnly "curse.maven:just-enough-resources-jer-240630:2728585" } + + // Boot error fix + if (project.debug_all.toBoolean() || project.debug_eio.toBoolean()) { + runtimeOnly files("libs/EnderCore-1.12.2-0.5.78-core.jar") + } } diff --git a/repositories.gradle b/repositories.gradle index 812d9ead..68fbcb22 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -9,7 +9,4 @@ repositories { name 'GTCEu Maven' url 'https://maven.gtceu.com' } - flatDir { - dirs 'libs' - } } diff --git a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java index ae66aab6..f8de01c8 100644 --- a/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java +++ b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java @@ -19,7 +19,6 @@ public class GTEMixinLoader implements ILateMixinLoader { public static final Map modMixinsConfig = new ImmutableMap.Builder() - .put(Mods.Names.BETTER_QUESTING, true) .put(Mods.Names.DRACONIC_EVOLUTION, true) .put(Mods.Names.DRACONIC_ADDITIONS, true) .put(Mods.Names.GREGTECH, true) diff --git a/src/main/java/com/github/gtexpert/core/mixins/betterquesting/GuiHomeUpdateMixin.java b/src/main/java/com/github/gtexpert/core/mixins/betterquesting/GuiHomeUpdateMixin.java deleted file mode 100644 index f1f83f7c..00000000 --- a/src/main/java/com/github/gtexpert/core/mixins/betterquesting/GuiHomeUpdateMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.github.gtexpert.core.mixins.betterquesting; - -import java.io.File; - -import net.minecraft.client.Minecraft; -import net.minecraftforge.fml.common.FMLCommonHandler; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import betterquesting.api.storage.BQ_Settings; -import betterquesting.api2.client.gui.controls.IPanelButton; -import betterquesting.api2.client.gui.events.PanelEvent; -import betterquesting.api2.client.gui.events.types.PEventButton; -import betterquesting.client.gui2.GuiHome; -import betterquesting.commands.admin.QuestCommandDefaults; -import betterquesting.handlers.SaveLoadHandler; - -/** - * Fixes the "Update Available!" button on the BetterQuesting home screen. - * The original handler only checks for the legacy single-file format (DefaultQuests.json), - * silently ignoring the directory format (DefaultQuests/) used by newer modpacks. - * This mixin adds support for the directory format by delegating to - * {@link QuestCommandDefaults#load}, matching the behavior of {@code /bq_admin default load}. - */ -@Mixin(value = GuiHome.class, remap = false) -public class GuiHomeUpdateMixin { - - @Inject(method = "onButtonPress", at = @At("HEAD"), cancellable = true) - private void gtexpert$fixUpdateButton(PanelEvent event, CallbackInfo ci) { - if (!(event instanceof PEventButton)) return; - - IPanelButton btn = ((PEventButton) event).getButton(); - if (btn.getButtonID() != 5) return; - - File dataDir = new File(BQ_Settings.defaultDir, QuestCommandDefaults.DEFAULT_FILE); - File legacyFile = new File(BQ_Settings.defaultDir, QuestCommandDefaults.DEFAULT_FILE + ".json"); - - if (dataDir.exists()) { - FMLCommonHandler.instance().getMinecraftServerInstance().addScheduledTask(() -> { - QuestCommandDefaults.load(null, null, dataDir, false); - SaveLoadHandler.INSTANCE.resetUpdate(); - }); - Minecraft.getMinecraft().displayGuiScreen(null); - } else if (legacyFile.exists()) { - FMLCommonHandler.instance().getMinecraftServerInstance().addScheduledTask(() -> { - QuestCommandDefaults.loadLegacy(null, null, legacyFile, false); - SaveLoadHandler.INSTANCE.resetUpdate(); - }); - Minecraft.getMinecraft().displayGuiScreen(null); - } - - ci.cancel(); - } -} diff --git a/src/main/resources/mixins.gtexpert.betterquesting.json b/src/main/resources/mixins.gtexpert.betterquesting.json deleted file mode 100644 index 32418f6f..00000000 --- a/src/main/resources/mixins.gtexpert.betterquesting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "package": "com.github.gtexpert.core.mixins.betterquesting", - "refmap": "mixins.gtexpert.refmap.json", - "target": "@env(DEFAULT)", - "minVersion": "0.8", - "compatibilityLevel": "JAVA_8", - "mixins": [ - ], - "server": [ - ], - "client": [ - "GuiHomeUpdateMixin" - ] -}