Merge pull request #1542 from SkyKingPX/master

feat: Add Forge Config, NeoForge Tag and NeoForge Configs & fix German "MC Bedrock" Translation

frontend/src/config/instanceConfigMap.ts

@@ -2873,6 +2873,42 @@ export const configData: {
       "config-version": t("TXT_CODE_c8cdeeee")
     }
   },
+  "forge/fml.toml": {
+    desc: t("TXT_CODE_7e6a82d8"),
+    config: {
+      "earlyWindowHeight": t("TXT_CODE_341dfd11"),
+      "versionCheck": t("TXT_CODE_ea04fb32"),
+      "earlyWindowControl": t("TXT_CODE_703cdd68"),
+      "earlyWindowFBScale": t("TXT_CODE_ecc99fb6"),
+      "earlyWindowProvider": t("TXT_CODE_55e91545"),
+      "earlyWindowWidth": t("TXT_CODE_bd1ff011"),
+      "earlyWindowMaximized": t("TXT_CODE_2ce63943"),
+      "defaultConfigPath": t("TXT_CODE_b02f295d"),
+      "disableOptimizedDFU": t("TXT_CODE_1f3aac40"),
+      "earlyWindowSkipGLVersions": t("TXT_CODE_44c67809"),
+      "maxThreads": t("TXT_CODE_e75ed0b5"),
+      "earlyWindowSquir": t("TXT_CODE_4fe284cd"),
+      "disableConfigWatcher": t("TXT_CODE_7c25c81a")
+    }
+  },
+  "neoforge/neoforge-server.toml": {
+    desc: t("TXT_CODE_5b6f3691"),
+    config: {
+      "removeErroringBlockEntities": t("TXT_CODE_f4c15e78"),
+      "removeErroringEntities": t("TXT_CODE_c53c342e"),
+      "fullBoundingBoxLadders": t("TXT_CODE_1fec78cc"),
+      "permissionHandler": t("TXT_CODE_dd65f101"),
+      "advertiseDedicatedServerToLan": t("TXT_CODE_176b2151")
+    }
+  },
+  "neoforge/neoforge-common.toml": {
+    desc: t("TXT_CODE_1efc7c5f"),
+    config: {
+      "logUntranslatedItemTagWarnings": t("TXT_CODE_cf393058"),
+      "logLegacyTagWarnings": t("TXT_CODE_b2f1310e"),
+      "attributeAdvancedTooltipDebugInfo": t("TXT_CODE_94d885d1")
+    }
+  },
   //   "mcdr/permission.yml": {},
   //   "mcdr/config.yml": {},
   "tshock/config.json": {

frontend/src/hooks/useInstance.ts

@@ -14,6 +14,7 @@ export const TYPE_MINECRAFT_SPIGOT = "minecraft/java/spigot";
 export const TYPE_MINECRAFT_PAPER = "minecraft/java/paper";
 export const TYPE_MINECRAFT_PUFFERFISH = "minecraft/java/pufferfish";
 export const TYPE_MINECRAFT_FORGE = "minecraft/java/forge";
+export const TYPE_MINECRAFT_NEOFORGE = "minecraft/java/neoforge";
 export const TYPE_MINECRAFT_FABRIC = "minecraft/java/fabric";
 export const TYPE_MINECRAFT_BUNGEECORD = "minecraft/java/bungeecord";
 export const TYPE_MINECRAFT_VELOCITY = "minecraft/java/velocity";
@@ -32,6 +33,7 @@ export const INSTANCE_TYPE_TRANSLATION: MapData<string> = {
   [TYPE_STEAM_SERVER_UNIVERSAL]: t("TXT_CODE_3d7fbe30"),
   [TYPE_MINECRAFT_JAVA]: t("TXT_CODE_97f779b3"),
   [TYPE_MINECRAFT_BEDROCK]: t("TXT_CODE_7f1aef9f"),
+  [TYPE_MINECRAFT_NUKKIT]: t("TXT_CODE_8f3e5807"),
   [TYPE_MINECRAFT_SPIGOT]: t("TXT_CODE_6c08319b"),
   [TYPE_MINECRAFT_PAPER]: t("TXT_CODE_ec0cda88"),
   [TYPE_MINECRAFT_PUFFERFISH]: t("TXT_CODE_c6d3bd8"),
@@ -41,6 +43,8 @@ export const INSTANCE_TYPE_TRANSLATION: MapData<string> = {
   [TYPE_MINECRAFT_BDS]: t("TXT_CODE_67b5f678"),
   [TYPE_MINECRAFT_SPONGE]: t("TXT_CODE_e4dbff32"),
   [TYPE_MINECRAFT_FORGE]: t("TXT_CODE_5112fcb2"),
+  [TYPE_MINECRAFT_NEOFORGE]: t("TXT_CODE_98b4ac74"),
+  [TYPE_MINECRAFT_MOHIST]: t("TXT_CODE_82e624d1"),
   [TYPE_MINECRAFT_FABRIC]: t("TXT_CODE_7af6d85a"),
   [TYPE_MINECRAFT_BUKKIT]: t("TXT_CODE_992bf9bc"),
   [TYPE_MINECRAFT_GEYSER]: t("TXT_CODE_4f57868"),
@@ -183,6 +187,7 @@ export const INSTANCE_CONFIGS: InstanceConfigs[] = [
       TYPE_MINECRAFT_JAVA,
       TYPE_MINECRAFT_BUKKIT,
       TYPE_MINECRAFT_FORGE,
+      TYPE_MINECRAFT_NEOFORGE,
       TYPE_MINECRAFT_FABRIC,
       TYPE_MINECRAFT_SPONGE,
       TYPE_MINECRAFT_PURPUR,
@@ -201,6 +206,8 @@ export const INSTANCE_CONFIGS: InstanceConfigs[] = [
       TYPE_MINECRAFT_JAVA,
       TYPE_MINECRAFT_BUKKIT,
       TYPE_MINECRAFT_FABRIC,
+      TYPE_MINECRAFT_FORGE,
+      TYPE_MINECRAFT_NEOFORGE,
       TYPE_MINECRAFT_SPONGE,
       TYPE_MINECRAFT_PURPUR,
       TYPE_MINECRAFT_PUFFERFISH
@@ -349,5 +356,29 @@ export const INSTANCE_CONFIGS: InstanceConfigs[] = [
     path: "tshock/config.json",
     redirect: "tshock/config.json",
     category: [TYPE_TERRARIA]
+  },
+  {
+    fileName: "[Forge] fml.toml",
+    type: "toml",
+    info: t("TXT_CODE_7e6a82d8"),
+    path: "config/fml.toml",
+    redirect: "forge/fml.toml",
+    category: [TYPE_MINECRAFT_FORGE]
+  },
+  {
+    fileName: "[NeoForge] neoforge-server.toml",
+    type: "toml",
+    info: t("TXT_CODE_5b6f3691"),
+    path: "config/neoforge-server.toml",
+    redirect: "neoforge/neoforge-server.toml",
+    category: [TYPE_MINECRAFT_NEOFORGE]
+  },
+  {
+    fileName: "[NeoForge] neoforge-common.toml",
+    type: "toml",
+    info: t("TXT_CODE_1efc7c5f"),
+    path: "config/neoforge-common.toml",
+    redirect: "neoforge/neoforge-common.toml",
+    category: [TYPE_MINECRAFT_NEOFORGE]
   }
 ];

languages/de_DE.json

@@ -628,7 +628,7 @@
   "TXT_CODE_66ce073e": "Offline",
   "TXT_CODE_673eac8e": "Hellmodus",
   "TXT_CODE_6750d9d3": "Die Verwendung von Profilen, die von anderen geteilt werden, kann zur Kompromittierung des Panels führen.",
-  "TXT_CODE_67b5f678": "MC Grundgestein",
+  "TXT_CODE_67b5f678": "MC Bedrock",
   "TXT_CODE_67c765be": "Geben Sie den Prozess an, der auf bestimmten Kernen ausgeführt werden soll, um die Hardwareressourcen Ihres Systems besser zu nutzen. Beispielsweise bedeutet 0,1, dass er auf dem 1. und 2. Kern ausgeführt wird, getrennt durch Kommas.",
   "TXT_CODE_67d68dd1": "Typ",
   "TXT_CODE_68128434": "Einen Minecraft-Spieleserver erstellen",

languages/en_US.json

@@ -2556,5 +2556,32 @@
   "TXT_CODE_bfbdf579": "This feature allows ordinary users to edit the configuration of Docker instances such as the \"start\" and \"update\" commands",
   "TXT_CODE_36cae384": "You are using a private IP address",
   "TXT_CODE_ea6e5e5e": "This node may not work properly when accessing the panel using a public IP address",
-  "TXT_CODE_678164d7": "You can find the node ID in the 'Node List' section of the merchant console"
+  "TXT_CODE_678164d7": "You can find the node ID in the 'Node List' section of the merchant console",
+  "TXT_CODE_7e6a82d8": "Configuration File of a Forge Server",
+  "TXT_CODE_341dfd11": "Early window height",
+  "TXT_CODE_ea04fb32": "Enable NeoForge global version checking",
+  "TXT_CODE_703cdd68": "Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.",
+  "TXT_CODE_ecc99fb6": "Early window framebuffer scale",
+  "TXT_CODE_55e91545": "Early window provider",
+  "TXT_CODE_bd1ff011": "Early window width",
+  "TXT_CODE_2ce63943": "Early Window starts maximized",
+  "TXT_CODE_b02f295d": "Default config path for servers",
+  "TXT_CODE_1f3aac40": "Disables Optimized DFU client-side - already disabled on servers",
+  "TXT_CODE_44c67809": "Skip specific GL versions, may help with buggy graphics card drivers",
+  "TXT_CODE_e75ed0b5": "Max threads for early initialization parallelism,  -1 is based on processor count",
+  "TXT_CODE_4fe284cd": "Squir?",
+  "TXT_CODE_7c25c81a": "Disables File Watcher. Used to automatically update config if its file has been modified.",
+  "TXT_CODE_5b6f3691": "Server Configuration File of a NeoForge Server",
+  "TXT_CODE_f4c15e78": "Set this to true to remove any BlockEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.",
+  "TXT_CODE_c53c342e": "Set this to true to remove any Entity (Note: Does not include BlockEntities) that throws an error in its tick method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.",
+  "TXT_CODE_1fec78cc": "Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticeable differences in mechanics so default is vanilla behavior. Default: false.",
+  "TXT_CODE_dd65f101": "The permission handler used by the server. Defaults to neoforge:default_handler if no such handler with that name is registered.",
+  "TXT_CODE_176b2151": "Set this to true to enable advertising the dedicated server to local LAN clients so that it shows up in the Multiplayer screen automatically.",
+  "TXT_CODE_1efc7c5f": "Common Configuration File of a NeoForge Server",
+  "TXT_CODE_cf393058": "A config option mainly for developers. Logs out modded item tags that do not have translations when running on integrated server. Format desired is tag.item.<namespace>.<path> for the translation key. Defaults to SILENCED. Allowed Values: SILENCED, DEV_SHORT, DEV_VERBOSE, PROD_SHORT, PROD_VERBOSE",
+  "TXT_CODE_b2f1310e": "A config option mainly for developers. Logs out modded tags that are using the 'forge' namespace when running on integrated server. Defaults to DEV_SHORT. Allowed Values: SILENCED, DEV_SHORT, DEV_VERBOSE, PROD_SHORT, PROD_VERBOSE",
+  "TXT_CODE_94d885d1": "Set this to true to enable showing debug information about attributes on an item when advanced tooltips is on.",
+  "TXT_CODE_8f3e5807": "MC-Nukkit",
+  "TXT_CODE_98b4ac74": "MC-NeoForge",
+  "TXT_CODE_82e624d1": "MC-Mohist"
 }

package-lock.json

@@ -13,9 +13,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },