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

10.0.0

Browse Source
This commit is contained in:
mfnalex 2021-05-19 15:16:24 +02:00
parent 1bda6e51e4
commit 295b616669
37 changed files with 91 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog
## 10.0.0
- API update - some weird Spigot update broke casting the Plugin instance to its interface.
- Plugins depending on ChestSort or using its API must be updated too.
- API is now accessed simply via de.jeff_media.chestsort.ChestSortAPI
- Added "isChestSortInstalled" method
## 9.7.2
- Updated Turkish translation

14
pom.xml
View File

@ -9,7 +9,7 @@
<name>ChestSort</name>
<url>https://www.chestsort.de</url>
<description>Automatically sorts your chests!</description>
<version>9.7.2</version>
<version>10.0.0</version>
<packaging>jar</packaging>
<properties>
@ -45,23 +45,23 @@
<relocations>
<relocation>
<pattern>de.jeff_media.jefflib</pattern>
<shadedPattern>de.jeff_media.ChestSort.jefflib</shadedPattern>
<shadedPattern>de.jeff_media.chestsort.jefflib</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.maven.artifact</pattern>
<shadedPattern>de.jeff_media.ChestSort.jefflib.thirdparty.org.apache.maven.artifact</shadedPattern>
<shadedPattern>de.jeff_media.chestsort.jefflib.thirdparty.org.apache.maven.artifact</shadedPattern>
</relocation>
<relocation>
<pattern>de.jeff_media.updatechecker</pattern>
<shadedPattern>de.jeff_media.ChestSort.updatechecker</shadedPattern>
<shadedPattern>de.jeff_media.chestsort.updatechecker</shadedPattern>
</relocation>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>de.jeff_media.ChestSort</shadedPattern>
<shadedPattern>de.jeff_media.chestsort</shadedPattern>
</relocation>
<relocation>
<pattern>io.papermc.lib</pattern>
<shadedPattern>de.jeff_media.ChestSort.paperlib</shadedPattern> <!-- Replace this -->
<shadedPattern>de.jeff_media.chestsort.paperlib</shadedPattern> <!-- Replace this -->
</relocation>
</relocations>
<artifactSet>
@ -149,7 +149,7 @@
<dependency>
<groupId>de.jeff_media</groupId>
<artifactId>ChestSortAPI</artifactId>
<version>2.0.0</version>
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>

5
src/main/java/de/jeff_media/ChestSort/ChestSortAPIHandler.java → src/main/java/de/jeff_media/chestsort/ChestSortAPIHandler.java
View File

