Skip to content

Commit 2520cb2

Browse files
TheBusyBiscuitTheBusyBiscuit
authored
Merge pull request #8 from variananora/rc-27-update
Update to RC-27 with the new class movement
2 parents b08809b + 3bde211 commit 2520cb2

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@
9797
<dependency>
9898
<groupId>com.github.slimefun</groupId>
9999
<artifactId>Slimefun4</artifactId>
100-
<version>RC-20</version>
100+
<version>RC-27</version>
101101
<scope>provided</scope>
102102
<exclusions>
103103
<exclusion>
104-
<groupId>io.github.thebusybiscuit</groupId>
105-
<artifactId>cscorelib2</artifactId>
104+
<groupId>io.github.baked-libs</groupId>
105+
<artifactId>dough-api</artifactId>
106106
</exclusion>
107107
</exclusions>
108108
</dependency>

‎src/main/java/io/github/thebusybiscuit/slimefunorechunks/OreChunk.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import org.bukkit.inventory.ItemStack;
77

88
import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
9-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
10-
import me.mrCookieSlime.Slimefun.Objects.Category;
11-
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
12-
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
9+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
10+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
11+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
12+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
1313

1414
public class OreChunk extends SlimefunItem {
1515

@@ -19,12 +19,12 @@ public class OreChunk extends SlimefunItem {
1919
private final MultiBlockMachine machine;
2020
private final ItemStack output;
2121

22-
public OreChunk(OreChunks plugin, Category category, String id, String name, int amplifier, String texture, ItemStack output) {
23-
this(plugin, category, id, name, "&7Use an Ore Crusher to turn this into Dust", amplifier, texture, RecipeType.ORE_CRUSHER, output);
22+
public OreChunk(OreChunks plugin, ItemGroup itemGroup, String id, String name, int amplifier, String texture, ItemStack output) {
23+
this(plugin, itemGroup, id, name, "&7Use an Ore Crusher to turn this into Dust", amplifier, texture, RecipeType.ORE_CRUSHER, output);
2424
}
2525

26-
public OreChunk(OreChunks plugin, Category category, String id, String name, String lore, int amplifier, String texture, RecipeType machine, ItemStack output) {
27-
super(category, new SlimefunItemStack(id, texture, "&r" + name, lore), RecipeType.GEO_MINER, new ItemStack[0]);
26+
public OreChunk(OreChunks plugin, ItemGroup itemGroup, String id, String name, String lore, int amplifier, String texture, RecipeType machine, ItemStack output) {
27+
super(itemGroup, new SlimefunItemStack(id, texture, "&r" + name, lore), RecipeType.GEO_MINER, new ItemStack[0]);
2828

2929
this.amplifier = amplifier;
3030
this.name = name;

‎src/main/java/io/github/thebusybiscuit/slimefunorechunks/OreChunks.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
import org.bukkit.plugin.java.JavaPlugin;
66

77
import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
8+
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
9+
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
810
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
9-
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
10-
import me.mrCookieSlime.Slimefun.Objects.Category;
11-
import me.mrCookieSlime.Slimefun.cscorelib2.config.Config;
12-
import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
13-
import me.mrCookieSlime.Slimefun.cscorelib2.skull.SkullItem;
14-
import me.mrCookieSlime.Slimefun.cscorelib2.updater.GitHubBuildsUpdater;
11+
import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
12+
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerHead;
13+
import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerSkin;
14+
import io.github.thebusybiscuit.slimefun4.libraries.dough.config.Config;
15+
import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
1516

1617
public class OreChunks extends JavaPlugin implements SlimefunAddon {
17-
18+
1819
@Override
1920
public void onEnable() {
2021
Config cfg = new Config(this);
@@ -24,39 +25,39 @@ public void onEnable() {
2425
new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/SlimefunOreChunks/master").start();
2526
}
2627

27-
Category category = new Category(new NamespacedKey(this, "ore_chunks"), new CustomItem(SkullItem.fromHash("dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8"), "&6Ore Chunks"));
28+
ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "ore_chunks"), new CustomItemStack(PlayerHead.getItemStack(PlayerSkin.fromHashCode("dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8")), "&6Ore Chunks"));
2829

29-
new OreChunk(this, category, "IRON_ORE_CHUNK", "Iron Ore Chunk", 4, "44cc1ccc75d0f724af8a5fe273edaf4c6d5951f9e4d038f9f16e4f2673ce3833",
30+
new OreChunk(this, itemGroup, "IRON_ORE_CHUNK", "Iron Ore Chunk", 4, "44cc1ccc75d0f724af8a5fe273edaf4c6d5951f9e4d038f9f16e4f2673ce3833",
3031
SlimefunItems.IRON_DUST).register(this);
3132

32-
new OreChunk(this, category, "GOLD_ORE_CHUNK", "Gold Ore Chunk", 2, "3184478b211439f3e2c509c3424ea5ff2fce73825c8bebf96cfccd103e4922eb",
33+
new OreChunk(this, itemGroup, "GOLD_ORE_CHUNK", "Gold Ore Chunk", 2, "3184478b211439f3e2c509c3424ea5ff2fce73825c8bebf96cfccd103e4922eb",
3334
SlimefunItems.GOLD_DUST).register(this);
3435

35-
new OreChunk(this, category, "COPPER_ORE_CHUNK", "Copper Ore Chunk", 5, "60d748757d6efddde852e0a4a1a9b92f2e4c58b1ea9a1731a32f6cedf2c23b36",
36+
new OreChunk(this, itemGroup, "COPPER_ORE_CHUNK", "Copper Ore Chunk", 5, "60d748757d6efddde852e0a4a1a9b92f2e4c58b1ea9a1731a32f6cedf2c23b36",
3637
SlimefunItems.COPPER_DUST).register(this);
3738

38-
new OreChunk(this, category, "TIN_ORE_CHUNK", "Tin Ore Chunk", 3, "de2c955177ff65a2d55af17743755090a5a6b68b3586ccbc31a342dad9ef7799",
39+
new OreChunk(this, itemGroup, "TIN_ORE_CHUNK", "Tin Ore Chunk", 3, "de2c955177ff65a2d55af17743755090a5a6b68b3586ccbc31a342dad9ef7799",
3940
SlimefunItems.TIN_DUST).register(this);
4041

41-
new OreChunk(this, category, "SILVER_ORE_CHUNK", "Silver Ore Chunk", 2, "dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8",
42+
new OreChunk(this, itemGroup, "SILVER_ORE_CHUNK", "Silver Ore Chunk", 2, "dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8",
4243
SlimefunItems.SILVER_DUST).register(this);
4344

44-
new OreChunk(this, category, "ALUMINUM_ORE_CHUNK", "Aluminum Ore Chunk", 4, "46732368c980b4c27495664bd50b5820cc37c573fb37a88f34c5d3a0dec66219",
45+
new OreChunk(this, itemGroup, "ALUMINUM_ORE_CHUNK", "Aluminum Ore Chunk", 4, "46732368c980b4c27495664bd50b5820cc37c573fb37a88f34c5d3a0dec66219",
4546
SlimefunItems.ALUMINUM_DUST).register(this);
4647

47-
new OreChunk(this, category, "LEAD_ORE_CHUNK", "Lead Ore Chunk", 2, "2333fcec07c89c5fdb886caf5e3ebf8c6a536dd662b31f91c1a6dbd913bc3db0",
48+
new OreChunk(this, itemGroup, "LEAD_ORE_CHUNK", "Lead Ore Chunk", 2, "2333fcec07c89c5fdb886caf5e3ebf8c6a536dd662b31f91c1a6dbd913bc3db0",
4849
SlimefunItems.LEAD_DUST).register(this);
4950

50-
new OreChunk(this, category, "ZINC_ORE_CHUNK", "Zinc Ore Chunk", 3, "63f82f20266b4b8e0456110379f941fca16413846e231e8ac202dc2caf7ffb41",
51+
new OreChunk(this, itemGroup, "ZINC_ORE_CHUNK", "Zinc Ore Chunk", 3, "63f82f20266b4b8e0456110379f941fca16413846e231e8ac202dc2caf7ffb41",
5152
SlimefunItems.ZINC_DUST).register(this);
5253

53-
new OreChunk(this, category, "MAGNESIUM_ORE_CHUNK", "Magnesium Ore Chunk", 4, "e8c99d857a5b34331699ce6b5449d8d75f6c50b294ea1a29108f66ca086528bb",
54+
new OreChunk(this, itemGroup, "MAGNESIUM_ORE_CHUNK", "Magnesium Ore Chunk", 4, "e8c99d857a5b34331699ce6b5449d8d75f6c50b294ea1a29108f66ca086528bb",
5455
SlimefunItems.MAGNESIUM_DUST).register(this);
5556

56-
new OreChunk(this, category, "NICKEL_ORE_CHUNK", "Nickel Ore Chunk", "&7You can smelt this into an Ingot in a Smeltery", 2, "3ba30df8316cdfe3c5b1ad7aa9775c94c3ad5e502ea1254efeb41344f7962381",
57+
new OreChunk(this, itemGroup, "NICKEL_ORE_CHUNK", "Nickel Ore Chunk", "&7You can smelt this into an Ingot in a Smeltery", 2, "3ba30df8316cdfe3c5b1ad7aa9775c94c3ad5e502ea1254efeb41344f7962381",
5758
RecipeType.SMELTERY, SlimefunItems.NICKEL_INGOT).register(this);
5859

59-
new OreChunk(this, category, "COBALT_ORE_CHUNK", "Cobalt Ore Chunk", "&7You can smelt this into an Ingot in a Smeltery", 1, "ec54a54b1a49c29686be1c6e3e05dd068f85e994c8c893838cc5878b5446bc8a",
60+
new OreChunk(this, itemGroup, "COBALT_ORE_CHUNK", "Cobalt Ore Chunk", "&7You can smelt this into an Ingot in a Smeltery", 1, "ec54a54b1a49c29686be1c6e3e05dd068f85e994c8c893838cc5878b5446bc8a",
6061
RecipeType.SMELTERY, SlimefunItems.COBALT_INGOT).register(this);
6162
}
6263

0 commit comments

Comments
 (0)