Merge pull request #15 from variananora/rc-27-update

Update to RC-27
Slimefun-Addon-Community · Sep 6, 2021 · 5c1ecd6 · 5c1ecd6
2 parents 961f122 + 3c32113
commit 5c1ecd6
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 85 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,12 +107,12 @@
         <dependency>
             <groupId>com.github.TheBusyBiscuit</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>RC-21</version>
+            <version>RC-27</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>io.github.thebusybiscuit</groupId>
-                    <artifactId>cscorelib2</artifactId>
+                    <groupId>io.github.baked-libs</groupId>
+                    <artifactId>dough-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java b/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java
diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/HighEnergySolarGenerator.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/HighEnergySolarGenerator.java
@@ -2,10 +2,10 @@
 
 import org.bukkit.inventory.ItemStack;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * The {@link HighEnergySolarGenerator} is simply a {@link SolarGenerator} which generates
@@ -16,8 +16,8 @@
  */
 public class HighEnergySolarGenerator extends SolarGenerator {
 
-    public HighEnergySolarGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
-        super(category, energy, energy, item, recipeType, recipe);
+    public HighEnergySolarGenerator(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
+        super(itemGroup, energy, energy, item, recipeType, recipe);
     }
 
 }
diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/LightningReceptor.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/LightningReceptor.java
@@ -11,13 +11,13 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
 import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * The {@link LightningReceptor} attracts a {@link LightningStrike} during thunderstorms
@@ -35,8 +35,8 @@ public class LightningReceptor extends SlimefunItem implements EnergyNetProvider
     private final int minPower;
     private final int maxPower;
 
-    public LightningReceptor(Category category, SlimefunItemStack item, int min, int max, RecipeType recipeType, ItemStack[] recipe) {
-        super(category, item, recipeType, recipe);
+    public LightningReceptor(ItemGroup itemGroup, SlimefunItemStack item, int min, int max, RecipeType recipeType, ItemStack[] recipe) {
+        super(itemGroup, item, recipeType, recipe);
 
         this.minPower = min;
         this.maxPower = max;

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/LunarGenerator.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/LunarGenerator.java
@@ -2,10 +2,10 @@
 
 import org.bukkit.inventory.ItemStack;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * The {@link LunarGenerator} is a {@link SolarGenerator} which <strong>only works at night!</strong>.
@@ -15,8 +15,8 @@
  */
 public class LunarGenerator extends SolarGenerator {
 
-    public LunarGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
-        super(category, 0, energy, item, recipeType, recipe);
+    public LunarGenerator(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
+        super(itemGroup, 0, energy, item, recipeType, recipe);
     }
 
 }
diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbine.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbine.java
@@ -13,13 +13,13 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
 import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * The {@link SteamTurbine} generates energy when placed above bubbling water.
@@ -34,8 +34,8 @@ public class SteamTurbine extends SlimefunItem implements EnergyNetProvider {
     private final Set<Location> validTurbines = ConcurrentHashMap.newKeySet();
     private final int generatedPower;
 
-    public SteamTurbine(Category category, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
-        super(category, item, recipeType, recipe);
+    public SteamTurbine(ItemGroup itemGroup, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
+        super(itemGroup, item, recipeType, recipe);
 
         this.generatedPower = generatedPower;
     }

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbineMultiblock.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbineMultiblock.java
@@ -3,14 +3,14 @@
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
 import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 
 /**
  * This is the multiblock variant of the {@link SteamTurbine}, as shown in the {@link SlimefunGuide}.
@@ -20,10 +20,10 @@
  */
 public class SteamTurbineMultiblock extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
 
-    public SteamTurbineMultiblock(Category category, SlimefunItemStack item, SteamTurbine turbine) {
-        super(category, item, RecipeType.MULTIBLOCK, new ItemStack[] {
+    public SteamTurbineMultiblock(ItemGroup itemGroup, SlimefunItemStack item, SteamTurbine turbine) {
+        super(itemGroup, item, RecipeType.MULTIBLOCK, new ItemStack[] {
                 null, turbine.getItem(), null,
-                null, new CustomItem(Material.WATER_BUCKET, "&fWater (Bubble Column)"), null,
+                null, new CustomItemStack(Material.WATER_BUCKET, "&fWater (Bubble Column)"), null,
                 null, new ItemStack(Material.MAGMA_BLOCK), null
         });
     }

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbine.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbine.java
@@ -12,13 +12,13 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
 import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * The {@link WindTurbine} generates energy when placed in the air and on top of fences.
@@ -34,8 +34,8 @@ public class WindTurbine extends SlimefunItem implements EnergyNetProvider {
     private final Set<Location> validTurbines = ConcurrentHashMap.newKeySet();
     private final int generatedPower;
 
-    public WindTurbine(Category category, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
-        super(category, item, recipeType, recipe);
+    public WindTurbine(ItemGroup itemGroup, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
+        super(itemGroup, item, recipeType, recipe);
 
         this.generatedPower = generatedPower;
     }

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbineMultiblock.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbineMultiblock.java
@@ -3,13 +3,13 @@
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
 import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 /**
  * This is the multiblock variant of the {@link WindTurbine}, as shown in the {@link SlimefunGuide}.
@@ -19,8 +19,8 @@
  */
 public class WindTurbineMultiblock extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
 
-    public WindTurbineMultiblock(Category category, SlimefunItemStack item, WindTurbine turbine) {
-        super(category, item, RecipeType.MULTIBLOCK, new ItemStack[] {
+    public WindTurbineMultiblock(ItemGroup itemGroup, SlimefunItemStack item, WindTurbine turbine) {
+        super(itemGroup, item, RecipeType.MULTIBLOCK, new ItemStack[] {
                 null, turbine.getItem(), null,
                 null, new ItemStack(Material.OAK_FENCE), null,
                 null, new ItemStack(Material.OAK_FENCE), null

diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/items/SteelRotor.java b/src/main/java/io/github/thebusybiscuit/ecopower/items/SteelRotor.java
@@ -2,18 +2,18 @@
 
 import org.bukkit.inventory.ItemStack;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 
 public class SteelRotor extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
 
-    public SteelRotor(Category category, SlimefunItemStack item, ItemStack[] recipe, ItemStack recipeOutput) {
-        super(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, recipeOutput);
+    public SteelRotor(ItemGroup itemGroup, SlimefunItemStack item, ItemStack[] recipe, ItemStack recipeOutput) {
+        super(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, recipeOutput);
     }
 
     @Override