@ -1,9 +1,12 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import de.jeff_media.ChestSortAPI.ChestSortAPI;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
/**
* This isn't used anymore
*/
public class ChestSortAPIHandler implements ChestSortAPI {
final ChestSortPlugin plugin;

2
src/main/java/de/jeff_media/ChestSort/ChestSortAdminCommand.java → src/main/java/de/jeff_media/chestsort/ChestSortAdminCommand.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import de.jeff_media.jefflib.NBTAPI;
import org.bukkit.Bukkit;

4
src/main/java/de/jeff_media/ChestSort/ChestSortCategory.java → src/main/java/de/jeff_media/chestsort/ChestSortCategory.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import de.jeff_media.ChestSort.utils.TypeMatchPositionPair;
import de.jeff_media.chestsort.utils.TypeMatchPositionPair;
public class ChestSortCategory implements Comparable<ChestSortCategory>{

2
src/main/java/de/jeff_media/ChestSort/ChestSortChestSortCommand.java → src/main/java/de/jeff_media/chestsort/ChestSortChestSortCommand.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

4
src/main/java/de/jeff_media/ChestSort/ChestSortConfigUpdater.java → src/main/java/de/jeff_media/chestsort/ChestSortConfigUpdater.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import java.io.*;
import java.nio.charset.StandardCharsets;
@ -11,7 +11,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import de.jeff_media.ChestSort.utils.Utils;
import de.jeff_media.chestsort.utils.Utils;
public class ChestSortConfigUpdater {

2
src/main/java/de/jeff_media/ChestSort/ChestSortDebugger.java → src/main/java/de/jeff_media/chestsort/ChestSortDebugger.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;

2
src/main/java/de/jeff_media/ChestSort/ChestSortInvSortCommand.java → src/main/java/de/jeff_media/chestsort/ChestSortInvSortCommand.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;

7
src/main/java/de/jeff_media/ChestSort/ChestSortListener.java → src/main/java/de/jeff_media/chestsort/ChestSortListener.java
View File

@ -1,8 +1,7 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import de.jeff_media.ChestSort.hooks.*;
import de.jeff_media.ChestSort.utils.LlamaUtils;
import de.jeff_media.ChestSortAPI.ChestSortAPI;
import de.jeff_media.chestsort.hooks.*;
import de.jeff_media.chestsort.utils.LlamaUtils;
import de.jeff_media.ChestSortAPI.ChestSortEvent;
import de.jeff_media.ChestSortAPI.ISortable;
import net.md_5.bungee.api.ChatMessageType;

2
src/main/java/de/jeff_media/ChestSort/ChestSortLogger.java → src/main/java/de/jeff_media/chestsort/ChestSortLogger.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;

2
src/main/java/de/jeff_media/ChestSort/ChestSortMessages.java → src/main/java/de/jeff_media/chestsort/ChestSortMessages.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.ChatColor;

18
src/main/java/de/jeff_media/ChestSort/ChestSortOrganizer.java → src/main/java/de/jeff_media/chestsort/ChestSortOrganizer.java
View File

@ -1,11 +1,11 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import de.jeff_media.ChestSort.hooks.CrackShotHook;
import de.jeff_media.ChestSort.hooks.InventoryPagesHook;
import de.jeff_media.ChestSort.hooks.SlimeFunHook;
import de.jeff_media.ChestSort.utils.CategoryLinePair;
import de.jeff_media.ChestSort.utils.TypeMatchPositionPair;
import de.jeff_media.ChestSort.utils.Utils;
import de.jeff_media.chestsort.hooks.CrackShotHook;
import de.jeff_media.chestsort.hooks.InventoryPagesHook;
import de.jeff_media.chestsort.hooks.SlimeFunHook;
import de.jeff_media.chestsort.utils.CategoryLinePair;
import de.jeff_media.chestsort.utils.TypeMatchPositionPair;
import de.jeff_media.chestsort.utils.Utils;
import de.jeff_media.ChestSortAPI.ChestSortEvent;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@ -453,12 +453,12 @@ public class ChestSortOrganizer {
}
// Sort a complete inventory
void sortInventory(Inventory inv) {
public void sortInventory(Inventory inv) {
sortInventory(inv, 0, inv.getSize() - 1);
}
// Sort an inventory only between startSlot and endSlot
void sortInventory(@NotNull Inventory inv, int startSlot, int endSlot) {
public void sortInventory(@NotNull Inventory inv, int startSlot, int endSlot) {
if(inv==null) return;
plugin.debug("Attempting to sort an Inventory and calling ChestSortEvent.");
Class<? extends Inventory> invClass = inv.getClass();

2
src/main/java/de/jeff_media/ChestSort/ChestSortPermissionsHandler.java → src/main/java/de/jeff_media/chestsort/ChestSortPermissionsHandler.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import java.util.HashMap;
import java.util.UUID;

2
src/main/java/de/jeff_media/ChestSort/ChestSortPlayerSetting.java → src/main/java/de/jeff_media/chestsort/ChestSortPlayerSetting.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.Bukkit;
import org.bukkit.inventory.Inventory;

25
src/main/java/de/jeff_media/ChestSort/ChestSortPlugin.java → src/main/java/de/jeff_media/chestsort/ChestSortPlugin.java
View File

@ -25,15 +25,15 @@
*/
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
import de.jeff_media.ChestSort.config.Config;
import de.jeff_media.ChestSort.hooks.EnderContainersHook;
import de.jeff_media.ChestSort.hooks.GenericGUIHook;
import de.jeff_media.ChestSort.hooks.PlayerVaultsHook;
import de.jeff_media.ChestSort.placeholders.ChestSortPlaceholders;
import de.jeff_media.ChestSort.utils.Utils;
import de.jeff_media.chestsort.config.Config;
import de.jeff_media.chestsort.hooks.EnderContainersHook;
import de.jeff_media.chestsort.hooks.GenericGUIHook;
import de.jeff_media.chestsort.hooks.PlayerVaultsHook;
import de.jeff_media.chestsort.placeholders.ChestSortPlaceholders;
import de.jeff_media.chestsort.utils.Utils;
import de.jeff_media.jefflib.JeffLib;
import de.jeff_media.jefflib.NBTAPI;
import de.jeff_media.jefflib.VersionUtil;
@ -74,7 +74,7 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
int mcMinorVersion; // 14 for 1.14, 13 for 1.13, ...
String mcVersion; // 1.13.2 = 1_13_R2
ChestSortMessages messages;
ChestSortOrganizer organizer;
public ChestSortOrganizer organizer;
Map<String, ChestSortPlayerSetting> perPlayerSettings = new HashMap<>();
ChestSortPermissionsHandler permissionsHandler;
ChestSortSettingsGUI settingsGUI;
@ -82,6 +82,11 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
UpdateChecker updateChecker;
boolean usingMatchingConfig = true;
boolean verbose = true;
private static ChestSortPlugin instance;
public static ChestSortPlugin getInstance() {
return instance;
}
// Creates the default configuration file
// Also checks the config-version of an already existing file. If the existing
@ -206,7 +211,7 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
return difference <= cooldown;
}
boolean isSortingEnabled(Player p) {
public boolean isSortingEnabled(Player p) {
if (perPlayerSettings == null) {
perPlayerSettings = new HashMap<>();
}
@ -352,6 +357,8 @@ public class ChestSortPlugin extends JavaPlugin implements de.jeff_media.ChestSo
@Override
public void onEnable() {
instance = this;
JeffLib.init(this);
String tmpVersion = getServer().getClass().getPackage().getName();

2
src/main/java/de/jeff_media/ChestSort/ChestSortSettingsGUI.java → src/main/java/de/jeff_media/chestsort/ChestSortSettingsGUI.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

2
src/main/java/de/jeff_media/ChestSort/ChestSortTabCompleter.java → src/main/java/de/jeff_media/chestsort/ChestSortTabCompleter.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort;
package de.jeff_media.chestsort;
import java.util.ArrayList;
import java.util.List;

4
src/main/java/de/jeff_media/ChestSort/config/Config.java → src/main/java/de/jeff_media/chestsort/config/Config.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.config;
package de.jeff_media.chestsort.config;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
public class Config {
public static final String HOTKEY_COOLDOWN = "hotkey-cooldown";

4
src/main/java/de/jeff_media/ChestSort/hooks/CrackShotHook.java → src/main/java/de/jeff_media/chestsort/hooks/CrackShotHook.java
View File

@ -1,10 +1,10 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import org.bukkit.inventory.ItemStack;
import com.shampaggon.crackshot.CSUtility;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
public class CrackShotHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/CrateReloadedHook.java → src/main/java/de/jeff_media/chestsort/hooks/CrateReloadedHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class CrateReloadedHook {

2
src/main/java/de/jeff_media/ChestSort/hooks/CustomItemsHook.java → src/main/java/de/jeff_media/chestsort/hooks/CustomItemsHook.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import org.bukkit.inventory.ItemStack;

4
src/main/java/de/jeff_media/ChestSort/hooks/EnderContainersHook.java → src/main/java/de/jeff_media/chestsort/hooks/EnderContainersHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class EnderContainersHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/GenericGUIHook.java → src/main/java/de/jeff_media/chestsort/hooks/GenericGUIHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class GenericGUIHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/GoldenCratesHook.java → src/main/java/de/jeff_media/chestsort/hooks/GoldenCratesHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class GoldenCratesHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/HeadDatabaseHook.java → src/main/java/de/jeff_media/chestsort/hooks/HeadDatabaseHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class HeadDatabaseHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/InventoryPagesHook.java → src/main/java/de/jeff_media/chestsort/hooks/InventoryPagesHook.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import java.io.File;
@ -9,7 +9,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.jetbrains.annotations.NotNull;
public class InventoryPagesHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/MinepacksHook.java → src/main/java/de/jeff_media/chestsort/hooks/MinepacksHook.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import org.bukkit.Bukkit;
import org.bukkit.inventory.Inventory;
@ -7,7 +7,7 @@ import org.bukkit.plugin.Plugin;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
public class MinepacksHook {

4
src/main/java/de/jeff_media/ChestSort/hooks/PlayerVaultsHook.java → src/main/java/de/jeff_media/chestsort/hooks/PlayerVaultsHook.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
public class PlayerVaultsHook {

2
src/main/java/de/jeff_media/ChestSort/hooks/SlimeFunHook.java → src/main/java/de/jeff_media/chestsort/hooks/SlimeFunHook.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.hooks;
package de.jeff_media.chestsort.hooks;
import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;

4
src/main/java/de/jeff_media/ChestSort/placeholders/ChestSortPlaceholders.java → src/main/java/de/jeff_media/chestsort/placeholders/ChestSortPlaceholders.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.placeholders;
package de.jeff_media.chestsort.placeholders;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player;

4
src/main/java/de/jeff_media/ChestSort/test/APIDeprecation.java → src/main/java/de/jeff_media/chestsort/test/APIDeprecation.java
View File

@ -1,6 +1,6 @@
package de.jeff_media.ChestSort.test;
package de.jeff_media.chestsort.test;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.entity.Player;
public class APIDeprecation {

2
src/main/java/de/jeff_media/ChestSort/utils/CategoryLinePair.java → src/main/java/de/jeff_media/chestsort/utils/CategoryLinePair.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.utils;
package de.jeff_media.chestsort.utils;
public class CategoryLinePair {

2
src/main/java/de/jeff_media/ChestSort/utils/LlamaUtils.java → src/main/java/de/jeff_media/chestsort/utils/LlamaUtils.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.utils;
package de.jeff_media.chestsort.utils;
import org.bukkit.entity.ChestedHorse;
import org.bukkit.entity.Donkey;

2
src/main/java/de/jeff_media/ChestSort/utils/TypeMatchPositionPair.java → src/main/java/de/jeff_media/chestsort/utils/TypeMatchPositionPair.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.utils;
package de.jeff_media.chestsort.utils;
public class TypeMatchPositionPair {

4
src/main/java/de/jeff_media/ChestSort/utils/Utils.java → src/main/java/de/jeff_media/chestsort/utils/Utils.java
View File

@ -1,4 +1,4 @@
package de.jeff_media.ChestSort.utils;
package de.jeff_media.chestsort.utils;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -6,7 +6,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import de.jeff_media.ChestSort.ChestSortPlugin;
import de.jeff_media.chestsort.ChestSortPlugin;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;

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

@ -1,4 +1,4 @@
main: de.jeff_media.ChestSort.ChestSortPlugin
main: de.jeff_media.chestsort.ChestSortPlugin
name: ChestSort
version: 9.7.1
api-version: "1.13"