Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Dev2 adding server (mostly done) #8

Open
wants to merge 10 commits into
base: Dev
Choose a base branch
from
Open

Dev2 adding server (mostly done) #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0778a3d
added `minecraftCommans.sh ` named arguments
canichols2 Jan 18, 2018
d88b955
cleaned up old functions that were commented out.
canichols2 Jan 18, 2018
d36cebf
fixed server start/stop buttons from opening/closing the server dropd…
canichols2 Jan 18, 2018
e4127a0
implemented a lot of the functions to get forgeVersions on the client…
canichols2 Jan 19, 2018
acd5a56
Configured scraping of minecraftforge.net for all versions based on v…
canichols2 Jan 19, 2018
15a11a1
initial changes to start .sh install from server.
canichols2 Jan 19, 2018
75b335f
fixed some bugs in .sh execution. still some more bugs though.
canichols2 Jan 19, 2018
afeab0e
reconfigured index.html and server.js to get the materialize dir out …
canichols2 Jan 19, 2018
a7cf540
added servers.js file which reads servers from disk and imports their…
canichols2 Jan 23, 2018
d222378
tweaked some server settings and implemented exports more throually
canichols2 Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@ Run the `installControlPanel.sh` script, it will install node, npm, and download
### Install Minecraft w/ Forge
The `installmcForge.sh` script will find the latest version of Vanilla Minecraft Server and Forge server and install them. It will also install any needed dependencies such as Java and Tmux.
use command line args if you want something specific.


`--servername` name of server, and install folder
`-v`|`--mcversion` version for vanilla minecraft
`-f`|`--forgeversion` version for forge
`-t`|`--servertype` "forge" or "vanilla"
`-xms`|`--xms` Minimum ram for vm
`-xmx`|`--xmx` Maximum ram for vm
114 changes: 56 additions & 58 deletions controlPanel/node_server/client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,70 +4,17 @@
<head>
<meta charset="UTF-8">
<title>Project Blocky</title>
<link rel="stylesheet" type="text/css" href="materialize/css/materialize.min.css">
<link rel="stylesheet" type="text/css" href="styles/terminal.css">
<link rel="stylesheet" type="text/css" href="styles/main.css">
<link rel="stylesheet" type="text/css" href="/materialize/css/materialize.min.css">
<link rel="stylesheet" type="text/css" href="/styles/terminal.css">
<link rel="stylesheet" type="text/css" href="/styles/main.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<!-- <script src="node_modules/socket.io-client/dist/socket.io.js"></script> -->
<script type="text/javascript" src="/materialize/js/materialize.min.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="index.js"></script>
<script src="/index.js"></script>
</head>

<body class="blue-grey darken-3">

<script>
console.log("We are in the setup");
// var socket = io.connect("//64.52.84.42:8080");
var socket = io.connect(window.location.hostname+":8080");
socket.on("connected", function(){
console.log("Connection was made!");
});
socket.on("stdOut",function(data){
console.log(data);
var SN = data.name
var term = document.getElementById(SN+"-stdout")
term.innerHTML += data.log;
term.scrollTop=term.scrollHeight
})
socket.on("servers",function(servers){
console.log("recieved server list: ",servers)
$('#serverList')[0].innerHTML=null;
for(s in servers){
console.log("creating server: ",s)
createServerExpandable(s);
var term = document.getElementById(s+"-stdout")
for(l in servers[s].log){
term.innerHTML += servers[s].log[l];
term.scrollTop=term.scrollHeight

}
}
})
function startServer(SN){
console.log("startingServer:",SN)
var data={name:SN}
socket.emit("startServer",data);
}
function stopServer(SN){
console.log("stopingServer:",SN)
var data={name:SN}
socket.emit("stopServer",data);
}
function editServer(){
console.log("Gonna edit something")
}
function uninstallServer(){
console.log("removing server installation")
socket.emit("uninstallServer");
}

function installServer(){
console.log("creating server installation")
socket.emit("installServer");
}

</script>

<nav class="nav-extended">

<div class="nav-wrapper blue-grey darken-1">
Expand Down Expand Up @@ -106,6 +53,57 @@ <h1 class="transparent center-align orange-text">Project Blocky</h1>
</div>
</div>

<div class="row card blue-grey lighten-1">
<div class="card-content white-text">
<div class="card-title">Create New Server</div>
<form action="#">
<div class="row">
<div class="input-field col s6">
<input data-error="Name your server" name="name" id="name" type="text">
<label class="validate" for="name">Server Name</label>
</div>
<div class="input-field col s3">
<input name="maxRam" id="maxMem" type="text">
<label for="maxRam">Max Ram</label>
</div>
<div class="input-field col s3">
<input name="maxRam" id="minMem" type="text">
<label for="minRam">Min Ram</label>
</div>
</div>
<div class="row">
<div class="input-field col s2">
<label>MC Version</label>
<select id="vanillaVer" class="">
<option value="" disabled selected></option>
<option value="1.12.2">1.12.2</option>
<option value="1.12.1">1.12.1</option>
<option value="1.11.1">1.11.1</option>
</select>
</div>
<div class="input-field col s4">
<label>Forge Version</label>
<select id="forgeVer" class="">
<option value="" disabled selected></option>
<option value="1.12.1">1.12.1</option>
<option value="1.112.1">1.112.1</option>
<option value="1.11.1">1.11.1</option>
</select>
</div>
<div class="input-field col s5">
<input type="checkbox" id="forgeCheckbox">
<label for="forgeCheckbox">Create Forge Server</label>
</div>
</div>
<div class="row">
<div id="creationMessage"></div>
</div>
<div class="row">
<button onclick="createServer()" class="btn waves-light right">Create Server</button>
</div>
</form>
</div>
</div>
<div class="row card blue-grey lighten-1">
<div class="card-content white-text">
<span class="card-title"><h3>The Beginning and End...</h3></span>
Expand Down
Loading