canopy (#6)

Hyperlink / IP Branding Changes (#5)

Changed Linked Twitter

Added all "Important Documents" mds and connected them.

Changed Social & Fun hrefs & IPs

Co-authored-by: Strailxx <primeaujarod@gmail.com>
Reviewed-on: https://git.canopymc.net/Canopy/birbmc.com/pulls/5
Co-Authored-By: Strailxx <rezzard10@hotmail.com>
Co-Committed-By: Strailxx <rezzard10@hotmail.com>

Changes for branding/Canopy

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Strailxx <rezzard10@hotmail.com>
Reviewed-on: https://git.canopymc.net/Canopy/canopymc.net/pulls/6
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>

branding.js

@@ -0,0 +1,55 @@
+const fs = require('fs');
+const https = require('https');
+
+function run() {
+    palette();
+    logo('large');
+    logo('small');
+}
+
+const paletteTemplate = `$palette1: #;
+$palette2: #809640;
+$palette3: #74873A;
+$palette4: #617B30;
+$palette5: #413D31;`
+
+function palette() {
+    const options = {
+        hostname: 'git.birbmc.com',
+        port: 443,
+        path: '/Canopy/branding/raw/branch/main/palette.json',
+        method: 'GET'
+    }
+    const req = https.request(options, res => {
+        res.on('data', data => {
+            const palette = JSON.parse(data);
+            fs.writeFileSync('src/assets/sass/_palette.scss', `$palette1: #${palette[4]};
+$palette2: #${palette[3]};
+$palette3: #${palette[2]};
+$palette4: #${palette[1]};
+$palette5: #${palette[0]};`);
+        });
+    });
+    req.end();
+}
+
+function logo(size) {
+    fs.truncateSync(`src/images/${size}.svg`)
+    const options = {
+        hostname: 'git.birbmc.com',
+        port: 443,
+        path: `/Canopy/branding/raw/branch/main/${size}.svg`,
+        method: 'GET'
+    }
+    const req = https.request(options, res => {
+        res.on('data', data => {
+            fs.appendFileSync(`src/images/${size}.svg`, data);
+        });
+    });
+    req.end();
+}
+
+// Run the h*ckin' thing
+if (require.main === module) {
+    run();
+}

package.json

@@ -10,6 +10,7 @@
     "dist": "npx copyfiles --up 1 src/assets/css/* src/assets/js/* src/assets/webfonts/* src/images/* dist/",
     "pages": "node pages.js",
     "index": "node index.js",
+    "branding": "node branding.js",
     "build": "npm run webfonts && npm run sass && npm run dist && npm run pages && npm run index"
   },
   "repository": {

src/assets/sass/_birbmc.scss

@@ -1,3 +1,4 @@
 .home {
   margin-left: 1em;
 }
+

src/assets/sass/_palette.scss

@@ -0,0 +1,5 @@
+$palette1: #74873A;
+$palette2: #617B30;
+$palette3: #809640;
+$palette4: #413D31;
+$palette5: #F4E5CD;

src/assets/sass/base/_page.scss

@@ -37,13 +37,8 @@ html {
 }
 
 body {
-  background-color: _palette(bg);
+  background-color: $palette5;
-  @include vendor(
+
-    "background-image",
-    (
-      "linear-gradient(45deg,#{_palette(accent)} 0.00%,#{_palette(accent1)} 6.67%,#{_palette(accent2)} 13.33%,#{_palette(accent3)} 20.00%,#{_palette(accent4)} 26.67%,#{_palette(accent5)} 33.33%,#{_palette(accent4)} 40.00%,#{_palette(accent3)} 46.67%,#{_palette(accent2)} 53.33%,#{_palette(accent1)} 60.00%,#{_palette(accent)} 66.67%,#{_palette(accent1)} 73.33%,#{_palette(accent2)} 80.00%,#{_palette(accent3)} 86.67%,#{_palette(accent4)} 93.33%,#{_palette(accent5)} 100.00%)"
-    )
-  );
   background-size: 300% 300%;
   background-position: 100% 0%;
 

src/assets/sass/base/_typography.scss

@@ -7,8 +7,8 @@
 /* Type */
 
 body {
-  background-color: _palette(bg);
+  background-color: $palette5;
-  color: _palette(fg);
+  color: $palette4;
 }
 
 body,

src/assets/sass/layout/_header.scss

@@ -49,7 +49,6 @@
         display: block;
         margin: 0 auto;
         max-width: 75%;
-        border-radius: 50%;
       }
     }
   }

