Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-02-23 02:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update PCGF_PluginLib version

Browse Source
This commit is contained in:
GeorgH93 2020-07-27 18:22:04 +02:00
parent d69116fe4b
commit 23a50776a9
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
10 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Minepacks/pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>at.pcgamingfreaks</groupId>
<artifactId>PluginLib</artifactId>
<version>1.0.28-SNAPSHOT</version>
<version>1.0.30-SNAPSHOT</version>
</dependency>
<!-- BadRabbit -->
<dependency>
@ -162,7 +162,7 @@
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>Standalone</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
<minimizeJar>false</minimizeJar>
<outputDirectory>${project.build.directory}</outputDirectory>
<artifactSet>
<includes>
@ -193,14 +193,6 @@
</excludes>
</relocation>
</relocations>
<filters>
<filter>
<artifact>at.pcgamingfreaks:PluginLib</artifact>
<excludes>
<exclude>*.yml</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>

15
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java
View File

@ -19,7 +19,7 @@
import at.pcgamingfreaks.Bukkit.MCVersion;
import at.pcgamingfreaks.Bukkit.NMSReflection;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.InventoryUtils;
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.InventoryCompressor;
import at.pcgamingfreaks.StringUtils;
@ -222,7 +222,7 @@ public void open(@NotNull Player player, boolean editable, final @Nullable Strin
if(MCVersion.isNewerOrEqualThan(MCVersion.MC_1_14))
{
final String usedTitle = (title == null) ? (player.equals(owner) ? titleOwnString : titleOther) : title;
Bukkit.getScheduler().runTaskLater(Minepacks.getInstance(), () -> Utils.updateInventoryTitle(player, usedTitle), 2);
Bukkit.getScheduler().runTaskLater(Minepacks.getInstance(), () -> InventoryUtils.updateInventoryTitle(player, usedTitle), 2);
}
}
@ -332,15 +332,8 @@ public void clear()
}
@Override
public void drop(Location location)
public void drop(final @NotNull Location location)
{
for(ItemStack i : bp.getContents())
{
if(i != null)
{
location.getWorld().dropItemNaturally(location, i);
}
}
clear();
InventoryUtils.dropInventory(bp, location);
}
}

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java
View File

@ -18,7 +18,7 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Command;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.Command.HelpData;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java
View File

@ -18,7 +18,7 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Command;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.Command.HelpData;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java
View File

@ -19,7 +19,7 @@
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.RegisterablePluginCommand;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearEvent;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent;
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java
View File

@ -18,7 +18,7 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Command;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.Calendar.TimeSpan;
import at.pcgamingfreaks.Command.HelpData;
import at.pcgamingfreaks.Message.MessageClickEvent;

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java
View File

@ -52,7 +52,7 @@ public void execute(@NotNull final CommandSender sender, final @NotNull String m
{
messageCheckingForUpdates.send(sender);
/*if_not[STANDALONE]*/
((at.pcgamingfreaks.PluginLib.Bukkit.PluginLib) at.pcgamingfreaks.PluginLib.Bukkit.PluginLib.getInstance()).update(null); // Make the PluginLib check for updates too
((at.pcgamingfreaks.PluginLib.Bukkit.PluginLib) at.pcgamingfreaks.PluginLib.Bukkit.PluginLib.getInstance()).getUpdater().update(); // Make the PluginLib check for updates too
/*end[STANDALONE]*/
((Minepacks) plugin).update(result -> {
switch(result)

6
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java
View File

@ -18,7 +18,7 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Listener;
import at.pcgamingfreaks.Bukkit.MCVersion;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.InventoryUtils;
import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
import org.bukkit.Material;
@ -110,7 +110,7 @@ public void onInventoryOpen(InventoryOpenEvent event)
Block shulkerBlock = ((ShulkerBox) event.getInventory().getHolder()).getBlock();
if(dropExistingContent)
{
Utils.dropInventory(event.getInventory(), shulkerBlock.getLocation());
InventoryUtils.dropInventory(event.getInventory(), shulkerBlock.getLocation());
}
event.getInventory().clear();
shulkerBlock.setType(Material.AIR);
@ -198,7 +198,7 @@ private boolean handleShulkerBlock(Block block)
if(removeExisting)
{
ShulkerBox shulkerBox = (ShulkerBox) block.getState();
if(dropExistingContent) Utils.dropInventory(shulkerBox.getInventory(), shulkerBox.getLocation());
if(dropExistingContent) InventoryUtils.dropInventory(shulkerBox.getInventory(), shulkerBox.getLocation());
shulkerBox.getInventory().clear();
block.setType(Material.AIR);
}

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java
View File

@ -17,9 +17,9 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Listener;
import at.pcgamingfreaks.Bukkit.HeadUtils;
import at.pcgamingfreaks.Bukkit.MCVersion;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.Util.HeadUtils;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent;
import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode;

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -20,7 +20,7 @@
import at.pcgamingfreaks.Bukkit.MCVersion;
import at.pcgamingfreaks.Bukkit.ManagedUpdater;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.Utils;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.ConsoleColor;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback;