diff --git a/.vscode/launch.json b/.vscode/launch.json index 704449d..7521a36 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,8 +8,8 @@ "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", "projectName": "suppress-OpenGL-1280", "cwd": "${workspaceFolder}\\run", - "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\classpath\\runClient_minecraftClasspath.txt\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- \"-DnativesDirectory\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\natives\" -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump \"-Dos.name\u003dWindows 10\" -Dos.version\u003d10.0", - "args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 1.18 --assetsDir C:\\Users\\Adam\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mixin.config suppressopengl1280.mixins.json", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\classpath\\runClient_minecraftClasspath.txt -Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DnativesDirectory\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\natives -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump \"-Dos.name\u003dWindows 10\" -Dos.version\u003d10.0", + "args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 1.18 --assetsDir C:\\Users\\adamr\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mixin.config suppressopengl1280.mixins.json", "env": { "MOD_CLASSES": "", "MCP_MAPPINGS": "official_1.18.2" @@ -22,8 +22,8 @@ "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", "projectName": "suppress-OpenGL-1280", "cwd": "${workspaceFolder}\\run", - "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\classpath\\runData_minecraftClasspath.txt\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", - "args": "--launchTarget forgedatauserdev --assetIndex 1.18 --assetsDir C:\\Users\\Adam\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mod suppressopengl1280 --all --output \"C:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\src\\generated\\resources\" --existing \"C:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\src\\main\\resources\" --mixin.config suppressopengl1280.mixins.json", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\classpath\\runData_minecraftClasspath.txt -Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "args": "--launchTarget forgedatauserdev --assetIndex 1.18 --assetsDir C:\\Users\\adamr\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mod suppressopengl1280 --all --output C:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\src\\generated\\resources --existing C:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\src\\main\\resources --mixin.config suppressopengl1280.mixins.json", "env": { "MOD_CLASSES": "", "MCP_MAPPINGS": "official_1.18.2" @@ -36,7 +36,7 @@ "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", "projectName": "suppress-OpenGL-1280", "cwd": "${workspaceFolder}\\run", - "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\classpath\\runGameTestServer_minecraftClasspath.txt\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\classpath\\runGameTestServer_minecraftClasspath.txt -Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", "args": "--launchTarget forgegametestserveruserdev --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mixin.config suppressopengl1280.mixins.json", "env": { "MOD_CLASSES": "", @@ -50,7 +50,7 @@ "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", "projectName": "suppress-OpenGL-1280", "cwd": "${workspaceFolder}\\run", - "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES \"-DlegacyClassPath.file\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\classpath\\runServer_minecraftClasspath.txt\" \"-Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -Dmixin.env.remapRefMap\u003dtrue \"-Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Adam\\Documents\\GitHub Repos\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg\" -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\Adam\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", + "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\classpath\\runServer_minecraftClasspath.txt -Dnet.minecraftforge.gradle.GradleStart.srg.srg-mcp\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\adamr\\Documents\\GitHub\\suppress-OpenGL-1280\\build\\createSrgToMcp\\output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar -Dforge.enabledGameTestNamespaces\u003dsuppressopengl1280 -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.0.0\\f55ddbb35612c6745cefc47d1a0d6dbfb25d3982\\bootstraplauncher-1.0.0.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\1.0.3\\acbf5e3c8a38fb8bf824a54fe45eee121c510392\\securejarhandler-1.0.3.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.2\\f4d7f0fc9054386f2893b602454d48e07d4fbead\\asm-commons-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.2\\fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946\\asm-util-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.2\\7487dd756daf96cab9986e44b9d7bcb796a61c10\\asm-analysis-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.2\\d96c99a30f5e1a19b0e609dbb19a44d8518ac01e\\asm-tree-9.2.jar;C:\\Users\\adamr\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.2\\81a03f76019c67362299c40e0ba13405f5467bff\\asm-9.2.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", "args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 40.2.0 --fml.mcVersion 1.18.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220404.173914 --mixin.config suppressopengl1280.mixins.json", "env": { "MOD_CLASSES": "", diff --git a/gradle.properties b/gradle.properties index 29585c1..3ff57d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx10G +org.gradle.jvmargs=-Xmx16G # Mod Properties -mod_version=1.2.1 +mod_version=1.2.2 maven_group=io.github.adamraichu archives_base_name=suppressopengl1280 diff --git a/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ClientSafeExecutor.java b/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ClientSafeExecutor.java new file mode 100644 index 0000000..fa1600e --- /dev/null +++ b/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ClientSafeExecutor.java @@ -0,0 +1,17 @@ +package io.github.adamraichu.suppressopengl1280.forge; + +import io.github.adamraichu.suppressopengl1280.forge.config.ConfigOptions; +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; +import net.minecraftforge.client.ConfigGuiHandler.ConfigGuiFactory; +import net.minecraftforge.fml.ModLoadingContext; + +public class ClientSafeExecutor { + public static void run() { + AutoConfig.register(ConfigOptions.class, GsonConfigSerializer::new); + + ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory((mc, screen) -> { + return AutoConfig.getConfigScreen(ConfigOptions.class, screen).get(); + })); + } +} diff --git a/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ModInitClass.java b/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ModInitClass.java index a145537..88524aa 100644 --- a/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ModInitClass.java +++ b/src/main/java/io/github/adamraichu/suppressopengl1280/forge/ModInitClass.java @@ -1,10 +1,6 @@ package io.github.adamraichu.suppressopengl1280.forge; -import io.github.adamraichu.suppressopengl1280.forge.config.ConfigOptions; -import me.shedaniel.autoconfig.AutoConfig; -import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.ConfigGuiHandler.ConfigGuiFactory; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.IExtensionPoint; import net.minecraftforge.fml.ModLoadingContext; @@ -16,14 +12,6 @@ public class ModInitClass { public ModInitClass() { ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); - DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> ModInitClass::clientSetup); - } - - public static void clientSetup() { - AutoConfig.register(ConfigOptions.class, GsonConfigSerializer::new); - - ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory((mc, screen) -> { - return AutoConfig.getConfigScreen(ConfigOptions.class, screen).get(); - })); + DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> ClientSafeExecutor::run); } }