mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #2275

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-09-01 22:38:22 +02:00
parent 457cce740e
commit 35c1fa6a23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -96,6 +96,7 @@
* Fixed #2265
* Fixed #2269
* Fixed #2266
* Fixed #2275
## Release Candidate 15 (01 Aug 2020)

22
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractCargoNode.java
View File

@ -13,6 +13,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
import io.github.thebusybiscuit.slimefun4.utils.ChatUtils;
import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
import io.github.thebusybiscuit.slimefun4.utils.HeadTexture;
import io.github.thebusybiscuit.slimefun4.utils.NumberUtils;
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
@ -76,11 +77,11 @@ abstract class AbstractCargoNode extends SlimefunItem {
protected void addChannelSelector(Block b, BlockMenu menu, int slotPrev, int slotCurrent, int slotNext) {
boolean isChestTerminalInstalled = SlimefunPlugin.getThirdPartySupportService().isChestTerminalInstalled();
int channel = ((!BlockStorage.hasBlockInfo(b) || BlockStorage.getLocationInfo(b.getLocation(), FREQUENCY) == null) ? 0 : (Integer.parseInt(BlockStorage.getLocationInfo(b.getLocation(), FREQUENCY))));
int channel = getSelectedChannel(b);
menu.replaceExistingItem(slotPrev, new CustomItem(HeadTexture.CARGO_ARROW_LEFT.getAsItemStack(), "&bPrevious Channel", "", "&e> Click to decrease the Channel ID by 1"));
menu.addMenuClickHandler(slotPrev, (p, slot, item, action) -> {
int newChannel = channel + 1;
int newChannel = channel - 1;
if (channel < 0) {
if (isChestTerminalInstalled) {
@ -124,6 +125,23 @@ abstract class AbstractCargoNode extends SlimefunItem {
});
}
private int getSelectedChannel(Block b) {
if (!BlockStorage.hasBlockInfo(b)) {
return 0;
}
else {
String frequency = BlockStorage.getLocationInfo(b.getLocation(), FREQUENCY);
if (frequency == null) {
return 0;
}
else {
int channel = Integer.parseInt(frequency);
return NumberUtils.clamp(0, channel, 16);
}
}
}
protected abstract void onPlace(BlockPlaceEvent e);
protected abstract void createBorder(BlockMenuPreset preset);