Grasscutters/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2024-11-26 21:30:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into patching

Browse Source
This commit is contained in:
SpikeHD 2022-07-16 17:03:36 -07:00
commit d46a2bdc44
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/lang/en.json
View File

@ -18,6 +18,7 @@
"recover_metadata": "Emergency Metadata Recovery",
"grasscutter_jar": "Set Grasscutter JAR",
"toggle_encryption": "Toggle Encryption",
"install_certificate": "Install Proxy Certificate",
"java_path": "Set Custom Java Path",
"grasscutter_with_game": "Automatically launch Grasscutter with game",
"language": "Select Language",
@ -46,7 +47,8 @@
"components": {
"select_file": "Select file or folder...",
"select_folder": "Select folder...",
"download": "Download"
"download": "Download",
"install": "Install"
},
"news": {
"latest_commits": "Recent Commits",

43
src/ui/components/menu/Options.tsx
View File

@ -198,6 +198,12 @@ export default class Options extends React.Component<IProps, IState> {
console.log(this.props)
await meta.restoreMetadata(this.props.downloadManager)
}
async installCert() {
await invoke('generate_ca_files', {
path: await dataDir() + 'cultivation'
})
}
render() {
return (
@ -220,18 +226,6 @@ export default class Options extends React.Component<IProps, IState> {
</BigButton>
</div>
</div>
{
this.state.swag && (
<div className='OptionSection' id="menuOptionsContainerAkebi">
<div className='OptionLabel' id="menuOptionsLabelAkebi">
<Tr text="swag.akebi" />
</div>
<div className='OptionValue' id="menuOptionsDirAkebi">
<DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
</div>
</div>
)
}
<div className='OptionSection' id="menuOptionsContainerGCJar">
<div className='OptionLabel' id="menuOptionsLabelGCJar">
<Tr text="options.grasscutter_jar" />
@ -250,6 +244,31 @@ export default class Options extends React.Component<IProps, IState> {
</BigButton>
</div>
</div>
<div className='OptionSection' id="menuOptionsContainerInstallCert">
<div className='OptionLabel' id="menuOptionsLabelInstallCert">
<Tr text="options.install_certificate" />
</div>
<div className='OptionValue' id="menuOptionsButtonInstallCert">
<BigButton disabled={false} onClick={this.installCert} id="installCert">
<Tr text="components.install" />
</BigButton>
</div>
</div>
{
this.state.swag && (
<>
<Divider />
<div className='OptionSection' id="menuOptionsContainerAkebi">
<div className='OptionLabel' id="menuOptionsLabelAkebi">
<Tr text="swag.akebi" />
</div>
<div className='OptionValue' id="menuOptionsDirAkebi">
<DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
</div>
</div>
</>
)
}
<Divider />

2
src/utils/server.ts
View File

@ -1,4 +1,4 @@
import { fs, invoke } from '@tauri-apps/api'
import { invoke } from '@tauri-apps/api'
export async function toggleEncryption(path: string) {
let serverConf