feat: use xaero's map

2023-12-09 14:29:03 +01:00 · 2023-12-09 14:29:03 +01:00 · 723a19dd0b
parent 599f843ffa
commit 723a19dd0b
5 changed files with 457 additions and 17 deletions
--- a/src/overrides/config/xaerominimap.txt
+++ b/src/overrides/config/xaerominimap.txt
@ -0,0 +1,133 @@
+#CONFIG ONLY OPTIONS
+ignoreUpdate:0
+settingsButton:false
+allowWrongWorldTeleportation:false
+differentiateByServerAddress:true
+debugEntityIcons:false
+debugEntityVariantIds:false
+radarHideInvisibleEntities:true
+allowInternetAccess:true
+#INGAME SETTINGS (DO NOT EDIT!)
+updateNotification:true
+minimap:true
+caveMaps:2
+caveZoom:1
+showWaypoints:true
+showIngameWaypoints:true
+displayRedstone:true
+deathpoints:true
+oldDeathpoints:false
+distance:1
+lockNorth:true
+zoom:0
+minimapSize:0
+chunkGrid:-1
+slimeChunks:false
+mapSafeMode:false
+minimapOpacity:100.0
+waypointsIngameIconScale:0
+waypointsIngameDistanceScale:0
+waypointsIngameNameScale:0
+waypointsIngameCloseScale:1.0
+antiAliasing:true
+blockColours:0
+lighting:true
+dotsStyle:0
+dotNameScale:1.0
+compassOverEverything:true
+showFlowers:true
+keepWaypointNames:true
+waypointsDistanceExp:0
+waypointsDistanceMin:0.0
+defaultWaypointTPCommandFormat:/tp @s {x} {y} {z}
+defaultWaypointTPCommandRotationFormat:/tp @s {x} {y} {z} {yaw} ~
+arrowScale:1.5
+arrowColour:0
+smoothDots:true
+worldMap:true
+terrainDepth:true
+terrainSlopes:2
+mainEntityAs:0
+blockTransparency:true
+waypointOpacityIngame:80
+waypointOpacityMap:90
+hideWorldNames:1
+openSlimeSettings:true
+alwaysShowDistance:false
+crossDimensionalTp:true
+biomeColorsVanillaMode:false
+lookingAtAngle:10
+lookingAtAngleVertical:180
+centeredEnlarged:false
+zoomOnEnlarged:2
+minimapTextAlign:2
+waypointsMutualEdit:true
+compassLocation:1
+compassDirectionScale:0
+caveMapsDepth:30
+hideWaypointCoordinates:false
+renderAllSets:false
+playerArrowOpacity:100
+waypointsBottom:false
+minimapShape:0
+lightOverlayType:0
+lightOverlayMaxLight:7
+lightOverlayMinLight:0
+lightOverlayColor:1
+uiScale:0
+bossHealthPushBox:1
+potionEffectPushBox:1
+minimapFrame:2
+minimapFrameColor:0
+compassColor:9
+northCompassColor:-1
+displayMultipleWaypointInfo:1
+entityRadar:true
+adjustHeightForCarpetLikeBlocks:true
+autoConvertWaypointDistanceToKmThreshold:10000
+waypointDistancePrecision:1
+mainDotSize:2
+partialYTeleportation:true
+deleteReachedDeathpoints:true
+hideMinimapUnderScreen:true
+hideMinimapUnderF3:true
+manualCaveModeStartAuto:true
+manualCaveModeStart:-1
+chunkGridLineWidth:1
+temporaryWaypointsGlobal:true
+keepUnlockedWhenEnlarged:false
+enlargedMinimapAToggle:false
+displayStainedGlass:true
+waypointOnMapScale:0
+switchToAutoOnDeath:true
+infoDisplayBackgroundOpacity:40
+caveModeToggleTimer:1000
+legibleCaveMaps:false
+biomeBlending:true
+displayTrackedPlayers:true
+dimensionScaledMaxWaypointDistance:true
+displayClaims:true
+displayCurrentClaim:true
+claimsFillOpacity:46
+claimsBorderOpacity:80
+infoDisplayOrder:coords:overworld_coords:chunk_coords:angles:dimension:biome:weather:light_level:time:real_time:highlights:light_overlay_indicator:manual_cave_mode_indicator:custom_sub_world
+infoDisplay:coords:true:15:-1
+infoDisplay:overworld_coords:false:15:-1
+infoDisplay:chunk_coords:false:15:-1
+infoDisplay:angles:false:15:-1
+infoDisplay:dimension:false:15:-1
+infoDisplay:biome:true:15:-1
+infoDisplay:weather:false:15:-1
+infoDisplay:light_level:1:15:-1
+infoDisplay:time:0:15:-1
+infoDisplay:real_time:0:15:-1
+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: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:gui.xaero_minimap:0:0:false:false:true:false
+#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints
--- a/src/overrides/config/xaeroworldmap.txt
+++ b/src/overrides/config/xaeroworldmap.txt
@ -0,0 +1,55 @@
+ignoreUpdate:0
+updateNotification:true
+allowInternetAccess:true
+differentiateByServerAddress:true
+caveMapsAllowed:true
+debug:false
+lighting:true
+colours:0
+loadChunks:true
+updateChunks:true
+terrainSlopes:2
+terrainDepth:true
+footsteps:true
+flowers:true
+coordinates:true
+hoveredBiome:true
+biomeColorsVanillaMode:false
+waypoints:true
+renderArrow:true
+displayZoom:true
+worldmapWaypointsScale:1.0
+openMapAnimation:true
+reloadVersion:0
+reloadEverything:false
+zoomButtons:true
+waypointBackgrounds:true
+detectAmbiguousY:true
+showDisabledWaypoints:false
+closeWaypointsWhenHopping:true
+adjustHeightForCarpetLikeBlocks:true
+onlyCurrentMapWaypoints:false
+minZoomForLocalWaypoints:0.0
+arrowColour:-2
+minimapRadar:true
+renderWaypoints:true
+partialYTeleportation:true
+displayStainedGlass:true
+caveModeDepth:30
+caveModeStart:2147483647
+autoCaveMode:-1
+legibleCaveMaps:true
+displayCaveModeStart:true
+caveModeToggleTimer:1000
+defaultCaveModeType:1
+biomeBlending:true
+trackedPlayers:true
+multipleImagesExport:false
+nightExport:false
+highlightsExport:false
+exportScaleDownSquare:20
+mapWritingDistance:-1
+displayClaims:true
+claimsFillOpacity:46
+claimsBorderOpacity:80
+globalVersion:1
--- a/src/overrides/defaultconfigs/ftbchunks/client-config.snbt
+++ b/src/overrides/defaultconfigs/ftbchunks/client-config.snbt
@ -0,0 +1,222 @@
+# Default config file that will be copied to local/ftbchunks/client-config.snbt if it doesn't exist!
+# Just copy any values you wish to override in here!
+
+{
+	# Biome blend
+	# Default: "blend_5x5"
+	# Valid values: "none", "blend_3x3", "blend_5x5", "blend_7x7", "blend_9x9", "blend_11x11", "blend_13x13", "blend_15x15"
+	biome_blend: "blend_5x5"
+	
+	# Chunk grid overlay in large map
+	# Default: false
+	chunk_grid: false
+	
+	# Show claimed chunks on the map
+	# Default: true
+	claimed_chunks_on_map: true
+	
+	# Automatically remove death waypoints if closer than this many blocks away (distance of 0 disables removal)
+	# Default: 0
+	# Range: 0 ~ 2147483647
+	death_waypoint_autoremove_distance: 0
+	
+	# Enables creation of death waypoints
+	# Default: true
+	death_waypoints: true
+	
+	# Enables debug info
+	# Default: false
+	debug_info: false
+	
+	# Advanced option. Foliage darkness
+	# Default: 50
+	# Range: 0 ~ 255
+	foliage_darkness: 50
+	
+	# Advanced option. Grass darkness
+	# Default: 50
+	# Range: 0 ~ 255
+	grass_darkness: 50
+	
+	# Show waypoints in world
+	# Default: true
+	in_world_waypoints: true
+	
+	# Different ways to render map
+	# Default: "none"
+	# Valid values: "none", "night", "topography", "blocks", "light_sources"
+	map_mode: "none"
+	
+	# Advanced option. Change how often the minimap will refresh icons
+	# Default: 500
+	# Range: 0 ~ 10000
+	minimap_icon_update_timer: 500
+	
+	# Noise added to map to make it look less plastic
+	# Default: 0.05
+	# Range: 0.0 ~ 0.5
+	noise: 0.05d
+	
+	# Only show entities that are on the surface
+	# Default: true
+	only_surface_entities: true
+	
+	# Show your own claimed chunks on the map
+	# Default: true
+	own_claimed_chunks_on_map: true
+	
+	# Reduces color palette to 256 colors
+	# Default: false
+	reduced_color_palette: false
+	
+	# Advanced option. How often map render update will be queued
+	# Default: 60
+	# Range: 1 ~ 600
+	rerender_queue_ticks: 60
+	
+	# Color intensity
+	# Default: 1.0
+	# Range: 0.0 ~ 1.0
+	saturation: 1.0d
+	
+	# Shadow intensity
+	# Default: 0.1
+	# Range: 0.0 ~ 0.3
+	shadows: 0.1d
+	
+	# Advanced option. Max tasks that can queue up
+	# Default: 100
+	# Range: 1 ~ 10000
+	task_queue_max: 100
+	
+	# Advanced option. How often queued tasks will run
+	# Default: 4
+	# Range: 1 ~ 300
+	task_queue_ticks: 4
+	
+	# How many blocks should height checks skip in water. 0 means flat water, ignoring terrain
+	# Default: 8
+	# Range: 0 ~ 128
+	water_height_factor: 8
+	
+	# Advanced option. Water visibility
+	# Default: 220
+	# Range: 0 ~ 255
+	water_visibility: 220
+	
+	# Distance at which waypoint dots start to fade
+	# Default: 1.0
+	# Range: 1.0 ~ 200.0
+	waypoint_dot_fade_distance: 1.0d
+	
+	# Distance at which waypoint beacons start to fade
+	# Default: 12.0
+	# Range: 1.0 ~ 200.0
+	waypoint_fade_distance: 12.0d
+	memory: {
+		# When the large map is closed, auto-release least recently accessed regions down to this number (0 disables releasing)
+		# Default: 32
+		# Range: 0 ~ 2147483647
+		autorelease_on_map_close: 32
+		
+		# Constrain maximum map zoom-out based on number of explored regions and available memory
+		# Default: true
+		max_zoom_constraint: true
+		
+		# Periodically release region data for non-recently-used regions to save memory (units of seconds, 0 disables releasing
+		# Default: 300
+		# Range: 0 ~ 2147483647
+		region_release_time: 300
+	}
+	minimap: {
+		# Show biome under minimap
+		# Default: true
+		biome: true
+		
+		# Blurs minimap
+		# Default: "auto"
+		# Valid values: "auto", "on", "off"
+		blur_mode: "auto"
+		
+		# Adds NWSE compass inside minimap
+		# Default: true
+		compass: true
+		
+		# Enable minimap
+		# Default: true
+        # NTX4-MZTE
+		enabled: false
+		
+		# Show entities on minimap
+		# Default: true
+		entities: true
+		
+		# Show entity heads on minimap
+		# Default: true
+		entity_heads: true
+		
+		# Entities in minimap will be larger
+		# Default: false
+		large_entities: false
+		
+		# Minimap will not rotate
+		# Default: true
+		locked_north: true
+		
+		# Show player heads on minimap
+		# Default: true
+		player_heads: true
+		
+		# Enables minimap to show up in corner
+		# Default: "top_right"
+		# Valid values: "bottom_left", "left", "top_left", "top_right", "right", "bottom_right"
+		position: "top_right"
+		
+		# Applied a conditional check to the offset. When set to anything other that None, the offset will apply only to the selected minimap position.
+		# When set to none and the maps offset is greater than 0, the offset will apply to all directions
+		# Default: "none"
+		# Valid values: "bottom_left", "left", "top_left", "top_right", "right", "bottom_right", "none"
+		position_offset_condition: "none"
+		
+		# Changes the maps X offset from it's origin point. When on the Left, the map will be pushed out from the left, then from the right when on the right.
+		# Default: 0
+		# Range: -∞ ~ +∞
+		position_offset_x: 0
+		
+		# Changes the maps X offset from it's origin point. When on the Left, the map will be pushed out from the left, then from the right when on the right.
+		# Default: 0
+		# Range: -∞ ~ +∞
+		position_offset_y: 0
+		
+		# Scale of minimap
+		# Default: 1.0
+		# Range: 0.25 ~ 4.0
+		scale: 1.0d
+		
+		# Draw a square minimap instead of a circular one
+		# Default: false
+		square: false
+		
+		# Minimap visibility
+		# Default: 255
+		# Range: 0 ~ 255
+		visibility: 255
+		
+		# Show waypoints on minimap
+		# Default: true
+		waypoints: true
+		
+		# Show XYZ under minimap
+		# Default: true
+		xyz: true
+		
+		# Show zone (claimed chunk or wilderness) under minimap
+		# Default: true
+		zone: true
+		
+		# Zoom distance of the minimap
+		# Default: 1.0
+		# Range: 1.0 ~ 4.0
+		zoom: 1.0d
+	}
+}
--- a/src/overrides/options.txt
+++ b/src/overrides/options.txt
@ -111,7 +111,7 @@ key_key.hotbar.9:key.keyboard.9
 key_key.the_bumblezone.beehemoth_up:key.keyboard.space
 key_key.the_bumblezone.beehemoth_down:key.keyboard.space
 key_key.ftbteams.open_gui:key.keyboard.unknown
