Skip to content

Commit 5c1ecd6

Browse files
TheBusyBiscuitTheBusyBiscuit
authored
Merge pull request #15 from variananora/rc-27-update
Update to RC-27
2 parents 961f122 + 3c32113 commit 5c1ecd6

File tree

10 files changed

+83
-85
lines changed

10 files changed

+83
-85
lines changed

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@
107107
<dependency>
108108
<groupId>com.github.TheBusyBiscuit</groupId>
109109
<artifactId>Slimefun4</artifactId>
110-
<version>RC-21</version>
110+
<version>RC-27</version>
111111
<scope>provided</scope>
112112
<exclusions>
113113
<exclusion>
114-
<groupId>io.github.thebusybiscuit</groupId>
115-
<artifactId>cscorelib2</artifactId>
114+
<groupId>io.github.baked-libs</groupId>
115+
<artifactId>dough-api</artifactId>
116116
</exclusion>
117117
</exclusions>
118118
</dependency>

‎src/main/java/io/github/thebusybiscuit/ecopower/EcoPowerPlugin.java‎

Lines changed: 35 additions & 37 deletions
Large diffs are not rendered by default.

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/HighEnergySolarGenerator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.bukkit.inventory.ItemStack;
44

5+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
6+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
7+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
58
import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator;
6-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
7-
import me.mrCookieSlime.Slimefun.Objects.Category;
8-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
99

1010
/**
1111
* The {@link HighEnergySolarGenerator} is simply a {@link SolarGenerator} which generates
@@ -16,8 +16,8 @@
1616
*/
1717
public class HighEnergySolarGenerator extends SolarGenerator {
1818

19-
public HighEnergySolarGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
20-
super(category, energy, energy, item, recipeType, recipe);
19+
public HighEnergySolarGenerator(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
20+
super(itemGroup, energy, energy, item, recipeType, recipe);
2121
}
2222

2323
}

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/LightningReceptor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import org.bukkit.inventory.ItemStack;
1212
import org.bukkit.plugin.java.JavaPlugin;
1313

14+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
15+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
16+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
17+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
1418
import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
1519
import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
1620
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
17-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
18-
import me.mrCookieSlime.Slimefun.Objects.Category;
19-
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
20-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
2121

2222
/**
2323
* The {@link LightningReceptor} attracts a {@link LightningStrike} during thunderstorms
@@ -35,8 +35,8 @@ public class LightningReceptor extends SlimefunItem implements EnergyNetProvider
3535
private final int minPower;
3636
private final int maxPower;
3737

38-
public LightningReceptor(Category category, SlimefunItemStack item, int min, int max, RecipeType recipeType, ItemStack[] recipe) {
39-
super(category, item, recipeType, recipe);
38+
public LightningReceptor(ItemGroup itemGroup, SlimefunItemStack item, int min, int max, RecipeType recipeType, ItemStack[] recipe) {
39+
super(itemGroup, item, recipeType, recipe);
4040

4141
this.minPower = min;
4242
this.maxPower = max;

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/LunarGenerator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.bukkit.inventory.ItemStack;
44

5+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
6+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
7+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
58
import io.github.thebusybiscuit.slimefun4.implementation.items.electric.generators.SolarGenerator;
6-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
7-
import me.mrCookieSlime.Slimefun.Objects.Category;
8-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
99

1010
/**
1111
* The {@link LunarGenerator} is a {@link SolarGenerator} which <strong>only works at night!</strong>.
@@ -15,8 +15,8 @@
1515
*/
1616
public class LunarGenerator extends SolarGenerator {
1717

18-
public LunarGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
19-
super(category, 0, energy, item, recipeType, recipe);
18+
public LunarGenerator(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int energy) {
19+
super(itemGroup, 0, energy, item, recipeType, recipe);
2020
}
2121

2222
}

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbine.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import org.bukkit.inventory.ItemStack;
1414
import org.bukkit.plugin.java.JavaPlugin;
1515

16+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
17+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
18+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
19+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
1620
import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
1721
import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
1822
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
19-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
20-
import me.mrCookieSlime.Slimefun.Objects.Category;
21-
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
22-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
2323

