Compare commits

..

No commits in common. "master" and "rewrite" have entirely different histories.

14 changed files with 276 additions and 72 deletions

View File

@ -4,4 +4,3 @@
deploy.sh
README.md
test.sh
Jenkinsfile

View File

@ -10,7 +10,6 @@ variables:
stages:
- build
# - test
- deploy
services:
- docker:dind
before_script:

19
Jenkinsfile vendored
View File

@ -1,19 +0,0 @@
pipeline {
agent {
docker {
image 'morlay/buildx:607a2ce'
}
}
stages {
stage('Build') {
steps {
echo 'BUILD'
}
}
stage('Build Tag') {
steps {
echo 'BUILD TAG'
}
}
}
}

View File

@ -11,8 +11,13 @@
<h1>About 9iron</h1>
<p>9iron is a website spun up by yours truly to unify the services I host and inevitably rope my friends into. It also aggregates documentation about the various games we play.</p>
<h1>About Me</h1>
<p>I am Salt. I'm an SRE and I play video games. You can reach me effectively through Discord if you have my handle, otherwise email is the best way to get ahold of me.</p>
<p>I am Salt. I'm a sysadmin and I play video games. I'm regrettably most active on Discord because there are no good alternatives (that my friends will join). You can also reach me very effectively through the Fediverse and email.</p>
<p>Hit me up if you wanna play something or if shit breaks.</p>
<dl>
<dt>Fedi:</dt>
<dd>salt@cowfee.moe</dd>
<dt>Discord:</dt>
<dd>Salt#0382</dd>
<dt>Email:</dt>
<dd>Check my commits</dd>
</dl>

29
css/index.php Normal file
View File

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
<title>9iron - Counter-Strike: Source</title>
</head>
<body>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
<div class="content">
<div class="section">
<h1>Counter-Strike: Source</h1>
<p>None of us are any good.</p>
</div>
<div class="subcontainer">
<h2>Connecting to the Server</h2>
<ol>
<li>Open Counter-Strike: Source</li>
<li>Hit "Find Servers"</li>
<li>Go to the "Favorites" tab</li>
<li>Hit "Add a server"</li>
<li>Enter <code>css.thefuck.how</code> in and hit enter</li>
<li>Connect to "The Salty Spitoon"</li>
<li>The password is "dicks". The password is always "dicks".</li>
</ol>
</div>
</div>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
</body>
</html>

View File

@ -19,6 +19,16 @@
<h1>Terraria</h1>
<p>A game we've sunk just as much time into as Minecraft. Sometimes modded, sometimes not</p>
</a>
<a href="/css" class="iconbutton">
<i class="fa fa-bomb"></i>
<h1>CS:S</h1>
<p>Rooty tooty "The bomb has been planted"</p>
</a>
<a href="/smz3mw" class="iconbutton">
<i class="fa fa-random"></i>
<h1>SMZ3 Multiworld</h1>
<p>Strap two games together, then strap a bunch of those games together and shake them real hard</p>
</a>
</div>
</div>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>

1
minecraft/packs/current Symbolic link
View File

@ -0,0 +1 @@
1.16.5-valhelsia

View File

@ -28,11 +28,19 @@
<h2>1. Installing Java</h2>
<p>Minecraft depends on Java. It's important that you have the latest 64-bit edition of Java installed.</p>
<ol>
<li>Go to <a href="https://adoptium.net/">Adoptium</a></li>
<li>Select "OpenJDK 8"</li>
<li>Click "Latest release"</li>
<li>Run through the installer</li>
<li>Go to <a href="https://www.java.com/en/download/manual.jsp">Java Downloads</a></li>
<li>Download and run the "Windows Offline (64-bit)" option</li>
</ol>
<div class="warning">
<i class="badge fa fa-warning"></i>
Ensure you do NOT install the 32-bit version of Java! Doing so may result in some of the following weird errors:
<ul>
<li>Being unable to launch a pack with over 4GB of memory allocated</li>
<li>"Java could not be invoked with the arguments specified"</li>
<li>Other random nebulous errors from MultiMC</li>
</ul>
If you're not sure whether or not you've installed 32-bit Java, uninstall and reinstall it just to be on the safe side.
</div>
</div>
<div class="subcontainer" id="multimc">
<h2>2. Installing MultiMC</h2>

