Merge

Hex27 · Sep 24, 2024 · d31c2fc · d31c2fc
2 parents f2dd698 + cca1daf
commit d31c2fc
Show file tree

Hide file tree

Showing 526 changed files with 38,573 additions and 28,881 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -118,7 +118,7 @@ ij_java_for_statement_wrap = on_every_item
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = always
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_imports_layout = *, |, javax.**, java.**, |, $*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -158,7 +158,7 @@ ij_java_new_line_after_lparen_in_annotation = false
 ij_java_new_line_after_lparen_in_deconstruction_pattern = true
 ij_java_new_line_after_lparen_in_record_header = false
 ij_java_new_line_when_body_is_presented = false
-ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
 ij_java_parameter_annotation_wrap = off
 ij_java_parameter_name_prefix =
 ij_java_parameter_name_suffix =

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,36 +1,36 @@
 name: Gradle Build
 
 on:
-    push:
-        branches: [ master ]
-    pull_request:
-        branches: [ master ]
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v4
+  build:
+    runs-on: ubuntu-latest
 
-            - name: Set up JDK
-              uses: actions/setup-java@v4
-              with:
-                  java-version: '21'
-                  distribution: 'temurin'
+    steps:
+      - uses: actions/checkout@v4
 
-            - name: Setup Gradle
-              uses: gradle/actions/setup-gradle@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
 
-            - name: Cache Gradle packages
-              uses: actions/cache@v4
-              with:
-                  path: |
-                      ~/.gradle/caches
-                      ~/.gradle/wrapper
-                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-                  restore-keys: |
-                      ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
-            - name: Build with Gradle
-              run: ./gradlew deploy
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Build with Gradle
+        run: ./gradlew deploy
diff --git a/README.md b/README.md
@@ -7,7 +7,9 @@
 
 
 <!-- TABLE OF CONTENTS -->
+
 # Table of Contents
+
 <details open="open">
   <summary>Table of Contents</summary>
   <ol>
@@ -31,8 +33,8 @@ git clone https://github.com/Hex27/TerraformGenerator.git
 cd TerraformGenerator
 gradlew buildProj:shadowJar
 ```
-The jar at `buildProj/build/libs/buildProj-all.jar` is the plugin.
 
+The jar at `buildProj/build/libs/buildProj-all.jar` is the plugin.
 
 <h2 name="support">Support</h2>
 
@@ -42,28 +44,35 @@ Support Discord: https://discord.gg/yW7JcqM
 
 Wiki: https://github.com/Hex27/TerraformGenerator/wiki/Configuration
 
-TerraformGenerator is a world generator plugin that aims to provide an enhanced vanilla feel. As of now, it is in an Alpha stage, meaning some core features are not implemented yet (a list of known issues and to-dos is at the bottom). However, the world should be playable to an extent, though I will not recommend putting it on any production environment that has strict requirements, because as of now, I am in mandatory National service, and support will be bottle-necked. 
+TerraformGenerator is a world generator plugin that aims to provide an enhanced vanilla feel. As of now, it is in an
+Alpha stage, meaning some core features are not implemented yet (a list of known issues and to-dos is at the bottom).
+However, the world should be playable to an extent, though I will not recommend putting it on any production environment
+that has strict requirements, because as of now, I am in mandatory National service, and support will be bottle-necked.
 
-There are commands, but they are developer commands and only available via /op. Try not to use them unless you understand what they do.
+There are commands, but they are developer commands and only available via /op. Try not to use them unless you
+understand what they do.
 
-On another note, for 1.15.2, the version released on 23rd Feb 2020 is the recommended version, as it fixes an itchy spigot issue. More details at the bottom under "bugs". 1.14.4 does not have this fix.
+On another note, for 1.15.2, the version released on 23rd Feb 2020 is the recommended version, as it fixes an itchy
+spigot issue. More details at the bottom under "bugs". 1.14.4 does not have this fix.
 
-There is also support for Java 14, but be warned that it will spit some minor errors, because the plugin does some Java illegal magic to get things done.
+There is also support for Java 14, but be warned that it will spit some minor errors, because the plugin does some Java
+illegal magic to get things done.
 
 <h2 name="getting-started">Getting started</h2>
 
 <h3>Step one: Install TerraformGenerator</h3>
 
 Make sure that you have installed the latest version of [TerraformGenerator][spigot-tfg].  
-To do that, stop your server and move the jar file to your server's `plugins` directory. Afterwards can you start your server again.
+To do that, stop your server and move the jar file to your server's `plugins` directory. Afterwards can you start your
+server again.
 
 <h3>Step two: Create the world</h3>
 You can choose between two methods on how to generate the world with TerraformGenerator
 
 <h4>Method One</h4>
 
 1. Turn off the server if it is running
-2. Open the `bukkit.yml` and add the following info to it.  
+2. Open the `bukkit.yml` and add the following info to it.
    ```yaml
    # By default does this section not exist within the bukkit.yml
    # and you have to add it yourself.
