Skip to content

Commit

Permalink
Added Magma stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexeption committed Mar 3, 2022
1 parent b63efe9 commit 8570449
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 2 deletions.
54 changes: 54 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<div align="center">
<img src="https://i.imgur.com/zTCTCWG.png" alt="Magma logo" align="middle"></img>

![](https://img.shields.io/badge/Minecraft%20Forge-1.16.5%20--%2036.2.27%20--%20cae822ce-orange.svg?style=for-the-badge) ![](https://img.shields.io/badge/Bukkit-1.16%20r5-blue?style=for-the-badge) ![](https://img.shields.io/badge/CraftBukkit-Build%2029dd68e-orange?style=for-the-badge) ![](https://img.shields.io/badge/Spigot-Build%20988b411-yellow?style=for-the-badge) [![](https://img.shields.io/github/workflow/status/magmafoundation/Magma-1.16.x/Dev-Builds?style=for-the-badge)](https://github.com/magmafoundation/Magma-1.16.x/actions/workflows/dev-builds.yaml)
</div>

## About

Magma is the next generation of hybrid minecraft server softwares.

Magma is based on Forge and Paper, meaning it can run both Craftbukkit/Spigot/Paper plugins and Forge mods.

We hope to eliminate all issues with craftbukkit forge servers. In the end, we envision a seamless, low lag Magma experience with support for newer 1.12+ versions of Minecraft.

## Deployment

### Installation

1. Download the recommended builds from the [**Releases** section](https://github.com/magmafoundation/Magma-1.16.x/releases) (**Download** the one that ends in installer)
1. Or Download the latest jar from [Magma Site](https://magmafoundation.org/)
2. Make a new directory(folder) for the server
3. Move the jar that you downloaded into the new directory
4. Run the jar with your command prompt or terminal, going to your directory and entering `java -jar Magma-[version]-installer.jar --installServer`. Change [version] to your Magma version number.
5. This will generate another jar `forge-[version].jar` run this as normal `java -jar forge-[version].jar`

### Building the sources

- Clone the Project
- You can use Git GUI (like GitHub Desktop/GitKraken) or clone using the terminal using:
- `git clone https://github.com/magmafoundation/Magma-1.16.x/`
- Building
- First you want to run the build command
- `./gradlew setup installerJar`
- Now go and get a drink this may take some time
- Navigate to `projects/magma/build/libs` directory of the compiled source code
- Copy the Jar to a new server directory (see Installation)

## Contribute to Magma

If you wish to inspect Magma, submit PRs, or otherwise work with Magma itself, you're in the right place!.

Please read the [CONTRIBUTING.md](https://github.com/magmafoundation/Magma-1.16.x/blob/master/CONTRIBUTING.md) to see how to contribute, setup, and run.

## Chat

You are welcome to visit Magma Discord server [here](https://discord.gg/6rkqngA).

You could also go to Magma's subreddit [here](https://www.reddit.com/r/Magma).

## Partners

![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)

[YourKit](http://www.yourkit.com/), makers of the outstanding java profiler, support open source projects of all kinds with their full featured [Java](https://www.yourkit.com/java/profiler/index.jsp) and [.NET](https://www.yourkit.com/.net/profiler/index.jsp) application profilers.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ project(':fmlonly') {
packedDependencies = PACKED_DEPS
from(extraTxts)
//TODO: make FML installer logo?
from(rootProject.file('/forge_installer_logo.png')) {
from(rootProject.file('/magma-logo.png')) {
rename { 'big_logo.png' }
}
}
Expand Down Expand Up @@ -1339,7 +1339,7 @@ project(':forge') {
task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, 'signUniversalJar', launcherJson]) {
packedDependencies = PACKED_DEPS
from(extraTxts)
from(rootProject.file('/forge_installer_logo.png')) {
from(rootProject.file('/magma-logo.png')) {
rename { 'big_logo.png' }
}
from(genClientBinPatches.output) {
Expand Down
Binary file removed forge_installer_logo.png
Binary file not shown.
Binary file modified icon.ico
Binary file not shown.
Binary file added magma-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8570449

Please sign in to comment.