75
smz3mw/index.php Normal file
View File

@ -0,0 +1,75 @@
<!DOCTYPE html>
<html>
<head>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
<title>9iron - SMZ3 Multiworld</title>
</head>
<body>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
<div class="content">
<h1>Setting Up the <i>Super Metroid</i>/<i>The Legend of Zelda - A Link to the Past</i> Multiworld Item Randomizer</h1>
<p>Disclaimer: Most of this information is duplicated from <a href="https://samus.link/mwinstructions">upstream documentation</a>. If anything here breaks, please consult that guide as the instructions may have changed.</p>
<div class="subcontainer">
<h2>1. Installing QUSB2SNES</h2>
<p>It's a big fancy name that means "driver to allow your emulator to talk to the multiworld server".</p>
<ol>
<li><a href="https://github.com/Skarsnik/QUsb2snes/releases">Go here</a></li>
<li>Download the latest release (expand "Assets" and pick the file that ends in ".exe")</li>
<li>Put it somewhere</li>
<li>Run it</li>
<li>Pick the option for "Enable Lua Bridge (snes9x-rr)" (you may have to right-click the tray icon if you don't get a window when you start the application)</li>
</ol>
</div>
<div class="subcontainer">
<h2>2. Installing Snes9x-rr</h2>
<p>We have to install a special emulator to interact with some special tooling and allow items to be sent between worlds.</p>
<ol>
<li><a href="https://github.com/gocha/snes9x-rr/releases/">Go here</a></li>
<li>Download the latest release (ends in "win32.zip")</li>
<li>Unzip it somewhere</li>
<li>Run <code>snes9x.exe</code> to start the emulator</li>
<li>File -&gt; Lua Scripting -&gt; New Lua Script Window</li>
<li>Load "luabridge.lua" from the directory you ran snes9x out of</li>
</ol>
</div>
<div class="subcontainer">
<h2>3. Connecting to the Multiworld</h2>
<p>From here, you have an emulator and a program to expose that emulator to the internet. Now we connect it to the multiworld randomizer engine so you can join the game.</p>
<ol>
<li>Ask somebody for the link to the party at <a href="https://samus.link">samus.link</a></li>
<li>Visit the link in your browser</li>
<li>Hit the "Connect" button next to your name</li>
<li>Upload your totally legitimately obtained Super Metroid and ALttP ROMs (the randomizer is very picky about which ones you upload; ask around for the right ones if you don't have them)</li>
<li>Pick your favorite sprites and colors and energy beep frequency</li>
<li>Download and play the ROM in snes9x</li>
<li>Hate life</li>
</ol>
</div>
<div class="subcontainer">
<h2>4. Playing the Game</h2>
<p>There are a number of resources available to help you in managing the sheer amount of information that you'll need to keep track of during the randomizer. Make good use of these:</p>
<ul>
<li><a href="http://smalttpr.mymm1.com/tracker/">ALttP Item Tracker</a> - Plug in what items you have and it'll tell you where you can go. Accounts for crossing through Super Metroid to get to somewhere you normally couldn't</li>
<li><a href="https://wiki.supermetroid.run/List_of_rooms">List of Rooms in Super Metroid</a> - The game is huge, so naming each room helps keep track of where you are. You can also see full screenshots of each room</li>
</ul>
<p>Also some tips:</p>
<ul>
<li>There are several points at which you can softlock in Super Metroid. Save early, save often, and know when to reset</li>
<li>You start with a full map in Super Metroid detailing every item's location. It's very helpful</li>
<li>There are many ways to skin a cat, some of them more or less painful than others</li>
</ul>
<ul>
<li>Kakariko Village is incredibly lucrative early on; there are 10-15 items in that area you can acquire with literally no items</li>
<li>Getting to the Dark World is a huge priority; you need the Moon Pearl and either a Hammer or a Glove to get there</li>
<li>Certain trees can be pulled in ALttP to yield pickups. The pickups that drop are random for each player</li>
</ul>
<ul>
<li>Just because you CAN get somewhere doesn't mean there will be anything helpful there. Glitches yield sequence breaks, not progression</li>
<li>Having a trusted third party available to check the spoiler log might not be a bad idea</li>
<li>Sometimes your progression can be in somebody else's world. If you know there's nothing for you to do, there's no shame in going and getting some Burger King while you wait</li>
</ul>
</div>
</div>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
</body>
</html>

View File

@ -52,7 +52,6 @@
"Better change tactics",
"honk.wmv",
"bomk",
"Degenerate",
"guys literally only want one thing",
"Dame da ne~!",
"You can't look up with your tongue out",
@ -113,16 +112,6 @@
// - Me, context forgotten
"\"Brett has Mrs. Chapman nipples\"",
// - Me
"\"28 - 6 >= Fuck You\"",
// - Me
"\"I fuck dirt\"",
// - Me
"\"Glorious Soviet manmeat\"",
// - Me
"\"Ah shit, soap! I'm getting hard!\"",
// - Me
"\"Tom Nook has whores in stock\"",
// - Me
"\"I suck a lot of dick, get over here\"",
// - Brett
"\"This was worth sucking dick\"",
@ -137,10 +126,6 @@
// - Brett
"\"Let's get this cock onto a tray!\"",
// - Brett
"\"All she needs to do is step on me\"",
// - Brett
"\"Fuck toy\"",
// - Brett, on accident
"\"This is Hell, they are all prostitutes.\"",
// - Jordyn
"\"Isn't an asshole like a brass instrument?\"",
@ -151,12 +136,8 @@
// - Jacob
"\"Much edge\"",
// - Jacob
"\"Ranked sudoku\"",
// - Jacob
"\"Oh it's a bear\"",
// - Lea, moments before being mauled by a grizzly bear
"\"Double-bitched out of love~\"",
// - Lea
"\"I'm in danger!\"",
// - At least four of us, constantly shittalking
"\"He got cancer and became a Nazi\"",
@ -179,12 +160,12 @@
// - Syd
"\"I'm gonna fart. I'm gonna-\"",
// - Tex of BPL, just before he farts medical into the next universe
"\"Double-bitched out of love~\"",
// - vampqu33n
"\"Fixing PHP is like coming home\"",
// - JE
"\"Now the Nazi party thinks I'm their little pogchamp\"",
// - Jacob, after I said he's my little pogchamp
"\"Fuck you, I had three ass surgeries!\"",
// - Jacob
"\"They're children you thirsty whores\"",
// - Sam
"\"Pichu is illegal\"",
@ -195,10 +176,6 @@
// - Also Sam
"\"There's no D in BDSM\"",
// - Rachael
"\"Beans fuck\"",
// - Preston
"\"So that's 9/11\"",
// - Lena
"God dammit, Sam",
"God dammit, Jacob",
"God dammit",

66
startpage/index.php Normal file
View File

@ -0,0 +1,66 @@
<html>
<head>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
<link href="/startpage/styles/styles.css" type="text/css" rel="stylesheet"/>
<title>New Tab</title>
</head>
<body>
<div class="header">
<form class="search-form" id="sp-search-form" action="https://www.startpage.com/do/dsearch" method="post">
<input type="text" name="query" class="search-input" placeholder="search" autofocus />
</form>
</div>
<div class="content">
<!-- LABBITY -->
<div class="spsection">
<div class="spsubsection">
<h4>Quicklinks</h4>
<a href="https://nc.desu.ltd/index.php/apps/files">Files</a>
<a href="https://nc.desu.ltd/index.php/apps/calendar">Calendar</a>
<a href="https://nc.desu.ltd/index.php/apps/news">Feed</a>
</div>
<div class="spsubsection">
<h4>desu.ltd</h4>
<a href="https://desu.ltd">Index</a>
<a href="https://git.desu.ltd">Gitea</a>
<a href="http://local.desu.ltd">Local</a>
</div>
<div class="spsubsection">
<h4>9iron</h4>
<a href="https://9iron.club">Index</a>
</div>
<div class="spsubsection">
<h4>Resources</h4>
<a href="https://console.aws.amazon.com">AWS Dashboard</a>
<a href="https://domains.google.com/">Google Domains</a>
<a href="https://cloud.linode.com/dashboard">Linode Dashboard</a>
</div>
</div>
<!-- FUN -->
<div class="spsection">
<div class="spsubsection">
<h4>Fedi</h4>
<a href="https://cowfee.moe">Cowfee</a>
<a href="https://tube.seriousposter.club/r/seriousposters#">SPCTube</a>
</div>
<div class="spsubsection">
<h4>Imageboards</h4>
<a href="https://8chan.moe">8chan.moe</a>
<a href="https://smuglo.li">smuglo.li</a>
</div>
<div class="spsubsection">
<h4>Projects</h4>
<a href="https://itazuraneko.neocities.org/learn/guide.html">Learn Japanese</a>
</div>
<div class="spsubsection">
<h4>Other</h4>
<a href="https://tcrf.net">TCRF</a>
<a href="http://www.vgmpf.com">VGMPF</a>
<a href="https://git.axiodl.com/AxioDL/urde">URDE</a>
</div>
</div>
<div class="quote"><?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-inspiration.php';?></div>
</div>
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
</body>
</html>

View File

@ -0,0 +1,66 @@
/*
* startpage.css
* Copyright (C) 2018 salt
*
* Distributed under terms of the MIT license.
*/
/* GLOBALS */
h3 {
font-size: 70%;
letter-spacing: 1em;
margin: auto;
padding-top: 2em 0 1em 0;
text-align: center;
text-transform: uppercase;
}
h4 {
margin: auto;
text-align: center;
}
/* SEARCH BAR */
.search-form {
margin: auto;
max-width: 32em;
padding: 2em;
text-align: center;
}
.search-input {
border: none;
border-bottom: 1px solid var(--link);
color: var(--text-color);
font-size: 16px;
font-family: var(--font);
padding: 0.25em;
transition: .04s ease-in;
width: 100%;
}
.search-input:hover,
.search-input:focus {
border-bottom: 1px solid var(--link-hover);
}
/* SECTIONS */
div.spsection{
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-rows: auto auto auto auto auto;
margin: 1em;
}
div.spsubsection a {
background: var(--background-bright);
border-radius: 8px;
box-shadow: 5px 5px var(--shadow);
display: block;
margin: 0.25em;
padding: 0.5em;
text-align: center;
}
div.spsubsection a:hover {
background: var(--link-hover);
color: var(--background);
}

View File

@ -8,22 +8,21 @@
/* GLOBALS */
:root {
--background-bright: #323232;
--background: #2a2a2a;
--background-bright: #fdfcfa;
--background: #ecebe9;
--line: rgba(0,0,0,0.1);
--greenlink: #47b625;
--greenlink-hover: #82e24f;
--greenlink: #327117;
--greenlink-hover: #47b625;
--warning: #f7cf04;
--error: #d95757;
--link: #5da9fb;
--link-hover: #81ccfb;
--link: #286a9d;
--link-hover: #3ea5f3;
--shadow: 8px -5px rgba(0,0,0,0.1);
--text: #d9d9d9;
--text-code: #d48163;
--text: #414040;
--text-code: #a7674e;
}
html {
overflow-y: scroll;
background: var(--background);
}
body {
background: var(--background);
@ -68,10 +67,9 @@ ol li,ul li {
/* CUSTOM DIVS AND SPANS */
a.quickbutton {
background: var(--link);
background: var(--background-bright);
border-radius: 8px;
box-shadow: 5px 5px var(--shadow);
color: var(--background);
display: block;
font-size: 150%;
margin: 0.5em 0;

10
test.sh
View File

@ -1,10 +0,0 @@
#! /bin/sh
#
# test.sh
# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
#
# Distributed under terms of the MIT license.
#
sudo docker run -p 8080:80 -it "$(sudo docker build -q .)"