From 66d76c8302cfec0e52178a7202d98e03d7e67113 Mon Sep 17 00:00:00 2001
From: Henry Gross-Hellsen <6283258+cowpod@users.noreply.github.com>
Date: Fri, 15 Nov 2024 14:45:18 -0800
Subject: [PATCH] api/index.php/mod: filter in db instead of php, add /loader
 endpoint, index.php: new description/titles/labels, index.php/modloaders:
 dynamic/js ui, filter out beta neoforge, add filesize to loaders, loader
 filenames reflect the type

---
 api/index.php                                 |  45 +-
 ...ge-fabric.php => add-modloader-fabric.php} |  33 +-
 functions/add-modloader.php                   |  21 +-
 index.php                                     | 138 ++++--
 resources/js/page_modloaders.js               | 406 +++++++++++-------
 5 files changed, 410 insertions(+), 233 deletions(-)
 rename functions/{package-fabric.php => add-modloader-fabric.php} (71%)

diff --git a/api/index.php b/api/index.php
index 5fe34d9..ba677c5 100644
--- a/api/index.php
+++ b/api/index.php
@@ -79,17 +79,52 @@
         $mcversion=$_GET['mcversion'];
     }
     if (!empty($loadertype) && !empty($mcversion)) {
-        $modq = $db->query("SELECT * FROM mods WHERE loadertype='{$loadertype}' AND ('{$mcversion}' LIKE mcversion || '%' OR mcversion LIKE '{$mcversion}' || '%')");
+        $modq = $db->query("SELECT * FROM mods WHERE type='mod' AND loadertype='{$loadertype}' AND ('{$mcversion}' LIKE mcversion || '%' OR mcversion LIKE '{$mcversion}' || '%')");
     } elseif (!empty($loadertype)) {
-        $modq = $db->query("SELECT * FROM mods WHERE loadertype='{$loadertype}'");
+        $modq = $db->query("SELECT * FROM mods WHERE type='mod' AND loadertype='{$loadertype}'");
     } elseif (!empty($mcversion)) {
-        $modq = $db->query("SELECT * FROM mods WHERE '{$mcversion}' LIKE mcversion || '%'");
+        $modq = $db->query("SELECT * FROM mods WHERE type='mod' AND '{$mcversion}' LIKE mcversion || '%'");
     } else {
-        $modq = $db->query("SELECT * FROM mods");
+        $modq = $db->query("SELECT * FROM mods WHERE type='mod'");
+    }
+    if ($modq) {
+        foreach ($modq as $mod) {
+            $filesize = isset($mod['filesize']) ? $mod['filesize'] : 0;
+            $modentry = [
+                'id'=>$mod['id'],
+                'pretty_name'=>$mod['pretty_name'],
+                'name'=>$mod['name'], 
+                'version'=>$mod['version'], 
+                'mcversion'=>$mod['mcversion'],
+                'md5'=>$mod['md5'], 
+                'url'=>$mod['url'], 
+                'filesize'=>$filesize
+            ];
+
+            array_push($modslist, $modentry);
+        }
+    }
+    echo json_encode($modslist, JSON_UNESCAPED_SLASHES);
+}
+else if (preg_match("/api\/loader$/", $url)) {
+    $modslist=[];
+    if (!empty($_GET['loadertype']) && ctype_alnum($_GET['loadertype'])) {
+        $loadertype=$_GET['loadertype'];
+    }
+    if (!empty($_GET['mcversion']) && preg_match('/^[a-zA-Z0-9\-\.]+$/', $_GET['mcversion'])) {
+        $mcversion=$_GET['mcversion'];
+    }
+    if (!empty($loadertype) && !empty($mcversion)) {
+        $modq = $db->query("SELECT * FROM mods WHERE type='forge' AND loadertype='{$loadertype}' AND ('{$mcversion}' LIKE mcversion || '%' OR mcversion LIKE '{$mcversion}' || '%')");
+    } elseif (!empty($loadertype)) {
+        $modq = $db->query("SELECT * FROM mods WHERE type='forge' AND loadertype='{$loadertype}'");
+    } elseif (!empty($mcversion)) {
+        $modq = $db->query("SELECT * FROM mods WHERE type='forge' AND '{$mcversion}' LIKE mcversion || '%'");
+    } else {
+        $modq = $db->query("SELECT * FROM mods WHERE type='forge'");
     }
     if ($modq) {
         foreach ($modq as $mod) {
-            if ($mod['type']!='mod') continue;
             $filesize = isset($mod['filesize']) ? $mod['filesize'] : 0;
             $modentry = [
                 'id'=>$mod['id'],
diff --git a/functions/package-fabric.php b/functions/add-modloader-fabric.php
similarity index 71%
rename from functions/package-fabric.php
rename to functions/add-modloader-fabric.php
index 34d1cf2..3fbed09 100644
--- a/functions/package-fabric.php
+++ b/functions/add-modloader-fabric.php
@@ -18,8 +18,12 @@
     exit();
 }
 
+global $db;
 require_once("db.php");
-$db=new Db;
+if (!isset($db)){
+    $db=new Db;
+    $db->connect();
+}
 
 if (file_put_contents("../forges/modpack-".$version."/version.json", file_get_contents("https://meta.fabricmc.net/v2/versions/loader/".$mcversion."/".urlencode($version)."/profile/json"))) {
     $zip = new ZipArchive();
@@ -36,21 +40,34 @@
     unlink("../forges/modpack-".$version."/version.json");
     rmdir("../forges/modpack-".$version);
     $md5 = md5_file("../forges/fabric-".$version.".zip");
+    $file_size=filesize("../forges/fabric-".$version.".zip");
     $url = "http://".$config['host'].$config['dir']."forges/fabric-".urlencode($version).".zip";
-
-    $db->connect();
-    $res = $db->execute("INSERT INTO `mods` (`name`,`pretty_name`,`md5`,`url`,`link`,`author`,`description`,`version`,`mcversion`,`filename`,`type`,`loadertype`) VALUES ('fabric','Fabric (alpha)','".$md5."','".$url."','https://fabricmc.net/','FabricMC Team', 'Fabric is a lightweight, experimental modding toolchain for Minecraft.', '".$version."','".$mcversion."','fabric-".$version.".zip','forge', 'fabric')");
-    $db->disconnect();
-    
+    $res = $db->execute("INSERT INTO `mods` (`name`,`pretty_name`,`md5`,`url`,`link`,`author`,`description`,`version`,`mcversion`,`filename`,`filesize`,`type`,`loadertype`) VALUES (
+        'fabric',
+        'Fabric (alpha)',
+        '{$md5}',
+        '{$url}',
+        'https://fabricmc.net/',
+        'FabricMC Team', 
+        'Fabric is a lightweight, experimental modding toolchain for Minecraft.', 
+        '{$version}',
+        '{$mcversion}',
+        'fabric-{$version}.zip',
+        '{$file_size}',
+        'forge',
+        'fabric'
+    )");
     if ($res) {
-        echo '{"status":"succ","message":"Mod has been saved."}';
+        echo '{"status":"succ","message":"Loader has been saved.", "id": '.$db->insert_id().'}';
     } else {
-        echo '{"status":"error","message":"Mod could not be added to database"}';
+        echo '{"status":"error","message":"Loader could not be added to database"}';
     }
+
 } else {
     echo '{"status":"error","message":"File download failed."}';
     unlink("../forges/modpack-".$version."/version.json");
     rmdir("../forges/modpack-".$version);
 }
 
+$db->disconnect();
 exit();
\ No newline at end of file
diff --git a/functions/add-modloader.php b/functions/add-modloader.php
index 466c0be..bb32c1b 100644
--- a/functions/add-modloader.php
+++ b/functions/add-modloader.php
@@ -48,7 +48,7 @@
 
 if (file_put_contents("../forges/modpack-".$version."/modpack.jar", file_get_contents($download_link))) {
     $zip = new ZipArchive();
-    if ($zip->open("../forges/forge-".$version.".zip", ZIPARCHIVE::CREATE) !== true) {
+    if ($zip->open("../forges/".$type."-".$version.".zip", ZIPARCHIVE::CREATE) !== true) {
         echo '{"status":"error","message":"Could not open archive"}';
         exit();
     }
@@ -60,10 +60,9 @@
     $zip->close();
     unlink("../forges/modpack-".$version."/modpack.jar");
     rmdir("../forges/modpack-".$version);
-    $md5 = md5_file("../forges/forge-".$version.".zip");
-    $filesize=filesize("../forges/forge-".$version.".zip");
-    $url = "http://".$config['host'].$config['dir']."forges/forge-".$version.".zip";
-
+    $md5 = md5_file("../forges/".$type."-".$version.".zip");
+    $file_size = filesize("../forges/".$type."-".$version.".zip");
+    $url = "http://".$config['host'].$config['dir']."forges/".$type."-".$version.".zip";
     $res = $db->execute("
         INSERT INTO `mods` (`name`,`pretty_name`,`md5`,`url`,`link`,`author`,`description`,`version`,`mcversion`,`filename`,`filesize`,`type`,`loadertype`) 
         VALUES (
@@ -76,23 +75,21 @@
             '".$type_descriptions[$type]."', 
             '".$version."', 
             '".$mcversion."', 
-            'forge-".$version.".zip',
-            ".$filesize.",
+            '".$type."-".$version.".zip',
+            ".$file_size.",
             'forge',
             '".$type."'
         )
     ");
-    $id=$db->insert_id();
-
     if ($res) {
-        echo '{"status":"succ","message":"Mod has been saved.", "id":"'.$id.'"}';
+        echo '{"status":"succ","message":"Loader has been saved.", "id":"'.$db->insert_id().'"}';
     } else {
-        echo '{"status":"error","message":"Mod could not be added to database"}';
+        echo '{"status":"error","message":"Loader could not be added to database"}';
     }
 } else {
     echo '{"status":"error","message":"File download failed."}';
     unlink("../forges/modpack-".$version."/modpack.jar");
     rmdir("../forges/modpack-".$version);
 }
-
+$db->disconnect();
 exit();
\ No newline at end of file
diff --git a/index.php b/index.php
index a67584d..c00b257 100644
--- a/index.php
+++ b/index.php
@@ -792,6 +792,7 @@ function uri($uri) {
                 $_GET['name'] = $modpack['name'];
             ?>
             <script>document.title = 'Modpack - <?php echo addslashes($modpack['display_name']) ?> - <?php echo addslashes($_SESSION['name']) ?>';</script>
+            
             <ul class="nav justify-content-end info-versions">
                 <li class="nav-item">
                     <a class="nav-link" href="./dashboard"><em class="fas fa-arrow-left fa-lg"></em> <?php echo $modpack['display_name'] ?></a>
@@ -838,6 +839,7 @@ function uri($uri) {
                 </li>
                 <div style="width:30px"></div>
             </ul>
+
             <div class="main">
                 <?php
                 $notechnic=true;
@@ -944,22 +946,22 @@ function uri($uri) {
                 <?php
                 if (substr($_SESSION['perms'],0,1)=="1") { ?>
                 <div class="card">
-                    <h2>Edit Modpack</h2>
+                    <h2>Modpack details</h2>
                     <hr>
                     <form action="./functions/edit-modpack.php" method="">
                         <input hidden type="text" name="id" value="<?php echo $_GET['id'] ?>">
-                        <input autocomplete="off" id="dn" class="form-control" type="text" name="display_name" placeholder="Modpack name" value="<?php echo $modpack['display_name'] ?>" />
+                        <input autocomplete="off" id="dn" class="form-control" type="text" name="display_name" placeholder="Name" value="<?php echo $modpack['display_name'] ?>" />
                         <br />
-                        <input autocomplete="off" id="slug" pattern="^[a-z0-9]+(?:-[a-z0-9]+)*$" class="form-control" type="text" name="name" placeholder="Modpack slug (same as on technicpack.net)" value="<?php echo $modpack['name'] ?>" />
+                        <input autocomplete="off" id="slug" pattern="^[a-z0-9]+(?:-[a-z0-9]+)*$" class="form-control" type="text" name="name" placeholder="Unqiue ID (technicpack.net slug)" value="<?php echo $modpack['name'] ?>" />
                         <br />
                         <div class="custom-control custom-checkbox">
                             <input <?php if ($modpack['public']==1){echo "checked";} ?> type="checkbox" name="ispublic" class="custom-control-input" id="public">
-                            <label class="custom-control-label" for="public">Public Modpack</label>
+                            <label class="custom-control-label" for="public">Public</label>
                         </div><br />
-                        <div class="btn-group" role="group" aria-label="Actions">
+                        <!-- <div class="btn-group" role="group" aria-label="Actions"> -->
                             <button type="submit" name="type" value="rename" class="btn btn-primary">Save</button>
-                            <button data-toggle="modal" data-target="#removeModpack" type="button" class="btn btn-danger">Remove Modpack</button>
-                        </div>
+                            <button data-toggle="modal" data-target="#removeModpack" type="button" class="btn btn-danger">Delete</button>
+                        <!-- </div> -->
 
                     </form>
                     <div class="modal fade" id="removeModpack" tabindex="-1" role="dialog" aria-labelledby="rmp" aria-hidden="true">
@@ -1027,6 +1029,8 @@ function uri($uri) {
                         </div>
 
                     </form><br />
+                </div>
+                <div class="card">
                     <h2>Copy Build</h2>
                     <hr>
                     <form action="./functions/copy-build.php" method="">
@@ -1079,7 +1083,7 @@ function uri($uri) {
                         <span id="warn_newname" style="display: none" class="text-danger">Build with this name already exists.</span>
                         <br />
                         <button type="submit" id="copybutton" name="submit" value="copy" class="btn btn-primary">Copy</button> 
-                        <button id="copylatestbutton" class="btn btn-primary" onclick="copylatest()">Copy latest</button>
+                        <button id="copylatestbutton" class="btn btn-secondary" onclick="copylatest()">Latest</button>
                     </form>
                 </div>
             <?php } ?>
@@ -1484,11 +1488,19 @@ function uri($uri) {
         <script>document.title = 'Mod Library - <?php echo addslashes($_SESSION['name']) ?>';</script>
         <div class="main">
 
+            <div class="card">
+                <h2>Mods</h2>
+                <div>
+                    A mod is a file that does things to your game. All mods which rely on Forge, Neoforge, or Fabric are supported.
+                    <br/>Here, you can install mods from <a href="https://modrinth.com" target="_blank">modrinth</a>, or mods you've downloaded from somewhere else.
+                    <br/>Note you will need to install a mod loader before using a mod.
+                </div>
+            </div>
             <?php if (substr($_SESSION['perms'],3,1)=="1") { ?>
 
             <?php if ($config['modrinth_integration']=='on') { ?>
             <div class="card">
-                <h2>Get mods - Modrinth</h2>
+                <h2>Modrinth</h2>
                 <form class="row" action="javascript:void(0)">
                     <div class="col-md-12 col-12 mb-2">
                         <select class="form-control" id="mcv">
@@ -1571,7 +1583,7 @@ function uri($uri) {
             <?php } ?>
 
             <div id="upload-card" class="card">
-                <h2>Upload mods</h2>
+                <h2>Upload</h2>
                 <div class="card-img-bottom">
                     <form id="modsform" enctype="multipart/form-data">
                         <div class="upload-mods">
@@ -1589,7 +1601,7 @@ function uri($uri) {
             </div>
 
             <div style="display: none" id="u-mods" class="card">
-                <h2>New Mods</h2>
+                <h2>New</h2>
                 <table class="table">
                     <thead>
                         <tr>
@@ -1609,7 +1621,7 @@ function uri($uri) {
             <?php } ?>
 
             <div class="card">
-                <h2>Available Mods</h2>
+                <h2>Installed</h2>
                 <hr>
                 <input placeholder="Search..." type="text" id="search" class="form-control"><br />
                 <table id="modstable" class="table table-striped sortable">
@@ -1691,7 +1703,6 @@ function uri($uri) {
                   </div>
                   <div class="modal-footer">
                     <button type="button" class="btn btn-primary" data-dismiss="modal">No</button>
-                    <button id="remove-button-force" type="button" class="btn btn-danger" data-dismiss="modal">Force Delete</button>
                     <button id="remove-button" type="button" class="btn btn-danger" data-dismiss="modal">Delete</button>
                   </div>
                 </div>
@@ -1756,55 +1767,68 @@ function uri($uri) {
               <div class="modal-dialog" role="document">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <h5 class="modal-title" id="rm">Delete mod <span id="mod-name-title"></span>?</h5>
+                    <h5 class="modal-title" id="rm">Delete loader <span id="mod-name-title"></span>?</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                       <span aria-hidden="true">&times;</span>
                     </button>
                   </div>
                   <div class="modal-body">
-                    Are you sure you want to delete mod <span id="mod-name"></span>? Mod's file will be deleted too.
+                    Are you sure you want to delete loader <span id="mod-name"></span>? Mod's file will be deleted too.
                   </div>
                   <div class="modal-footer">
                     <button type="button" class="btn btn-primary" data-dismiss="modal">No</button>
-                    <button id="remove-button-force" type="button" class="btn btn-danger" data-dismiss="modal">Force Delete</button>
                     <button id="remove-button" type="button" class="btn btn-danger" data-dismiss="modal">Delete</button>
                   </div>
                 </div>
               </div>
             </div>
 
+
+            <div class="card">
+                <h2>Mod loaders</h2>
+                <div>
+                    A mod loader is a mod that loads other mods.
+                    <br/>It is almost always required for your modpack, and must be added to a build before using any other mods.
+                    <br/>You can install loaders here, or, you can upload your own <a href="https://support.technicpack.net/hc/en-us/articles/17049267195021-How-to-Create-a-Client-Modpack#Installing-a-mod-loader" target="_blank">modpack.jar</a>.
+                </div>
+            </div>
+
             <?php if (substr($_SESSION['perms'], 5, 1)=="1") { ?>
-            <div class="btn-group btn-group-justified btn-block">
+<!--             <div class="btn-group btn-group-justified btn-block">
                 <button id="fetch-forge" onclick="fetch_forges()" class="btn btn-primary mr-1">Show Forge Versions</button>
-                <!-- <button disabled id="save" onclick="window.location.reload()" style="display:none;" class="btn btn-success">(Forge) Save and Refresh</button> -->
                 <button id="fetch-neoforge" onclick="fetch_neoforge()" class="btn btn-primary mr-1">Show Neoforge Versions</button>
                 <button id="fetch-fabric" onclick="fetchfabric()" class="btn btn-primary mr-1">Show Fabric Versions</button>
-            </div>
-            <span id="info" class="text-danger"></span>
-            <div class="card" id="fabrics" style="display:none;">
-                <h2>(α) Fabric Installer</h2>
+            </div> -->
+            <div class="card" id="fabrics">
+                <h2>Fabric</h2>
                 <form>
                     <label for="lod">Loader Version</label>
                     <select id="lod"></select><br>
                     <label for="ver">Game Version</label>
                     <select id="ver"></select><br>
-                    <button id="sub-button" type="button" onclick="download()" class="btn btn-primary">Install</button>
+                    <button id="sub-button" type="button" onclick="download_fabric()" class="btn btn-primary" disabled><em class="fas fa-cog fa-lg fa-spin"></em></button>
                 </form>
+                <span id="installfabricinfo" style="display:none;"></span>
             </div>
-            <div class="card" id="neoforges" style="display:none;">
-                <h2>Neoforge Installer</h2>
+
+            <div class="card" id="neoforges">
+                <h2>Neoforge</h2>
                 <form>
                     <label for="lod">Version</label>
                     <select id="lod-neoforge" required></select><br>
-<!--                     <label for="ver">Game Version</label>
-                    <select id="ver-neoforge" required></select><br> -->
-                    <button id="sub-button-neoforge" type="button" onclick="download_neoforge()" class="btn btn-primary">Install</button>
+                    <!-- <label for="ver">Game Version</label> -->
+                    <!-- <select id="ver-neoforge" required></select><br> -->
+                    <button id="sub-button-neoforge" type="button" onclick="download_neoforge()" class="btn btn-primary" disabled><em class="fas fa-cog fa-lg fa-spin"></em></button>
                 </form>
-                <span id="sub-button-neoforge-message" style="display:hidden;"></span>
+                <span id="installneoforgeinfo" style="display:none;"></span>
             </div>
-            <div class="card" id="fetched-mods" style="display: none">
-                <h2>Available Forge Versions</h2>
-                <table class="table table-striped sortable">
+
+            <div class="card" id="fetched-mods">
+                <h2>Forge</h2>
+                <form>
+                    <button id="fetch-forge" onclick="fetch_forges()" class="btn btn-primary">Show Versions</button>
+                </form>
+                <table id="table-fetched-mods" style="display:none" class="table table-striped sortable">
                     <thead>
                         <tr>
                             <th scope="col" style="width:10%" data-defaultsign="_19">Minecraft</th>
@@ -1817,10 +1841,11 @@ function uri($uri) {
                     <tbody id="forge-table">
                     </tbody>
                 </table>
+                <span id="installforgeinfo" class="text-danger" style="display:none;"></span>
             </div>
 
             <div class="card">
-                <h2>Upload custom mod loader</h2>
+                <h2>Custom</h2>
                 <hr>
                 <form action="./functions/custom_modloader.php" method="POST" enctype="multipart/form-data">
                     <div class="form-group">
@@ -1847,7 +1872,7 @@ function uri($uri) {
             <?php } ?>
 
             <div class="card">
-                <h2>Mod loaders</h2>
+                <h2>Installed</h2>
                 <?php if (isset($_GET['errfilesize'])) {
                     echo '<span class="text-danger">File is too big! Check your post_max_size (current value '.ini_get('post_max_size').') and upload_max_filesize (current value '.ini_get('upload_max_filesize').') values in '.php_ini_loaded_file().'</span>';
                 } ?>
@@ -1868,22 +1893,34 @@ function uri($uri) {
                     </thead>
                     <tbody id="forge-available">
                         <?php
+
+                        $buildsq=$db->query("SELECT id,name,mods FROM builds");
+                        $installed_loader_ids=[];
+                        if ($buildsq){
+                            foreach ($buildsq as $build){
+                                $mods=explode(',', $build['mods'],2);
+                                // echo $mods[0];
+                                array_push($installed_loader_ids, $mods[0]);
+                            }
+                        }
+
+                        $used_loaders=[];
+                        $installed_loaders=[];
                         $mods = $db->query("SELECT * FROM `mods` WHERE `type` = 'forge' ORDER BY `id` DESC");
-                        $installed_mc_loaders=[];
                         if ($mods){
-                            foreach ($mods as $mod){
-                                if ($mod['loadertype']=='fabric') {
-                                    // fabric versioning is different
-                                    array_push($installed_mc_loaders, $mod['loadertype'].'-'.$mod['mcversion']);
-                                } else {
-                                    array_push($installed_mc_loaders, $mod['loadertype'].'-'.$mod['version']);
+                            foreach ($mods as $mod) {
+                                if (in_array($mod['id'],$installed_loader_ids)) {
+                                    array_push($used_loaders, $mod['loadertype'].'-'.$mod['mcversion'].'-'.$mod['version']);
                                 }
-                            ?>
+                                array_push($installed_loaders, $mod['loadertype'].'-'.$mod['mcversion'].'-'.$mod['version']);
+
+                                $remove_box_str="{$mod['id']}, '{$mod['loadertype']}', '{$mod['mcversion']}', '{$mod['version']}', ";
+                                ?>
                             <tr id="mod-row-<?php echo $mod['id'] ?>">
                                 <td scope="row"><?php echo $mod['mcversion'] ?></td>
                                 <td><?php echo $mod['version'] ?></td>
                                 <td><?php echo $mod['loadertype']?></td>
-                                <td> <?php if (substr($_SESSION['perms'], 5, 1)=="1") { ?><button  onclick="remove_box(<?php echo $mod['id'].",'".$mod['pretty_name']." ".$mod['version']."'" ?>)" data-toggle="modal" data-target="#removeMod" class="btn btn-danger btn-sm">Remove</button><?php } ?></td>
+                                <td><?php if (substr($_SESSION['perms'], 5, 1)=="1") { ?><button  onclick="remove_box(<?php echo $remove_box_str ?>)" data-toggle="modal" data-target="#removeMod" class="btn btn-danger btn-sm">Remove</button><?php } ?></td>
                                 <td><em style="display: none" class="fas fa-cog fa-spin fa-sm"></em></td>
                             </tr>
                             <?php
@@ -1896,10 +1933,17 @@ function uri($uri) {
 
             <script>
             <?php
-            if (!empty($installed_mc_loaders)) {
-                echo 'let installed_mc_loaders=JSON.parse(\''.json_encode($installed_mc_loaders).'\');';
+            if (!empty($installed_loaders)) {
+                $installed_loaders_json=json_encode($installed_loaders, JSON_UNESCAPED_SLASHES);
+                echo "let installed_loaders=JSON.parse('{$installed_loaders_json}');";
+            } else {
+                echo 'let installed_loaders=[];';
+            }
+            if (!empty($used_loaders)) {
+                $used_loaders_json = json_encode($used_loaders, JSON_UNESCAPED_SLASHES);
+                echo "let used_loaders=JSON.parse('{$used_loaders_json}');";
             } else {
-                echo 'let installed_mc_loaders=[];';
+                echo 'let used_loaders=[];';
             }
             ?>
             </script>
@@ -1946,7 +1990,7 @@ function uri($uri) {
             </div>
             <?php } ?>
             <div class="card">
-                <h2>Available Files</h2>
+                <h2>Files</h2>
                 <table class="table table-striped sortable">
                     <thead>
                         <tr>
diff --git a/resources/js/page_modloaders.js b/resources/js/page_modloaders.js
index 2f826d4..8189e6b 100644
--- a/resources/js/page_modloaders.js
+++ b/resources/js/page_modloaders.js
@@ -1,10 +1,19 @@
-function remove_box(id,name) {
-    $("#mod-name-title").text(name);
-    $("#mod-name").text(name);
-    $("#remove-button").attr("onclick","remove("+id+",false)");
-    $("#remove-button-force").attr("onclick","remove("+id+",true)");
+const CACHE_INSTALLER_TTL=3600;
+
+function remove_box(id,name,minecraft,version) {
+    if (used_loaders.includes(name+'-'+minecraft+'-'+version)) {
+        $("#mod-name-title").html(name+' <b>(in use)</b>');
+        $("#mod-name").html(name+' <b>(in use)</b>');
+        $("#remove-button").attr("onclick",`remove(${id},'${name}','${minecraft}','${version}',true)`);
+        $("#remove-button").text('Force delete')
+    } else {
+        $("#mod-name-title").text(name);
+        $("#mod-name").text(name);
+        $("#remove-button").attr("onclick",`remove(${id},'${name}','${minecraft}','${version}',false)`);
+        $("#remove-button").text('Delete')
+    }
 }
-function remove(id,force) {
+function remove(id,name,minecraft,version,force) {
     var request = new XMLHttpRequest();
     request.onreadystatechange = function() {
         if (this.readyState == 4 && this.status == 200) {
@@ -12,12 +21,11 @@ function remove(id,force) {
             if (response['status']=='succ') {
                 console.log('success!');
                 $("#mod-row-"+id).remove();
-            } else {
-                // todo: use styled alert instead of this
-                // alert("Cannot delete modloader as it is used by a build.");
-                // $("#removeModWarn").show();
-                if (confirm(response['message']+" Press OK to go to '"+response['bname']+"'")) {
-                    window.location.href="/build?id="+response['bid'];
+                if (used_loaders.includes(name+'-'+minecraft+'-'+version)) {
+                    const index = used_loaders.indexOf(name+'-'+minecraft+'-'+version);
+                    if (index > -1) {
+                      used_loaders.splice(index, 1);
+                    }
                 }
             }
         }
@@ -28,7 +36,7 @@ function remove(id,force) {
 }
 
 // Fabric Download
-let download = () => {
+let download_fabric = () => {
     let minecraft = $("#ver").children("option:selected").val();
     let version = $("#lod").children("option:selected").val();
     if ($("#ver").children("option:selected").attr("disabled")!==undefined && $("#ver").children("option:selected").attr("disabled")!==false) {
@@ -37,89 +45,128 @@ let download = () => {
         $("#sub-button").attr("disabled","true")
         $("#sub-button")[0].innerHTML = "<i class='fas fa-cog fa-spin'></i>"
         let packager = new XMLHttpRequest();
-        packager.open('GET', './functions/package-fabric.php?version='+encodeURIComponent(minecraft)+"&loader="+encodeURIComponent(version))
+        packager.open('GET', './functions/add-modloader-fabric.php?version='+encodeURIComponent(minecraft)+"&loader="+encodeURIComponent(version))
         packager.onreadystatechange = () => {
             if (packager.readyState === 4) {
                 if (packager.status === 200) {
+                    console.log(packager.response)
                     parsed = JSON.parse(packager.response)
                     if (parsed["status"] === "succ") {
-                        // $("#sub-button")[0].classList.remove("btn-primary")
-                        // $("#sub-button")[0].classList.add("btn-success")
-                        // $("#sub-button")[0].innerHTML = "<i class='fas fa-check'></i> Please reload the page."
-                        // window.location.reload();
-
                         $("#ver").children("option:selected").attr("disabled",true);
-                        // $("#ver").children("option:selected").innerHTML=$("#ver").children("option:selected").innerHTML+" (installed)";
                         $("#sub-button")[0].innerHTML = "Install";
-
-                        add_item(minecraft, version, 'fabric', parsed['id']);
-
-                        // $("#lod").children("option:selected").attr("disabled",true);
-                        // $("#ver").next().attr("selected","selected");
+                        add_item(parsed['id'], 'fabric', minecraft, version);
+                        $('#installfabricinfo').addClass('text-success')
+                        $('#installfabricinfo').removeClass('text-danger')
+                        installed_loaders.push('fabric-'+minecraft+'-'+parsed['version'])
+                        $('#ver option:selected').attr('disabled',true);
+                    } else {
+                        $('#installfabricinfo').addClass('text-danger')
+                        $('#installfabricinfo').removeClass('text-success')
                     }
-                    // $("#fetch-forge").removeAttr("disabled");
-                    // $("#fetch-neoforge").removeAttr("disabled");
                     $("#sub-button").removeAttr("disabled");
+                    $('#installfabricinfo').html(parsed['message'])
+                    $('#installfabricinfo').show()
                 }
             }
         }
         packager.send()
     }
 }
+
 // Fetch Fabric Versions
-let fetchfabric = () => {
-    $("#fetch-fabric").attr("disabled",true)
-    // $("#fetch-forge").attr("disabled",true)
-    // $("#fetch-neoforge").attr("disabled",true)
-    $("#fetch-fabric").html("Loading...<i class='fas fa-cog fa-spin fa-sm'></i>")
-    let versions = new XMLHttpRequest()
-    let loaders = new XMLHttpRequest()
-    versions.open('GET','https://meta.fabricmc.net/v2/versions/game')
-    loaders.open('GET','https://meta.fabricmc.net/v2/versions/loader')
-    versions.onreadystatechange = () => {
-        if (versions.readyState === 4) {
-            if (versions.status === 200) {
-                response = JSON.parse(versions.response)
-                for (key in response) {
-                    if (response[key]["stable"]) {
-                        if (!installed_mc_loaders.includes('fabric-'+response[key]["version"])) {
-                            ver = document.createElement("option")
-                            ver.text = response[key]["version"]
-                            ver.value = response[key]["version"]
-                            $("#ver")[0].add(ver)
-                            installed_mc_loaders.push('fabric-'+response[key]["version"]);
-                        }
-                    } 
+async function fetch_fabric() {
+    async function fetch_versions() {
+        return new Promise((resolve, reject) => {
+            let versions = new XMLHttpRequest()
+            versions.open('GET','https://meta.fabricmc.net/v2/versions/game')
+            versions.onreadystatechange = () => {
+                if (versions.readyState === 4) {
+                    if (versions.status === 200) {
+                        set_cached('installer_fabric_versions', versions.response, CACHE_INSTALLER_TTL)
+                        resolve(versions.response)
+                        return versions.response
+                    }
                 }
             }
-        }
+            versions.onerror = function() {
+                resolve([]);
+            };
+            versions.send()
+        });
     }
-    loaders.onreadystatechange = () => {
-        if (loaders.readyState === 4) {
-            if (loaders.status === 200) {
-                response = JSON.parse(loaders.response)
-                for (key in response) {
-                    if (response[key]["stable"]) {
-                        ver = document.createElement("option")
-                        ver.text = response[key]["version"]
-                        ver.value = response[key]["version"]
-                        $("#lod")[0].add(ver)
+    async function fetch_loaders() {
+        return new Promise((resolve, reject) => {
+            let loaders = new XMLHttpRequest()
+            loaders.open('GET','https://meta.fabricmc.net/v2/versions/loader')
+            loaders.onreadystatechange = () => {
+                if (loaders.readyState === 4) {
+                    if (loaders.status === 200) {
+                        set_cached('installer_fabric_loaders', loaders.response, CACHE_INSTALLER_TTL)
+                        // response = JSON.parse(loaders.response)
+                        resolve(loaders.response)
+                        return loaders.response
                     }
                 }
-                $("#fetch-fabric").html("Show Fabric Installer")
-                $("#fabrics")[0].style.display = "flex";
+            }
+            loaders.onerror = function() {
+                resolve([])
+            }
+            loaders.send()
+        });
+    }
+
+    if (get_cached('installer_fabric_versions')) {
+        var versions=JSON.parse(get_cached('installer_fabric_versions'));
+    } else {
+        var versions=JSON.parse(await fetch_versions());
+    }
+    if (get_cached('installer_fabric_loaders')) {
+        var loaders=JSON.parse(get_cached('installer_fabric_loaders'));
+    } else {
+        var loaders=JSON.parse(await fetch_loaders());
+    }
+
+    versions = versions.filter((v) => v['stable'] == true);
+    loaders = loaders.filter((v) => v['stable'] == true);
+
+    let merged = versions.map((v, i) => [v['version'], loaders[0]['version']]);
+
+    for (v of merged) {
+        let minecraft=v[0];
+        let loader=v[1]
+            // console.log($("#ver")[0])
+        if (!installed_loaders.includes('fabric-'+minecraft+'-'+loader)) {
+            if ($(`#lod option[value='${loader}']`).length == 0) {
+                lod = document.createElement("option")
+                lod.text = loader
+                lod.value = loader
+                $("#lod")[0].add(lod)
+            }
+            if ($(`#ver option[value='${minecraft}']`).length == 0) {
+                mcv = document.createElement("option")
+                mcv.text = minecraft
+                mcv.value = minecraft
+                $("#ver")[0].add(mcv)
             }
         }
+        
     }
-    loaders.send()
-    versions.send()
+
+    $('#sub-button').attr('disabled',false);
+    $('#sub-button').text('Install');
+    $("#fetch-fabric").html("Show Fabric Installer")
+    $("#fabrics")[0].style.display = "flex";
+    
+
 }
+// neoforge download
 let download_neoforge = () => {
     let VERSIONS_ENDPOINT = 'https://maven.neoforged.net/api/maven/versions/releases/'
     let FORGE_GAV = 'net/neoforged/neoforge'
     let DOWNLOAD_URL = 'https://maven.neoforged.net/releases'
 
     let version = $("#lod-neoforge").children("option:selected").val();
+    // let minecraft = $("#ver-neoforge").children("option:selected").val();  
     let minecraft = "1."+version.slice(0,version.lastIndexOf('.'));
     let download_link = `${DOWNLOAD_URL}/${FORGE_GAV}/${encodeURIComponent(version)}/neoforge-${encodeURIComponent(version)}-installer.jar`;
     
@@ -129,7 +176,7 @@ let download_neoforge = () => {
         return;
     } else {
         $("#sub-button-neoforge").attr("disabled","true")
-        $("#sub-button-neoforge-message").hide();
+        $("#installneoforgeinfo").hide();
         $("#sub-button-neoforge")[0].innerHTML = "<i class='fas fa-cog fa-spin'></i>"
 
         let packager = new XMLHttpRequest();
@@ -140,26 +187,27 @@ let download_neoforge = () => {
                     console.log(packager.response);
                     parsed = JSON.parse(packager.response)
                     if (parsed["status"] === "succ") {
-                        // $("#sub-button-neoforge")[0].classList.remove("btn-primary")
-                        // $("#sub-button-neoforge")[0].classList.add("btn-success")
-                        // $("#sub-button-neoforge")[0].innerHTML = "<i class='fas fa-check'></i> Please reload the page."
-                        // window.location.reload();
                         $("#lod-neoforge").children("option:selected").attr("disabled",true);
                         $("#lod-neoforge").children("option:selected").innerHTML=$("#lod-neoforge").children("option:selected").innerHTML+" (installed)";
                         $("#sub-button-neoforge")[0].innerHTML = "Install";
 
-                        add_item(minecraft, version, 'neoforge', parsed['id']);
+                        add_item(parsed['id'], 'neoforge', minecraft, version);
                         $("#lod-neoforge").next().attr("selected","selected");
+                        $('#installneoforgeinfo').addClass('text-success');
+                        $('#installneoforgeinfo').removeClass('text-danger');
+                        installed_loaders.push('neoforge-'+minecraft+'-'+parsed['version'])
                     } else {
                         $("#sub-button-neoforge").removeAttr("disabled")
-                        $("#sub-button-neoforge-message").show();
-                        $("#sub-button-neoforge-message")[0].innerHTML = parsed["message"];
+                        $("#installneoforgeinfo").show();
+                        $("#installneoforgeinfo")[0].innerHTML = parsed["message"];
                         $("#lod-neoforge").children("option:selected").attr("disabled",true);
                         $("#sub-button-neoforge")[0].innerHTML = "Install"
+                        $('#installneoforgeinfo').addClass('text-danger');
+                        $('#installneoforgeinfo').removeClass('text-success');
                     }
-                    // $("#fetch-forge").removeAttr("disabled");
-                    // $("#fetch-fabric").removeAttr("disabled");
                     $("#sub-button-neoforge").removeAttr("disabled")
+                    $('#installneoforgeinfo').html(parsed['message'])
+                    $('#installneoforgeinfo').show();
                 }
             }
         }
@@ -168,10 +216,35 @@ let download_neoforge = () => {
 }
 // Fetch Neoforge Versions
 let fetch_neoforge = () => {
-    // $("#fetch-fabric").attr("disabled",true)
-    // $("#fetch-forge").attr("disabled",true)
+    function parse_versions(versions) {
+        for (key in versions) {
+            let loader = versions[key]
+            let minecraft = '1.'+loader.substring(0, loader.lastIndexOf('.'));
+            if (!installed_loaders.includes('neoforge-'+minecraft+'-'+loader)) {
+                if ($(`#lod-neoforge option[value='${loader}']`).length == 0) {
+                    lod = document.createElement("option")
+                    lod.text = minecraft+' - '+loader;
+                    lod.value = loader
+                    $("#lod-neoforge")[0].add(lod)
+                }
+
+                // if ($(`#ver-neoforge option[value='${minecraft}']`).length == 0) {
+                //     ver = document.createElement("option")
+                //     ver.text = minecraft;
+                //     ver.value = minecraft
+                //     $("#ver-neoforge")[0].add(ver)
+                // }
+            }
+        }
+        $('#sub-button-neoforge').attr('disabled',false);
+        $('#sub-button-neoforge').text('Install');
+    }
     $("#fetch-neoforge").attr("disabled",true)
     $("#fetch-neoforge").html("Loading...<i class='fas fa-cog fa-spin fa-sm'></i>")
+    if (get_cached('installer_neoforge_versions')) {
+        let versions=JSON.parse(get_cached('installer_neoforge_versions'));
+        parse_versions(versions);
+    }
     let loaders = new XMLHttpRequest()
     loaders.open('GET','https://maven.neoforged.net/api/maven/versions/releases/net/neoforged/neoforge')
     loaders.onreadystatechange = () => {
@@ -180,18 +253,9 @@ let fetch_neoforge = () => {
                 response = JSON.parse(loaders.response)
                 if (response["versions"]) {
                     let versions = response["versions"].reverse();
-                    for (key in versions) {
-                        let value = versions[key]
-                        // if (!value.endsWith("-beta")) {
-                            if (!installed_mc_loaders.includes('neoforge-'+value)) {
-                                ver = document.createElement("option")
-                                ver.text = '1.'+value.substring(0, value.lastIndexOf('.'))+' - '+value;
-                                ver.value = value
-                                $("#lod-neoforge")[0].add(ver)
-                                installed_mc_loaders.push('neoforge-'+value);
-                            }
-                        // }
-                    }
+                    versions = versions.filter((v) => !v.endsWith('beta'));
+                    set_cached('installer_neoforge_versions', JSON.stringify(versions), CACHE_INSTALLER_TTL) // 1 hour
+                    parse_versions(versions);
                 }
                 $("#fetch-neoforge").html("Show Neoforge Installer");
                 $("#neoforges")[0].style.display = "flex";
@@ -201,12 +265,12 @@ let fetch_neoforge = () => {
     loaders.send()
 }
 
-// add forge version
-function add(v,link,mcv,id) {
+// download forge version
+function download_forge(id,minecraft,version,link) {
     $("#button-add-"+id).attr("disabled",true);
     $("#cog-"+id).show();
     var request = new XMLHttpRequest();
-    request.open('GET', './functions/add-modloader.php?type=forge&version='+v+'&dl='+link+'&mcversion='+mcv);
+    request.open('GET', './functions/add-modloader.php?type=forge&version='+version+'&dl='+link+'&mcversion='+minecraft);
     request.onreadystatechange = function() {
         if (request.readyState == 4) {
             if (request.status == 200) {
@@ -216,12 +280,17 @@ function add(v,link,mcv,id) {
                 $("#fetch-neoforge").removeAttr("disabled");
                 if (response['status']=="succ") {
                     $("#check-"+id).show();
-                    add_item(mcv,v,'forge',response['id']);
+                    add_item(response['id'], 'forge', minecraft, version);
+                    $("#installforgeinfo").addClass('text-success');
+                    $("#installforgeinfo").removeClass('text-danger');
+                    installed_loaders.push('forge-'+minecraft+'-'+version)
                 } else {
                     $("#times-"+id).show();
-                    $("#info").text(response['message']);
+                    $("#installforgeinfo").addClass('text-danger');
+                    $("#installforgeinfo").removeClass('text-success');
                 }
-
+                $("#installforgeinfo").text(response['message']);
+                $("#installforgeinfo").show();
             }
         }
     }
@@ -232,93 +301,108 @@ const forge_link = "https://maven.minecraftforge.net/net/minecraftforge/forge";
 
 // Fetch forge versions
 async function fetch_forges() {
-    $("#fetch-forge").attr("disabled", true);
-    // $("#fetch-fabric").attr("disabled", true);
-    // $("#fetch-neoforge").attr("disabled",true);
-    $("#fetch-forge").html("Loading...<i class='fas fa-cog fa-spin fa-sm'></i>");
-    var request = new XMLHttpRequest();
-    request.open('GET', './functions/forge-links.php');
-    request.onreadystatechange = async function() {
-        if (request.readyState == 4 && request.status == 200) {
-            response = JSON.parse(this.response);
-
-            response = Object.fromEntries(
-                Object.entries(response).reverse()
-            );
-
-            $("#fetched-mods").show();
+    async function verify_link_then_add(id,minecraft,version,link) {
+        console.log('verifying '+link)
+        // check each version and then add it to list
+        return new Promise((resolve, reject) => {
+            fetch(link, { method:'HEAD' })
+            .then(response=> {
+                if (response.status == 404) {
+                    reject(id);
+                } else if (response.status == 200) {
+                    $("#forge-table").append(`
+                    <tr id="forge-${id}">
+                        <td scope="row" data-value="${minecraft}">${minecraft}</td>
+                        <td data-value="${version}">${version}</td>
+                        <td data-value="${link}" class="d-none d-md-table-cell" style="overflow-wrap: break-word;"><a href="${link}" style="word-break: break-all;">${link}</a></td>
+                        <td><button id="button-add-${id}" onclick="download_forge(${id}, '${minecraft}', '${version}', '${link}')" class="btn btn-primary btn-sm">Add to Database</button></td>
+                        <td><em id="cog-${id}" style="display:none" class="fas fa-spin fa-cog fa-2x"></em><em id="check-${id}" style="display:none" class="text-success fas fa-check fa-2x"></em><em id="times-${id}" style="display:none" class="text-danger fas fa-times fa-2x"></em></td>
+                    </tr>`);
+                    resolve(true);
+                }
+            })
+            .catch(error=>{
+                reject(false);
+            });
+        }).catch(error=>{
+            reject(false);
+        });
+    }
+    async function parse_versions(response){
+        if (get_cached('installer_forge_versions')) {
+            let response=JSON.parse(get_cached('installer_forge_versions'));
+            for (var key in response) {
+                console.log(response[key])
+                await verify_link_then_add(response[key]["id"], response[key]["mc"], response[key]['name'], response[key]["link"]);
+            }
+        } else {
+            let valid=[];
             console.log("ignore 404s, they're supposed to be suppressed/catched with onerror")
-            let onesix_404ed=false;
+            let onesix_worked=false;
             for (var key in response) {
-                // if below problematic version 1.6.1, AND we couldn't get 1.6.1, skip the rest
-                if (compareVersions(key,'1.6.0')<0 && onesix_404ed) {
-                    continue;
-                } else {
-                    try {
-                        await chf(response[key]["link"],response[key]["name"],response[key]["id"],response[key]["mc"]);
-                    } catch (e) {
-                        console.log(`ignoring 404 #4: '${key}'`);
-                        if (compareVersions(key,'1.6.0')<0) {
-                            onesix_404ed=true;
+                if (!installed_loaders.includes('forge-'+response[key]['minecraft']+'-'+response[key]['name'])) {
+                    if (onesix_worked || compareVersions(key,'1.6.0')>0) {
+                        // if 1.6.0 worked, or we are above 1.6.0
+                        try {
+                            let isvalid = await verify_link_then_add(response[key]['id'], response[key]['name'], response[key]['mc'], response[key]['link']);
+                            if (isvalid) {
+                                valid.push(response[key]);
+                            if (compareVersions(key,'1.6.0')<0) {
+                                onesix_worked=false;
+                            }
+                            }
+                        } catch (e) {
+                            if (compareVersions(key,'1.6.0')<0) {
+                                onesix_worked=false;
+                            }
                         }
                     }
                 }
             }
-
-            $("#fetch-forge").html("Show Forge Installer");
-            // $("#fetch-forge").removeAttr("disabled");
-            // $("#fetch-fabric").removeAttr("disabled");
-            // $("#fetch-neoforge").removeAttr("disabled");
+            set_cached('installer_forge_versions', JSON.stringify(valid), CACHE_INSTALLER_TTL);
         }
+        $("#fetch-forge").hide();
     }
-    
-    request.send();
-}
 
-// add item to installer list
-async function chf(link,name,id,mc) {
-    return new Promise((resolve, reject) => {
-        fetch(link, { method:'HEAD' })
-        .then(response=> {
-            if (response.status == 404) {
-                // console.log('ignoring 404 #1');
-                reject(id);
-            } else if (response.status == 200) {
-                $("#forge-table").append(`
-                <tr id="forge-${id}">
-                    <td scope="row" data-value="${mc}">${mc}</td>
-                    <td data-value="${name}">${name}</td>
-                    <td data-value="${link}" class="d-none d-md-table-cell" style="overflow-wrap: break-word;"><a href="${link}" style="word-break: break-all;">${link}</a></td>
-                    <td><button id="button-add-${id}" onclick="add(\'${name}\', \'${link}\', \'${mc}', \'${id}\')" class="btn btn-primary btn-sm">Add to Database</button></td>
-                    <td><em id="cog-${id}" style="display:none" class="fas fa-spin fa-cog fa-2x"></em><em id="check-${id}" style="display:none" class="text-success fas fa-check fa-2x"></em><em id="times-${id}" style="display:none" class="text-danger fas fa-times fa-2x"></em></td>
-                </tr>`);
-                resolve(id);
+    $("#fetch-forge").attr("disabled", true);
+    $("#fetch-forge").html("Loading...<i class='fas fa-cog fa-spin fa-sm'></i>");
+    $("#table-fetched-mods").show();
+
+    if (get_cached('installer_forge_versions')) {
+        let response=JSON.parse(get_cached('installer_forge_versions'));
+        parse_versions(response);
+    } else {
+        var request = new XMLHttpRequest();
+        request.open('GET', './functions/forge-links.php');
+        request.onreadystatechange = async function() {
+            if (request.readyState == 4 && request.status == 200) {
+                response = JSON.parse(this.response);
+                response = Object.fromEntries(Object.entries(response).reverse());
+                // cached in parse_versions
+                parse_versions(response);
             }
-        })
-        .catch(error=>{
-            // console.log('ignoring 404 #2');
-            reject(id);
-        });
-    }).catch(error=>{
-        // console.log('ignoring 404 #3');
-        reject(id);
-    });
+        }
+        
+        request.send();
+    }
 }
 
 // add item to installed list
-function add_item(minecraft,version,type,dbid) {
+function add_item(id,name,minecraft,version) {
     let item = $('<tr>', { 
-        id: 'mod-row-'+dbid, 
+        id: 'mod-row-'+id, 
         html: `
         <td scope="row" data-value="${minecraft}">${minecraft}</td>
         <td data-value="${version}">${version}</td>
-        <td data-value="${type}">${type}</td>
-        <td data-value="Remove"><button onclick="remove_box(${dbid},'${type} ${version}')" data-toggle="modal" data-target="#removeMod" class="btn btn-danger btn-sm">Remove</button></td>
-        <td data-value><svg style="display: none;" class="svg-inline--fa fa-cog fa-w-16 fa-spin fa-sm" aria-hidden="true" data-prefix="fas" data-icon="cog" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><path fill="currentColor" d="M444.788 291.1l42.616 24.599c4.867 2.809 7.126 8.618 5.459 13.985-11.07 35.642-29.97 67.842-54.689 94.586a12.016 12.016 0 0 1-14.832 2.254l-42.584-24.595a191.577 191.577 0 0 1-60.759 35.13v49.182a12.01 12.01 0 0 1-9.377 11.718c-34.956 7.85-72.499 8.256-109.219.007-5.49-1.233-9.403-6.096-9.403-11.723v-49.184a191.555 191.555 0 0 1-60.759-35.13l-42.584 24.595a12.016 12.016 0 0 1-14.832-2.254c-24.718-26.744-43.619-58.944-54.689-94.586-1.667-5.366.592-11.175 5.459-13.985L67.212 291.1a193.48 193.48 0 0 1 0-70.199l-42.616-24.599c-4.867-2.809-7.126-8.618-5.459-13.985 11.07-35.642 29.97-67.842 54.689-94.586a12.016 12.016 0 0 1 14.832-2.254l42.584 24.595a191.577 191.577 0 0 1 60.759-35.13V25.759a12.01 12.01 0 0 1 9.377-11.718c34.956-7.85 72.499-8.256 109.219-.007 5.49 1.233 9.403 6.096 9.403 11.723v49.184a191.555 191.555 0 0 1 60.759 35.13l42.584-24.595a12.016 12.016 0 0 1 14.832 2.254c24.718 26.744 43.619 58.944 54.689 94.586 1.667 5.366-.592 11.175-5.459 13.985L444.788 220.9a193.485 193.485 0 0 1 0 70.2zM336 256c0-44.112-35.888-80-80-80s-80 35.888-80 80 35.888 80 80 80 80-35.888 80-80z"></path></svg></td>` 
+        <td data-value="${name}">${name}</td>
+        <td data-value="Remove"><button onclick="remove_box(${id},'${name}','${minecraft}','${version}')" data-toggle="modal" data-target="#removeMod" class="btn btn-danger btn-sm">Remove</button></td>
+        <td data-value><em style="display: none" class="fas fa-cog fa-spin fa-sm"></em></td>` 
     });
     $("#forge-available").append(item);
 }
 
 $(document).ready(function(){
     $("#nav-mods").trigger('click');
+    fetch_fabric()
+    fetch_neoforge()
 });
\ No newline at end of file