-key_key.ftbchunks.map:key.keyboard.m
+key_key.ftbchunks.map:key.keyboard.unknown
 key_key.ftbchunks.minimap.zoomIn:key.keyboard.equal
 key_key.ftbchunks.minimap.zoomOut:key.keyboard.minus
 key_key.ftbchunks.add_waypoint:key.keyboard.unknown
@ -166,6 +166,9 @@ key_key.hexerei.book_hovering_recipe:key.keyboard.r
 key_key.hexerei.glasses_zoom:key.keyboard.z
 key_placebo.toggleWings:key.keyboard.keypad.8
 key_key.shrink.shrink:key.keyboard.g
+key_key.dankstorage.construction:key.keyboard.i
+key_key.dankstorage.lock_slot:key.keyboard.left.control
+key_key.dankstorage.pickup_mode:key.keyboard.o
 key_key.buildinggadgets.settings_menu:key.keyboard.g
 key_key.buildinggadgets.range:key.keyboard.r
 key_key.buildinggadgets.undo:key.keyboard.u
@ -173,17 +176,14 @@ key_key.buildinggadgets.anchor:key.keyboard.h
 key_key.buildinggadgets.fuzzy:key.keyboard.unknown
 key_key.buildinggadgets.connected_area:key.keyboard.unknown
 key_key.buildinggadgets.rotate_mirror:key.keyboard.unknown
