diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java index d1d6a3b10..28e8b5d32 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java @@ -4,9 +4,10 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.Soulbound; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -public class SoulboundBackpack extends SlimefunBackpack { +public class SoulboundBackpack extends SlimefunBackpack implements Soulbound { public SoulboundBackpack(int size, Category category, SlimefunItemStack item, ItemStack[] recipe) { super(size, category, item, RecipeType.MAGIC_WORKBENCH, recipe); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/ElectricPress.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/ElectricPress.java index ee1ee340f..07b9c6ad1 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/ElectricPress.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/ElectricPress.java @@ -34,6 +34,9 @@ public abstract class ElectricPress extends AContainer implements RecipeDisplayI registerRecipe(new MachineRecipe(10, new ItemStack[] {new ItemStack(Material.ENDER_EYE)}, new ItemStack[] {new CustomItem(SlimefunItems.ENDER_LUMP_1, 2)})); registerRecipe(new MachineRecipe(12, new ItemStack[] {new CustomItem(SlimefunItems.ENDER_LUMP_1, 4)}, new ItemStack[] {SlimefunItems.ENDER_LUMP_2})); registerRecipe(new MachineRecipe(14, new ItemStack[] {new CustomItem(SlimefunItems.ENDER_LUMP_2, 4)}, new ItemStack[] {SlimefunItems.ENDER_LUMP_3})); + + registerRecipe(new MachineRecipe(18, new ItemStack[] {new CustomItem(SlimefunItems.TINY_URANIUM, 9)}, new ItemStack[] {SlimefunItems.SMALL_URANIUM})); + registerRecipe(new MachineRecipe(24, new ItemStack[] {new CustomItem(SlimefunItems.SMALL_URANIUM, 4)}, new ItemStack[] {SlimefunItems.URANIUM})); } @Override diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/EnhancedCraftingTable.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/EnhancedCraftingTable.java index ad5e3781c..0018fa783 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/EnhancedCraftingTable.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/EnhancedCraftingTable.java @@ -73,6 +73,7 @@ public class EnhancedCraftingTable extends MultiBlockMachine { final ItemStack adding = RecipeType.getRecipeOutputList(this, inputs.get(i)).clone(); if (Slimefun.hasUnlocked(p, adding, true)) { Inventory inv2 = Bukkit.createInventory(null, 9, "test"); + for (int j = 0; j < inv.getContents().length; j++) { inv2.setItem(j, inv.getContents()[j] != null ? (inv.getContents()[j].getAmount() > 1 ? new CustomItem(inv.getContents()[j], inv.getContents()[j].getAmount() - 1): null): null); } @@ -81,6 +82,7 @@ public class EnhancedCraftingTable extends MultiBlockMachine { if (outputInv != null) { SlimefunItem sfItem = SlimefunItem.getByItem(adding); + if (sfItem instanceof SlimefunBackpack) { ItemStack backpack = null; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index b5ec81bbd..c486e1eec 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -1240,7 +1240,7 @@ public final class SlimefunSetup { .register(true); new SoulboundBackpack(36, Categories.PORTABLE, (SlimefunItemStack) SlimefunItems.BOUND_BACKPACK, - new ItemStack[] {SlimefunItems.ENDER_LUMP_2, null, SlimefunItems.ENDER_LUMP_2, SlimefunItems.ESSENCE_OF_AFTERLIFE, SlimefunItems.RADIANT_BACKPACK, SlimefunItems.ESSENCE_OF_AFTERLIFE, SlimefunItems.ENDER_LUMP_2, null, SlimefunItems.ENDER_LUMP_2}) + new ItemStack[] {SlimefunItems.ENDER_LUMP_2, null, SlimefunItems.ENDER_LUMP_2, SlimefunItems.ESSENCE_OF_AFTERLIFE, SlimefunItems.WOVEN_BACKPACK, SlimefunItems.ESSENCE_OF_AFTERLIFE, SlimefunItems.ENDER_LUMP_2, null, SlimefunItems.ENDER_LUMP_2}) .register(true); new JetBoots((SlimefunItemStack) SlimefunItems.DURALUMIN_JETBOOTS, diff --git a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java index a90875aee..2aad6ce22 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java @@ -16,7 +16,8 @@ public class ContributionsConnector extends GitHubConnector { private static final List blacklist = Arrays.asList( "invalid-email-address", "renovate-bot", - "ImgBotApp" + "ImgBotApp", + "TheBusyBot" ); private final String prefix;