From 50aaa4b965ff93b0958cdaade218660186dde796 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sat, 27 Jun 2020 14:04:31 +0200
Subject: [PATCH] Added a few more items to the Bio Generator

---
 CHANGELOG.md                                  |  3 +++
 README.md                                     |  2 +-
 pom.xml                                       | 12 +++++------
 .../electric/generators/BioGenerator.java     | 20 +++++++++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93026a309..c370baea7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,8 +31,11 @@
 * Added a new language: Tagalog
 * Added Magical Zombie Pills
 * Added 1.13 compatibility to the Auto Drier
+* Added Corals to the fuel list for the Bio Generator
 * (1.16+) Slimefun guide can now show Smithing Table recipes
 * (1.16+) Added Nether Gold Ore recipe to the Ore Crusher
+* (1.16+) Added Shroomlights to the fuel list for the Bio Generator
+* (1.16+) Added Warped and Crimson Fungus to the fuel list for the Bio Generator
 
 #### Changes
 * Coolant Cells now last twice as long
diff --git a/README.md b/README.md
index 4cace9dcc..32fc24d49 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Slimefun 4
 Looking for the download link? [**Click here**](https://github.com/TheBusyBiscuit/Slimefun4/blob/master/README.md#download-slimefun-4)
 
-Slimefun is a plugin which aims to turn your Bukkit/Spigot Server into a modpack without ever installing a single mod. It offers everything you could possibly imagine. From Backpacks to Jetpacks! Slimefun lets every player decide on their own how much they want to dive into Magic or Tech.<br>
+Slimefun is a plugin which aims to turn your Spigot Server into a modpack without ever installing a single mod. It offers everything you could possibly imagine. From Backpacks to Jetpacks! Slimefun lets every player decide on their own how much they want to dive into Magic or Tech.<br>
 We got everything from magical wands to nuclear reactors.<br>
 We feature a magical altar, an electric power grid and even item transport systems.
 
diff --git a/pom.xml b/pom.xml
index ecdc0c245..128eb224b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <inceptionYear>2013</inceptionYear>
     <packaging>jar</packaging>
 
-    <description>Slimefun is a Bukkit / Spigot plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server.</description>
+    <description>Slimefun is a Spigot plugin that simulates a modpack-like atmosphere by adding over 500 new items and recipes to your Minecraft Server.</description>
     <url>https://github.com/TheBusyBiscuit/Slimefun4</url>
 
     <properties>
@@ -21,9 +21,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <!-- Bukkit properties -->
-        <bukkit.version>1.16.1</bukkit.version>
-        <bukkit.javadocs>https://hub.spigotmc.org/javadocs/bukkit/</bukkit.javadocs>
+        <!-- Spigot properties -->
+        <spigot.version>1.16.1</spigot.version>
+        <spigot.javadocs>https://hub.spigotmc.org/javadocs/spigot/</spigot.javadocs>
 
         <!-- Default settings for sonarcloud.io -->
         <sonar.projectKey>TheBusyBiscuit_Slimefun4</sonar.projectKey>
@@ -209,7 +209,7 @@
 
                     <!-- We can reference Bukkit's API in our Javadocs -->
                     <links>
-                        <link>${bukkit.javadocs}</link>
+                        <link>${spigot.javadocs}</link>
                     </links>
 
                     <!-- We can group pakages together in our Javadocs -->
@@ -272,7 +272,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>${bukkit.version}-R0.1-SNAPSHOT</version>
+            <version>${spigot.version}-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
index 9582f390f..563a3fd71 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
@@ -58,6 +58,17 @@ public abstract class BioGenerator extends AGenerator {
             }
         }
 
+        if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_15)) {
+            registerFuel(new MachineFuel(4, new ItemStack(Material.HONEYCOMB)));
+            registerFuel(new MachineFuel(40, new ItemStack(Material.HONEYCOMB_BLOCK)));
+        }
+
+        if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) {
+            registerFuel(new MachineFuel(4, new ItemStack(Material.SHROOMLIGHT)));
+            registerFuel(new MachineFuel(2, new ItemStack(Material.CRIMSON_FUNGUS)));
+            registerFuel(new MachineFuel(2, new ItemStack(Material.WARPED_FUNGUS)));
+        }
+
         // Leaves
         for (Material m : Tag.LEAVES.getValues()) {
             registerFuel(new MachineFuel(1, new ItemStack(m)));
@@ -67,6 +78,15 @@ public abstract class BioGenerator extends AGenerator {
         for (Material m : Tag.SAPLINGS.getValues()) {
             registerFuel(new MachineFuel(1, new ItemStack(m)));
         }
+
+        // Corals
+        for (Material m : Tag.CORALS.getValues()) {
+            registerFuel(new MachineFuel(2, new ItemStack(m)));
+        }
+
+        for (Material m : Tag.CORAL_BLOCKS.getValues()) {
+            registerFuel(new MachineFuel(2, new ItemStack(m)));
+        }
     }
 
     @Override