-key_key.buildinggadgets.material_list:key.keyboard.m
-key_key.dankstorage.construction:key.keyboard.i
-key_key.dankstorage.lock_slot:key.keyboard.left.control
-key_key.dankstorage.pickup_mode:key.keyboard.o
+key_key.buildinggadgets.material_list:key.keyboard.unknown
 key_key.mekanismadditions.voice:key.keyboard.u
 key_key.industrialforegoing.backpack.desc:key.keyboard.unknown
 key_key.botania_corporea_request:key.keyboard.c
 key_key.curios.open.desc:key.keyboard.g
 key_key.ftbultimine:key.keyboard.grave.accent
-key_key.control:key.keyboard.left.control
 key_key.spirit.toggle:key.keyboard.v
+key_key.control:key.keyboard.left.control
 key_framedblocks.key.update_cull:key.keyboard.f9
 key_framedblocks.key.wipe_cache:key.keyboard.unknown
 key_key.toms_storage.open_terminal:key.keyboard.b
@ -223,19 +223,18 @@ key_key.ars_nouveau.qc7:key.keyboard.unknown
 key_key.ars_nouveau.qc8:key.keyboard.unknown
 key_key.ars_nouveau.qc9:key.keyboard.unknown
 key_key.ars_nouveau.qc10:key.keyboard.unknown
