Merge pull request #162 from Lodestone-Team/fix-flavour-type-bind

lgtm

src/bindings/FabricInstallerVersion.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FabricInstallerVersion = string;

src/bindings/FabricLoaderVersion.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FabricLoaderVersion = string;

src/bindings/ForgeBuildVersion.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ForgeBuildVersion = string;

src/bindings/MinecraftFlavour.ts

@@ -1,3 +1,17 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { FabricInstallerVersion } from './FabricInstallerVersion';
+import type { FabricLoaderVersion } from './FabricLoaderVersion';
+import type { ForgeBuildVersion } from './ForgeBuildVersion';
+import type { PaperBuildVersion } from './PaperBuildVersion';
 
-export type MinecraftFlavour = 'vanilla' | 'fabric' | 'paper' | 'spigot';
+export type MinecraftFlavour =
+  | 'vanilla'
+  | {
+      fabric: {
+        loader_version: FabricLoaderVersion | null;
+        installer_version: FabricInstallerVersion | null;
+      };
+    }
+  | { paper: { build_version: PaperBuildVersion | null } }
+  | 'spigot'
+  | { forge: { build_version: ForgeBuildVersion | null } };

src/bindings/PaperBuildVersion.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PaperBuildVersion = bigint;

src/bindings/impl/FlavourStringToMinecraftFlavour.ts

@@ -0,0 +1,19 @@
+import { MinecraftFlavour } from 'bindings/MinecraftFlavour';
+
+export function flavourStringToMinecraftFlavour(
+  flavour: string
+): MinecraftFlavour {
+  switch (flavour.toLowerCase()) {
+    case 'vanilla':
+      return 'vanilla';
+    case 'fabric':
+      return { fabric: { loader_version: null, installer_version: null } };
+    case 'paper':
+      return { paper: { build_version: null } };
+    case 'spigot':
+      return 'spigot';
+    case 'forge':
+      return { forge: { build_version: null } };
+  }
+  throw new Error(`Unknown flavour: ${flavour}`);
+}

src/components/Minecraft/Create/MinecraftBasicForm.tsx

@@ -1,6 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
-import { MinecraftFlavour } from 'bindings/MinecraftFlavour';
 import { MinecraftVersions } from 'bindings/MinecraftVersions';
 import ComboField from 'components/Atoms/Form/ComboField';
 import InputField from 'components/Atoms/Form/InputField';
@@ -10,12 +9,9 @@ import { MinecraftSetupConfigPrimitiveForm } from './form';
 
 export default function MinecraftBasicForm() {
   const { data: minecraftFlavours, isLoading: minecraftFlavoursLoading } =
-    useQuery<MinecraftFlavour[]>(['minecraft', 'flavours'], () =>
-      axios.get('/games/minecraft/flavours').then((res) => {
-        // sort by name
-        return res.data.sort((a: MinecraftFlavour, b: MinecraftFlavour) => {
-          return a.localeCompare(b);
-        });
+    useQuery<string[]>(['minecraft', 'flavours'], () =>
+      axios.get<Array<string>>('/games/minecraft/flavours').then((res) => {
+        return res.data;
       })
     );
 

src/components/Minecraft/MinecraftCreateForm.tsx

@@ -15,6 +15,7 @@ import {
 import MinecraftAdvancedForm from './Create/MinecraftAdvancedForm';
 import MinecraftBasicForm from './Create/MinecraftBasicForm';
 import MinecraftNameForm from './Create/MinecraftNameForm';
+import { flavourStringToMinecraftFlavour } from 'bindings/impl/FlavourStringToMinecraftFlavour';
 
 function _renderStepContent(step: number) {
   switch (step) {
@@ -61,7 +62,7 @@ export default function CreateMinecraftInstance({
   ) {
     const parsedValues: MinecraftSetupConfigPrimitive = {
       ...values,
-      flavour: values.flavour as MinecraftFlavour,
+      flavour: flavourStringToMinecraftFlavour(values.flavour),
       cmd_args: values.cmd_args.split(' ').filter((item) => item !== ''),
       auto_start: values.auto_start === 'true',
       restart_on_crash: values.restart_on_crash === 'true',