eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Initial bug fixes (#127)

Browse Source 
* Initial bug fixes

* fix compile error on non-mac

* Fix even more bugs

* Fix more

* fix more

* fix build

* fix build

* address review comments
This commit is contained in:
Geometrically
2023-06-02 07:09:46 -07:00
committed by GitHub
parent 9ea548cfe3
commit ee61951698
57 changed files with 3823 additions and 2813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
theseus_gui/src/pages/instance/Index.vue
View File

@@ -48,9 +48,13 @@
>
Loading...
</Button>
<!--TODO: https://github.com/tauri-apps/tauri/issues/4062 -->
<Button class="instance-button" icon-only @click="open({ defaultPath: instance.path })">
<Button
v-tooltip="'Open instance folder'"
class="instance-button"
@click="showInFolder(instance.path)"
>
<FolderOpenIcon />
Folder
</Button>
</span>
</Card>
@@ -104,8 +108,8 @@ import { process_listener, profile_listener } from '@/helpers/events'
import { useRoute } from 'vue-router'
import { ref, onUnmounted } from 'vue'
import { convertFileSrc } from '@tauri-apps/api/tauri'
import { open } from '@tauri-apps/api/dialog'
import { handleError, useBreadcrumbs, useLoading, useSearch } from '@/store/state'
import { showInFolder } from '@/helpers/utils.js'
const route = useRoute()
const searchStore = useSearch()
@@ -148,24 +152,17 @@ await checkProcess()
const stopInstance = async () => {
playing.value = false
try {
if (!uuid.value) {
const uuids = await get_uuids_by_profile_path(instance.value.path).catch(handleError)
uuid.value = uuids[0] // populate Uuid to listen for in the process_listener
uuids.forEach(async (u) => await kill_by_uuid(u).catch(handleError))
} else await kill_by_uuid(uuid.value).catch(handleError)
} catch (err) {
// Theseus currently throws:
// "Error launching Minecraft: Minecraft exited with non-zero code 1" error
// For now, we will catch and just warn
console.warn(err)
}
if (!uuid.value) {
const uuids = await get_uuids_by_profile_path(instance.value.path).catch(handleError)
uuid.value = uuids[0] // populate Uuid to listen for in the process_listener
uuids.forEach(async (u) => await kill_by_uuid(u).catch(handleError))
} else await kill_by_uuid(uuid.value).catch(handleError)
}
const unlistenProfiles = await profile_listener(async (event) => {
if (event.path === route.params.id) {
instance.value = await get(route.params.id).catch(handleError)
searchStore.instanceContext = instance.value
}
})

11
theseus_gui/src/pages/instance/Logs.vue
View File

@@ -30,10 +30,9 @@
</div>
</div>
<div ref="logContainer" class="log-text">
<!-- {{ logs[1] }}-->
<div v-for="line in logs[selectedLogIndex]?.stdout.split('\n')" :key="line" class="no-wrap">
{{ line }}
</div>
<span v-for="line in logs[selectedLogIndex]?.stdout.split('\n')" :key="line" class="no-wrap">
{{ line }} <br />
</span>
</div>
</Card>
</template>
@@ -210,5 +209,9 @@ onUnmounted(() => {
overflow: auto;
white-space: normal;
color-scheme: dark;
.no-wrap {
white-space: pre;
}
}
</style>

102
theseus_gui/src/pages/instance/Mods.vue
View File

@@ -3,29 +3,55 @@
<div class="card-row">
<div class="iconified-input">
<SearchIcon />
<input v-model="searchFilter" type="text" placeholder="Search Mods" class="text-input" />
<input
v-model="searchFilter"
type="text"
:placeholder="`Search ${search.length} ${(['All', 'Other'].includes(selectedProjectType)
? 'projects'
: selectedProjectType.toLowerCase()
).slice(0, search.length === 1 ? -1 : 64)}...`"
class="text-input"
autocomplete="off"
/>
</div>
<span class="manage">
<span class="text-combo">
<span class="no-wrap sort"> Sort By </span>
<span class="no-wrap sort"> Sort by </span>
<DropdownSelect
v-model="sortFilter"
name="sort-by"
:options="['Name', 'Version', 'Author']"
:options="['Name', 'Version', 'Author', 'Enabled']"
default-value="Name"
class="dropdown"
/>
</span>
<Button color="primary" @click="router.push({ path: '/browse/mod' })">
<Button
color="primary"
@click="
router.push({
path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
})
"
>
<PlusIcon />
<span class="no-wrap"> Add Content </span>
<span class="no-wrap"> Add content </span>
</Button>
</span>
</div>
<Chips
v-if="Object.keys(selectableProjectTypes).length > 1"
v-model="selectedProjectType"
:items="Object.keys(selectableProjectTypes)"
/>
<div class="table">
<div class="table-row table-head">
<div class="table-cell table-text">
<Button icon-only :disabled="!projects.some((x) => x.outdated)" @click="updateAll">
<Button
v-tooltip="'Update all projects'"
icon-only
:disabled="!projects.some((x) => x.outdated)"
@click="updateAll"
>
<UpdatedIcon />
</Button>
</div>
@@ -37,7 +63,13 @@
<div v-for="mod in search" :key="mod.file_name" class="table-row">
<div class="table-cell table-text">
<AnimatedLogo v-if="mod.updating" class="btn icon-only updating-indicator"></AnimatedLogo>
<Button v-else :disabled="!mod.outdated" icon-only @click="updateProject(mod)">
<Button
v-else
v-tooltip="'Update project'"
:disabled="!mod.outdated"
icon-only
@click="updateProject(mod)"
>
<UpdatedIcon v-if="mod.outdated" />
<CheckIcon v-else />
</Button>
@@ -55,11 +87,12 @@
<div class="table-cell table-text">{{ mod.version }}</div>
<div class="table-cell table-text">{{ mod.author }}</div>
<div class="table-cell table-text manage">
<Button icon-only @click="removeMod(mod)">
<Button v-tooltip="'Remove project'" icon-only @click="removeMod(mod)">
<TrashIcon />
</Button>
<input
id="switch-1"
autocomplete="off"
type="checkbox"
class="switch stylized-toggle"
:checked="!mod.disabled"
@@ -82,6 +115,8 @@ import {
UpdatedIcon,
DropdownSelect,
AnimatedLogo,
Chips,
formatProjectType,
} from 'omorphia'
import { computed, ref } from 'vue'
import { convertFileSrc } from '@tauri-apps/api/tauri'
@@ -120,6 +155,7 @@ for (const [path, project] of Object.entries(props.instance.projects)) {
disabled: project.disabled,
updateVersion: project.metadata.update_version,
outdated: !!project.metadata.update_version,
project_type: project.metadata.project.project_type,
})
} else if (project.metadata.type === 'inferred') {
projects.value.push({
@@ -131,6 +167,7 @@ for (const [path, project] of Object.entries(props.instance.projects)) {
icon: project.metadata.icon ? convertFileSrc(project.metadata.icon) : null,
disabled: project.disabled,
outdated: false,
project_type: project.metadata.project_type,
})
} else {
projects.value.push({
@@ -142,16 +179,33 @@ for (const [path, project] of Object.entries(props.instance.projects)) {
icon: null,
disabled: project.disabled,
outdated: false,
project_type: null,
})
}
}
const searchFilter = ref('')
const sortFilter = ref('')
const selectedProjectType = ref('All')
const selectableProjectTypes = computed(() => {
const obj = { All: 'all' }
for (const project of projects.value) {
obj[project.project_type ? formatProjectType(project.project_type) + 's' : 'Other'] =
project.project_type
}
return obj
})
const search = computed(() => {
const projectType = selectableProjectTypes.value[selectedProjectType.value]
const filtered = projects.value.filter((mod) => {
return mod.name.toLowerCase().includes(searchFilter.value.toLowerCase())
return (
mod.name.toLowerCase().includes(searchFilter.value.toLowerCase()) &&
(projectType === 'all' || mod.project_type === projectType)
)
})
return updateSort(filtered, sortFilter.value)
@@ -179,6 +233,16 @@ function updateSort(projects, sort) {
}
return 0
})
case 'Enabled':
return projects.slice().sort((a, b) => {
if (a.disabled && !b.disabled) {
return 1
}
if (!a.disabled && b.disabled) {
return -1
}
return 0
})
default:
return projects.slice().sort((a, b) => {
if (a.name < b.name) {
@@ -230,6 +294,8 @@ async function updateProject(mod) {
async function toggleDisableMod(mod) {
mod.path = await toggle_disable_project(props.instance.path, mod.path).catch(handleError)
console.log(mod.disabled)
mod.disabled = !mod.disabled
}
async function removeMod(mod) {
@@ -248,6 +314,10 @@ async function removeMod(mod) {
gap: 0.5rem;
}
.table {
margin-block-start: 0;
}
.table-row {
grid-template-columns: min-content 2fr 1fr 1fr 8rem;
}
@@ -284,14 +354,8 @@ async function removeMod(mod) {
width: 7rem !important;
}
.no-wrap {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&.sort {
padding-left: 0.5rem;
}
.sort {
padding-left: 0.5rem;
}
</style>
<style lang="scss">
@@ -300,4 +364,8 @@ async function removeMod(mod) {
margin-left: 0.5rem !important;
}
}
.v-popper--theme-tooltip .v-popper__inner {
background: #fff !important;
}
</style>

311
theseus_gui/src/pages/instance/Options.vue
View File

@@ -3,7 +3,7 @@
<div class="change-versions-modal universal-body">
<div class="input-row">
<p class="input-label">Loader</p>
<Chips v-model="loader" :items="loaders" />
<Chips v-model="loader" :items="loaders" :never-empty="false" />
</div>
<div class="input-row">
<p class="input-label">Game Version</p>
@@ -22,7 +22,7 @@
@change="(value) => (loaderVersionIndex = value.index)"
/>
</div>
<div class="button-group">
<div class="push-right input-group">
<button class="btn" @click="$refs.changeVersionsModal.hide()">
<XIcon />
Cancel
@@ -41,7 +41,7 @@
<section class="card">
<div class="label">
<h3>
<span class="label__title size-card-header">Profile</span>
<span class="label__title size-card-header">Instance</span>
</h3>
</div>
<label for="instance-icon">
@@ -68,13 +68,13 @@
<label for="project-name">
<span class="label__title">Name</span>
</label>
<input id="profile-name" v-model="title" maxlength="80" type="text" />
<input id="profile-name" v-model="title" autocomplete="off" maxlength="80" type="text" />
<div class="adjacent-input">
<label for="edit-versions">
<span class="label__title">Edit mod loader/game versions</span>
<span class="label__description">
Allows you to change the mod loader, loader version, or game version of the profile.
Allows you to change the mod loader, loader version, or game version of the instance.
</span>
</label>
<button id="edit-versions" class="btn" @click="$refs.changeVersionsModal.show()">
@@ -83,8 +83,12 @@
</button>
</div>
</section>
<Card class="settings-card">
<h2 class="settings-title">Java</h2>
<Card>
<div class="label">
<h3>
<span class="label__title size-card-header">Java</span>
</h3>
</div>
<div class="settings-group">
<h3>Installation</h3>
<Checkbox v-model="overrideJavaInstall" label="Override global java installations" />
@@ -95,10 +99,12 @@
<h3>Java arguments</h3>
<Checkbox v-model="overrideJavaArgs" label="Override global java arguments" />
<input
id="java-args"
v-model="javaArgs"
autocomplete="off"
:disabled="!overrideJavaArgs"
type="text"
class="input installation-input"
class="installation-input"
placeholder="Enter java arguments..."
/>
</div>
@@ -107,98 +113,156 @@
<Checkbox v-model="overrideEnvVars" label="Override global environment variables" />
<input
v-model="envVars"
autocomplete="off"
:disabled="!overrideEnvVars"
type="text"
class="input installation-input"
class="installation-input"
placeholder="Enter environment variables..."
/>
</div>
<hr class="card-divider" />
<div class="settings-group">
<h3>Java memory</h3>
<Checkbox v-model="overrideMemorySettings" label="Override global memory settings" />
<div class="sliders">
<span class="slider">
Minimum memory
<Slider
v-model="memory.minimum"
:disabled="!overrideMemorySettings"
:min="256"
:max="maxMemory"
:step="10"
/>
<Slider
v-model="memory.maximum"
:disabled="!overrideMemorySettings"
:min="256"
:max="maxMemory"
:step="1"
/>
</div>
</Card>
<Card>
<div class="label">
<h3>
<span class="label__title size-card-header">Window</span>
</h3>
</div>
<div class="adjacent-input">
<Checkbox v-model="overrideWindowSettings" label="Override global window settings" />
</div>
<div class="adjacent-input">
<label for="width">
<span class="label__title">Width</span>
<span class="label__description"> The width of the game window when launched. </span>
</label>
<input
id="width"
v-model="resolution[0]"
autocomplete="off"
:disabled="!overrideWindowSettings"
type="number"
placeholder="Enter width..."
/>
</div>
<div class="adjacent-input">
<label for="height">
<span class="label__title">Height</span>
<span class="label__description"> The height of the game window when launched. </span>
</label>
<input
id="height"
v-model="resolution[1]"
autocomplete="off"
:disabled="!overrideWindowSettings"
type="number"
class="input"
placeholder="Enter height..."
/>
</div>
</Card>
<Card>
<div class="label">
<h3>
<span class="label__title size-card-header">Hooks</span>
</h3>
</div>
<div class="adjacent-input">
<Checkbox v-model="overrideHooks" label="Override global hooks" />
</div>
<div class="adjacent-input">
<label for="pre-launch">
<span class="label__title">Pre launch</span>
<span class="label__description"> Ran before the instance is launched. </span>
</label>
<input
id="pre-launch"
v-model="hooks.pre_launch"
autocomplete="off"
:disabled="!overrideHooks"
type="text"
placeholder="Enter pre-launch command..."
/>
</div>
<div class="adjacent-input">
<label for="wrapper">
<span class="label__title">Wrapper</span>
<span class="label__description"> Wrapper command for launching Minecraft. </span>
</label>
<input
id="wrapper"
v-model="hooks.wrapper"
autocomplete="off"
:disabled="!overrideHooks"
type="text"
placeholder="Enter wrapper command..."
/>
</div>
<div class="adjacent-input">
<label for="post-exit">
<span class="label__title">Post exit</span>
<span class="label__description"> Ran after the game closes. </span>
</label>
<input
id="post-exit"
v-model="hooks.post_exit"
autocomplete="off"
:disabled="!overrideHooks"
type="text"
placeholder="Enter post-exit command..."
/>
</div>
</Card>
<Card>
<div class="label">
<h3>
<span class="label__title size-card-header">Instance management</span>
</h3>
</div>
<div class="adjacent-input">
<label for="repair-profile">
<span class="label__title">Repair instance</span>
<span class="label__description">
Reinstalls the instance and checks for corruption. Use this if your game is not launching
due to launcher-related errors.
</span>
<span class="slider">
Maximum memory
<Slider
v-model="memory.maximum"
:disabled="!overrideMemorySettings"
:min="256"
:max="maxMemory"
:step="10"
/>
</label>
<button
id="repair-profile"
class="btn btn-highlight"
:disabled="repairing"
@click="repairProfile"
>
<HammerIcon /> Repair
</button>
</div>
<div class="adjacent-input">
<label for="delete-profile">
<span class="label__title">Delete instance</span>
<span class="label__description">
Fully removes a instance from the disk. Be careful, as once you delete a instance there is
no way to recover it.
</span>
</div>
</div>
</Card>
<Card class="settings-card">
<h2 class="settings-title">Window</h2>
<Checkbox v-model="overrideWindowSettings" label="Override global window settings" />
<div class="settings-group">
<div class="toggle-setting">
Width
<input
v-model="resolution[0]"
:disabled="!overrideWindowSettings"
type="number"
class="input"
@change="updateProfile"
/>
</div>
<div class="toggle-setting">
Height
<input
v-model="resolution[1]"
:disabled="!overrideWindowSettings"
type="number"
class="input"
@change="updateProfile"
/>
</div>
</div>
</Card>
<Card class="settings-card">
<h2 class="settings-title">Hooks</h2>
<Checkbox v-model="overrideHooks" label="Override global hooks" />
<div class="settings-group">
<div class="toggle-setting">
Pre launch
<input v-model="hooks.pre_launch" :disabled="!overrideHooks" type="text" />
</div>
<div class="toggle-setting">
Wrapper
<input v-model="hooks.wrapper" :disabled="!overrideHooks" type="text" />
</div>
<div class="toggle-setting">
Post exit
<input v-model="hooks.post_exit" :disabled="!overrideHooks" type="text" />
</div>
</div>
</Card>
<Card class="settings-card">
<h2 class="settings-title">Profile management</h2>
<div class="settings-group">
<div class="toggle-setting">
Repair profile
<button class="btn btn-highlight" :disabled="repairing" @click="repairProfile">
<HammerIcon /> Repair
</button>
</div>
<div class="toggle-setting">
Delete profile
<button class="btn btn-danger" :disabled="removing" @click="removeProfile">
<TrashIcon /> Delete
</button>
</div>
</label>
<button
id="delete-profile"
class="btn btn-danger"
:disabled="removing"
@click="removeProfile"
>
<TrashIcon /> Delete
</button>
</div>
</Card>
</template>
@@ -221,7 +285,7 @@ import {
} from 'omorphia'
import { useRouter } from 'vue-router'
import { edit, edit_icon, get_optimal_jre_key, install, remove } from '@/helpers/profile.js'
import { computed, readonly, ref, shallowRef, watch } from 'vue'
import { computed, onMounted, readonly, ref, shallowRef, watch } from 'vue'
import { get_max_memory } from '@/helpers/jre.js'
import { get } from '@/helpers/settings.js'
import JavaSelector from '@/components/ui/JavaSelector.vue'
@@ -388,10 +452,9 @@ const [fabric_versions, forge_versions, quilt_versions, all_game_versions, loade
.then(ref)
.catch(handleError),
])
loaders.value.push('vanilla')
loaders.value.unshift('vanilla')
const loader = ref(props.instance.metadata.loader)
const gameVersion = ref(props.instance.metadata.game_version)
const selectableGameVersions = computed(() => {
return all_game_versions.value
@@ -457,6 +520,8 @@ async function saveGvLoaderEdits() {
editing.value = false
changeVersionsModal.value.hide()
}
onMounted(() => console.log(loader.value))
</script>
<style scoped lang="scss">
@@ -478,73 +543,23 @@ async function saveGvLoaderEdits() {
flex-direction: row;
gap: 1rem;
}
.button-group {
display: flex;
gap: 0.5rem;
justify-content: flex-end;
}
}
.settings-card {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.input-group {
display: flex;
gap: 0.5rem;
}
.input-stack {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.settings-title {
color: var(--color-contrast);
}
.settings-group {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin: 1rem 0;
h3 {
margin: 0;
}
}
.installation-input {
width: 100%;
}
.sliders {
display: flex;
flex-wrap: wrap;
flex-direction: row;
gap: 1rem;
width: 100%;
.slider {
flex-grow: 1;
}
}
.toggle-setting {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
gap: 0.5rem;
}
.card-divider {
background-color: var(--color-button-bg);
border: none;
color: var(--color-button-bg);
height: 1px;
margin: var(--gap-sm) 0;
}
:deep(button.checkbox) {
border: none;
}