+key_key.drawMahoujin:key.keyboard.unknown
+key_key.changeMysticCode:key.keyboard.y
+key_key.settingsGUI:key.keyboard.period
+key_key.selectiveDisplacement:key.keyboard.h
 key_key.control_energy:key.keyboard.unknown
 key_key.control_potential:key.keyboard.unknown
 key_key.control_stability:key.keyboard.unknown
 key_key.control_void:key.keyboard.unknown
 key_key.crossroads.control_zoom:key.keyboard.unknown
 key_key.prop_pack_boost:key.keyboard.left.control
-key_key.drawMahoujin:key.keyboard.m
-key_key.changeMysticCode:key.keyboard.y
-key_key.settingsGUI:key.keyboard.period
-key_key.selectiveDisplacement:key.keyboard.h
 key_bloodmagic.keybind.cycle_holding_pos:key.keyboard.unknown
 key_bloodmagic.keybind.cycle_holding_neg:key.keyboard.unknown
-key_psimisc.keybind:key.keyboard.c
 key_key.waila.config:key.keyboard.keypad.0
 key_key.waila.show_overlay:key.keyboard.keypad.1
 key_key.waila.toggle_liquid:key.keyboard.keypad.2
@ -243,18 +242,16 @@ key_key.waila.narrate:key.keyboard.keypad.6
 key_key.waila.show_details:key.keyboard.left.shift
 key_key.waila.show_recipes:key.keyboard.keypad.3
 key_key.waila.show_uses:key.keyboard.keypad.4
