From d3f5b4df809fd03919952285a1906652097f00e6 Mon Sep 17 00:00:00 2001 From: syeyoung Date: Sun, 1 Jan 2023 01:43:21 +0900 Subject: - tweaker prevents mod from running ??? Why!!! Signed-off-by: syeyoung --- loader/build.gradle | 13 +++++++----- .../kr/syeyoung/dungeonsguide/launcher/Main.java | 4 ++-- .../dungeonsguide/launcher/coremod/DGTweaker.java | 23 ++++++++++++++-------- loader/src/main/resources/mcmod.info | 8 ++++---- 4 files changed, 29 insertions(+), 19 deletions(-) (limited to 'loader') diff --git a/loader/build.gradle b/loader/build.gradle index c4b0f4f8..a163444b 100644 --- a/loader/build.gradle +++ b/loader/build.gradle @@ -21,7 +21,6 @@ loom { // probably will have to my own mixin tweaker, due to dungeonsguide's weird dynamic loading stuff // property("mixin.debug", "true") // property("asmhelper.verbose", "true") - arg("--tweakClass", "kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker") // arg("--mixin", "mixins.examplemod.json") } @@ -35,8 +34,9 @@ loom { runs { client { - runDir = 'runtime' + runDir = '../runtime' property('devauth.enabled','true') + property("fml.coreMods.load", "kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker") client() vmArgs.remove("-XstartOnFirstThread") } @@ -94,8 +94,9 @@ tasks.withType(Jar) { archivesBaseName = "dungeonsguide-loader" manifest { attributes["FMLCorePluginContainsFMLMod"] = "true" - attributes["ForceLoadAsMod"] = "true" - attributes["TweakClass"] = "kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker" + attributes["FMLCorePlugin"] = 'kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker' +// attributes["ForceLoadAsMod"] = "true" not applicable, not using mixins +// attributes["TweakClass"] = "kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker" // If you don't want mixins, remove these lines // this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" @@ -106,10 +107,12 @@ tasks.withType(Jar) { tasks.shadowJar { archiveFileName = jar.archiveFileName - + exclude "META-INF/versions/**" dependencies { include(dependency("org.slf4j:slf4j-api:1.7.25")) include(dependency("org.json:json:20171018")) + include(dependency("org.bouncycastle:bcpg-jdk15on:1.70")) + include(dependency("org.bouncycastle:bcprov-jdk15on:1.70")) } } diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java index ed11d7c1..15eee333 100755 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java @@ -55,8 +55,8 @@ import java.util.*; @Mod(modid = Main.MOD_ID, version = Main.VERSION) public class Main { - public static final String MOD_ID = "dungeons_guide_wrapper"; - public static final String VERSION = "1.0"; + public static final String MOD_ID = "dungeons_guide_loader"; + public static final String VERSION = "4.0.0"; public static final String DOMAIN = "https://v2.dungeons.guide/api"; private static Main main; diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/coremod/DGTweaker.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/coremod/DGTweaker.java index 1c1b51d0..5c3e0836 100644 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/coremod/DGTweaker.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/coremod/DGTweaker.java @@ -20,28 +20,35 @@ package kr.syeyoung.dungeonsguide.launcher.coremod; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import java.io.File; import java.util.List; +import java.util.Map; -public class DGTweaker implements ITweaker { +public class DGTweaker implements IFMLLoadingPlugin { @Override - public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { - + public String[] getASMTransformerClass() { + return new String[] {EventBusTransformer.class.getName()}; } @Override - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - classLoader.registerTransformer(EventBusTransformer.class.getName()); + public String getModContainerClass() { + return null; } @Override - public String getLaunchTarget() { + public String getSetupClass() { return null; } @Override - public String[] getLaunchArguments() { - return new String[0]; + public void injectData(Map map) { + + } + + @Override + public String getAccessTransformerClass() { + return null; } } diff --git a/loader/src/main/resources/mcmod.info b/loader/src/main/resources/mcmod.info index 8448396d..aef3ce3e 100755 --- a/loader/src/main/resources/mcmod.info +++ b/loader/src/main/resources/mcmod.info @@ -1,14 +1,14 @@ [ { - "modid": "skyblock_dungeons_guide", - "name": "Skyblock Dungeons Guide", - "description": "A mod to help dungeon players to find and solve secrets and puzzles most efficiently.", + "modid": "dungeons_guide_loader", + "name": "Dungeons Guide Loader", + "description": "A loader to a mod to help dungeon players to find and solve secrets and puzzles most efficiently.", "version": "4.0.0", "mcversion": "1.8.9", "url": "https://discord.gg/dg", "updateUrl": "", "authorList": ["syeyoung", "kokoniara"], - "credits": "The guild Jerry's Crew, for nothing.", + "credits": ":)", "logoFile": "", "screenshots": [], "dependencies": [] -- cgit