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

Added #1387 to CHANGELOG.md

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-01-26 03:15:10 +01:00
parent 20af3fc8ed
commit 06558541f3
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -32,6 +32,7 @@
* Added Grind Stone Recipes for Prismarine * Added Grind Stone Recipes for Prismarine
* Added String to the Bio Reactor * Added String to the Bio Reactor
* Added a config setting to limit how many Nodes a Network can have * Added a config setting to limit how many Nodes a Network can have
* Added support for Furnaces and Brewing Stands to Cargo Networks
### Changes ### Changes
* Removed Solar Array * Removed Solar Array
@ -48,6 +49,7 @@
* Fixed Cargo Networks particles being broken * Fixed Cargo Networks particles being broken
* Fixed #1379 * Fixed #1379
* Fixed #1212 * Fixed #1212
* Fixed #114
## Release Candidate 4 (06 Jan 2020) ## Release Candidate 4 (06 Jan 2020)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4

74
src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java
View File

@ -1,19 +1,23 @@
package me.mrCookieSlime.Slimefun.api.item_transport; package me.mrCookieSlime.Slimefun.api.item_transport;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.inventory.BrewerInventory;
import org.bukkit.inventory.FurnaceInventory;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu; import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.inventory.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public final class CargoManager { public final class CargoManager {
@ -34,13 +38,15 @@ public final class CargoManager {
if (is.getAmount() > template.getAmount()) { if (is.getAmount() > template.getAmount()) {
menu.replaceExistingItem(slot, new CustomItem(is, is.getAmount() - template.getAmount())); menu.replaceExistingItem(slot, new CustomItem(is, is.getAmount() - template.getAmount()));
return template; return template;
} else { }
else {
menu.replaceExistingItem(slot, null); menu.replaceExistingItem(slot, null);
return is.clone(); return is.clone();
} }
} }
} }
} else { }
else {
BlockState state = target.getState(); BlockState state = target.getState();
if (state instanceof InventoryHolder) { if (state instanceof InventoryHolder) {
@ -51,7 +57,8 @@ public final class CargoManager {
if (inv instanceof FurnaceInventory) { if (inv instanceof FurnaceInventory) {
minSlot = 2; minSlot = 2;
maxSlot = 3; maxSlot = 3;
} else if (inv instanceof BrewerInventory) { }
else if (inv instanceof BrewerInventory) {
maxSlot = 3; maxSlot = 3;
} }
for (int slot = minSlot; slot < maxSlot; slot++) { for (int slot = minSlot; slot < maxSlot; slot++) {
@ -61,7 +68,8 @@ public final class CargoManager {
if (is.getAmount() > template.getAmount()) { if (is.getAmount() > template.getAmount()) {
inv.setItem(slot, ChestManipulator.trigger(target, slot, is, new CustomItem(is, is.getAmount() - template.getAmount()))); inv.setItem(slot, ChestManipulator.trigger(target, slot, is, new CustomItem(is, is.getAmount() - template.getAmount())));
return template; return template;
} else { }
else {
inv.setItem(slot, ChestManipulator.trigger(target, slot, is, new CustomItem(is, is.getAmount() - template.getAmount()))); inv.setItem(slot, ChestManipulator.trigger(target, slot, is, new CustomItem(is, is.getAmount() - template.getAmount())));
return is.clone(); return is.clone();
} }
@ -84,7 +92,8 @@ public final class CargoManager {
return new ItemSlot(is.clone(), slot); return new ItemSlot(is.clone(), slot);
} }
} }
} else { }
else {
BlockState state = target.getState(); BlockState state = target.getState();
if (state instanceof InventoryHolder) { if (state instanceof InventoryHolder) {
@ -96,7 +105,8 @@ public final class CargoManager {
if (inv instanceof FurnaceInventory) { if (inv instanceof FurnaceInventory) {
minSlot = 2; minSlot = 2;
maxSlot = 3; maxSlot = 3;
} else if (inv instanceof BrewerInventory) { }
else if (inv instanceof BrewerInventory) {
maxSlot = 3; maxSlot = 3;
} }
@ -125,13 +135,15 @@ public final class CargoManager {
if (is == null) { if (is == null) {
menu.replaceExistingItem(slot, stack.clone()); menu.replaceExistingItem(slot, stack.clone());
return null; return null;
} else if (SlimefunManager.isItemSimilar(new CustomItem(is, 1), new CustomItem(stack, 1), true) && is.getAmount() < is.getType().getMaxStackSize()) { }
else if (SlimefunManager.isItemSimilar(new CustomItem(is, 1), new CustomItem(stack, 1), true) && is.getAmount() < is.getType().getMaxStackSize()) {
int amount = is.getAmount() + stack.getAmount(); int amount = is.getAmount() + stack.getAmount();
if (amount > is.getType().getMaxStackSize()) { if (amount > is.getType().getMaxStackSize()) {
is.setAmount(is.getType().getMaxStackSize()); is.setAmount(is.getType().getMaxStackSize());
stack.setAmount(amount - is.getType().getMaxStackSize()); stack.setAmount(amount - is.getType().getMaxStackSize());
} else { }
else {
is.setAmount(amount); is.setAmount(amount);
stack = null; stack = null;
} }
@ -140,7 +152,8 @@ public final class CargoManager {
return stack; return stack;
} }
} }
} else { }
else {
BlockState state = target.getState(); BlockState state = target.getState();
if (state instanceof InventoryHolder) { if (state instanceof InventoryHolder) {
@ -155,18 +168,22 @@ public final class CargoManager {
if (stack.getType().isFuel()) { if (stack.getType().isFuel()) {
minSlot = 1; minSlot = 1;
maxSlot = 2; maxSlot = 2;
} else { }
else {
maxSlot = 1; maxSlot = 1;
} }
} else if (inv instanceof BrewerInventory) { }
else if (inv instanceof BrewerInventory) {
//Check if it goes in the potion slot, //Check if it goes in the potion slot,
if (stack.getType() == Material.POTION || stack.getType() == Material.LINGERING_POTION || stack.getType() == Material.SPLASH_POTION) { if (stack.getType() == Material.POTION || stack.getType() == Material.LINGERING_POTION || stack.getType() == Material.SPLASH_POTION) {
maxSlot = 3; maxSlot = 3;
//The blaze powder slot, //The blaze powder slot,
} else if (stack.getType() == Material.BLAZE_POWDER) { }
else if (stack.getType() == Material.BLAZE_POWDER) {
minSlot = 4; minSlot = 4;
maxSlot = 5; maxSlot = 5;
} else { }
else {
//Or the input //Or the input
minSlot = 3; minSlot = 3;
maxSlot = 4; maxSlot = 4;
@ -179,14 +196,16 @@ public final class CargoManager {
if (is == null) { if (is == null) {
inv.setItem(slot, ChestManipulator.trigger(target, slot, null, stack.clone())); inv.setItem(slot, ChestManipulator.trigger(target, slot, null, stack.clone()));
return null; return null;
} else if (SlimefunManager.isItemSimilar(new CustomItem(is, 1), new CustomItem(stack, 1), true) && is.getAmount() < is.getType().getMaxStackSize()) { }
else if (SlimefunManager.isItemSimilar(new CustomItem(is, 1), new CustomItem(stack, 1), true) && is.getAmount() < is.getType().getMaxStackSize()) {
int amount = is.getAmount() + stack.getAmount(); int amount = is.getAmount() + stack.getAmount();
ItemStack prev = is.clone(); ItemStack prev = is.clone();
if (amount > is.getType().getMaxStackSize()) { if (amount > is.getType().getMaxStackSize()) {
is.setAmount(is.getType().getMaxStackSize()); is.setAmount(is.getType().getMaxStackSize());
stack.setAmount(amount - is.getType().getMaxStackSize()); stack.setAmount(amount - is.getType().getMaxStackSize());
} else { }
else {
is.setAmount(amount); is.setAmount(amount);
stack = null; stack = null;
} }
@ -197,6 +216,7 @@ public final class CargoManager {
} }
} }
} }
return stack; return stack;
} }
@ -239,18 +259,22 @@ public final class CargoManager {
BlockStorage.addBlockInfo(block, "index", String.valueOf(index)); BlockStorage.addBlockInfo(block, "index", String.valueOf(index));
return SlimefunManager.isItemSimilar(item, items.get(index), lore); return SlimefunManager.isItemSimilar(item, items.get(index), lore);
} else { }
else {
for (ItemStack stack : items) { for (ItemStack stack : items) {
if (SlimefunManager.isItemSimilar(item, stack, lore)) return true; if (SlimefunManager.isItemSimilar(item, stack, lore)) return true;
} }
return false; return false;
} }
} else { }
else {
for (int slot : SLOTS) { for (int slot : SLOTS) {
if (menu.getItemInSlot(slot) != null && SlimefunManager.isItemSimilar(item, new CustomItem(menu.getItemInSlot(slot), 1), lore)) { if (menu.getItemInSlot(slot) != null && SlimefunManager.isItemSimilar(item, new CustomItem(menu.getItemInSlot(slot), 1), lore)) {
return false; return false;
} }
} }
return true; return true;
} }
} }