+key_psimisc.keybind:key.keyboard.c
 key_key.unmountVehicle:key.keyboard.backslash
 key_key.electrodynamics.jetpackascend:key.keyboard.space
-key_key.electrodynamics.jetpackmode:key.keyboard.m
+key_key.electrodynamics.jetpackmode:key.keyboard.unknown
 key_key.electrodynamics.togglenvgs:key.keyboard.n
 key_key.electrodynamics.servoleggingsmode:key.keyboard.l
 key_key.electrodynamics.toggleservoleggings:key.keyboard.k
-key_pneumaticcraft.armor.upgrade.compressedcreativity.mechanical_visor:key.keyboard.unknown
-key_key.integrateddynamics.logic_programmer_focus_search:key.keyboard.f:ALT
-key_key.integrateddynamics.logic_programmer_open_rename:key.keyboard.r:ALT
 key_key.push_to_talk:key.keyboard.caps.lock
 key_key.whisper:key.keyboard.unknown
-key_key.mute_microphone:key.keyboard.m
+key_key.mute_microphone:key.keyboard.unknown
 key_key.disable_voice_chat:key.keyboard.n
 key_key.hide_icons:key.keyboard.h
 key_key.voice_chat:key.keyboard.v
@ -262,9 +259,33 @@ key_key.voice_chat_settings:key.keyboard.unknown
 key_key.voice_chat_group:key.keyboard.g
 key_key.voice_chat_toggle_recording:key.keyboard.unknown
 key_key.voice_chat_adjust_volumes:key.keyboard.unknown
+key_key.integrateddynamics.logic_programmer_focus_search:key.keyboard.f:ALT
+key_key.integrateddynamics.logic_programmer_open_rename:key.keyboard.r:ALT
+key_pneumaticcraft.armor.upgrade.compressedcreativity.mechanical_visor:key.keyboard.unknown
 key_key.modularrouters.configure:key.keyboard.c
 key_key.modularrouters.moduleInfo:key.keyboard.i
 key_pneumaticcraft.armor.upgrade.core_components:key.keyboard.unknown
