Skip to content

add support for 1.21.4, fix slimefun api breaking changes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexsvorada wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for 1.21.4, fix slimefun api breaking changes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<version>UNOFFICIAL</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.3.0</version>

<configuration>

Expand Down Expand Up @@ -90,14 +90,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-27</version>
<version>experimental-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -110,8 +110,8 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>
24 changes: 12 additions & 12 deletions src/main/java/io/github/thebusybiscuit/slimefunorechunks/OreChunks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,40 @@ public void onEnable() {
new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/SlimefunOreChunks/master").start();
}

ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "ore_chunks"), new CustomItemStack(PlayerHead.getItemStack(PlayerSkin.fromHashCode("dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8")), "&6Ore Chunks"));
ItemGroup itemGroup = new ItemGroup(new NamespacedKey(this, "ore_chunks"), CustomItemStack.create(PlayerHead.getItemStack(PlayerSkin.fromHashCode("dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8")), "&6Ore Chunks"));

new OreChunk(this, itemGroup, "IRON_ORE_CHUNK", "Iron Ore Chunk", 4, "44cc1ccc75d0f724af8a5fe273edaf4c6d5951f9e4d038f9f16e4f2673ce3833",
SlimefunItems.IRON_DUST).register(this);
SlimefunItems.IRON_DUST.item()).register(this);

new OreChunk(this, itemGroup, "GOLD_ORE_CHUNK", "Gold Ore Chunk", 2, "3184478b211439f3e2c509c3424ea5ff2fce73825c8bebf96cfccd103e4922eb",
SlimefunItems.GOLD_DUST).register(this);
SlimefunItems.GOLD_DUST.item()).register(this);

new OreChunk(this, itemGroup, "COPPER_ORE_CHUNK", "Copper Ore Chunk", 5, "60d748757d6efddde852e0a4a1a9b92f2e4c58b1ea9a1731a32f6cedf2c23b36",
SlimefunItems.COPPER_DUST).register(this);
SlimefunItems.COPPER_DUST.item()).register(this);

new OreChunk(this, itemGroup, "TIN_ORE_CHUNK", "Tin Ore Chunk", 3, "de2c955177ff65a2d55af17743755090a5a6b68b3586ccbc31a342dad9ef7799",
SlimefunItems.TIN_DUST).register(this);
SlimefunItems.TIN_DUST.item()).register(this);

new OreChunk(this, itemGroup, "SILVER_ORE_CHUNK", "Silver Ore Chunk", 2, "dde8f949bbf3a42782c531fbf8de9dc2d8cd84dd7cb8f5d5328eeda83956aac8",
SlimefunItems.SILVER_DUST).register(this);
SlimefunItems.SILVER_DUST.item()).register(this);

new OreChunk(this, itemGroup, "ALUMINUM_ORE_CHUNK", "Aluminum Ore Chunk", 4, "46732368c980b4c27495664bd50b5820cc37c573fb37a88f34c5d3a0dec66219",
SlimefunItems.ALUMINUM_DUST).register(this);
SlimefunItems.ALUMINUM_DUST.item()).register(this);

new OreChunk(this, itemGroup, "LEAD_ORE_CHUNK", "Lead Ore Chunk", 2, "2333fcec07c89c5fdb886caf5e3ebf8c6a536dd662b31f91c1a6dbd913bc3db0",
SlimefunItems.LEAD_DUST).register(this);
SlimefunItems.LEAD_DUST.item()).register(this);

new OreChunk(this, itemGroup, "ZINC_ORE_CHUNK", "Zinc Ore Chunk", 3, "63f82f20266b4b8e0456110379f941fca16413846e231e8ac202dc2caf7ffb41",
SlimefunItems.ZINC_DUST).register(this);
SlimefunItems.ZINC_DUST.item()).register(this);

new OreChunk(this, itemGroup, "MAGNESIUM_ORE_CHUNK", "Magnesium Ore Chunk", 4, "e8c99d857a5b34331699ce6b5449d8d75f6c50b294ea1a29108f66ca086528bb",
SlimefunItems.MAGNESIUM_DUST).register(this);
SlimefunItems.MAGNESIUM_DUST.item()).register(this);

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

new OreChunk(this, itemGroup, "COBALT_ORE_CHUNK", "Cobalt Ore Chunk", "&7You can smelt this into an Ingot in a Smeltery", 1, "ec54a54b1a49c29686be1c6e3e05dd068f85e994c8c893838cc5878b5446bc8a",
RecipeType.SMELTERY, SlimefunItems.COBALT_INGOT).register(this);
RecipeType.SMELTERY, SlimefunItems.COBALT_INGOT.item()).register(this);
}

@Override
Expand Down