Upstream/ChestSort
1
0
Fork 0
mirror of https://github.com/JEFF-Media-GbR/ChestSort.git synced 2024-12-12 04:17:44 +01:00
Code Issues Projects Releases Wiki Activity

8.15.1

Browse Source
This commit is contained in:
mfnalex 2020-07-14 23:19:36 +02:00
parent 7cb026e156
commit d461084d5f
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## 8.15.1
- Fixed dirt in containers being affected by the right-click hotkey even though the player had no dirt in his inventory
## 8.15.0 ## 8.15.0
- Enabled left-click and right-click hotkey for 3rd party plugins implementing the ISortable interface from ChestSort's API (You only need this update if you use plugins depending on the ChestSortAPI) - Enabled left-click and right-click hotkey for 3rd party plugins implementing the ISortable interface from ChestSort's API (You only need this update if you use plugins depending on the ChestSortAPI)

2
pom.xml
View File

@ -9,7 +9,7 @@
<name>ChestSort</name> <name>ChestSort</name>
<url>https://www.chestsort.de</url> <url>https://www.chestsort.de</url>
<description>Automatically sorts your chests!</description> <description>Automatically sorts your chests!</description>
<version>8.15.0</version> <version>8.15.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

8
src/main/java/de/jeff_media/ChestSort/ChestSortOrganizer.java
View File

@ -554,7 +554,6 @@ public class ChestSortOrganizer {
public void stuffInventoryIntoAnother(Inventory source, Inventory destination, Inventory origSource, boolean onlyMatchingStuff) { public void stuffInventoryIntoAnother(Inventory source, Inventory destination, Inventory origSource, boolean onlyMatchingStuff) {
Material placeholderMaterial = Material.DIRT;
ItemStack[] hotbarStuff = new ItemStack[9]; ItemStack[] hotbarStuff = new ItemStack[9];
boolean destinationIsPlayerInventory = true; boolean destinationIsPlayerInventory = true;
if (destination.getHolder() == null || !(destination.getHolder() instanceof Player) || destination.getType() != InventoryType.PLAYER) { if (destination.getHolder() == null || !(destination.getHolder() instanceof Player) || destination.getType() != InventoryType.PLAYER) {
@ -565,7 +564,7 @@ public class ChestSortOrganizer {
if (destinationIsPlayerInventory) { if (destinationIsPlayerInventory) {
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
hotbarStuff[i] = destination.getItem(i); hotbarStuff[i] = destination.getItem(i);
destination.setItem(i, new ItemStack(placeholderMaterial, 64)); destination.setItem(i, getPlaceholderBlock());
} }
} }
@ -600,6 +599,11 @@ public class ChestSortOrganizer {
} }
// Used to temporarily fill the hotbar
private ItemStack getPlaceholderBlock() {
return new ItemStack(Material.BARRIER, 64);
}
public void stuffPlayerInventoryIntoAnother(PlayerInventory source, public void stuffPlayerInventoryIntoAnother(PlayerInventory source,
Inventory destination, boolean onlyMatchingStuff) { Inventory destination, boolean onlyMatchingStuff) {
boolean destinationIsShulkerBox = destination.getType().name().equalsIgnoreCase("SHULKER_BOX"); boolean destinationIsShulkerBox = destination.getType().name().equalsIgnoreCase("SHULKER_BOX");

2
src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
main: de.jeff_media.ChestSort.ChestSortPlugin main: de.jeff_media.ChestSort.ChestSortPlugin
name: ChestSort name: ChestSort
version: 8.15.0 version: 8.15.1
api-version: "1.13" api-version: "1.13"
description: Allows automatic chest sorting description: Allows automatic chest sorting
author: mfnalex author: mfnalex