mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Fixes #1269

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-12-01 20:55:46 +01:00
parent 958a3c0429
commit 8183a1a5af
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SoulboundBackpack.java
View File

@ -4,9 +4,10 @@ import org.bukkit.inventory.ItemStack;
import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.Category;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.Soulbound;
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; 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) { public SoulboundBackpack(int size, Category category, SlimefunItemStack item, ItemStack[] recipe) {
super(size, category, item, RecipeType.MAGIC_WORKBENCH, recipe); super(size, category, item, RecipeType.MAGIC_WORKBENCH, recipe);

3
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/ElectricPress.java
View File

@ -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(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(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(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 @Override

2
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/EnhancedCraftingTable.java
View File

@ -73,6 +73,7 @@ public class EnhancedCraftingTable extends MultiBlockMachine {
final ItemStack adding = RecipeType.getRecipeOutputList(this, inputs.get(i)).clone(); final ItemStack adding = RecipeType.getRecipeOutputList(this, inputs.get(i)).clone();
if (Slimefun.hasUnlocked(p, adding, true)) { if (Slimefun.hasUnlocked(p, adding, true)) {
Inventory inv2 = Bukkit.createInventory(null, 9, "test"); Inventory inv2 = Bukkit.createInventory(null, 9, "test");
for (int j = 0; j < inv.getContents().length; j++) { 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); 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) { if (outputInv != null) {
SlimefunItem sfItem = SlimefunItem.getByItem(adding); SlimefunItem sfItem = SlimefunItem.getByItem(adding);
if (sfItem instanceof SlimefunBackpack) { if (sfItem instanceof SlimefunBackpack) {
ItemStack backpack = null; ItemStack backpack = null;

2
src/main/java/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -1240,7 +1240,7 @@ public final class SlimefunSetup {
.register(true); .register(true);
new SoulboundBackpack(36, Categories.PORTABLE, (SlimefunItemStack) SlimefunItems.BOUND_BACKPACK, 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); .register(true);
new JetBoots((SlimefunItemStack) SlimefunItems.DURALUMIN_JETBOOTS, new JetBoots((SlimefunItemStack) SlimefunItems.DURALUMIN_JETBOOTS,

3
src/main/java/me/mrCookieSlime/Slimefun/hooks/github/ContributionsConnector.java
View File

@ -16,7 +16,8 @@ public class ContributionsConnector extends GitHubConnector {
private static final List<String> blacklist = Arrays.asList( private static final List<String> blacklist = Arrays.asList(
"invalid-email-address", "invalid-email-address",
"renovate-bot", "renovate-bot",
"ImgBotApp" "ImgBotApp",
"TheBusyBot"
); );
private final String prefix; private final String prefix;