+key_gui.xaero_switch_waypoint_set:key.keyboard.unknown
+key_gui.xaero_instant_waypoint:key.keyboard.keypad.add
+key_gui.xaero_toggle_slime:key.keyboard.unknown
+key_gui.xaero_toggle_grid:key.keyboard.unknown
+key_gui.xaero_toggle_waypoints:key.keyboard.unknown
+key_gui.xaero_toggle_map_waypoints:key.keyboard.unknown
+key_gui.xaero_toggle_map:key.keyboard.unknown
+key_gui.xaero_enlarge_map:key.keyboard.z
+key_gui.xaero_waypoints_key:key.keyboard.u
+key_gui.xaero_zoom_in:key.keyboard.unknown
+key_gui.xaero_zoom_out:key.keyboard.unknown
+key_gui.xaero_new_waypoint:key.keyboard.b
+key_gui.xaero_display_all_sets:key.keyboard.unknown
+key_gui.xaero_toggle_light_overlay:key.keyboard.unknown
+key_gui.xaero_toggle_entity_radar:key.keyboard.unknown
+key_gui.xaero_reverse_entity_radar:key.keyboard.unknown
+key_gui.xaero_toggle_manual_cave_mode:key.keyboard.unknown
+key_gui.xaero_alternative_list_players:key.keyboard.unknown
+key_gui.xaero_toggle_tracked_players:key.keyboard.unknown
+key_gui.xaero_toggle_pac_chunk_claims:key.keyboard.unknown
+key_gui.xaero_minimap_settings:key.keyboard.y
 key_pneumaticcraft.armor.upgrade.block_tracker:key.keyboard.unknown
 key_pneumaticcraft.armor.upgrade.entity_tracker:key.keyboard.unknown
 key_pneumaticcraft.armor.upgrade.search:key.keyboard.unknown
@ -296,6 +317,12 @@ key_key.draconicevolution.dislocator_blink:key.keyboard.unknown
 key_key.draconicevolution.dislocator_gui:key.keyboard.unknown
 key_key.draconicevolution.dislocator_up:key.keyboard.unknown
 key_key.draconicevolution.dislocator_down:key.keyboard.unknown
+key_gui.xaero_open_map:key.keyboard.m
+key_gui.xaero_open_settings:key.keyboard.right.bracket
+key_gui.xaero_map_zoom_in:key.keyboard.unknown
+key_gui.xaero_map_zoom_out:key.keyboard.unknown
+key_gui.xaero_quick_confirm:key.keyboard.right.shift
+key_gui.xaero_toggle_dimension:key.keyboard.unknown
 key_key.supercircuitmaker.open_palette:key.keyboard.left.alt
 key_key.supercircuitmaker.component_placement_modifier:key.keyboard.left.control
 key_tetra.toolbelt.binding.access:key.keyboard.b
--- a/src/pack.rkt
+++ b/src/pack.rkt
@ -180,4 +180,7 @@
  (mod "https://maven.tilera.xyz/net/anvilcraft/anvillib-18-forge/1.1.0/anvillib-18-forge-1.1.0.jar")
  (mod "https://maven.tilera.xyz/com/cursedcauldron/wildbackport-forge/2.1.0/wildbackport-forge-2.1.0.jar")
  (mod "https://maven.tilera.xyz/net/anvilcraft/ntx4core/ntx4core/1.1.0/ntx4core-1.1.0.jar")
-  (mod "https://s3.tilera.xyz/cdn/minecraft/mods/hexcasting/hexcasting-forge-1.18.2-0.9.6.jar"))
+  (mod "https://s3.tilera.xyz/cdn/minecraft/mods/hexcasting/hexcasting-forge-1.18.2-0.9.6.jar")
+  ;; MZTE fork additions
+  (mod "https://cdn.modrinth.com/data/NcUtCpym/versions/AJD2gqOd/XaerosWorldMap_1.37.3_Forge_1.18.2.jar")
+  (mod "https://cdn.modrinth.com/data/1bokaNcj/versions/gyxRW7KS/Xaeros_Minimap_23.9.3_Forge_1.18.2.jar"))