src/assets/sass/libs/_vars.scss

@@ -1,3 +1,5 @@
+@import "../palette";
+
 // Misc.
 $misc: (
   z-index-base: 10000,
@@ -44,20 +46,20 @@ $palette: (
   border2: rgba(255, 255, 255, 0.75),
   border2-bg: rgba(255, 255, 255, 0.2),
   invert: (
-    bg: #ffffff,
+    bg: #F7F7F7,
-    bg-alt: #f7f7f7,
+    bg-alt: #FFFFFF7F,
-    fg: #636363,
+    fg: $palette4,
-    fg-bold: #636363,
+    fg-bold: $palette4,
     fg-light: rgba(99, 99, 99, 0.25),
     border: #dddddd,
     border-bg: rgba(222, 222, 222, 0.25),
     border2: #dddddd,
     border2-bg: rgba(222, 222, 222, 0.5),
   ),
-  accent: #61bb46,
+  accent: $palette5,
-  accent1: #fbb828,
+  accent1: $palette4,
-  accent2: #f8801b,
+  accent2: $palette3,
-  accent3: #e0393d,
+  accent3: $palette2,
-  accent4: #953b97,
+  accent4: $palette2,
-  accent5: #0a9ddb,
+  accent5: $palette1,
 );

src/images/small.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 497.81 470.44"><defs><style>.cls-1{fill:#413d31;stroke-width:8px;}.cls-1,.cls-5{stroke:#413d31;stroke-miterlimit:10;}.cls-2{fill:#617b30;}.cls-3{fill:#74843a;}.cls-4{fill:#809340;}.cls-5{fill:none;stroke-width:24px;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_12" data-name="Layer 12"><path class="cls-1" d="M233.82,466.44V393.33a86.76,86.76,0,0,1-38.27-12A80.14,80.14,0,0,1,167,352.39q-10.86-18.48-10.85-44V194.92h18.28V307.26q0,22.85,9.9,38.84a64.18,64.18,0,0,0,25.51,24,70.93,70.93,0,0,0,32.75,8,72.25,72.25,0,0,0,33.71-8.18,67,67,0,0,0,25.89-24q10.1-15.8,10.1-38.65V194.92h17.51V308.4q0,25.91-10.66,44.37a75.25,75.25,0,0,1-28.56,28.56,95.55,95.55,0,0,1-38.47,12v73.11Z"/><rect class="cls-1" x="156.14" y="131.15" width="18.28" height="70.57"/><rect class="cls-1" x="312.28" y="129.41" width="17.52" height="74.18"/><rect class="cls-2" x="179.44" y="51.55" width="237.4" height="100.92" rx="21"/><rect class="cls-3" x="96.01" width="260.15" height="123.93" rx="27.52"/><rect class="cls-4" x="48" y="57.91" width="224.91" height="82.64" rx="23.04"/><rect class="cls-4" x="272.9" y="183.26" width="224.91" height="82.64" rx="25.15"/><rect class="cls-4" y="153.43" width="146.13" height="58.86" rx="21"/><path class="cls-5" d="M394.38,265.9c0,19.5-29.45,35.28-65.84,35.28"/><path class="cls-5" d="M93.38,212.29c0,13.59,28.07,24.58,62.76,24.58"/></g></g></svg>

src/index.html

@@ -6,13 +6,13 @@
 -->
 <html>
   <head>
-    <title>BirbMC</title>
+    <title>The Canopy</title>
     <meta charset="utf-8" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, user-scalable=no"
     />
-    <link rel="shortcut icon" href="images/logo.png" type="image/png">
+    <link rel="shortcut icon" href="images/small.svg">
     <link rel="stylesheet" href="assets/css/main.css" />
     <noscript>
       <link rel="stylesheet" href="assets/css/noscript.css" />
@@ -23,8 +23,7 @@
     <div id="wrapper">
       <!-- Header -->
       <header id="header" class="alt">
-        <span class="logo"><img src="images/logo.png" alt="" /></span>
+        <span class="logo"><img src="images/large.svg" alt="" /></span>
-        <h1>BirbMC</h1>
         <p>A semi-vanilla LGBTQ+ friendly Java Minecraft server.</p>
       </header>
 
@@ -47,10 +46,10 @@
           <div class="spotlight">
             <div class="content">
               <header class="major">
-                <h2>BirbMC</h2>
+                <h2>The Canopy</h2>
               </header>
               <p>
-                BirbMC is a new semi-vanilla Minecraft server (Java) that
+                The Canopy is a new semi-vanilla Minecraft server (Java) that
                 launched on June 13th 2020! We are looking to grow our community
                 of active and friendly players.
               </p>
@@ -90,7 +89,7 @@
               <span class="icon solid major style2 fa-map-marked-alt"></span>
               <h3>Dynmap</h3>
               <p>
-                View our <a href="https://map.birbmc.com/">server's map</a> in
+                View our <a href="https://map.canopymc.com/">server's map</a> in
                 real time, similarly to google maps! This tool gives our players
                 the ability to view their builds from a birds eye or isometric
                 view, but also explore new regions with navigational ease.
@@ -134,25 +133,25 @@
                 <li>
                   <p class="content">
                     Make sure to read our
-                    <a href="http://birbmc.com/rules">rules</a> before you join!
+                    <a href="rules">rules</a> before you join!
                   </p>
                 </li>
                 <li>
                   <p class="content">
                     Learn about
-                    <a href="https://birbmc.com/land_claims">land claims</a>
+                    <a href="land-claims">land claims</a>
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    Help reduce <a href="https://birbmc.com/lag">lag</a> and keep
+                    Help reduce <a href="lag">lag</a> and keep
                     the server running smoothly
                   </p>
                 </li>
                 <li>
                   <p class="content">
                     Set up your
-                    <a href="https://birbmc.com/nether">nether</a> portal, and
+                    <a href="nether">nether</a> portal, and
                     connect to the tunnel system
                   </p>
                 </li>
@@ -164,12 +163,12 @@
               <ul class="content">
                 <li>
                   <p class="content">
-                    Survival server: <strong>play.birbmc.com</strong>
+                    Survival server: <strong>play.canopymc.com</strong>
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    Creative server: <strong>creative.birbmc.com</strong>
+                    Creative server: <strong>creative.canopymc.com</strong>
                   </p>
                 </li>
               </ul>
@@ -181,17 +180,17 @@
                 <li>
                   <p class="content">
                     Take a look around our
-                    <a href="http://map.birbmc.com/">dynmap</a>
+                    <a href="https://canopymc.net/map">dynmap</a>
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    <a href="https://stats.birbmc.com/">Stats.</a> So many stats.
+                    <a href="https://stonks.canopymc.net/">Stats.</a> So many stats.
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    Learn about <a href="https://birbmc.com/discord">Geoffrey</a>,
+                    Learn about <a href="https://canopymc.net/discord">Geoffrey</a>,
                     our shop & location bot.
                   </p>
                 </li>
@@ -203,26 +202,23 @@
               <ul class="content">
                 <li>
                   <p class="content">
-                    Join us on <a href="https://birbmc.com/discord">Discord</a>!
+                    Join us on <a href="https://canopymc.net/discord">Discord</a>!
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    Follow us on <a href="https://twitter.com/birb_mc">Twitter</a>!
+                    Follow us on <a href="https://twitter.com/TheCanopyMC">Twitter</a>!
                   </p>
                 </li>
                 <li>
                   <p class="content">
                     Give us some updoots on
-                    <a href="https://www.reddit.com/r/BirbMC/">Reddit</a>
+                    <a href="https://www.reddit.com/r/CanopyMC/">Reddit</a>
                   </p>
                 </li>
                 <li>
                   <p class="content">
-                    Join our
+                    Tumble with us on <a href="https://thecanopy.tumblr.com/">Tumblr</a>
-                    <a href="https://steamcommunity.com/groups/BirbMC"
-                    >Steam Group</a
-                    >
                   </p>
                 </li>
               </ul>
@@ -245,7 +241,7 @@
 
           <h3>Donations</h3>
           <p>
-            If you <a href="https://birbmc.com/donate">donate</a> to help pay
+            If you <a href="https://canopymc.net/donate">donate</a> to help pay
             for server costs (<em
               >make sure to leave your IGN in the memo section</em
             >), you get access to a few
@@ -266,7 +262,7 @@
                 type="text"
                 readonly
                 id="server-ip"
-                value="play.birbmc.com"
+                value="play.canopymc.com"
               />
 
               <button
@@ -284,7 +280,7 @@
       <!-- Footer -->
       <footer id="footer">
         <p class="copyright">
-          &copy; BirbMC. Design: <a href="https://html5up.net">HTML5 UP</a>.
+          &copy; The Canopy. Design: <a href="https://html5up.net">HTML5 UP</a>.
         </p>
       </footer>
     </div>

src/pages/lag.md

@@ -0,0 +1,44 @@
+---
+title: How to Reduce Server Lag
+path: lag
+---
+
+# How to Reduce Server Lag
+
+<p align=center>
+Server lag is something that we try to actively avoid. Staff tries to mitigate it as much as possible ourselves but there are ways you can help! This guide will show you ways you can decrease the lag created by your farms and bases.
+</p>
+
+<p align=center>
+<i>If anything is unclear by the end feel free to contact a staff member!</i>
+</p>
+
+# Not Allowed by Any Means
+
+* Mob farms that do not kill mobs automatically or alternatively do not have a turn off function
+* Chunk Loaders
+* Lag machines (obviously)
+
+# Easy Ways to Reduce Lag
+
+1. **Avoid unnecessary or large amounts of mobs within your render distance** - Mob AI leads to heaps of lag! Villagers being one of the biggest culprits of this We recommend avoiding having more than 100 passive mobs within your render distance. On the Villager front we ask two things from you:
+    * Have no more than 30 villagers loaded around you at a time *(except being for an "offshore" trading hall more on this in a second `See #2`)* This 30 Villager limit counts for general villagers around your base aswell as in Iron Farms and anything else you would use them for!
+<p></p> <!-- Spacer (there has to be a better way to do this -->
+
+2. **Build villager trading halls outside of render distance (offshore)** - This is a trading hall that is outside away from all your bases and AFKable farms to reduce villager AI as much as possible! While these offshore trading halls can have more than the 30 cap that is set for around bases/AFK Farms please do not go wild! We recommend building the halls **~128 Blocks** away from any main parts of your  Base/Farms
+
+3. **Separate larger laggier farms** - When building your farms do not stack multiple huge farms! Having one large one and a few small ones nearby is perfectly okay but having and loading multiple large farms in one area is call for a lag fest.
+
+4. **Design mob farms to kill mobs** - **(REQUIRED)** If mob farms/grinders do not kill the mobs they are spawning the mobs are highly likely to be grouped together by design and can cause significant lag. **Mob farms must automatically kill mobs**, but can by design have a toggle to kill them manually when the farm is actively being used. If you only want it to be manual make sure there is a switch to turn the farm off.
+
+5. **Avoid <a href= "https://minecraft.fandom.com/wiki/Entity">entity</a> cramming** - The most common cause of this is having a pen of cows/pigs or any other mob with not enough space for the animals this results in entity collisions which can cause significant amounts of lag! Easiest way to reduce this is by:
+    * **Spreading entities out over as many chunks as possible** - Easiest way to do this is while in game press f3 + g and that will pull up chunk borders! With this information spread your pens out in as many chunks as possible  
+<p></p>
+
+6. **Reducing Lag Involving Redstone** - Redstone while fun can also be quite the lag producer! There are a few steps that you can take to lessen the impact of your wired masterpieces!:
+    * **Completely light up your redstone builds** - A big portion of redstone lag can be pointed towards the light level updates that redstone has to do! Counter this by lighting up your wired area to decrease the amount of light changes happening.
+    * **Confine redstone builds to as few chunks as possible** - As redstone updates move from chunk to chunk they cause that new chunk to update. That being said reducing the number chunks a redstone build is in decreases the number of updates being made.
+    * **Design redstone builds/farms that shut off** - Can be as simple as a lever!
+<p></p>
+
+7. **Generally Minimize the use of <a href="https://minecraft.fandom.com/wiki/Block_entity">block entities</a>** - (Item frames, signs, etc.) to name a few! These help increase your general FPS aswell! The more you have down the lower FPS will go!

src/pages/land-claims.md

@@ -0,0 +1,41 @@
+---
+title: Land Claiming Rules
+path: land-claims
+---
+
+# Land Claiming Rules
+
+1. **Building in other people's land claims without permission is not allowed.** Make sure to always check <a href="https://canopymc.net/map">our map</a> to check out existing land claims!
+
+2. **Refer to <a href="rules">rules</a>** for rules specific to the spawn land claim and how to build there.
+
+3. **After 30 days of inactivity.** Staff may remove your claim and grant it to someone else if there is only the equivilent of **a dirt hut** within it, or shrink your claim towhat's been built within it.
+
+    &#8594; Land claims are processed by staff in <a href="https://discord.com/channels/453642155089723392/858541079754309652">**#land-claiming**</a> in discord.
+
+The standard size for a land claim is 100 blocks radius:
+* Expansion of said claims are granted when the original claim has been sufficiently filled in with builds
+
+# How to get a Claim
+
+**Firstly!** Make sure you are **not** claiming anything within **100 blocks** of the border of a previous claim. If there are any conflicts in who should be granted an area, staff will determine who receives the land claim based on the earliest placed item/block by either user in that area, or move your requested claim away enough that it fits the 100 block limit.
+
+To make a claim you must:
+* Take a screenshot of the area you would like to builld in on dynmap
+* Draw a circle around the approximate area you would like to build in
+* Make sure to include the center point of your circle you would like to claim
+* Post the screenshot in <a href="https://discord.com/channels/453642155089723392/858541079754309652">**#land-claiming**</a> for staff to review. Staff will notify you if your claim is approved!
+* Please specify if your claim is for a base, farm or town when submitting the claim.
+
+Example: <a href="https://discord.com/channels/453642155089723392/858541079754309652/863452385317748737">**Land Claim (Redirects to discord)**</a>
+
+# Early Week Claiming (First Few Weeks of Season)
+
+In order to ensure a fair process for who acquires what land, the following processes will be in place at the start of each season:
+
+1. In order to claim land, you must **place a block or sign or any otheer object** at the location you wish to claim.
+2. This placement will be how staff determines who was at a particular spot first if there are any conflicts
+3. Post a screenshot in <a href="https://discord.com/channels/453642155089723392/858541079754309652">**#land-claiming**</a> claiming and post the center point of your circle
+4. Please specify if the claim is for a base, farm or town when submitting your claim.
+
+Refer to the example above!

src/pages/nether.md

@@ -0,0 +1,55 @@
+---
+title: Finding Your Tunnel and Setting Up Your Portal
+path: nether
+---
+# Finding Your Tunnel and Setting Up Your Portal
+
+Nether Portals can be hard to setup so heres a comprehensive guide to set one of your very own up!
+
+**You will require: 20 Obsidian + Flint and Steel**
+
+# Correctly Placing Your Portal
+
+1. Build and light a nether portal at your base in the overworld.
+
+2. Type `/portal` while standing next to your portal in the overworld and write down the coords it gives you. **(Change the Y coordinate to 130 for the portal in the nether)**
+
+3. Go into the nether *(Preferably through a portal already connected to the nether hub)* and build a 2nd portal and light it at the coords you have written down. **(Again make sure your portal is at Y:130 so it lines up correctly)**
+
+# How to choose a Main Tunnel
+
+* There are 4 Main Tunnels
+    * One that causes your `X` coordinate to `increase` **(East)**
+    * One that causes your `X` coordinate to `decrease` **(West)**
+    * One that causes your `Y` coordinate to `increase` **(South)**
+    * One that causes your `Y` coordinate to `decrease` **(North)**
+* Figure out which coordinate **(X or Z)** is the bigger number **(ignore the negative)**
+* Head down the corresponding Main Tunnel until you reach the bigger number. Claim a segment close to that number
+* Branch off the Main tunnel to reach your destination. **(The smaller number between X and Z)**
+
+Thats it you're done! Build your portal and light it! (If it does not link correctly, feel free to reach out to a staff member for help)
+
+# Nether Rules / Tunnel Guidelines
+
+<p align="center">
+<b>PLEASE WAIT UNTIL AFTER THE NETHER HUB AND TUNNELS ARE BUILT BEFORE MAKING YOUR OWN NICE TUNNEL</b>
+</p>
+
+* **Tunnel/Portal Rules**
+    * Staff reserves the right to break any portals that are improperly placed or built. We will always message you if we need to do this, so please read these guidelines to avoid this!
+    * Player Built Tunnels are to be **spawnproof!** We do not want mobs spawning on the roof with us and around the portals.
+    * Tunnel Segments should not be combined into a larger tunnel.
+    * The Pillars at the opening to the main tunnel are **not** to be removed or altered preserving the design of the main tunnel.  
+      
+  <p></p> <!-- It just works to add a gap okay.... Don't ask me why I'm dumb -->
+* **Nether Rules**
+    * No nether farms are to be built within the soft border on the nether roof **(~ +/-650 blocks)**
+    * Farms underneath the nether roof are ok as long as they do not:
+        * Cause lag for those passing by
+        * Do not restrict what can be built on the nether roof
+        * *For more clarification on farms & whats allowed see:* <a href="https://discord.com/channels/453642155089723392/858750819976609802/873062039222911036">*here*</a>
+
+
+
+
+

src/pages/rules.md

@@ -0,0 +1,32 @@
+---
+title: Server Rules
+path: rules 
+---
+
+# Server Rules
+
+1. **Respect one another and don't ruin other's experience.** If you have any problems with a player that you are unable to resolve yourself, contact staff.
+
+2. **Don't Grief** If you break it on accident, you fix it.
+
+3. **Don't Steal** If the chest isn't marked free, or you don't have explicit permission from the owner, don't take from it.
+
+4. **No game-changing mods, such as x-ray, flying, cave finders, etc.** if you are unsure, please ask a staff member.
+
+5. **The answer to the last question on the whitelist** is `penguin`.
+
+6. **No duping or using unfair game exploits.** TNT duping is disabled and is not allowed.
+
+# Spawn Rules
+
+1. **Staff may change builds at spawn as needed.** Builds that are too big, encroaching on prior builds, are unfinished, or otherwise disruptive may be modified by staff. We will always contact you prior to changing things, unless you have been inactive for an extended period of time on the server.
+
+2. **Please do not build any shops or markets within the spawn land claim.** With a limited amount of space we ask that shops be built elsewhere.
+
+3. **No automated or laggy farms/machines at spawn.** Spawn is where new players experience the server for the first time, and these are the most likely to hamper their first impression by dropping their fps.
+
+4. **Please Try to limit any entities within your builds, such as item frames.** We want players to be able to add entities to their builds, so try to keep your total amount of entities low to reduce FPS impact. Staff may remove and chest these items if you have an excessive amount within your build.
+
+# Nether Rules
+
+**See <a href="nether">here</a> for everything nether related!**