diff --git a/.gitignore b/.gitignore index 03ab3ad..c81d48b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,25 @@ # block files that are not needed .minecraft/.bobby .minecraft/.fabric +.minecraft/.mixin.out +.minecraft/.replay .minecraft/config .minecraft/coremods .minecraft/crash-reports .minecraft/essential +.minecraft/figura .minecraft/logs .minecraft/ModTranslations .minecraft/not-enough-crashes .minecraft/patched_shaders +.minecraft/replay_recordings .minecraft/resourcepacks .minecraft/saves .minecraft/screenshots .minecraft/server-resource-packs .minecraft/shaderpacks .minecraft/texturepacks +.minecraft/XaeroW* .minecraft/realms_persistence.json .minecraft/usercache.json .minecraft/whitelist.json @@ -24,11 +29,8 @@ .minecraft/servers.dat_old -fabrilous-updater-*.jar -/instance.cfg -/.packignore -/natives !.minecraft/config/yosbr/* +fabrilous-updater-*.jar *.disabled update-pack.data/.* @@ -36,3 +38,6 @@ update-pack.data/*/ update-pack.data/update.sh update-pack.data/busybox.exe +instance.cfg +.packignore +natives diff --git a/.minecraft/config/yosbr/config/hudtweaks.json b/.minecraft/config/yosbr/config/hudtweaks.json new file mode 100644 index 0000000..1a523af --- /dev/null +++ b/.minecraft/config/yosbr/config/hudtweaks.json @@ -0,0 +1,259 @@ +{ + "minecraft:hotbar": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:title": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:hunger": { + "forceDisplay": false, + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:tooltip": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:air": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:subtitle": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:armor": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:expbar": { + "forceDisplay": false, + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:mounthealth": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:bossbar": { + "maxHeight": 0.33333334, + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:actionbar": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:health": { + "flipped": false, + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:jumpbar": { + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + }, + "minecraft:statuseffects": { + "vertical": false, + "xPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "yPos": { + "posType": "default", + "parent": "minecraft:screen", + "anchorPos": 0.0, + "relativePos": 0.0, + "offset": 0.0 + }, + "xScale": 1.0, + "yScale": 1.0 + } +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/inventoryhud.json b/.minecraft/config/yosbr/config/inventoryhud.json new file mode 100644 index 0000000..998ce84 --- /dev/null +++ b/.minecraft/config/yosbr/config/inventoryhud.json @@ -0,0 +1,71 @@ +{ + "inv_toggle": true, + "inv_mini": false, + "inv_vert": false, + "inv_alpha": 0, + "inv_hide_b_g": false, + "inv_aminated": false, + "pot_toggle": true, + "pot_alpha": 100, + "pot_gap": 0, + "pot_mini": false, + "bar_duration": 300, + "pot_hor": true, + "arm_toggle": true, + "arm_above": 100, + "arm_view": "percentage", + "move_all": true, + "show_empty": true, + "show_armor": true, + "show_main": true, + "show_off": true, + "show_arrows": true, + "show_inv": true, + "arm_bars": true, + "arm_scale": 100, + "show_count": false, + "inv_x": 160, + "inv_y": 52, + "inv_val": "BOTTOM", + "inv_hal": "RIGHT", + "pot_x": 30, + "pot_y": 0, + "pot_val": "CENTER", + "pot_hal": "LEFT", + "arm_x": 0, + "arm_y": 70, + "arm_val": "BOTTOM", + "arm_hal": "MIDDLE", + "helm_x": 103, + "helm_y": 54, + "chest_x": 103, + "chest_y": 37, + "leg_x": -103, + "leg_y": 54, + "boots_x": -103, + "boots_y": 37, + "main_x": 103, + "main_y": 71, + "off_x": -103, + "off_y": 71, + "arr_x": 103, + "arr_y": 20, + "inv_icon_x": -103, + "inv_icon_y": 20, + "helm_hal": "MIDDLE", + "chest_hal": "MIDDLE", + "leg_hal": "MIDDLE", + "boots_hal": "MIDDLE", + "main_hal": "MIDDLE", + "off_hal": "MIDDLE", + "arr_hal": "MIDDLE", + "inv_icon_hal": "MIDDLE", + "helm_val": "BOTTOM", + "chest_val": "BOTTOM", + "leg_val": "BOTTOM", + "boots_val": "BOTTOM", + "main_val": "BOTTOM", + "off_val": "BOTTOM", + "arr_val": "BOTTOM", + "inv_icon_val": "BOTTOM" +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/iris.properties b/.minecraft/config/yosbr/config/iris.properties new file mode 100644 index 0000000..18a83c1 --- /dev/null +++ b/.minecraft/config/yosbr/config/iris.properties @@ -0,0 +1,5 @@ +#This file stores configuration options for Iris, such as the currently active shaderpack +#Sun Jan 16 15:06:30 PST 2022 +maxShadowRenderDistance=32 +shaderPack= +enableShaders=true diff --git a/.minecraft/config/yosbr/config/libgui.json5 b/.minecraft/config/yosbr/config/libgui.json5 new file mode 100644 index 0000000..219ed6f --- /dev/null +++ b/.minecraft/config/yosbr/config/libgui.json5 @@ -0,0 +1,4 @@ +{ + // Whether dark mode should be enabled. Will only affect Vanilla-styled GUIs. + "darkMode": false +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/replaymod.json b/.minecraft/config/yosbr/config/replaymod.json new file mode 100644 index 0000000..d10af1f --- /dev/null +++ b/.minecraft/config/yosbr/config/replaymod.json @@ -0,0 +1,65 @@ +{ + "core": { + "notifications": true + }, + "advanced": { + "recordingPath": "./.replay/recordings/", + "cachePath": "./.replay/cache/", + "renderPath": "./.replay/videos/", + "skipPostRenderGui": false, + "askForOpenEye": true, + "skipPostScreenshotGui": false, + "fullBrightness": "replaymod.gui.settings.fullbrightness.gamma", + "fullBrightness_valid_values": [ + "replaymod.gui.settings.fullbrightness.gamma", + "replaymod.gui.settings.fullbrightness.nightvision", + "replaymod.gui.settings.fullbrightness.both" + ] + }, + "recording": { + "recordSingleplayer": true, + "recordServer": true, + "indicator": false, + "autoStartRecording": true, + "autoPostProcess": true, + "renameDialog": true + }, + "replay": { + "showChat": true, + "showServerIPs": true, + "camera": "replaymod.camera.classic", + "camera_valid_values": [ + "replaymod.camera.classic", + "replaymod.camera.vanilla" + ], + "mainMenuButton": "DEFAULT", + "mainMenuButton_valid_values": [ + "BIG", + "DEFAULT", + "TOP_LEFT", + "TOP_RIGHT", + "LEFT_OF_SINGLEPLAYER", + "RIGHT_OF_SINGLEPLAYER", + "LEFT_OF_MULTIPLAYER", + "RIGHT_OF_MULTIPLAYER", + "LEFT_OF_REALMS", + "RIGHT_OF_REALMS", + "LEFT_OF_MODS", + "RIGHT_OF_MODS" + ] + }, + "render": { + "frameTimeFromWorldTime": false + }, + "simplepathing": { + "pathpreview": true, + "autosync": true, + "timelineLength": 1800, + "interpolator": "replaymod.gui.editkeyframe.interpolator.catmullrom.name", + "interpolator_valid_values": [ + "replaymod.gui.editkeyframe.interpolator.catmullrom.name", + "replaymod.gui.editkeyframe.interpolator.cubic.name", + "replaymod.gui.editkeyframe.interpolator.linear.name" + ] + } +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/roughlyenoughitems/config.json5 b/.minecraft/config/yosbr/config/roughlyenoughitems/config.json5 new file mode 100644 index 0000000..245ea2e --- /dev/null +++ b/.minecraft/config/yosbr/config/roughlyenoughitems/config.json5 @@ -0,0 +1,155 @@ +{ + "basics": { + "favorites": [], + // Declares whether cheating mode is on. + "cheating": false, + "favoritesEnabled": true, + "keyBindings": { + "recipeKeybind": { + "keyCode": "key.keyboard.r", + "modifier": 2 + }, + "usageKeybind": { + "keyCode": "key.keyboard.u", + "modifier": 2 + }, + "hideKeybind": { + "keyCode": "key.keyboard.o", + "modifier": 2 + }, + "previousPageKeybind": { + "keyCode": "key.keyboard.unknown", + "modifier": 0 + }, + "nextPageKeybind": { + "keyCode": "key.keyboard.unknown", + "modifier": 0 + }, + "focusSearchFieldKeybind": { + "keyCode": "key.keyboard.unknown", + "modifier": 0 + }, + "copyRecipeIdentifierKeybind": { + "keyCode": "key.mouse.middle", + "modifier": 0 + }, + "favoriteKeybind": { + "keyCode": "key.keyboard.a", + "modifier": 2 + }, + "exportImageKeybind": { + "keyCode": "key.keyboard.f8", + "modifier": 0 + }, + "previousScreenKeybind": { + "keyCode": "key.keyboard.backspace", + "modifier": 0 + } + }, + // Declares whether REI is visible. + "overlayVisible": true, + "cheatingStyle": "GRAB", + "motion": { + "favoritesAnimation": true + } + }, + "advanced": { + "filtering": { + "shouldFilterDisplays": true, + "filteringRules": [ + "{id:\"roughlyenoughitems:manual\",rule:{}}" + ], + "filteredStacks": [] + }, + "enableJeiCompatibilityLayer": true, + "tooltips": { + // Declares whether REI should append mod names to entries. + "appendModNames": true, + // Declares whether favorites tooltip should be displayed. + "displayFavoritesTooltip": false + }, + "layout": { + // The ordering of the items on the entry panel. + "entryPanelOrdering": "REGISTRY_ASCENDING", + // Declares the maximum amount of recipes displayed in a page if possible. + "maxRecipesPerPage": 8, + // Declares the maximum amount of recipes displayed in a page if possible. + "maxRecipesPageHeight": 300, + // Declares whether entry rendering time should be debugged. + "debugRenderTimeRequired": false, + // Merges displays with equal contents under 1 display. + "mergeDisplayUnderOne": true + }, + "accessibility": { + "entrySize": 1.0, + // Declares the position of the entry panel. + "displayPanelLocation": "RIGHT", + // Declares whether scrolled entry panel should snap to rows. + "snapToRows": false, + // Declares how the scrollbar in composite screen should act. + "compositeScrollBarPermanent": false, + "toastDisplayedOnCopyIdentifier": true, + // Declares whether REI should use compact tabs for categories. + "useCompactTabs": true + }, + "search": { + // Declares whether search time should be debugged. + "debugSearchTimeRequired": false, + // Declares whether REI should search async. + "asyncSearch": true, + // Declares how many entries should be grouped one async search. + "asyncSearchPartitionSize": 100, + "tooltipSearch": "ALWAYS", + "tagSearch": "PREFIX", + "identifierSearch": "ALWAYS", + "modSearch": "PREFIX" + }, + "commands": { + // Declares the command used to change gamemode. + "gamemodeCommand": "/gamemode {gamemode}", + // Declares the command used in servers to cheat items. + "giveCommand": "/give {player_name} {item_identifier}{nbt} {count}", + // Declares the command used to change weather. + "weatherCommand": "/weather {weather}" + }, + "miscellaneous": { + // Declares whether arrows in containers should be clickable. + "clickableRecipeArrows": true, + "registerRecipesInAnotherThread": true, + "newFastEntryRendering": true + } + }, + "appearance": { + "recipeScreenType": "COMPOSITE", + // Declares the appearance of REI windows. + "theme": "LIGHT", + "layout": { + // Declares the position of the search field. + "searchFieldLocation": "CENTER", + // Declares the position of the config button. + "configButtonLocation": "LOWER", + // Declares whether the craftable filter button is enabled. + "enableCraftableOnlyButton": false + }, + // Declares the appearance of recipe's border. + "recipeBorder": "DEFAULT", + // Declares whether entry panel is scrolled. + "scrollingEntryListWidget": false, + "horizontalEntriesBoundaries": 1.0, + "verticalEntriesBoundaries": 1.0, + "horizontalEntriesBoundariesColumns": 50, + "verticalEntriesBoundariesRows": 1000, + "favoritesHorizontalEntriesBoundaries": 1.0, + "favoritesHorizontalEntriesBoundariesColumns": 50, + "syntaxHighlightingMode": "COLORFUL" + }, + "functionality": { + // Declares whether REI should remove the recipe book. + "disableRecipeBook": false, + // Declares whether mob effects should be on the left side instead of the right side. + "leftSideMobEffects": false, + // Declares whether subsets is enabled. + "isSubsetsEnabled": false, + "allowInventoryHighlighting": true + } +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/sodium-extra-options.json b/.minecraft/config/yosbr/config/sodium-extra-options.json new file mode 100644 index 0000000..3f9402f --- /dev/null +++ b/.minecraft/config/yosbr/config/sodium-extra-options.json @@ -0,0 +1,51 @@ +{ + "animation_settings": { + "animation": true, + "animate_water": true, + "animate_lava": true, + "animate_fire": true, + "animate_portal": true, + "block_animations": true + }, + "particle_settings": { + "particles": true, + "rain_splash": true, + "explosion": true, + "water": true, + "smoke": true, + "potion": true, + "portal": true, + "redstone": true, + "drip": true, + "firework": true, + "bubble": true, + "environment": true, + "villagers": true, + "composter": true, + "block_break": true, + "block_breaking": true + }, + "detail_settings": { + "rain_snow": true, + "biome_colors": true, + "sky_colors": true + }, + "render_settings": { + "fog_distance": 0, + "light_updates": true, + "item_frame": true, + "armor_stand": true, + "painting": true, + "piston": true + }, + "extra_settings": { + "show_fps": false, + "show_coords": false, + "reduce_resolution_on_mac": true, + "cloud_height": 192, + "toasts": false, + "instant_sneak": false, + "prevent_shaders": false, + "use_fast_random": true + } +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/sodium-extra.properties b/.minecraft/config/yosbr/config/sodium-extra.properties new file mode 100644 index 0000000..dde224b --- /dev/null +++ b/.minecraft/config/yosbr/config/sodium-extra.properties @@ -0,0 +1,7 @@ +# This is the configuration file for Sodium Extra. +# This file exists for debugging purposes and should not be configured otherwise. +# +# You can find information on editing this file and all the available options here: +# https://github.com/FlashyReese/sodium-extra-fabric/wiki/Configuration-File +# +# By default, this file will be empty except for this notice. diff --git a/.minecraft/config/yosbr/config/sodium-mixins.properties b/.minecraft/config/yosbr/config/sodium-mixins.properties new file mode 100644 index 0000000..2c04ad8 --- /dev/null +++ b/.minecraft/config/yosbr/config/sodium-mixins.properties @@ -0,0 +1,6 @@ +# This is the configuration file for Sodium. +# +# You can find information on editing this file and all the available options here: +# https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File +# +# By default, this file will be empty except for this notice. diff --git a/.minecraft/config/yosbr/config/sodium-options.json b/.minecraft/config/yosbr/config/sodium-options.json new file mode 100644 index 0000000..dede9ea --- /dev/null +++ b/.minecraft/config/yosbr/config/sodium-options.json @@ -0,0 +1,26 @@ +{ + "quality": { + "weather_quality": "DEFAULT", + "leaves_quality": "DEFAULT", + "enable_vignette": true + }, + "advanced": { + "arena_memory_allocator": "ASYNC", + "allow_direct_memory_access": true, + "enable_memory_tracing": false, + "use_advanced_staging_buffers": true, + "cpu_render_ahead_limit": 3 + }, + "performance": { + "chunk_builder_threads": 0, + "always_defer_chunk_updates": false, + "animate_only_visible_textures": true, + "use_entity_culling": true, + "use_particle_culling": true, + "use_fog_occlusion": true, + "use_block_face_culling": true + }, + "notifications": { + "hide_donation_button": false + } +} \ No newline at end of file diff --git a/.minecraft/config/yosbr/config/xaerominimap_entities.json b/.minecraft/config/yosbr/config/xaerominimap_entities.json new file mode 100644 index 0000000..d3a1ade --- /dev/null +++ b/.minecraft/config/yosbr/config/xaerominimap_entities.json @@ -0,0 +1,151 @@ +{ + "hardInclude": "anything", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [ + "minecraft:item_frame" + ], + "name": "gui.xaero_entity_category_root", + "protection": true, + "settingOverrides": { + "displayed": true, + "heightBasedFade": true, + "renderOrder": 0.0, + "heightLimit": 20.0, + "names": 0.0, + "color": 13.0, + "displayNameWhenIconFails": true, + "entityNumber": 1000.0, + "alwaysDisplayNametags": false, + "dotSize": 2.0, + "icons": 1.0, + "iconScale": 1.0 + }, + "subCategories": [ + { + "hardInclude": "living", + "includeList": [], + "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": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_players", + "protection": true, + "settingOverrides": { + "renderOrder": 6.0, + "color": 15.0 + }, + "subCategories": [ + { + "hardInclude": "same-team", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_same_team", + "protection": true, + "settingOverrides": {}, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_other_teams", + "protection": true, + "settingOverrides": { + "renderOrder": 7.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "hostile", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile", + "protection": true, + "settingOverrides": { + "renderOrder": 3.0 + }, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_hostile_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 5.0 + }, + "subCategories": [] + } + ] + }, + { + "hardInclude": "anything", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly", + "protection": true, + "settingOverrides": {}, + "subCategories": [ + { + "hardInclude": "tamed", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_friendly_tamed", + "protection": true, + "settingOverrides": { + "renderOrder": 4.0 + }, + "subCategories": [] + } + ] + } + ] + }, + { + "hardInclude": "items", + "includeList": [], + "excludeMode": "ONLY", + "excludeList": [], + "name": "gui.xaero_entity_category_items", + "protection": true, + "settingOverrides": { + "renderOrder": 1.0, + "color": 12.0 + }, + "subCategories": [] + }, + { + "hardInclude": "anything", + "includeList": [], + "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/.minecraft/config/yosbr/config/xaeropatreon.txt b/.minecraft/config/yosbr/config/xaeropatreon.txt new file mode 100644 index 0000000..da260c5 --- /dev/null +++ b/.minecraft/config/yosbr/config/xaeropatreon.txt @@ -0,0 +1 @@ +showCapes:true diff --git a/.minecraft/config/yosbr/config/xaeroworldmap.txt b/.minecraft/config/yosbr/config/xaeroworldmap.txt new file mode 100644 index 0000000..c229027 --- /dev/null +++ b/.minecraft/config/yosbr/config/xaeroworldmap.txt @@ -0,0 +1,32 @@ +ignoreUpdate:0 +updateNotification:true +differentiateByServerAddress:true +netherlikeCaveMapAllowed:true +debug:false +lighting:true +colours:0 +loadChunks:true +updateChunks:true +terrainSlopes:2 +terrainDepth:true +footsteps:true +flowers:true +compression:false +coordinates: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 +globalVersion:1 diff --git a/.minecraft/config/yosbr/options.amecsapi.txt b/.minecraft/config/yosbr/options.amecsapi.txt new file mode 100644 index 0000000..1c3b764 --- /dev/null +++ b/.minecraft/config/yosbr/options.amecsapi.txt @@ -0,0 +1,100 @@ +key_modifiers_key.attack:0,0,0 +key_modifiers_key.use:0,0,0 +key_modifiers_key.forward:0,0,0 +key_modifiers_key.left:0,0,0 +key_modifiers_key.back:0,0,0 +key_modifiers_key.right:0,0,0 +key_modifiers_key.jump:0,0,0 +key_modifiers_key.sneak:0,0,0 +key_modifiers_key.sprint:0,0,0 +key_modifiers_key.drop:0,0,0 +key_modifiers_key.inventory:0,0,0 +key_modifiers_key.chat:0,0,0 +key_modifiers_key.playerlist:0,0,0 +key_modifiers_key.pickItem:0,0,0 +key_modifiers_key.command:0,0,0 +key_modifiers_key.socialInteractions:0,0,0 +key_modifiers_key.screenshot:0,0,0 +key_modifiers_key.togglePerspective:0,0,0 +key_modifiers_key.smoothCamera:0,0,0 +key_modifiers_key.fullscreen:0,0,0 +key_modifiers_key.spectatorOutlines:0,0,0 +key_modifiers_key.swapOffhand:0,0,0 +key_modifiers_key.saveToolbarActivator:0,0,0 +key_modifiers_key.loadToolbarActivator:0,0,0 +key_modifiers_key.advancements:0,0,0 +key_modifiers_key.hotbar.1:0,0,0 +key_modifiers_key.hotbar.2:0,0,0 +key_modifiers_key.hotbar.3:0,0,0 +key_modifiers_key.hotbar.4:0,0,0 +key_modifiers_key.hotbar.5:0,0,0 +key_modifiers_key.hotbar.6:0,0,0 +key_modifiers_key.hotbar.7:0,0,0 +key_modifiers_key.hotbar.8:0,0,0 +key_modifiers_key.hotbar.9:0,0,0 +key_modifiers_key.firstperson.toggle:0,0,0 +key_modifiers_key.blockmeter.assign:0,0,0 +key_modifiers_key.blockmeter.menu:0,0,0 +key_modifiers_key.entityculling.toggle:0,0,0 +key_modifiers_figura.config.action_wheel_button:0,0,0 +key_modifiers_figura.config.player_popup_button:0,0,0 +key_modifiers_figura.config.panic_button:0,0,0 +key_modifiers_key.grid.showhide:0,0,0 +key_modifiers_key.grid.here:0,0,0 +key_modifiers_key.grid.fixy:0,0,0 +key_modifiers_key.grid.spawns:0,0,0 +key_modifiers_key.grid.settings:0,0,0 +key_modifiers_key.inventoryhud.toggle:0,0,0 +key_modifiers_key.inventoryhud.openconfig:0,0,0 +key_modifiers_key.inventoryhud.togglepot:0,0,0 +key_modifiers_key.inventoryhud.togglearm:0,0,0 +key_modifiers_key.inventoryhud.toggleall:0,0,0 +key_modifiers_iris.keybind.reload:0,0,0 +key_modifiers_iris.keybind.toggleShaders:0,0,0 +key_modifiers_iris.keybind.shaderPackSelection:0,0,0 +key_modifiers_key.lightoverlay.enable_overlay:0,0,0 +key_modifiers_key.minecraftcapes.gui:0,0,0 +key_modifiers_key.mousewheelie.open_config_screen:0,0,0 +key_modifiers_key.mousewheelie.sort_inventory:0,0,0 +key_modifiers_key.mousewheelie.scroll_up:0,0,0 +key_modifiers_key.mousewheelie.scroll_down:0,0,0 +key_modifiers_key.mousewheelie.pick_tool:0,0,0 +key_modifiers_nimble.keybind.frontView:0,0,0 +key_modifiers_key.blockmixer.toggleslot:0,0,0 +key_modifiers_key.blockmixer.increaseratio:0,0,0 +key_modifiers_key.blockmixer.decreaseratio:0,0,0 +key_modifiers_key.okzoomer.zoom:0,0,0 +key_modifiers_key.okzoomer.decrease_zoom:0,0,0 +key_modifiers_key.okzoomer.increase_zoom:0,0,0 +key_modifiers_key.okzoomer.reset_zoom:0,0,0 +key_modifiers_key.perspectivemod.toggle:0,0,0 +key_modifiers_key.plasmo_voice.settings:0,0,0 +key_modifiers_gui.xaero_switch_waypoint_set:0,0,0 +key_modifiers_gui.xaero_instant_waypoint:0,0,0 +key_modifiers_gui.xaero_toggle_slime:0,0,0 +key_modifiers_gui.xaero_toggle_grid:0,0,0 +key_modifiers_gui.xaero_toggle_waypoints:0,0,0 +key_modifiers_gui.xaero_toggle_map_waypoints:0,0,0 +key_modifiers_gui.xaero_toggle_map:0,0,0 +key_modifiers_gui.xaero_enlarge_map:0,0,0 +key_modifiers_gui.xaero_waypoints_key:0,0,0 +key_modifiers_gui.xaero_zoom_in:0,0,0 +key_modifiers_gui.xaero_zoom_out:0,0,0 +key_modifiers_gui.xaero_new_waypoint:0,0,0 +key_modifiers_gui.xaero_display_all_sets:0,0,0 +key_modifiers_gui.xaero_toggle_light_overlay:0,0,0 +key_modifiers_gui.xaero_toggle_entity_radar:0,0,0 +key_modifiers_gui.xaero_reverse_entity_radar:0,0,0 +key_modifiers_gui.xaero_minimap_settings:0,0,0 +key_modifiers_gui.xaero_open_map:0,0,0 +key_modifiers_gui.xaero_open_settings:0,0,0 +key_modifiers_gui.xaero_map_zoom_in:0,0,0 +key_modifiers_gui.xaero_map_zoom_out:0,0,0 +key_modifiers_gui.xaero_quick_confirm:0,0,0 +key_modifiers_keybind.name.ESSENTIAL_FRIENDS:0,0,0 +key_modifiers_keybind.name.COSMETIC_STUDIO:0,0,0 +key_modifiers_keybind.name.COSMETICS_VISIBILITY_TOGGLE:0,0,0 +key_modifiers_keybind.name.ADD_FRIEND:0,0,0 +key_modifiers_keybind.name.CHAT_PEEK:0,0,0 +key_modifiers_keybind.name.INVITE_FRIENDS:0,0,0 +key_modifiers_keybind.name.ZOOM:0,0,0 diff --git a/.minecraft/config/yosbr/options.txt b/.minecraft/config/yosbr/options.txt new file mode 100644 index 0000000..49217b6 --- /dev/null +++ b/.minecraft/config/yosbr/options.txt @@ -0,0 +1,81 @@ +version:2865 +autoJump:false +guiScale:2 +graphicsMode:1 +tutorialStep:find_tree +key_key.fullscreen:key.keyboard.f11 +key_key.saveToolbarActivator:key.keyboard.unknown +key_key.loadToolbarActivator:key.keyboard.unknown +key_key.advancements:key.keyboard.l +key_key.blockmeter.assign:key.keyboard.unknown +key_key.blockmeter.menu:key.keyboard.unknown +key_figura.config.action_wheel_button:key.keyboard.unknown +key_figura.config.player_popup_button:key.keyboard.unknown +key_figura.config.panic_button:key.keyboard.unknown +key_key.grid.showhide:key.keyboard.unknown +key_key.grid.here:key.keyboard.unknown +key_key.grid.fixy:key.keyboard.unknown +key_key.grid.spawns:key.keyboard.unknown +key_key.grid.settings:key.keyboard.unknown +key_key.inventoryhud.toggle:key.keyboard.i +key_key.inventoryhud.openconfig:key.keyboard.unknown +key_key.inventoryhud.togglepot:key.keyboard.unknown +key_key.inventoryhud.togglearm:key.keyboard.unknown +key_key.inventoryhud.toggleall:key.keyboard.unknown +key_iris.keybind.reload:key.keyboard.r +key_iris.keybind.toggleShaders:key.keyboard.k +key_iris.keybind.shaderPackSelection:key.keyboard.o +key_key.lightoverlay.enable_overlay:key.keyboard.f7 +key_key.minecraftcapes.gui:key.keyboard.j +key_key.mousewheelie.open_config_screen:key.keyboard.unknown +key_key.mousewheelie.sort_inventory:key.mouse.middle +key_key.mousewheelie.scroll_up:key.amecsapi.mouse.scroll.up +key_key.mousewheelie.scroll_down:key.amecsapi.mouse.scroll.down +key_key.mousewheelie.pick_tool:key.keyboard.unknown +key_nimble.keybind.frontView:key.keyboard.unknown +key_key.blockmixer.toggleslot:key.keyboard.unknown +key_key.blockmixer.increaseratio:key.keyboard.unknown +key_key.blockmixer.decreaseratio:key.keyboard.unknown +key_key.okzoomer.zoom:key.keyboard.c +key_key.okzoomer.decrease_zoom:key.amecsapi.mouse.scroll.up +key_key.okzoomer.increase_zoom:key.amecsapi.mouse.scroll.down +key_key.okzoomer.reset_zoom:key.keyboard.unknown +key_key.perspectivemod.toggle:key.keyboard.f4 +key_key.plasmo_voice.settings:key.keyboard.v +key_gui.xaero_switch_waypoint_set:key.keyboard.unknown +key_gui.xaero_instant_waypoint:key.keyboard.unknown +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.unknown +key_gui.xaero_zoom_in:key.keyboard.keypad.subtract +key_gui.xaero_zoom_out:key.keyboard.keypad.add +key_gui.xaero_new_waypoint:key.keyboard.unknown +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_minimap_settings:key.keyboard.y +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_keybind.name.ESSENTIAL_FRIENDS:key.keyboard.unknown +key_keybind.name.COSMETIC_STUDIO:key.keyboard.unknown +key_keybind.name.COSMETICS_VISIBILITY_TOGGLE:key.keyboard.unknown +key_keybind.name.ADD_FRIEND:key.keyboard.unknown +key_keybind.name.CHAT_PEEK:key.keyboard.unknown +key_keybind.name.INVITE_FRIENDS:key.keyboard.unknown +key_keybind.name.ZOOM:key.keyboard.unknown +soundCategory_music:0.0 +modelPart_cape:true +modelPart_jacket:true +modelPart_left_sleeve:true +modelPart_right_sleeve:true +modelPart_left_pants_leg:true +modelPart_right_pants_leg:true +modelPart_hat:true diff --git a/.minecraft/mods/PerspectiveModRedux-1.17-0.0.5_01.jar b/.minecraft/mods/PerspectiveModRedux-1.17-0.0.5_01.jar new file mode 100644 index 0000000..46b5fb3 Binary files /dev/null and b/.minecraft/mods/PerspectiveModRedux-1.17-0.0.5_01.jar differ diff --git a/.minecraft/mods/XaerosWorldMap_1.19.1_Fabric_1.18.jar b/.minecraft/mods/XaerosWorldMap_1.19.1_Fabric_1.18.jar new file mode 100644 index 0000000..6d3ef13 Binary files /dev/null and b/.minecraft/mods/XaerosWorldMap_1.19.1_Fabric_1.18.jar differ diff --git a/.minecraft/mods/Xaeros_Minimap_FP21.23.1_Fabric_1.18.jar b/.minecraft/mods/Xaeros_Minimap_FP21.23.1_Fabric_1.18.jar new file mode 100644 index 0000000..c6c5721 Binary files /dev/null and b/.minecraft/mods/Xaeros_Minimap_FP21.23.1_Fabric_1.18.jar differ diff --git a/.minecraft/mods/firstperson-fabric-2.1.0-mc1.18-pre1.jar b/.minecraft/mods/firstperson-fabric-2.1.0-mc1.18-pre1.jar new file mode 100644 index 0000000..aaf04dc Binary files /dev/null and b/.minecraft/mods/firstperson-fabric-2.1.0-mc1.18-pre1.jar differ diff --git a/.minecraft/mods/notenoughanimations-fabric-1.4.0-mc1.18-pre1.jar b/.minecraft/mods/notenoughanimations-fabric-1.4.0-mc1.18-pre1.jar new file mode 100644 index 0000000..a6fc95f Binary files /dev/null and b/.minecraft/mods/notenoughanimations-fabric-1.4.0-mc1.18-pre1.jar differ diff --git a/update-pack.data/updater.sh b/update-pack.data/updater.sh index 66a7b78..3ff4b72 100644 --- a/update-pack.data/updater.sh +++ b/update-pack.data/updater.sh @@ -16,6 +16,5 @@ cd ../ update-pack.data/git/bin/git.exe config pull.rebase false update-pack.data/git/bin/git.exe pull origin 1.18 -update-pack.data/git/bin/git.exe branch -D main echo "[$0] If there were any errors, please inform the Modpack Author"