diff --git a/.gitignore b/.gitignore index e61327f..1d7e6fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ flame/overrides.txt -minecraft/journeymap +instance.cfg +minecraft/ minecraft/downloads minecraft/dynamic-data-pack-cache minecraft/dynamic-resource-pack-cache @@ -19,8 +20,11 @@ minecraft/backup minecraft/.sable minecraft/.mixin.out minecraft/mods/mcef-libraries +minecraft/logs +minecraft/.qmenu_opened.marker +minecraft/command_history.txt +minecraft/options.txt +minecraft/mods/.connector # Config stuff (optimizations) minecraft/config/* -!minecraft/config/modernfix-common.toml -!minecraft/config/sodium-options.json diff --git a/instance.cfg b/instance.cfg index 3b99ded..392999c 100644 --- a/instance.cfg +++ b/instance.cfg @@ -1,88 +1,62 @@ -[General] -ConfigVersion=1.3 -ManagedPack=true -iconKey=PEAK -ManagedPackID= -ManagedPackType=flame -ManagedPackName=Gooncraft -ManagedPackVersionID= -ManagedPackVersionName= -name=Gooncraft -InstanceType=OneSix -ExportAuthor=fuckniggers -ExportName=lol -ExportOptionalFiles=true -ExportSummary= -ExportVersion=67 -JoinServerOnLaunch=false -LogPrePostOutput=true -OverrideCommands=false -OverrideConsole=false -OverrideEnv=false -OverrideGameTime=false -OverrideJava=false -OverrideJavaArgs=false -OverrideJavaLocation=false -OverrideLegacySettings=false -OverrideMemory=false -OverrideMiscellaneous=false -OverrideNativeWorkarounds=false -OverridePerformance=false -OverrideWindow=false -Profiler= -UseAccountForInstance=false -lastLaunchTime=1777990038114 -lastTimePlayed=166 -linkedInstances=[\"[]\"] -notes= -totalTimePlayed=2930 -AutomaticJava=false -GlobalDataPacksEnabled=false -GlobalDataPacksPath= -ManagedPackURL= -ModDownloadLoaders=[] -OverrideModDownloadLoaders=false -shortcuts= -AutoCloseConsole=false -CloseAfterLaunch=false -CustomGLFWPath= -CustomOpenALPath= -EnableFeralGamemode=false -EnableMangoHud=false -Env={} -IgnoreJavaCompatibility=false -InstanceAccountId= -JavaPath= -JoinServerOnLaunchAddress= -JoinWorldOnLaunch=-XX:+ -JvmArgs= -LaunchMaximized=false -LowMemWarning=true -MaxMemAlloc=8192 -MinMemAlloc=8192 -MinecraftWinHeight=480 -MinecraftWinWidth=854 -OnlineFixes=false -PermGen=128 -PostExitCommand= -PreLaunchCommand= -QuitAfterGameStop=false -RecordGameTime=true -ShowConsole=false -ShowConsoleOnError=true -ShowGameTime=true -UseDiscreteGpu=false -UseNativeGLFW=false -UseNativeOpenAL=false -UseZink=false -WrapperCommand= - -[UI] -mods_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAANwB8AAAAHAAAABgAAAGQAAAAHAAAAZAAAAAkAAABkAAAACgAAAGQAAAAIAAAAZAAAAAsAAABkAAAADAAAAGQAAALuAAAADQEBAAAAAAAAAQAAAAAAAABk/////wAAAIEAAAAAAAAADQAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAPoAAAABAAAAAQAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAA+gAAAAAZAAAAAAAAAAAAAAAAAAAAAE=" -resourcepacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAHQAAAAAEAAAAGAAAAZAAAAlgAAAAHAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAHAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" -shaderpacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAFEAAAAAEAAAAEAAAAZAAAAZAAAAAFAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAFAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" -texturepacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAGIAAAAAEAAAAFAAAAZAAAAlgAAAAGAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAGAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" -mods_Page\ColumnsOverride=false -resourcepacks_Page\ColumnsOverride=false -shaderpacks_Page\ColumnsOverride=false -texturepacks_Page\ColumnsOverride=false +[General] +AutomaticJava=false +ConfigVersion=1.3 +ExportAuthor=fuckniggers +ExportName=lol +ExportOptionalFiles=true +ExportSummary= +ExportVersion=67 +GlobalDataPacksEnabled=false +GlobalDataPacksPath= +IgnoreJavaCompatibility=false +InstanceType=OneSix +JavaArchitecture=64 +JavaPath=/usr/lib/jvm/graalvm-community-openjdk-21.0.2+13.1/bin/java +JavaRealArchitecture=amd64 +JavaSignature=ce7e8f86ab58edbbbfbbbbfc22dfa05b9d90f703 +JavaVendor=GraalVM Community +JavaVersion=21.0.2 +JoinServerOnLaunch=false +LogPrePostOutput=true +ManagedPack=true +ManagedPackID= +ManagedPackName=Gooncraft +ManagedPackType=flame +ManagedPackURL= +ManagedPackVersionID= +ManagedPackVersionName= +ModDownloadLoaders=[] +OverrideCommands=false +OverrideConsole=false +OverrideEnv=false +OverrideGameTime=false +OverrideJava=false +OverrideJavaArgs=false +OverrideJavaLocation=true +OverrideLegacySettings=false +OverrideMemory=false +OverrideMiscellaneous=false +OverrideModDownloadLoaders=false +OverrideNativeWorkarounds=false +OverridePerformance=false +OverrideWindow=false +Profiler= +UseAccountForInstance=false +iconKey=PEAK +lastLaunchTime=1778143237333 +lastTimePlayed=4061 +linkedInstances=[\"[]\"] +name=Gooncraft +notes= +shortcuts= +totalTimePlayed=20822 + +[UI] +mods_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAANwB8AAAAHAAAABgAAAGQAAAAHAAAAZAAAAAkAAABkAAAACgAAAGQAAAAIAAAAZAAAAAsAAABkAAAADAAAAGQAAALuAAAADQEBAAAAAAAAAQAAAAAAAABk/////wAAAIEAAAAAAAAADQAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAPoAAAABAAAAAQAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAGQAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAA+gAAAAAZAAAAAAAAAAAAAAAAAAAAAE=" +mods_Page\ColumnsOverride=false +resourcepacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAHQAAAAAEAAAAGAAAAZAAAAlgAAAAHAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAHAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" +resourcepacks_Page\ColumnsOverride=false +shaderpacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAFEAAAAAEAAAAEAAAAZAAAAZAAAAAFAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAFAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" +shaderpacks_Page\ColumnsOverride=false +texturepacks_Page\Columns="AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAAGIAAAAAEAAAAFAAAAZAAAAlgAAAAGAQEAAAAAAAABAAAAAAAAAGT/////AAAAgQAAAAAAAAAGAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAABAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAZAAAAAEAAAAAAAAD6AAAAABkAAAAAAAAAAAAAAAAAAAAAQ==" +texturepacks_Page\ColumnsOverride=false diff --git a/minecraft/config/modernfix-common.toml b/minecraft/config/modernfix-common.toml index 84bece8..45fb3c5 100644 --- a/minecraft/config/modernfix-common.toml +++ b/minecraft/config/modernfix-common.toml @@ -1,11 +1,2 @@ -#These JEI plugins will be loaded on the main thread -blacklist_async_jei_plugins = ["jepb:jei_plugin"] - -[perf.dynamic_resources] - enabled = true - -[perf.remove_spawn_chunks] - enabled = true - -[perf.faster_loading] - enabled = true +#These JEI plugins will be loaded on the main thread +blacklist_async_jei_plugins = ["jepb:jei_plugin"] diff --git a/minecraft/config/sodium-options.json b/minecraft/config/sodium-options.json index e60ed1a..1d2c213 100644 --- a/minecraft/config/sodium-options.json +++ b/minecraft/config/sodium-options.json @@ -1,7 +1,7 @@ { "quality": { - "weather_quality": "DEFAULT", - "leaves_quality": "DEFAULT", + "weather_quality": "FAST", + "leaves_quality": "FAST", "enable_vignette": true }, "advanced": { @@ -16,8 +16,7 @@ "use_entity_culling": true, "use_fog_occlusion": true, "use_block_face_culling": true, - "use_no_error_g_l_context": true, - "use_persistent_mapping": true + "use_no_error_g_l_context": true }, "notifications": { "has_cleared_donation_button": false, @@ -26,4 +25,4 @@ "debug": { "terrain_sorting_enabled": true } -} +} \ No newline at end of file diff --git a/minecraft/icon.png b/minecraft/icon.png index 64f33bb..af3351e 100644 Binary files a/minecraft/icon.png and b/minecraft/icon.png differ diff --git a/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar b/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar index 2c9cf0c..54e5b26 100644 Binary files a/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar and b/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar differ diff --git a/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar.input b/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar.input index 87ad450..8248d9e 100644 --- a/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar.input +++ b/minecraft/mods/.connector/Pleasure Horizons-0.7.0+1.21.1_mapped_moj_1.21.1.jar.input @@ -1 +1 @@ -2.0.0-beta.14+1.21.1,client,fc39ab31b348c335e15dcb6470c8b09e2657d3962a2d4ed2211315cd4dc1b685 \ No newline at end of file +2.0.0-beta.14+1.21.1,client,20bd466559cca9f03241b453f54683bd749d19697cfe13c0a5fcd04058a6edbb \ No newline at end of file diff --git a/minecraft/mods/.connector/patch_audit.txt b/minecraft/mods/.connector/patch_audit.txt index 0c3ef2d..ae21b50 100644 --- a/minecraft/mods/.connector/patch_audit.txt +++ b/minecraft/mods/.connector/patch_audit.txt @@ -1,16 +1,7 @@ ==== Connector Mixin Patch Audit Summary ==== -Successful: 2 +Successful: 0 Partial: 0 Failed: 0 -Success rate: 100,00% Accuracy: 100,00% +Success rate: NaN% Accuracy: NaN% ============================================= -Mixin method com/terraformersmc/modmenu/mixin/MixinGameMenu onInitWidgets(Lorg/spongepowered/asm/mixin/injection/callback/CallbackInfo;Lnet/minecraft/client/gui/layouts/GridLayout;)V - >> Using org.sinytra.adapter.transform.preprocess.LocalCaptureUpgradeTransformer - - Upgrade captured locals - -Mixin method com/terraformersmc/modmenu/mixin/MixinTitleScreen onRender(Ljava/lang/String;)Ljava/lang/String; - >> Using org.sinytra.adapter.patch.processor.PropertyProcessor - - Set property 'at' to: AtData{value=INVOKE, ordinal=0, target=Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)I} - - Set property 'method' to: MethodQualifier[owner=null, name=lambda$render$13, desc=(Lnet/minecraft/client/gui/GuiGraphics;ILjava/lang/Integer;Ljava/lang/String;)V] - diff --git a/mmc-pack.json b/mmc-pack.json index d937834..d11de0d 100644 --- a/mmc-pack.json +++ b/mmc-pack.json @@ -3,6 +3,7 @@ { "cachedName": "LWJGL 3", "cachedVersion": "3.3.3", + "cachedVolatile": true, "dependencyOnly": true, "uid": "org.lwjgl3", "version": "3.3.3"