Skip to content

[pull] master from Bunnky:master #7

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
pull wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[pull] master from Bunnky:master #7

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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,19 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.6-R0.1-SNAPSHOT</version>
<version>1.21.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-37</version>
<version>3ea21da4fe</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.baked-libs</groupId>
<groupId>com.github.Slimefun.dough</groupId>
<artifactId>dough-api</artifactId>
<version>1.2.0</version>
<version>cb22e71335</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
86 changes: 43 additions & 43 deletions src/main/java/me/bunnky/slimevision/slimefun/Setup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void setup() {

SlimeVision plugin = SlimeVision.getInstance();

ItemStack groupItem = new CustomItemStack(Material.ENDER_EYE, "&bSlime Vision", "", "I wish this worked!");
ItemStack groupItem = CustomItemStack.create(Material.ENDER_EYE, "&bSlime Vision", "", "I wish this worked!");
NamespacedKey groupId = new NamespacedKey(SlimeVision.getInstance(), "slime_vision");
ItemGroup group = new ItemGroup(groupId, groupItem);

Expand Down Expand Up @@ -392,103 +392,103 @@ public static void setup() {

ItemStack[] slimeScribeRecipe = {
null, null, null,
null, slimeEyeInverted, null,
null, slimeEyeInverted.item(), null,
null, null, null
};
ItemStack[] slimeEyeInvertedRecipe = {
null, SlimefunItems.HEAVY_CREAM, null,
null, slimeEye, null,
null, SlimefunItems.HEAVY_CREAM.item(), null,
null, slimeEye.item(), null,
null, null, null
};
ItemStack[] slimeOrbInvertedRecipe = {
null, SlimefunItems.HEAVY_CREAM, null,
null, slimeOrb, null,
null, SlimefunItems.HEAVY_CREAM.item(), null,
null, slimeOrb.item(), null,
null, null, null
};
ItemStack[] slimeGlobInvertedRecipe = {
null, SlimefunItems.HEAVY_CREAM, null,
null, slimeGlob, null,
null, SlimefunItems.HEAVY_CREAM.item(), null,
null, slimeGlob.item(), null,
null, null, null
};
ItemStack[] slimeChunkInvertedRecipe = {
null, SlimefunItems.HEAVY_CREAM, null,
null, slimeChunk, null,
null, SlimefunItems.HEAVY_CREAM.item(), null,
null, slimeChunk.item(), null,
null, null, null
};
ItemStack[] slimeEyeNetworksRecipe = {
null, null, null,
null, slimeEye, null,
null, slimeEye.item(), null,
null, null, null
};
ItemStack[] slimeOrbNetworksRecipe = {
null, null, null,
null, slimeOrb, null,
null, slimeOrb.item(), null,
null, null, null
};
ItemStack[] slimeGlobNetworksRecipe = {
null, null, null,
null, slimeGlob, null,
null, slimeGlob.item(), null,
null, null, null
};
ItemStack[] slimeChunkNetworksRecipe = {
null, null, null,
null, slimeChunk, null,
null, slimeChunk.item(), null,
null, null, null
};
ItemStack[] slimeEyeRecipe = {
particleNorth, particleTop, SlimefunItems.ADVANCED_CIRCUIT_BOARD,
particleWest, slimeOrb, particleEast,
SlimefunItems.ADVANCED_CIRCUIT_BOARD, particleBottom, particleSouth
particleNorth.item(), particleTop.item(), SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(),
particleWest.item(), slimeOrb.item(), particleEast.item(),
SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), particleBottom.item(), particleSouth.item()
};
ItemStack[] slimeOrbRecipe = {
particleNorth, particleTop, SlimefunItems.ADVANCED_CIRCUIT_BOARD,
particleWest, slimeGlob, particleEast,
SlimefunItems.ADVANCED_CIRCUIT_BOARD, particleBottom, particleSouth
particleNorth.item(), particleTop.item(), SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(),
particleWest.item(), slimeGlob.item(), particleEast.item(),
SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), particleBottom.item(), particleSouth.item()
};
ItemStack[] slimeGlobRecipe = {
particleNorth, particleTop, SlimefunItems.ADVANCED_CIRCUIT_BOARD,
particleWest, slimeChunk, particleEast,
SlimefunItems.ADVANCED_CIRCUIT_BOARD, particleBottom, particleSouth
particleNorth.item(), particleTop.item(), SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(),
particleWest.item(), slimeChunk.item(), particleEast.item(),
SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), particleBottom.item(), particleSouth.item()
};
ItemStack[] slimeChunkRecipe = {
particleNorth, particleTop, SlimefunItems.ADVANCED_CIRCUIT_BOARD,
particleWest, SlimefunItems.NETHER_ICE, particleEast,
SlimefunItems.ADVANCED_CIRCUIT_BOARD, particleBottom, particleSouth
particleNorth.item(), particleTop.item(), SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(),
particleWest.item(), SlimefunItems.NETHER_ICE.item(), particleEast.item(),
SlimefunItems.ADVANCED_CIRCUIT_BOARD.item(), particleBottom.item(), particleSouth.item()
};
ItemStack[] particleBaseRecipe = {
SlimefunItems.AIR_RUNE, SlimefunItems.EARTH_RUNE, SlimefunItems.FIRE_RUNE,
SlimefunItems.WATER_RUNE, new ItemStack(Material.CANDLE), SlimefunItems.LIGHTNING_RUNE,
SlimefunItems.ESSENCE_OF_AFTERLIFE, SlimefunItems.RAINBOW_RUNE, SlimefunItems.SMALL_URANIUM
SlimefunItems.AIR_RUNE.item(), SlimefunItems.EARTH_RUNE.item(), SlimefunItems.FIRE_RUNE.item(),
SlimefunItems.WATER_RUNE.item(), new ItemStack(Material.CANDLE), SlimefunItems.LIGHTNING_RUNE.item(),
SlimefunItems.ESSENCE_OF_AFTERLIFE.item(), SlimefunItems.RAINBOW_RUNE.item(), SlimefunItems.SMALL_URANIUM.item()
};
ItemStack[] particleTopRecipe = {
null, new ItemStack(Material.RED_DYE), null,
null, particleBase, null,
SlimefunItems.STEEL_THRUSTER, SlimefunItems.FUEL_BUCKET, SlimefunItems.STEEL_THRUSTER
null, particleBase.item(), null,
SlimefunItems.STEEL_THRUSTER.item(), SlimefunItems.FUEL_BUCKET.item(), SlimefunItems.STEEL_THRUSTER.item()
};
ItemStack[] particleBottomRecipe = {
SlimefunItems.STEEL_THRUSTER, SlimefunItems.FUEL_BUCKET, SlimefunItems.STEEL_THRUSTER,
null, particleBase, null,
SlimefunItems.STEEL_THRUSTER.item(), SlimefunItems.FUEL_BUCKET.item(), SlimefunItems.STEEL_THRUSTER.item(),
null, particleBase.item(), null,
null, new ItemStack(Material.CYAN_DYE), null
};
ItemStack[] particleEastRecipe = {
SlimefunItems.STEEL_THRUSTER, null, null,
SlimefunItems.FUEL_BUCKET, particleBase, new ItemStack(Material.YELLOW_DYE),
SlimefunItems.STEEL_THRUSTER, null, null
SlimefunItems.STEEL_THRUSTER.item(), null, null,
SlimefunItems.FUEL_BUCKET.item(), particleBase.item(), new ItemStack(Material.YELLOW_DYE),
SlimefunItems.STEEL_THRUSTER.item(), null, null
};
ItemStack[] particleWestRecipe = {
null, null, SlimefunItems.STEEL_THRUSTER,
new ItemStack(Material.GREEN_DYE), particleBase, SlimefunItems.FUEL_BUCKET,
null, null, SlimefunItems.STEEL_THRUSTER
null, null, SlimefunItems.STEEL_THRUSTER.item(),
new ItemStack(Material.GREEN_DYE), particleBase.item(), SlimefunItems.FUEL_BUCKET.item(),
null, null, SlimefunItems.STEEL_THRUSTER.item()
};
ItemStack[] particleSouthRecipe = {
SlimefunItems.STEEL_THRUSTER, SlimefunItems.FUEL_BUCKET, SlimefunItems.STEEL_THRUSTER,
null, particleBase, null,
SlimefunItems.STEEL_THRUSTER.item(), SlimefunItems.FUEL_BUCKET.item(), SlimefunItems.STEEL_THRUSTER.item(),
null, particleBase.item(), null,
null, new ItemStack(Material.ORANGE_DYE), null
};
ItemStack[] particleNorthRecipe = {
null, new ItemStack(Material.PURPLE_DYE), null,
null, particleBase, null,
SlimefunItems.STEEL_THRUSTER, SlimefunItems.FUEL_BUCKET, SlimefunItems.STEEL_THRUSTER
null, particleBase.item(), null,
SlimefunItems.STEEL_THRUSTER.item(), SlimefunItems.FUEL_BUCKET.item(), SlimefunItems.STEEL_THRUSTER.item()
};

//########################
Expand Down