@@ -76,31 +85,47 @@ You can choose between two methods on how to generate the world with TerraformGe
 
 <h4>Method two</h4>
 This method requires the usage of a World Management plugin. *DO METHOD ONE FIRST.*
-In this example are we using Multiverse-Core. TerraformGenerator *should* work with any other World Manager, but we won't guarantee it!
+In this example are we using Multiverse-Core. TerraformGenerator *should* work with any other World Manager, but we
+won't guarantee it!
 
-Before creating the world, make sure it doesn't exist already. If it does will you need to delete it using `/mvdelete <world>` followed by `/mvconfirm`.  
-To create a world with TerraformGenerator, execute `/mvcreate <world> normal -g TerraformGenerator` where `<world>` is the name of the world to create.
+Before creating the world, make sure it doesn't exist already. If it does will you need to delete it
+using `/mvdelete <world>` followed by `/mvconfirm`.  
+To create a world with TerraformGenerator, execute `/mvcreate <world> normal -g TerraformGenerator` where `<world>` is
+the name of the world to create.
 
 **Note:**  
-There is a rare chance that the world might not get loaded with TerraformGenerator as the World Generator set. In those cases could newly loaded chunks break the look of the world by being normal vanilla chunks. That may mean that you haven't done method one. If you have, try doing method one alone without the world management plugin. If the problem persists, report it on github or discord.
+There is a rare chance that the world might not get loaded with TerraformGenerator as the World Generator set. In those
+cases could newly loaded chunks break the look of the world by being normal vanilla chunks. That may mean that you
+haven't done method one. If you have, try doing method one alone without the world management plugin. If the problem
+persists, report it on github or discord.
 
 <h2 name="images">Images</h2>
-Find images on the wiki 
+Find images on the wiki
 
 https://github.com/Hex27/TerraformGenerator/wiki/Biomes
 
 https://github.com/Hex27/TerraformGenerator/wiki/Structures
 
 <h2 name="known-bugs">Known bugs</h2>
-Not maintained here. You can check the issue tracker. If you've found a bug, you can open an issue, or report it on discord
+Not maintained here. You can check the issue tracker. If you've found a bug, you can open an issue, or report it on
+discord
 
 <!-- MARKDOWN LINKS -->
+
 [contributors-shield]: https://img.shields.io/github/contributors/Hex27/terraformgenerator.svg?style=for-the-badge
+
 [contributors-url]: https://github.com/Hex27/terraformgenerator/graphs/contributors
+
 [forks-shield]: https://img.shields.io/github/forks/Hex27/terraformgenerator.svg?style=for-the-badge
+
 [forks-url]: https://github.com/Hex27/terraformgenerator/network/members
+
 [stars-shield]: https://img.shields.io/github/stars/Hex27/terraformgenerator.svg?style=for-the-badge
+
 [stars-url]: https://github.com/Hex27/terraformgenerator/stargazers
+
 [issues-shield]: https://img.shields.io/github/issues/Hex27/terraformgenerator.svg?style=for-the-badge
+
 [issues-url]: https://github.com/Hex27/terraformgenerator/issues
+
 [spigot-tfg]: https://www.spigotmc.org/resources/75132/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,7 @@ subprojects {
         maven("https://repo.codemc.io/repository/nms/")
 		// maven("https://libraries.minecraft.net/minecraft-server")
 		maven("https://papermc.io/repo/repository/maven-public/")
+		maven("https://jitpack.io")
     }
 //    Handle this inside each implementation as different minecraft versions support a different max jvm version
 //    java {

diff --git a/buildProj/build.gradle.kts b/buildProj/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     implementation(project(":implementation:v1_20_R3"))
     implementation(project(":implementation:v1_20_R4"))
     implementation(project(":implementation:v1_21_R1"))
+    implementation("com.github.AvarionMC:yaml:1.1.1")
 }
 
 tasks.shadowJar {

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -4,6 +4,7 @@ dependencies {
     compileOnly(group = "org.spigotmc", name = "spigot", version = "1.18-R0.1-SNAPSHOT")
 	// compileOnly(group = "org.spigotmc", name = "spigot", version = "1.16.4-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:20.1.0")
+    compileOnly("com.github.AvarionMC:yaml:1.1.1")
 }
 
 // Set this to the lowest compat in implementation