diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d790abd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Disable Git line ending conversion, to prevent packwiz index hashes changing when committing from Windows +* -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index 920ec13..1e038cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Exclude exported CurseForge zip files -*.zip - -# Exclude exported Modrinth modpacks -*.mrpack +# Exclude exported CurseForge zip files +*.zip + +# Exclude exported Modrinth modpacks +*.mrpack diff --git a/README.md b/README.md index b0484bd..27bcdc3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -A minecraft modpack for general use and to improve quality of life on multiplayer servers that I play. - -## Note -Modpack contains mods that might be aganist rules on some servers. You should always check if any mods that you use are allowed on servers that you play. +A minecraft modpack for general use and to improve quality of life on multiplayer servers that I play. + +## Note +Modpack contains mods that might be aganist rules on some servers. You should always check if any mods that you use are allowed on servers that you play. diff --git a/config/craftpresence.properties b/config/craftpresence.properties index b63bfc0..80fb94a 100644 --- a/config/craftpresence.properties +++ b/config/craftpresence.properties @@ -1,78 +1,78 @@ -#CraftPresence - Configuration Settings -#Current Version -> v1.8.8 (Schema v2) -# -#Last synchronized: -#Sat Apr 02 15:55:35 CEST 2022 -Large_Image_Key_Format=&DEFAULT& -Enable_Join_Requests=true -Default_Icon=jappa_grass_498 -Show_Elapsed_Time=true -Default_Dimension_Icon=unknown -Entity_Riding_Messages=[default;Riding &entity&] -Reset_Time_on_Init=false -Tooltip_Border_Color=0x505000FF -Strip_Extra_Gui_Elements=false -Gui_Messages=[default;In &screen&] -Last_MC_Version_ID=758 -Language_ID=en_us -Verbose_Mode=false -Enable_Per-Item_System=false -Client_ID=450485984333660181 -Detect_Dimension_Data=false -Player_Inner_Info_Placeholder=(&health&) -Details_Message_Format= -Enable_Commands=true -Vivecraft_Message=Playing in VR via Vivecraft -Loading_Message=Loading... -Party_Privacy=0 -Enable_Per-Entity_System=false -Detect_MCUpdater_Instance=false -Default\ Biome\ Icon=unknown -Player_List_Placeholder=¤t& / &max& Players -Format_Words=true -Main_Menu_Message=In the Main Menu -Config_Gui_Keybind=96 -Include_Extra_Gui_Classes=false -Auto_Register=true -Gui_Background_Color=minecraft;textures/gui/options_background.png -Fallback_Pack_Placeholder= -Player_Outer_Info_Placeholder=&name& -Detect_Curse_Manifest=false -Detect_Technic_Pack=false -World_Data_Placeholder=On &worldname& -Server_Messages=[default;Playing Multiplayer] -Show_Logging_in_Chat=false -Biome_Messages=[default;Playing in &biome&] -Small_Image_Text_Format=&SERVER& -Modpack_Message=&name& -Enable_Per-Gui_System=false -Render_Tooltips=true -Dimension_Messages=[default;In the &dimension&] -Schema_Version=2 -Default_Server_Icon=default -Button_Background_Color=minecraft;textures/gui/widgets.png -Game_State_Message_Format=&MAINMENU&&SERVER& -Small_Image_Key_Format= -Player_Items_Placeholder=Items\: &main& -Reduced_Background_Tint=true -Detect_World_Data=true -Detect_Biome_Data=false -LAN_Game_Message=Playing on a LAN Server -Split_Character=; -Debug_Mode=false -Default_Server_Name=Minecraft Server -Mods_Placeholder=&modcount& Mods -Item_Messages=[default;Holding &item&] -Player_Skin_Endpoint=https\://crafatar.com/avatars/%1$s -Entity_Target_Messages=[default;Targeting &entity&] -Detect_MultiMC_Instance=false -Tooltip_Background_Color=0xF0100010 -Player_Coordinate_Placeholder=At &xPosition&, &zPosition& -Strip_Translation_Colors=false -Rounding_Size=3 -Player_Health_Placeholder=Health\: ¤t&/&max& -Entity_Attacking_Messages=[default;Attacking &entity&] -Default_Server_Motd=A Minecraft Server -Large_Image_Text_Format=&MCVERSION&      &BRAND& &MODS& -Singleplayer_Game_Message=Playing Singleplayer -Refresh_Rate=2 +#CraftPresence - Configuration Settings +#Current Version -> v1.8.8 (Schema v2) +# +#Last synchronized: +#Sat Apr 02 15:55:35 CEST 2022 +Large_Image_Key_Format=&DEFAULT& +Enable_Join_Requests=true +Default_Icon=jappa_grass_498 +Show_Elapsed_Time=true +Default_Dimension_Icon=unknown +Entity_Riding_Messages=[default;Riding &entity&] +Reset_Time_on_Init=false +Tooltip_Border_Color=0x505000FF +Strip_Extra_Gui_Elements=false +Gui_Messages=[default;In &screen&] +Last_MC_Version_ID=758 +Language_ID=en_us +Verbose_Mode=false +Enable_Per-Item_System=false +Client_ID=450485984333660181 +Detect_Dimension_Data=false +Player_Inner_Info_Placeholder=(&health&) +Details_Message_Format= +Enable_Commands=true +Vivecraft_Message=Playing in VR via Vivecraft +Loading_Message=Loading... +Party_Privacy=0 +Enable_Per-Entity_System=false +Detect_MCUpdater_Instance=false +Default\ Biome\ Icon=unknown +Player_List_Placeholder=¤t& / &max& Players +Format_Words=true +Main_Menu_Message=In the Main Menu +Config_Gui_Keybind=96 +Include_Extra_Gui_Classes=false +Auto_Register=true +Gui_Background_Color=minecraft;textures/gui/options_background.png +Fallback_Pack_Placeholder= +Player_Outer_Info_Placeholder=&name& +Detect_Curse_Manifest=false +Detect_Technic_Pack=false +World_Data_Placeholder=On &worldname& +Server_Messages=[default;Playing Multiplayer] +Show_Logging_in_Chat=false +Biome_Messages=[default;Playing in &biome&] +Small_Image_Text_Format=&SERVER& +Modpack_Message=&name& +Enable_Per-Gui_System=false +Render_Tooltips=true +Dimension_Messages=[default;In the &dimension&] +Schema_Version=2 +Default_Server_Icon=default +Button_Background_Color=minecraft;textures/gui/widgets.png +Game_State_Message_Format=&MAINMENU&&SERVER& +Small_Image_Key_Format= +Player_Items_Placeholder=Items\: &main& +Reduced_Background_Tint=true +Detect_World_Data=true +Detect_Biome_Data=false +LAN_Game_Message=Playing on a LAN Server +Split_Character=; +Debug_Mode=false +Default_Server_Name=Minecraft Server +Mods_Placeholder=&modcount& Mods +Item_Messages=[default;Holding &item&] +Player_Skin_Endpoint=https\://crafatar.com/avatars/%1$s +Entity_Target_Messages=[default;Targeting &entity&] +Detect_MultiMC_Instance=false +Tooltip_Background_Color=0xF0100010 +Player_Coordinate_Placeholder=At &xPosition&, &zPosition& +Strip_Translation_Colors=false +Rounding_Size=3 +Player_Health_Placeholder=Health\: ¤t&/&max& +Entity_Attacking_Messages=[default;Attacking &entity&] +Default_Server_Motd=A Minecraft Server +Large_Image_Text_Format=&MCVERSION&      &BRAND& &MODS& +Singleplayer_Game_Message=Playing Singleplayer +Refresh_Rate=2 diff --git a/config/customwindowtitle-client.toml b/config/customwindowtitle-client.toml index ccb85a2..e4a1244 100644 --- a/config/customwindowtitle-client.toml +++ b/config/customwindowtitle-client.toml @@ -1,3 +1,3 @@ -title = 'Minecraft VMU - {mcversion}' -icon16 = '' -icon32 = '' +title = 'Minecraft VMU - {mcversion}' +icon16 = '' +icon32 = '' diff --git a/config/fabric/indigo-renderer.properties b/config/fabric/indigo-renderer.properties index 19d1bb6..8135647 100644 --- a/config/fabric/indigo-renderer.properties +++ b/config/fabric/indigo-renderer.properties @@ -1,8 +1,8 @@ -#Indigo properties file -#Sat Apr 02 15:55:34 CEST 2022 -debug-compare-lighting=auto -fix-exterior-vertex-lighting=auto -ambient-occlusion-mode=hybrid -always-tesselate-blocks=auto -fix-smooth-lighting-offset=auto -fix-luminous-block-ambient-occlusion=auto +#Indigo properties file +#Sat Apr 02 15:55:34 CEST 2022 +debug-compare-lighting=auto +fix-exterior-vertex-lighting=auto +ambient-occlusion-mode=hybrid +always-tesselate-blocks=auto +fix-smooth-lighting-offset=auto +fix-luminous-block-ambient-occlusion=auto diff --git a/config/mousewheelie.hjson b/config/mousewheelie.hjson index 1b090b4..f693f16 100644 --- a/config/mousewheelie.hjson +++ b/config/mousewheelie.hjson @@ -1,107 +1,107 @@ -{ - // General settings - general: { - // Sets the interval in milliseconds in which certain packets are fired. - // Lower numbers increase the speed but might be rejected by servers. - // default: 10 - // Must be inclusively between 1 and 1000 - interaction-rate: 10 - // Enables right-clicking in recipe books/villager trading to swiftly craft/trade. - // default: true - enable-quick-craft: true - // This option will treat the hotbar as a separate scope. - // This means that pushing the inventory or sorting the main inventory will not affect the hotbar and vice-versa. - // default: true - hotbar-scope: true - // Enables using armor/elytra items to swap them with the currently equipped item. - // default: true - enable-quick-armor-swapping: true - } - scrolling: { - // Enables scrolling of stacks - // default: true - enable: true - // Invert the scroll direction when scrolling items - // default: false - invert: false - // If enabled items will be moved according to whether your scrolling up or down. - // If disabled you will scroll to change the amount of items present (up will increase - down will decrease - // default: true - directional-scrolling: true - // Sets whether to by default scroll items - // out of the creative menu. - // default: true - scroll-creative-menu-items: true - // Sets whether creative mode tabs can - // be switched by scrolling over them. - // default: true - scroll-creative-menu-tabs: true - } - // Change sort modes. Existing sort modes are ALPHABET, RAW_ID and QUANTITY - sort: { - // Sets the sort mode for normal sorting. - // default: raw_id - primary-sort: raw_id - // Sets the sort mode for sorting whilst pressing shift. - // default: quantity - shift-sort: quantity - // Sets the sort mode for sorting whilst pressing control. - // default: alphabet - control-sort: alphabet - } - // Configure refill related stuff here. - refill: { - // Refills stacks in the off hand - // default: true - off-hand: true - // Refill when eating items - // default: true - eat: true - // Refill when dropping items - // default: true - drop: true - // Refill when using up items - // default: true - use: true - // Refill on other occasions - // default: true - other: true - // Enable/Disable specific rules for how to refill items - rules: { - // Tries to find any block items - // default: false - any-block: false - // Find items of the same item group - // default: false - itemgroup: false - // Try to find similar items through the item type hierarchy - // default: false - item-hierarchy: false - // Try to find similar block items through the block type hierarchy - // default: false - block-hierarchy: false - // Try to find other food items - // default: false - food: false - // Try to find equal items (no nbt matching) - // default: true - equal-items: true - // Try to find equal stacks (nbt matching - // default: true - equal-stacks: true - } - } - // Configure picking the correct tool for the currently faced block. - tool-picking: { - // Pick correct tool when middle clicking whilst holding a tool. - // default: true - hold-tool: true - // Pick correct tool when middle clicking whilst holding the same block as faced. - // default: false - hold-block: false - // Allows picking tools from the inventory. - // If disabled picking will only happen from the hotbar. - // default: true - pick-from-inventory: true - } +{ + // General settings + general: { + // Sets the interval in milliseconds in which certain packets are fired. + // Lower numbers increase the speed but might be rejected by servers. + // default: 10 + // Must be inclusively between 1 and 1000 + interaction-rate: 10 + // Enables right-clicking in recipe books/villager trading to swiftly craft/trade. + // default: true + enable-quick-craft: true + // This option will treat the hotbar as a separate scope. + // This means that pushing the inventory or sorting the main inventory will not affect the hotbar and vice-versa. + // default: true + hotbar-scope: true + // Enables using armor/elytra items to swap them with the currently equipped item. + // default: true + enable-quick-armor-swapping: true + } + scrolling: { + // Enables scrolling of stacks + // default: true + enable: true + // Invert the scroll direction when scrolling items + // default: false + invert: false + // If enabled items will be moved according to whether your scrolling up or down. + // If disabled you will scroll to change the amount of items present (up will increase - down will decrease + // default: true + directional-scrolling: true + // Sets whether to by default scroll items + // out of the creative menu. + // default: true + scroll-creative-menu-items: true + // Sets whether creative mode tabs can + // be switched by scrolling over them. + // default: true + scroll-creative-menu-tabs: true + } + // Change sort modes. Existing sort modes are ALPHABET, RAW_ID and QUANTITY + sort: { + // Sets the sort mode for normal sorting. + // default: raw_id + primary-sort: raw_id + // Sets the sort mode for sorting whilst pressing shift. + // default: quantity + shift-sort: quantity + // Sets the sort mode for sorting whilst pressing control. + // default: alphabet + control-sort: alphabet + } + // Configure refill related stuff here. + refill: { + // Refills stacks in the off hand + // default: true + off-hand: true + // Refill when eating items + // default: true + eat: true + // Refill when dropping items + // default: true + drop: true + // Refill when using up items + // default: true + use: true + // Refill on other occasions + // default: true + other: true + // Enable/Disable specific rules for how to refill items + rules: { + // Tries to find any block items + // default: false + any-block: false + // Find items of the same item group + // default: false + itemgroup: false + // Try to find similar items through the item type hierarchy + // default: false + item-hierarchy: false + // Try to find similar block items through the block type hierarchy + // default: false + block-hierarchy: false + // Try to find other food items + // default: false + food: false + // Try to find equal items (no nbt matching) + // default: true + equal-items: true + // Try to find equal stacks (nbt matching + // default: true + equal-stacks: true + } + } + // Configure picking the correct tool for the currently faced block. + tool-picking: { + // Pick correct tool when middle clicking whilst holding a tool. + // default: true + hold-tool: true + // Pick correct tool when middle clicking whilst holding the same block as faced. + // default: false + hold-block: false + // Allows picking tools from the inventory. + // If disabled picking will only happen from the hotbar. + // default: true + pick-from-inventory: true + } } \ No newline at end of file diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt index 977a8df..6e59c03 100644 --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -1,103 +1,103 @@ -#CONFIG ONLY OPTIONS -ignoreUpdate:324 -settingsButton:false -allowWrongWorldTeleportation:false -differentiateByServerAddress:true -debugEntityIcons:false -debugEntityVariantIds:false -#INGAME SETTINGS (DO NOT EDIT!) -updateNotification:false -minimap:false -caveMaps:0 -caveZoom:0 -showWaypoints:true -showIngameWaypoints:true -displayRedstone:true -deathpoints:true -oldDeathpoints:true -distance:1 -showCoords:true -lockNorth:true -zoom:0 -minimapSize:169 -chunkGrid:8 -slimeChunks:false -mapSafeMode:false -minimapOpacity:100.0 -waypointsIngameIconScale:0 -waypointsIngameDistanceScale:0 -waypointsIngameNameScale:0 -waypointsIngameCloseScale:1.0 -antiAliasing:false -blockColours:0 -lighting:true -dotsStyle:0 -dotNameScale:1.0 -compassOverWaypoints:false -showBiome:false -showFlowers:true -keepWaypointNames:false -waypointsDistanceExp:0 -waypointsDistanceMin:0.0 -defaultWaypointTPCommandFormat:/tppos {x} {y} {z} -defaultWaypointTPCommandRotationFormat:/tppos {x} {y} {z} {yaw} ~ -arrowScale:1.0 -arrowColour:0 -smoothDots:false -worldMap:true -terrainDepth:true -terrainSlopes:2 -mainEntityAs:0 -blockTransparency:true -waypointOpacityIngame:80 -waypointOpacityMap:90 -hideWorldNames:1 -openSlimeSettings:true -alwaysShowDistance:false -showLightLevel:0 -renderLayerIndex:1 -crossDimensionalTp:true -showTime:0 -biomeColorsVanillaMode:false -lookingAtAngle:20 -lookingAtAngleVertical:180 -centeredEnlarged:false -zoomedOutEnlarged:false -minimapTextAlign:0 -showAngles:false -waypointsMutualEdit:true -compassLocation:1 -compassScale:1 -caveMapsDepth:13 -hideWaypointCoordinates:false -renderAllSets:false -playerArrowOpacity:100 -waypointsBottom:false -minimapShape:0 -lightOverlayType:-1 -lightOverlayMaxLight:7 -lightOverlayMinLight:0 -lightOverlayColor:13 -uiScale:0 -bossHealthPushBox:1 -potionEffectPushBox:1 -minimapFrame:0 -minimapFrameColor:9 -compassColor:9 -northCompassColor:-1 -showDimensionName:false -displayMultipleWaypointInfo:1 -entityRadar:true -adjustHeightForCarpetLikeBlocks:true -autoConvertWaypointDistanceToKmThreshold:10000 -waypointDistancePrecision:1 -mainDotSize:2 -partialYTeleportation:true -deleteReachedDeathpoints:true -hideMinimapUnderScreen:true -interface:dummy:0:36:true:false:false:false -interface:dummy:0:10000:true:false:false:false -interface:dummy:0:0:false:false:true:false -interface:dummy:0:36:true:false:false:false -interface:gui.xaero_minimap:0:0:false:false:true:false -#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints +#CONFIG ONLY OPTIONS +ignoreUpdate:324 +settingsButton:false +allowWrongWorldTeleportation:false +differentiateByServerAddress:true +debugEntityIcons:false +debugEntityVariantIds:false +#INGAME SETTINGS (DO NOT EDIT!) +updateNotification:false +minimap:false +caveMaps:0 +caveZoom:0 +showWaypoints:true +showIngameWaypoints:true +displayRedstone:true +deathpoints:true +oldDeathpoints:true +distance:1 +showCoords:true +lockNorth:true +zoom:0 +minimapSize:169 +chunkGrid:8 +slimeChunks:false +mapSafeMode:false +minimapOpacity:100.0 +waypointsIngameIconScale:0 +waypointsIngameDistanceScale:0 +waypointsIngameNameScale:0 +waypointsIngameCloseScale:1.0 +antiAliasing:false +blockColours:0 +lighting:true +dotsStyle:0 +dotNameScale:1.0 +compassOverWaypoints:false +showBiome:false +showFlowers:true +keepWaypointNames:false +waypointsDistanceExp:0 +waypointsDistanceMin:0.0 +defaultWaypointTPCommandFormat:/tppos {x} {y} {z} +defaultWaypointTPCommandRotationFormat:/tppos {x} {y} {z} {yaw} ~ +arrowScale:1.0 +arrowColour:0 +smoothDots:false +worldMap:true +terrainDepth:true +terrainSlopes:2 +mainEntityAs:0 +blockTransparency:true +waypointOpacityIngame:80 +waypointOpacityMap:90 +hideWorldNames:1 +openSlimeSettings:true +alwaysShowDistance:false +showLightLevel:0 +renderLayerIndex:1 +crossDimensionalTp:true +showTime:0 +biomeColorsVanillaMode:false +lookingAtAngle:20 +lookingAtAngleVertical:180 +centeredEnlarged:false +zoomedOutEnlarged:false +minimapTextAlign:0 +showAngles:false +waypointsMutualEdit:true +compassLocation:1 +compassScale:1 +caveMapsDepth:13 +hideWaypointCoordinates:false +renderAllSets:false +playerArrowOpacity:100 +waypointsBottom:false +minimapShape:0 +lightOverlayType:-1 +lightOverlayMaxLight:7 +lightOverlayMinLight:0 +lightOverlayColor:13 +uiScale:0 +bossHealthPushBox:1 +potionEffectPushBox:1 +minimapFrame:0 +minimapFrameColor:9 +compassColor:9 +northCompassColor:-1 +showDimensionName:false +displayMultipleWaypointInfo:1 +entityRadar:true +adjustHeightForCarpetLikeBlocks:true +autoConvertWaypointDistanceToKmThreshold:10000 +waypointDistancePrecision:1 +mainDotSize:2 +partialYTeleportation:true +deleteReachedDeathpoints:true +hideMinimapUnderScreen:true +interface:dummy:0:36:true:false:false:false +interface:dummy:0:10000:true:false:false:false +interface:dummy:0:0:false:false:true:false +interface:dummy:0:36:true:false:false:false +interface:gui.xaero_minimap:0:0:false:false:true:false +#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints diff --git a/config/xaeropatreon.txt b/config/xaeropatreon.txt index 7ec0105..3fd8762 100644 --- a/config/xaeropatreon.txt +++ b/config/xaeropatreon.txt @@ -1 +1 @@ -showCapes:false +showCapes:false diff --git a/config/xaeroworldmap.txt b/config/xaeroworldmap.txt index a98ac2b..1eb5e79 100644 --- a/config/xaeroworldmap.txt +++ b/config/xaeroworldmap.txt @@ -1,32 +1,32 @@ -ignoreUpdate:128 -updateNotification:false -differentiateByServerAddress:true -netherlikeCaveMapAllowed:true -debug:false -lighting:true -colours:0 -loadChunks:true -updateChunks:true -terrainSlopes:2 -terrainDepth:true -footsteps:true -flowers:true -coordinates:true -biomeColorsVanillaMode:false -waypoints:true -renderArrow:true -displayZoom:true -worldmapWaypointsScale:1.0 -openMapAnimation:false -reloadVersion:0 -reloadEverything:false -zoomButtons:true -waypointBackgrounds:true -detectAmbiguousY:true -showDisabledWaypoints:false -closeWaypointsWhenHopping:true -adjustHeightForCarpetLikeBlocks:true -onlyCurrentMapWaypoints:false -minZoomForLocalWaypoints:0.0 -arrowColour:-2 -globalVersion:18 +ignoreUpdate:128 +updateNotification:false +differentiateByServerAddress:true +netherlikeCaveMapAllowed:true +debug:false +lighting:true +colours:0 +loadChunks:true +updateChunks:true +terrainSlopes:2 +terrainDepth:true +footsteps:true +flowers:true +coordinates:true +biomeColorsVanillaMode:false +waypoints:true +renderArrow:true +displayZoom:true +worldmapWaypointsScale:1.0 +openMapAnimation:false +reloadVersion:0 +reloadEverything:false +zoomButtons:true +waypointBackgrounds:true +detectAmbiguousY:true +showDisabledWaypoints:false +closeWaypointsWhenHopping:true +adjustHeightForCarpetLikeBlocks:true +onlyCurrentMapWaypoints:false +minZoomForLocalWaypoints:0.0 +arrowColour:-2 +globalVersion:18 diff --git a/index.toml b/index.toml index 1e831af..6e0d3fe 100644 --- a/index.toml +++ b/index.toml @@ -219,4 +219,4 @@ metafile = true [[files]] file = "options.txt" -hash = "3f6ffc5a88f8ae3c983529484757570f8ceaaf00b458e8d64cc1b9dcfb8d0efd" +hash = "9583692ac517a572ee40201f8f207a0e9a91e98a061379decd425a07587131e2" diff --git a/pack.toml b/pack.toml index 5ec0c5f..dfcaf67 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.0.0" [index] file = "index.toml" hash-format = "sha256" -hash = "910c2e7443f3f3ac95acc4c1e5489f8e18b71f85b660b369dbfc64d41abd1b26" +hash = "ffd9441fe241f68048ed1b2f93402f51a034b1b2029fe0d608e56a3aebec9497" [versions] fabric = "0.13.3"