diff --git a/pom.xml b/pom.xml
index 346ded1..20b1760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,12 +107,12 @@
com.github.TheBusyBiscuit
Slimefun4
- RC-21
+ RC-27
provided
- io.github.thebusybiscuit
- cscorelib2
+ io.github.baked-libs
+ dough-api
diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java b/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java
index 9f8cf01..e29fb49 100644
--- a/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java
+++ b/src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java
@@ -14,21 +14,20 @@
import io.github.thebusybiscuit.ecopower.generators.WindTurbine;
import io.github.thebusybiscuit.ecopower.generators.WindTurbineMultiblock;
import io.github.thebusybiscuit.ecopower.items.SteelRotor;
+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.SlimefunAddon;
import io.github.thebusybiscuit.slimefun4.core.attributes.MachineTier;
import io.github.thebusybiscuit.slimefun4.core.attributes.MachineType;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
import io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet;
import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.config.Config;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder;
import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-import me.mrCookieSlime.Slimefun.cscorelib2.config.Config;
-import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
-import me.mrCookieSlime.Slimefun.cscorelib2.updater.GitHubBuildsUpdater;
-import me.mrCookieSlime.Slimefun.cscorelib2.updater.Updater;
public class EcoPowerPlugin extends JavaPlugin implements SlimefunAddon {
@@ -37,140 +36,139 @@ public void onEnable() {
Config cfg = new Config(this);
if (cfg.getBoolean("options.auto-update") && getDescription().getVersion().startsWith("DEV - ")) {
- Updater updater = new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/EcoPower/master");
- updater.start();
+ new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/EcoPower/master").start();
}
new Metrics(this, 8154);
- ItemStack categoryItem = new CustomItem(SlimefunUtils.getCustomHead("240775c3ad75763613f32f04986881bbe4eee4366d0c57f17f7c7514e2d0a77d"), "&2Eco-Power Generators");
- Category category = new Category(new NamespacedKey(this, "generators"), categoryItem, 4);
+ ItemStack categoryItem = new CustomItemStack(SlimefunUtils.getCustomHead("240775c3ad75763613f32f04986881bbe4eee4366d0c57f17f7c7514e2d0a77d"), "&2Eco-Power Generators");
+ ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "generators"), categoryItem, 4);
SlimefunItemStack rotor = new SlimefunItemStack("STEEL_ROTOR", "c51944b488e11cda65177d5911d651282b3012665e63b8929e1b6a4744b7ca8", "&bSteel Rotor");
- new SteelRotor(category, rotor, new ItemStack[] {
+ new SteelRotor(itemGroup, rotor, new ItemStack[] {
null, SlimefunItems.STEEL_INGOT, null,
SlimefunItems.STEEL_INGOT, new ItemStack(Material.IRON_BLOCK), SlimefunItems.STEEL_INGOT,
null, SlimefunItems.STEEL_INGOT, null
}, new SlimefunItemStack(rotor, 2)).register(this);
- SteamTurbine simpleTurbine = registerSteamTurbine(category, "STEAM_TURBINE", "aefd921cb61594324f3c09d7ac7d38185d2734333968f3ac38382cddf15f6d71", "&eSimple Steam Turbine", MachineTier.MEDIUM, 4, new ItemStack[] {
+ SteamTurbine simpleTurbine = registerSteamTurbine(itemGroup, "STEAM_TURBINE", "aefd921cb61594324f3c09d7ac7d38185d2734333968f3ac38382cddf15f6d71", "&eSimple Steam Turbine", MachineTier.MEDIUM, 4, new ItemStack[] {
null, rotor, null,
SlimefunItems.STEEL_INGOT, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.STEEL_INGOT,
null, SlimefunItems.COPPER_WIRE, null
});
- SteamTurbine advancedTurbine = registerSteamTurbine(category, "STEAM_TURBINE_2", "161aad79fb748bff1e6e94d4b6a5a277cc961c1a9abfe2a4ed88baab8a2b5971", "&cAdvanced Steam Turbine", MachineTier.ADVANCED, 6, new ItemStack[] {
+ SteamTurbine advancedTurbine = registerSteamTurbine(itemGroup, "STEAM_TURBINE_2", "161aad79fb748bff1e6e94d4b6a5a277cc961c1a9abfe2a4ed88baab8a2b5971", "&cAdvanced Steam Turbine", MachineTier.ADVANCED, 6, new ItemStack[] {
null, rotor, null,
SlimefunItems.BRASS_INGOT, simpleTurbine.getItem(), SlimefunItems.BRASS_INGOT,
SlimefunItems.BRASS_INGOT, SlimefunItems.COPPER_WIRE, SlimefunItems.BRASS_INGOT
});
- registerSteamTurbine(category, "STEAM_TURBINE_3", "b65e29a67860d82f66afe1060ec8a9ceacc8c7afe108f5d42f52ba854b0a62dc", "&4Carbonado Steam Turbine", MachineTier.END_GAME, 13, new ItemStack[] {
+ registerSteamTurbine(itemGroup, "STEAM_TURBINE_3", "b65e29a67860d82f66afe1060ec8a9ceacc8c7afe108f5d42f52ba854b0a62dc", "&4Carbonado Steam Turbine", MachineTier.END_GAME, 13, new ItemStack[] {
null, rotor, null,
SlimefunItems.CARBONADO, advancedTurbine.getItem(), SlimefunItems.CARBONADO,
SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.REINFORCED_ALLOY_INGOT
});
- WindTurbine simpleWindTurbine = registerWindTurbine(category, "WIND_TURBINE", "d23e4ce096e00eae6aba10d356b785c3fecc5aa3d7dad4a4a2a27ed7750df981", "&eSimple Wind Turbine", MachineTier.MEDIUM, 5, new ItemStack[] {
+ WindTurbine simpleWindTurbine = registerWindTurbine(itemGroup, "WIND_TURBINE", "d23e4ce096e00eae6aba10d356b785c3fecc5aa3d7dad4a4a2a27ed7750df981", "&eSimple Wind Turbine", MachineTier.MEDIUM, 5, new ItemStack[] {
null, rotor, null,
SlimefunItems.STEEL_THRUSTER, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.STEEL_THRUSTER,
null, SlimefunItems.COPPER_WIRE, null
});
- WindTurbine advancedWindTurbine = registerWindTurbine(category, "WIND_TURBINE_2", "2df9e595dbeac33f43b37dd4ffbc234ea0fa7c3f98aad77dc906ce5d6783c79d", "&cAdvanced Wind Turbine", MachineTier.ADVANCED, 11, new ItemStack[] {
+ WindTurbine advancedWindTurbine = registerWindTurbine(itemGroup, "WIND_TURBINE_2", "2df9e595dbeac33f43b37dd4ffbc234ea0fa7c3f98aad77dc906ce5d6783c79d", "&cAdvanced Wind Turbine", MachineTier.ADVANCED, 11, new ItemStack[] {
null, rotor, null,
SlimefunItems.ELECTRO_MAGNET, simpleWindTurbine.getItem(), SlimefunItems.ELECTRO_MAGNET,
SlimefunItems.ALUMINUM_BRASS_INGOT, SlimefunItems.COPPER_WIRE, SlimefunItems.ALUMINUM_BRASS_INGOT
});
- registerWindTurbine(category, "WIND_TURBINE_3", "3fcef461b43f06ef9d58c94065bbf41b77a10050520b44082d5f66f6dbe71da0", "&4Carbonado Wind Turbine", MachineTier.END_GAME, 23, new ItemStack[] {
+ registerWindTurbine(itemGroup, "WIND_TURBINE_3", "3fcef461b43f06ef9d58c94065bbf41b77a10050520b44082d5f66f6dbe71da0", "&4Carbonado Wind Turbine", MachineTier.END_GAME, 23, new ItemStack[] {
SlimefunItems.FERROSILICON, rotor, SlimefunItems.FERROSILICON,
SlimefunItems.ELECTRIC_MOTOR, advancedWindTurbine.getItem(), SlimefunItems.ELECTRIC_MOTOR,
SlimefunItems.CARBONADO, SlimefunItems.FERROSILICON, SlimefunItems.CARBONADO
});
- registerLightningReceptor(category, "LIGHTNING_RECEPTOR", "&eLightning Receptor", 512, 8192, new ItemStack[] {
+ registerLightningReceptor(itemGroup, "LIGHTNING_RECEPTOR", "&eLightning Receptor", 512, 8192, new ItemStack[] {
null, new ItemStack(Material.END_ROD), null,
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.POWER_CRYSTAL, SlimefunItems.BLISTERING_INGOT_3,
SlimefunItems.REINFORCED_PLATE, SlimefunItems.ENERGY_REGULATOR, SlimefunItems.REINFORCED_PLATE
});
- LunarGenerator lunarGenerator = registerLunarGenerator(category, "LUNAR_GENERATOR", "&5Lunar Generator", 128, new ItemStack[] {
+ LunarGenerator lunarGenerator = registerLunarGenerator(itemGroup, "LUNAR_GENERATOR", "&5Lunar Generator", 128, new ItemStack[] {
new ItemStack(Material.PHANTOM_MEMBRANE), SlimefunItems.SOLAR_GENERATOR_4, new ItemStack(Material.PHANTOM_MEMBRANE),
SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.CARBONADO, SlimefunItems.DAMASCUS_STEEL_INGOT,
SlimefunItems.COPPER_WIRE, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.COPPER_WIRE
});
- SolarGenerator solarGenerator = registerHighEnergySolarGenerator(category, "HIGH_ENERGY_SOLAR_GENERATOR", "c4fe135c311f7086edcc5e6dbc4ef4b23f819fddaa42f827dac46e3574de2287", "&9High-Energy Solar Generator", 256, new ItemStack[] {
+ SolarGenerator solarGenerator = registerHighEnergySolarGenerator(itemGroup, "HIGH_ENERGY_SOLAR_GENERATOR", "c4fe135c311f7086edcc5e6dbc4ef4b23f819fddaa42f827dac46e3574de2287", "&9High-Energy Solar Generator", 256, new ItemStack[] {
SlimefunItems.SOLAR_GENERATOR_2, lunarGenerator.getItem(), SlimefunItems.SOLAR_GENERATOR_2,
SlimefunItems.CARBONADO, SlimefunItems.POWER_CRYSTAL, SlimefunItems.CARBONADO,
SlimefunItems.BLISTERING_INGOT_3, new ItemStack(Material.NETHER_STAR), SlimefunItems.BLISTERING_INGOT_3
});
- registerSolarHelmet(category, "HIGH_ENERGY_SOLAR_HELMET", "&9High-Energy Solar Helmet", 5, new ItemStack[] {
+ registerSolarHelmet(itemGroup, "HIGH_ENERGY_SOLAR_HELMET", "&9High-Energy Solar Helmet", 5, new ItemStack[] {
null, solarGenerator.getItem(), null,
SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.REINFORCED_ALLOY_INGOT,
SlimefunItems.REINFORCED_ALLOY_INGOT, null, SlimefunItems.REINFORCED_ALLOY_INGOT
});
- registerHighEnergySolarGenerator(category, "RADIANT_SOLAR_GENERATOR", "240775c3ad75763613f32f04986881bbe4eee4366d0c57f17f7c7514e2d0a77d", "&9Radiant Solar Generator", 512, new ItemStack[] {
+ registerHighEnergySolarGenerator(itemGroup, "RADIANT_SOLAR_GENERATOR", "240775c3ad75763613f32f04986881bbe4eee4366d0c57f17f7c7514e2d0a77d", "&9Radiant Solar Generator", 512, new ItemStack[] {
lunarGenerator.getItem(), solarGenerator.getItem(), lunarGenerator.getItem(),
SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.POWER_CRYSTAL, SlimefunItems.BLISTERING_INGOT_3,
SlimefunItems.REINFORCED_PLATE, SlimefunItems.CARBONADO, SlimefunItems.REINFORCED_PLATE
});
}
- private WindTurbine registerWindTurbine(Category category, String id, String texture, String name, MachineTier tier, int power, ItemStack[] recipe) {
+ private WindTurbine registerWindTurbine(ItemGroup itemGroup, String id, String texture, String name, MachineTier tier, int power, ItemStack[] recipe) {
SlimefunItemStack turbineItem = new SlimefunItemStack(id, texture, name, "&7Component of the " + name + " Generator");
- WindTurbine turbine = new WindTurbine(category, turbineItem, power, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
+ WindTurbine turbine = new WindTurbine(itemGroup, turbineItem, power, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
turbine.register(this);
SlimefunItemStack multiblockItem = new SlimefunItemStack(id + "_MULTIBLOCK", texture, name + " Generator", "", LoreBuilder.machine(tier, MachineType.GENERATOR), LoreBuilder.powerBuffer(0), LoreBuilder.powerPerSecond(power * 2));
- new WindTurbineMultiblock(category, multiblockItem, turbine).register(this);
+ new WindTurbineMultiblock(itemGroup, multiblockItem, turbine).register(this);
return turbine;
}
- private SteamTurbine registerSteamTurbine(Category category, String id, String texture, String name, MachineTier tier, int power, ItemStack[] recipe) {
+ private SteamTurbine registerSteamTurbine(ItemGroup itemGroup, String id, String texture, String name, MachineTier tier, int power, ItemStack[] recipe) {
SlimefunItemStack turbineItem = new SlimefunItemStack(id, texture, name, "&7Component of the " + name + " Generator");
- SteamTurbine turbine = new SteamTurbine(category, turbineItem, power, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
+ SteamTurbine turbine = new SteamTurbine(itemGroup, turbineItem, power, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
turbine.register(this);
SlimefunItemStack multiblockItem = new SlimefunItemStack(id + "_MULTIBLOCK", texture, name + " Generator", "", LoreBuilder.machine(tier, MachineType.GENERATOR), LoreBuilder.powerBuffer(0), LoreBuilder.powerPerSecond(power * 2));
- new SteamTurbineMultiblock(category, multiblockItem, turbine).register(this);
+ new SteamTurbineMultiblock(itemGroup, multiblockItem, turbine).register(this);
return turbine;
}
- private LightningReceptor registerLightningReceptor(Category category, String id, String name, int min, int max, ItemStack[] recipe) {
+ private LightningReceptor registerLightningReceptor(ItemGroup itemGroup, String id, String name, int min, int max, ItemStack[] recipe) {
final String texture = "31a3cd9b016b1228ec01fd6f0992c64f3b9b7b29773fa46439ab3f3c8a347704";
SlimefunItemStack item = new SlimefunItemStack(id, texture, name, "", "&fThis machine can channel energy", "&ffrom lightning strikes during", "&fa thunderstorm", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.power(min, " - " + max + " J per lightning strike"));
- LightningReceptor receptor = new LightningReceptor(category, item, min, max, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
+ LightningReceptor receptor = new LightningReceptor(itemGroup, item, min, max, RecipeType.ENHANCED_CRAFTING_TABLE, recipe);
receptor.register(this);
return receptor;
}
- private LunarGenerator registerLunarGenerator(Category category, String id, String name, int power, ItemStack[] recipe) {
+ private LunarGenerator registerLunarGenerator(ItemGroup itemGroup, String id, String name, int power, ItemStack[] recipe) {
final String texture = "afdd9e588d2461d2d3d058cb3e0af2b3a3367607aa14d124ed92a833f25fb112";
SlimefunItemStack item = new SlimefunItemStack(id, texture, name, "", "&fThis Lunar Generator only", "&fruns at night!", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.powerBuffer(0), LoreBuilder.powerPerSecond(power * 2));
- LunarGenerator generator = new LunarGenerator(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
+ LunarGenerator generator = new LunarGenerator(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
generator.register(this);
return generator;
}
- private HighEnergySolarGenerator registerHighEnergySolarGenerator(Category category, String id, String texture, String name, int power, ItemStack[] recipe) {
+ private HighEnergySolarGenerator registerHighEnergySolarGenerator(ItemGroup itemGroup, String id, String texture, String name, int power, ItemStack[] recipe) {
SlimefunItemStack item = new SlimefunItemStack(id, texture, name, "", "&fThis Solar Generator runs", "&fall day and night!", "", LoreBuilder.machine(MachineTier.END_GAME, MachineType.GENERATOR), LoreBuilder.powerBuffer(0), LoreBuilder.powerPerSecond(power * 2));
- HighEnergySolarGenerator generator = new HighEnergySolarGenerator(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
+ HighEnergySolarGenerator generator = new HighEnergySolarGenerator(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
generator.register(this);
return generator;
}
- private SolarHelmet registerSolarHelmet(Category category, String id, String name, int power, ItemStack[] recipe) {
+ private SolarHelmet registerSolarHelmet(ItemGroup itemGroup, String id, String name, int power, ItemStack[] recipe) {
SlimefunItemStack item = new SlimefunItemStack(id, Material.IRON_HELMET, name, "", "&fThis Solar Helmet charges", "&fany held or worn items", "", LoreBuilder.power(power, "/charge"));
- SolarHelmet solarHelmet = new SolarHelmet(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
+ SolarHelmet solarHelmet = new SolarHelmet(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, power);
solarHelmet.register(this);
return solarHelmet;
}
diff --git a/src/main/java/io/github/thebusybiscuit/ecopower/generators/HighEnergySolarGenerator.java b/src/main/java/io/github/thebusybiscuit/ecopower/generators/HighEnergySolarGenerator.java
index fb028d4..84bdf67 100644
--- 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
index a1aba00..d984b55 100644
--- 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
index 244ec80..6006445 100644
--- 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 only works at night!.
@@ -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
index 8e148c5..2da282f 100644
--- 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 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
index 9e956a4..e9b9b2e 100644
--- 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 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
index 64cb00b..9c08ddb 100644
--- 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 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
index 19af11b..3260091 100644
--- 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 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
index f6def68..9c63ea2 100644
--- 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 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