From 27b0f27848d09843c53045f4a3e4615ba1448ea7 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Thu, 10 Aug 2023 19:19:18 -0400 Subject: [PATCH] wip --- config/waila/waila.json | 72 ++++++------- config/waila/waila_plugins.json | 65 ++++++++++++ config/xaerominimap.txt | 22 ++-- config/xaerominimap_entities.json | 167 ++++++++++++++++++++++++++++++ config/xaeropatreon.txt | 2 +- config/xaeroworldmap.txt | 16 ++- index.toml | 17 ++- mods/ears.pw.toml | 13 +++ mods/sodium-extra.pw.toml | 14 --- mods/xaeros-minimap.pw.toml | 8 +- mods/xaeros-world-map.pw.toml | 8 +- pack.toml | 2 +- 12 files changed, 328 insertions(+), 78 deletions(-) mode change 100644 => 100755 config/waila/waila.json create mode 100644 config/waila/waila_plugins.json mode change 100644 => 100755 config/xaerominimap.txt create mode 100644 config/xaerominimap_entities.json mode change 100644 => 100755 config/xaeropatreon.txt mode change 100644 => 100755 config/xaeroworldmap.txt create mode 100644 mods/ears.pw.toml delete mode 100644 mods/sodium-extra.pw.toml diff --git a/config/waila/waila.json b/config/waila/waila.json old mode 100644 new mode 100755 index 8709bf9..4a77927 --- a/config/waila/waila.json +++ b/config/waila/waila.json @@ -1,41 +1,41 @@ { - "general": { - "displayTooltip": true, - "shiftForDetails": true, - "hideShiftText": false, - "displayMode": "TOGGLE", - "hideFromPlayerList": true, - "hideFromDebug": true, - "enableTextToSpeech": false, - "rateLimit": 250 - }, - "overlay": { - "position": { - "align": { - "x": "CENTER", - "y": "TOP" - }, - "anchor": { - "x": "CENTER", - "y": "TOP" - }, - "x": 0, - "y": 0, - "bossBarsOverlap": false + "general": { + "displayTooltip": true, + "shiftForDetails": true, + "hideShiftText": false, + "displayMode": "TOGGLE", + "hideFromPlayerList": true, + "hideFromDebug": true, + "enableTextToSpeech": false, + "rateLimit": 250 + }, + "overlay": { + "position": { + "align": { + "x": "CENTER", + "y": "TOP" }, - "color": { - "backgroundAlpha": 0, - "themes": [], - "activeTheme": "waila:vanilla" + "anchor": { + "x": "CENTER", + "y": "TOP" }, - "scale": 1.0 + "x": 0, + "y": 0, + "bossBarsOverlap": false }, - "formatter": { - "modName": "§9§o%s", - "blockName": "§f%s", - "fluidName": "§f%s", - "entityName": "§f%s", - "registryName": "§8%s" + "color": { + "backgroundAlpha": 0, + "themes": [], + "activeTheme": "waila:vanilla" }, - "configVersion": 1 - } \ No newline at end of file + "scale": 1.0 + }, + "formatter": { + "modName": "§9§o%s", + "blockName": "§f%s", + "fluidName": "§f%s", + "entityName": "§f%s", + "registryName": "§8%s" + }, + "configVersion": 1 +} \ No newline at end of file diff --git a/config/waila/waila_plugins.json b/config/waila/waila_plugins.json new file mode 100644 index 0000000..ce99c5c --- /dev/null +++ b/config/waila/waila_plugins.json @@ -0,0 +1,65 @@ +{ + "waila": { + "show_blocks": true, + "show_fluids": false, + "show_entities": true, + "show_icon": true, + "icon_position": "MIDDLE", + "show_mod_name": true, + "show_item_mod_name": true, + "show_registry": true + }, + "minecraft": { + "item_entity": true, + "pet.owner": true, + "pet.hide_unknown_owner": false, + "attribute.block_position": false, + "attribute.block_state": true, + "attribute.entity_position": false, + "attribute.health": true, + "attribute.absorption": true, + "attribute.armor": true, + "attribute.compact": false, + "attribute.icon_per_line": 25, + "attribute.long_health_max": 100, + "attribute.long_armor_max": 100, + "attribute.horse_jump_height": true, + "attribute.horse_speed": true, + "jukebox.record": true, + "timer.grow": true, + "timer.breed": true, + "override.invisible_entity": true, + "override.trapped_chest": false, + "override.powder_snow": true, + "override.infested": false, + "override.vehicle": true, + "breaking_progress.enabled": true, + "breaking_progress.color": -1426063361, + "breaking_progress.bottom_only": false, + "spawner_type": true, + "crop_progress": true, + "redstone.lever": true, + "redstone.repeater": true, + "redstone.comparator": true, + "redstone.level": true, + "player_head.name": true, + "level.composter": true, + "level.honey": true, + "note_block.type": true, + "note_block.note": "SHARP", + "note_block.int_value": false + }, + "wailax": { + "energy.enabled_block": true, + "energy.enabled_entity": true, + "fluid.enabled_block": true, + "fluid.enabled_entity": true, + "fluid.display_unit": "MILLIBUCKETS", + "progress.enabled_block": true, + "progress.enabled_entity": true, + "item.enabled_block": true, + "item.enabled_entity": true, + "item.nbt": true, + "item.max_height": 3 + } +} \ No newline at end of file diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt old mode 100644 new mode 100755 index 23bbe2e..318006d --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -36,7 +36,7 @@ dotNameScale:1.0 compassOverEverything:true showFlowers:true keepWaypointNames:true -waypointsDistanceExp:0 +waypointsDistanceExp:3 waypointsDistanceMin:0.0 defaultWaypointTPCommandFormat:/tp @s {x} {y} {z} defaultWaypointTPCommandRotationFormat:/tp @s {x} {y} {z} {yaw} ~ @@ -48,7 +48,7 @@ terrainDepth:true terrainSlopes:2 mainEntityAs:0 blockTransparency:true -waypointOpacityIngame:80 +waypointOpacityIngame:25 waypointOpacityMap:90 hideWorldNames:1 openSlimeSettings:true @@ -56,14 +56,14 @@ alwaysShowDistance:false renderLayerIndex:1 crossDimensionalTp:true biomeColorsVanillaMode:false -lookingAtAngle:10 -lookingAtAngleVertical:180 +lookingAtAngle:5 +lookingAtAngleVertical:5 centeredEnlarged:true zoomOnEnlarged:0 minimapTextAlign:0 waypointsMutualEdit:true compassLocation:1 -compassScale:1 +compassDirectionScale:0 caveMapsDepth:30 hideWaypointCoordinates:false renderAllSets:false @@ -84,7 +84,7 @@ northCompassColor:-1 displayMultipleWaypointInfo:1 entityRadar:true adjustHeightForCarpetLikeBlocks:true -autoConvertWaypointDistanceToKmThreshold:10000 +autoConvertWaypointDistanceToKmThreshold:1000 waypointDistancePrecision:1 mainDotSize:2 partialYTeleportation:true @@ -102,7 +102,9 @@ waypointOnMapScale:0 switchToAutoOnDeath:true infoDisplayBackgroundOpacity:45 caveModeToggleTimer:1000 -displayPacPlayers:true +legibleCaveMaps:false +biomeBlending:true +displayTrackedPlayers:true displayClaims:true displayCurrentClaim:true claimsFillOpacity:46 @@ -122,9 +124,9 @@ infoDisplay:highlights:true:15:-1 infoDisplay:light_overlay_indicator:true:15:-1 infoDisplay:manual_cave_mode_indicator:true:15:-1 infoDisplay:custom_sub_world:true:15:-1 +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:135:false:false:false:false -interface:dummy:120:0:true:false:false:false -interface:dummy:0:50:true:false:false:false +interface:dummy:0:36:true:false:false:false interface:gui.xaero_minimap:0:10000:false:false:false:false #WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json new file mode 100644 index 0000000..6a4f43b --- /dev/null +++ b/config/xaerominimap_entities.json @@ -0,0 +1,167 @@ +{ + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:glow_item_frame", + "minecraft:item_frame" + ], + "name": "gui.xaero_entity_category_root", + "protection": true, + "settingOverrides": { + "displayHeight": 0.0, + "displayed": true, + "heightBasedFade": true, + "renderOrder": 0.0, + "color": 13.0, + "displayNameWhenIconFails": true, + "entityNumber": 1000.0, + "alwaysDisplayNametags": false, + "startFadingAt": 0.0, + "dotSize": 2.0, + "renderOverMinimapFrame": 1.0, + "icons": 2.0, + "names": 0.0, + "heightLimit": 20.0, + "iconScale": 1.0 + }, + "subCategories": [ + { + "hardInclude": "living", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:armor_stand" + ], + "name": "gui.xaero_entity_category_living", + "protection": true, + "settingOverrides": { + "renderOrder": 2.0, + "color": 14.0 + }, + "subCategories": [ + { + "hardInclude": "players", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_players", + "protection": true, + "settingOverrides": { + "renderOrder": 6.0, + "heightLimit": 2050.0, + "color": 15.0 + }, + "subCategories": [ + { + "hardInclude": "same-team", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_same_team", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_teams", + "protection": true, + "settingOverrides": { + "renderOrder": 7.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "hostile", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile", + "protection": true, + "settingOverrides": { + "renderOrder": 3.0 + }, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 5.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly", + "protection": true, + "settingOverrides": {}, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 4.0 + }, + "subCategories": [] + } + ] + } + ] + }, + { + "hardInclude": "items", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_items", + "protection": true, + "settingOverrides": { + "renderOrder": 1.0, + "color": 12.0 + }, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "includeListInSuperCategory": true, + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_entities", + "protection": true, + "settingOverrides": { + "color": 5.0 + }, + "subCategories": [] + } + ] +} \ No newline at end of file diff --git a/config/xaeropatreon.txt b/config/xaeropatreon.txt old mode 100644 new mode 100755 index 3d8249e..7ec0105 --- a/config/xaeropatreon.txt +++ b/config/xaeropatreon.txt @@ -1 +1 @@ -showCapes:true +showCapes:false diff --git a/config/xaeroworldmap.txt b/config/xaeroworldmap.txt old mode 100644 new mode 100755 index 1b20182..862b7f7 --- a/config/xaeroworldmap.txt +++ b/config/xaeroworldmap.txt @@ -1,7 +1,7 @@ ignoreUpdate:0 updateNotification:true differentiateByServerAddress:true -netherlikeCaveMapAllowed:true +caveMapsAllowed:true debug:false lighting:true colours:0 @@ -21,7 +21,7 @@ worldmapWaypointsScale:1.0 openMapAnimation:true reloadVersion:0 reloadEverything:false -zoomButtons:true +zoomButtons:false waypointBackgrounds:true detectAmbiguousY:true showDisabledWaypoints:false @@ -32,9 +32,17 @@ minZoomForLocalWaypoints:0.0 arrowColour:-2 minimapRadar:true renderWaypoints:true -partialYTeleportation:true +partialYTeleportation:false displayStainedGlass:true -pacPlayers:true +caveModeDepth:30 +caveModeStart:2147483647 +autoCaveMode:-1 +legibleCaveMaps:false +displayCaveModeStart:true +caveModeToggleTimer:1000 +defaultCaveModeType:1 +biomeBlending:true +trackedPlayers:true displayClaims:true claimsFillOpacity:46 claimsBorderOpacity:80 diff --git a/index.toml b/index.toml index ef78dd2..d8c1199 100644 --- a/index.toml +++ b/index.toml @@ -24,12 +24,21 @@ file = "config/replaymod.json" [[files]] file = "config/roughlyenoughitems/config.json5" +[[files]] +file = "config/visuality.json" + [[files]] file = "config/waila/waila.json" +[[files]] +file = "config/waila/waila_plugins.json" + [[files]] file = "config/xaerominimap.txt" +[[files]] +file = "config/xaerominimap_entities.json" + [[files]] file = "config/xaeropatreon.txt" @@ -49,10 +58,6 @@ file = "icon.png" file = "mods/3dskinlayers.pw.toml" metafile = true -[[files]] -file = "mods/antighost.pw.toml" -metafile = true - [[files]] file = "mods/appleskin.pw.toml" metafile = true @@ -129,6 +134,10 @@ metafile = true file = "mods/dynamic-fps.pw.toml" metafile = true +[[files]] +file = "mods/ears.pw.toml" +metafile = true + [[files]] file = "mods/entityculling.pw.toml" metafile = true diff --git a/mods/ears.pw.toml b/mods/ears.pw.toml new file mode 100644 index 0000000..e6a0e0f --- /dev/null +++ b/mods/ears.pw.toml @@ -0,0 +1,13 @@ +name = "Ears (+ Snouts/Muzzles, Tails, Horns, Wings, and More)" +filename = "ears-fabric-1.20-1.4.6.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/mfzaZK3Z/versions/Lr5BTYBp/ears-fabric-1.20-1.4.6.jar" +hash-format = "sha1" +hash = "26316f8d2ee10a00fc438e068f24accd9f8c0ded" + +[update] +[update.modrinth] +mod-id = "mfzaZK3Z" +version = "Lr5BTYBp" diff --git a/mods/sodium-extra.pw.toml b/mods/sodium-extra.pw.toml deleted file mode 100644 index 439e324..0000000 --- a/mods/sodium-extra.pw.toml +++ /dev/null @@ -1,14 +0,0 @@ -name = "Sodium Extra" -filename = "sodium-extra-0.4.22+mc1.20.1-build.105.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/PtjYWJkn/versions/KFJPGpgu/sodium-extra-0.4.22%2Bmc1.20.1-build.105.jar" -hash-format = "sha1" -hash = "23eed8a2c46f4cd5ee601fe67100ee3f56ee0973" - -# TEMP DISABLED until Bobby is compatible with up-to-date Sodium -# [update] -# [update.modrinth] -# mod-id = "PtjYWJkn" -# version = "5KCYvoSI" diff --git a/mods/xaeros-minimap.pw.toml b/mods/xaeros-minimap.pw.toml index 3713105..4faa178 100644 --- a/mods/xaeros-minimap.pw.toml +++ b/mods/xaeros-minimap.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's Minimap" -filename = "Xaeros_Minimap_23.6.0_Fabric_1.20.jar" +filename = "Xaeros_Minimap_23.6.1_Fabric_1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/1bokaNcj/versions/2aWIxg96/Xaeros_Minimap_23.6.0_Fabric_1.20.jar" +url = "https://cdn.modrinth.com/data/1bokaNcj/versions/1DxAMjCv/Xaeros_Minimap_23.6.1_Fabric_1.20.jar" hash-format = "sha1" -hash = "0758807766b8eb0c53a35d8ad479d75269e4f24d" +hash = "54eba2b9dc604c662137c490bf7d160aab08804c" [update] [update.modrinth] mod-id = "1bokaNcj" -version = "2aWIxg96" +version = "1DxAMjCv" diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml index 0113051..b6f079e 100644 --- a/mods/xaeros-world-map.pw.toml +++ b/mods/xaeros-world-map.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's World Map" -filename = "XaerosWorldMap_1.31.0_Fabric_1.20.jar" +filename = "XaerosWorldMap_1.32.0_Fabric_1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/NcUtCpym/versions/hZzMR1av/XaerosWorldMap_1.31.0_Fabric_1.20.jar" +url = "https://cdn.modrinth.com/data/NcUtCpym/versions/RBZYvZJ4/XaerosWorldMap_1.32.0_Fabric_1.20.jar" hash-format = "sha1" -hash = "f9395c93e7b13f6c5bdcd4f515b80cb9fa584922" +hash = "9e25e722198fbb14eaf4261bdbbb2d44c1776509" [update] [update.modrinth] mod-id = "NcUtCpym" -version = "hZzMR1av" +version = "RBZYvZJ4" diff --git a/pack.toml b/pack.toml index 5b4cb4f..aa1e46a 100644 --- a/pack.toml +++ b/pack.toml @@ -1,6 +1,6 @@ name = "Evan's Pack" author = "Evan Pratten" -version = "1.0.1" +version = "1.0.2" pack-format = "packwiz:1.1.0" [index]