2424
/**
2525
* The {@link SteamTurbine} generates energy when placed above bubbling water.
@@ -34,8 +34,8 @@ public class SteamTurbine extends SlimefunItem implements EnergyNetProvider {
3434
private final Set<Location> validTurbines = ConcurrentHashMap.newKeySet();
3535
private final int generatedPower;
3636

37-
public SteamTurbine(Category category, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
38-
super(category, item, recipeType, recipe);
37+
public SteamTurbine(ItemGroup itemGroup, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
38+
super(itemGroup, item, recipeType, recipe);
3939

4040
this.generatedPower = generatedPower;
4141
}

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/SteamTurbineMultiblock.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import org.bukkit.Material;
44
import org.bukkit.inventory.ItemStack;
55

6+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
7+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
8+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
69
import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
710
import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
811
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
912
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
10-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
11-
import me.mrCookieSlime.Slimefun.Objects.Category;
12-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
13-
import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
13+
import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
1414

1515
/**
1616
* This is the multiblock variant of the {@link SteamTurbine}, as shown in the {@link SlimefunGuide}.
@@ -20,10 +20,10 @@
2020
*/
2121
public class SteamTurbineMultiblock extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
2222

23-
public SteamTurbineMultiblock(Category category, SlimefunItemStack item, SteamTurbine turbine) {
24-
super(category, item, RecipeType.MULTIBLOCK, new ItemStack[] {
23+
public SteamTurbineMultiblock(ItemGroup itemGroup, SlimefunItemStack item, SteamTurbine turbine) {
24+
super(itemGroup, item, RecipeType.MULTIBLOCK, new ItemStack[] {
2525
null, turbine.getItem(), null,
26-
null, new CustomItem(Material.WATER_BUCKET, "&fWater (Bubble Column)"), null,
26+
null, new CustomItemStack(Material.WATER_BUCKET, "&fWater (Bubble Column)"), null,
2727
null, new ItemStack(Material.MAGMA_BLOCK), null
2828
});
2929
}

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbine.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import org.bukkit.inventory.ItemStack;
1313
import org.bukkit.plugin.java.JavaPlugin;
1414

15+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
16+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
17+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
18+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
1519
import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider;
1620
import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
1721
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
18-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
19-
import me.mrCookieSlime.Slimefun.Objects.Category;
20-
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
21-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
2222

2323
/**
2424
* 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 {
3434
private final Set<Location> validTurbines = ConcurrentHashMap.newKeySet();
3535
private final int generatedPower;
3636

37-
public WindTurbine(Category category, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
38-
super(category, item, recipeType, recipe);
37+
public WindTurbine(ItemGroup itemGroup, SlimefunItemStack item, int generatedPower, RecipeType recipeType, ItemStack[] recipe) {
38+
super(itemGroup, item, recipeType, recipe);
3939

4040
this.generatedPower = generatedPower;
4141
}

‎src/main/java/io/github/thebusybiscuit/ecopower/generators/WindTurbineMultiblock.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import org.bukkit.Material;
44
import org.bukkit.inventory.ItemStack;
55

6+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
7+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
8+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
69
import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
710
import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
811
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
912
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
10-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
11-
import me.mrCookieSlime.Slimefun.Objects.Category;
12-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
1313

1414
/**
1515
* This is the multiblock variant of the {@link WindTurbine}, as shown in the {@link SlimefunGuide}.
@@ -19,8 +19,8 @@
1919
*/
2020
public class WindTurbineMultiblock extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
2121

22-
public WindTurbineMultiblock(Category category, SlimefunItemStack item, WindTurbine turbine) {
23-
super(category, item, RecipeType.MULTIBLOCK, new ItemStack[] {
22+
public WindTurbineMultiblock(ItemGroup itemGroup, SlimefunItemStack item, WindTurbine turbine) {
23+
super(itemGroup, item, RecipeType.MULTIBLOCK, new ItemStack[] {
2424
null, turbine.getItem(), null,
2525
null, new ItemStack(Material.OAK_FENCE), null,
2626
null, new ItemStack(Material.OAK_FENCE), null

‎src/main/java/io/github/thebusybiscuit/ecopower/items/SteelRotor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import org.bukkit.inventory.ItemStack;
44

5+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
6+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
7+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
58
import io.github.thebusybiscuit.slimefun4.api.events.PlayerRightClickEvent;
69
import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
710
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
811
import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
9-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
10-
import me.mrCookieSlime.Slimefun.Objects.Category;
11-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
1212

1313
public class SteelRotor extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
1414

15-
public SteelRotor(Category category, SlimefunItemStack item, ItemStack[] recipe, ItemStack recipeOutput) {
16-
super(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, recipeOutput);
15+
public SteelRotor(ItemGroup itemGroup, SlimefunItemStack item, ItemStack[] recipe, ItemStack recipeOutput) {
16+
super(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, recipeOutput);
1717
}
1818

1919
@Override

0 commit comments

Comments
 (0)