aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.vscode/launch.json30
-rw-r--r--loader/build.gradle13
-rwxr-xr-xloader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java4
-rw-r--r--loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/coremod/DGTweaker.java23
-rwxr-xr-xloader/src/main/resources/mcmod.info8
-rw-r--r--mod/build.gradle4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java2
7 files changed, 34 insertions, 50 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3e01bcab..ef72b13b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,39 +3,13 @@
"configurations": [
{
"type": "java",
- "name": "Minecraft Client",
- "request": "launch",
- "cwd": "${workspaceFolder}/runtime",
- "console": "internalConsole",
- "stopOnEntry": false,
- "mainClass": "net.fabricmc.devlaunchinjector.Main",
- "vmArgs": "\"-Dfabric.dli.config\u003d/home/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
- "args": "",
- "env": {},
- "projectName": ""
- },
- {
- "type": "java",
- "name": "Minecraft Server",
- "request": "launch",
- "cwd": "${workspaceFolder}/run",
- "console": "internalConsole",
- "stopOnEntry": false,
- "mainClass": "net.fabricmc.devlaunchinjector.Main",
- "vmArgs": "\"-Dfabric.dli.config\u003d/home/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dserver\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
- "args": "\"nogui\"",
- "env": {},
- "projectName": ""
- },
- {
- "type": "java",
"name": "Minecraft Client (:loader)",
"request": "launch",
"cwd": "${workspaceFolder}/loader/runtime",
"console": "internalConsole",
"stopOnEntry": false,
"mainClass": "net.fabricmc.devlaunchinjector.Main",
- "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/loader/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-XstartOnFirstThread\" \"-Ddevauth.enabled\u003dtrue\" \"-XstartOnFirstThread\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
+ "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/loader/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Ddevauth.enabled\u003dtrue\" \"-Dfml.coreMods.load\u003dkr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
"args": "",
"env": {},
"projectName": "loader"
@@ -48,7 +22,7 @@
"console": "internalConsole",
"stopOnEntry": false,
"mainClass": "net.fabricmc.devlaunchinjector.Main",
- "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/mod/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-XstartOnFirstThread\" \"-Ddevauth.enabled\u003dtrue\" \"-XstartOnFirstThread\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
+ "vmArgs": "\"-Dfabric.dli.config\u003d/Users/syeyoung/Documents/dungeonsguide/Dungeons@@0020Guide/mod/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Ddevauth.enabled\u003dtrue\" \"-Ddg.loader\u003ddevenv\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
"args": "",
"env": {},
"projectName": "mod"
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<String> 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<String, Object> 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": []
diff --git a/mod/build.gradle b/mod/build.gradle
index ee33fedd..0d7138fe 100644
--- a/mod/build.gradle
+++ b/mod/build.gradle
@@ -20,7 +20,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")
}
@@ -33,8 +32,9 @@ loom {
}
runs {
client {
- runDir = 'runtime'
+ runDir = '../runtime'
property('devauth.enabled','true')
+ property("fml.coreMods.load", "kr.syeyoung.dungeonsguide.launcher.coremod.DGTweaker")
property('dg.loader', 'devenv')
client()
vmArgs.remove("-XstartOnFirstThread")
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java
index aea56f3b..b84fdcb8 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/VersionInfo.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.util.Optional;
public class VersionInfo {
- public static final String VERSION = "4.0.0-beta.1";
+ public static final String VERSION = "2023/01/01-651ce09";
public static IDGLoader getCurrentLoader() {
return Main.getMain().getCurrentLoader();
generated by cgit (git 2.46.0) at 2024-11-22 13:46:49 +0000