mirror of
https://github.com/songoda/UltimateStacker.git
synced 2024-09-27 06:02:45 +02:00
Merge branch 'development'
This commit is contained in:
commit
205cb7b8dd
4
pom.xml
4
pom.xml
@ -2,7 +2,7 @@
|
|||||||
<groupId>com.songoda</groupId>
|
<groupId>com.songoda</groupId>
|
||||||
<artifactId>UltimateStacker</artifactId>
|
<artifactId>UltimateStacker</artifactId>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<version>1.11.16</version>
|
<version>1.11.17</version>
|
||||||
<build>
|
<build>
|
||||||
<defaultGoal>clean install</defaultGoal>
|
<defaultGoal>clean install</defaultGoal>
|
||||||
<finalName>UltimateStacker-${project.version}</finalName>
|
<finalName>UltimateStacker-${project.version}</finalName>
|
||||||
@ -110,7 +110,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot</artifactId>
|
<artifactId>spigot</artifactId>
|
||||||
<version>1.15</version>
|
<version>1.16.1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -13,8 +13,6 @@ import com.songoda.core.database.SQLiteConnector;
|
|||||||
import com.songoda.core.gui.GuiManager;
|
import com.songoda.core.gui.GuiManager;
|
||||||
import com.songoda.core.hooks.HologramManager;
|
import com.songoda.core.hooks.HologramManager;
|
||||||
import com.songoda.core.hooks.WorldGuardHook;
|
import com.songoda.core.hooks.WorldGuardHook;
|
||||||
import com.songoda.core.nms.NmsManager;
|
|
||||||
import com.songoda.core.nms.nbt.NBTItem;
|
|
||||||
import com.songoda.core.utils.TextUtils;
|
import com.songoda.core.utils.TextUtils;
|
||||||
import com.songoda.ultimatestacker.commands.*;
|
import com.songoda.ultimatestacker.commands.*;
|
||||||
import com.songoda.ultimatestacker.database.DataManager;
|
import com.songoda.ultimatestacker.database.DataManager;
|
||||||
@ -44,7 +42,6 @@ import org.bukkit.entity.EntityType;
|
|||||||
import org.bukkit.entity.Item;
|
import org.bukkit.entity.Item;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
|
||||||
import org.bukkit.metadata.FixedMetadataValue;
|
import org.bukkit.metadata.FixedMetadataValue;
|
||||||
import org.bukkit.plugin.PluginManager;
|
import org.bukkit.plugin.PluginManager;
|
||||||
|
|
||||||
@ -108,14 +105,15 @@ public class UltimateStacker extends SongodaPlugin {
|
|||||||
|
|
||||||
// Setup plugin commands
|
// Setup plugin commands
|
||||||
this.commandManager = new CommandManager(this);
|
this.commandManager = new CommandManager(this);
|
||||||
this.commandManager.addCommand(new CommandUltimateStacker())
|
this.commandManager.addMainCommand("us")
|
||||||
.addSubCommand(new CommandSettings(guiManager))
|
.addSubCommands(new CommandSettings(guiManager),
|
||||||
.addSubCommand(new CommandRemoveAll())
|
new CommandRemoveAll(),
|
||||||
.addSubCommand(new CommandReload())
|
new CommandReload(),
|
||||||
.addSubCommand(new CommandGiveSpawner())
|
new CommandGiveSpawner(),
|
||||||
.addSubCommand(new CommandSpawn())
|
new CommandSpawn(),
|
||||||
.addSubCommand(new CommandLootables())
|
new CommandLootables(),
|
||||||
.addSubCommand(new CommandConvert(guiManager));
|
new CommandConvert(guiManager)
|
||||||
|
);
|
||||||
|
|
||||||
this.entityUtils = new EntityUtils();
|
this.entityUtils = new EntityUtils();
|
||||||
|
|
||||||
@ -381,7 +379,7 @@ public class UltimateStacker extends SongodaPlugin {
|
|||||||
/**
|
/**
|
||||||
* Change the stacked amount for this item
|
* Change the stacked amount for this item
|
||||||
*
|
*
|
||||||
* @param item item entity to update
|
* @param item item entity to update
|
||||||
* @param itemStack ItemStack that will represent this item
|
* @param itemStack ItemStack that will represent this item
|
||||||
* @param newAmount number of items this item represents
|
* @param newAmount number of items this item represents
|
||||||
*/
|
*/
|
||||||
@ -400,7 +398,7 @@ public class UltimateStacker extends SongodaPlugin {
|
|||||||
}
|
}
|
||||||
// If amount is 0, Minecraft change the type to AIR
|
// If amount is 0, Minecraft change the type to AIR
|
||||||
if (itemStack.getType() == Material.AIR)
|
if (itemStack.getType() == Material.AIR)
|
||||||
return;
|
return;
|
||||||
item.setItemStack(itemStack);
|
item.setItemStack(itemStack);
|
||||||
|
|
||||||
if ((blacklisted && !Settings.ITEM_HOLOGRAM_BLACKLIST.getBoolean())
|
if ((blacklisted && !Settings.ITEM_HOLOGRAM_BLACKLIST.getBoolean())
|
||||||
|
@ -46,7 +46,7 @@ public class CommandConvert extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us convert";
|
return "convert";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -95,7 +95,7 @@ public class CommandGiveSpawner extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us givespawner <player/all> <type> [size]";
|
return "givespawner <player/all> <type> [size]";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -44,7 +44,7 @@ public class CommandLootables extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us lootables";
|
return "lootables";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -34,7 +34,7 @@ public class CommandReload extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us reload";
|
return "reload";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -85,7 +85,7 @@ public class CommandRemoveAll extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us removeall <entities/items> [all]";
|
return "removeall <entities/items> [all]";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -7,6 +7,7 @@ import com.songoda.ultimatestacker.UltimateStacker;
|
|||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class CommandSettings extends AbstractCommand {
|
public class CommandSettings extends AbstractCommand {
|
||||||
@ -15,7 +16,7 @@ public class CommandSettings extends AbstractCommand {
|
|||||||
GuiManager guiManager;
|
GuiManager guiManager;
|
||||||
|
|
||||||
public CommandSettings(GuiManager guiManager) {
|
public CommandSettings(GuiManager guiManager) {
|
||||||
super(true, "Settings");
|
super(CommandType.PLAYER_ONLY, "Settings");
|
||||||
this.guiManager = guiManager;
|
this.guiManager = guiManager;
|
||||||
instance = UltimateStacker.getInstance();
|
instance = UltimateStacker.getInstance();
|
||||||
}
|
}
|
||||||
@ -28,7 +29,7 @@ public class CommandSettings extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<String> onTab(CommandSender sender, String... args) {
|
protected List<String> onTab(CommandSender sender, String... args) {
|
||||||
return null;
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -38,7 +39,7 @@ public class CommandSettings extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us settings";
|
return "settings";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -79,7 +79,7 @@ public class CommandSpawn extends AbstractCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSyntax() {
|
public String getSyntax() {
|
||||||
return "/us spawn <entity> <amount>";
|
return "spawn <entity> <amount>";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
package com.songoda.ultimatestacker.commands;
|
|
||||||
|
|
||||||
import com.songoda.core.commands.AbstractCommand;
|
|
||||||
import com.songoda.ultimatestacker.UltimateStacker;
|
|
||||||
import com.songoda.ultimatestacker.utils.Methods;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class CommandUltimateStacker extends AbstractCommand {
|
|
||||||
|
|
||||||
UltimateStacker instance;
|
|
||||||
|
|
||||||
public CommandUltimateStacker() {
|
|
||||||
super(false, "UltimateStacker");
|
|
||||||
instance = UltimateStacker.getInstance();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected ReturnType runCommand(CommandSender sender, String... args) {
|
|
||||||
sender.sendMessage("");
|
|
||||||
instance.getLocale().newMessage("&7Version " + instance.getDescription().getVersion()
|
|
||||||
+ " Created with <3 by &5&l&oSongoda").sendPrefixedMessage(sender);
|
|
||||||
|
|
||||||
for (AbstractCommand command : instance.getCommandManager().getAllCommands()) {
|
|
||||||
if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) {
|
|
||||||
sender.sendMessage(Methods.formatText("&8 - &a" + command.getSyntax() + "&7 - " + command.getDescription()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sender.sendMessage("");
|
|
||||||
|
|
||||||
return ReturnType.SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected List<String> onTab(CommandSender cs, String... strings) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPermissionNode() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getSyntax() {
|
|
||||||
return "/UltimateStacker";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDescription() {
|
|
||||||
return "Displays this page.";
|
|
||||||
}
|
|
||||||
}
|
|
@ -151,9 +151,11 @@ public class EntityStack {
|
|||||||
|
|
||||||
newEntity.getEquipment().clear();
|
newEntity.getEquipment().clear();
|
||||||
|
|
||||||
if (killed.getType() == EntityType.PIG_ZOMBIE)
|
if (killed.getType().name().equals("PIG_ZOMBIE"))
|
||||||
newEntity.getEquipment().setItemInHand(CompatibleMaterial.GOLDEN_SWORD.getItem());
|
newEntity.getEquipment().setItemInHand(CompatibleMaterial.GOLDEN_SWORD.getItem());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (Settings.CARRY_OVER_METADATA_ON_DEATH.getBoolean()) {
|
if (Settings.CARRY_OVER_METADATA_ON_DEATH.getBoolean()) {
|
||||||
for (Map.Entry<String, MetadataValue> entry : getMetadata(killed).entrySet())
|
for (Map.Entry<String, MetadataValue> entry : getMetadata(killed).entrySet())
|
||||||
newEntity.setMetadata(entry.getKey(), entry.getValue());
|
newEntity.setMetadata(entry.getKey(), entry.getValue());
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package com.songoda.ultimatestacker.listeners;
|
package com.songoda.ultimatestacker.listeners;
|
||||||
|
|
||||||
import com.gmail.filoghost.holographicdisplays.nms.interfaces.NMSManager;
|
|
||||||
import com.songoda.core.compatibility.ServerVersion;
|
import com.songoda.core.compatibility.ServerVersion;
|
||||||
import com.songoda.core.nms.NmsManager;
|
import com.songoda.core.nms.NmsManager;
|
||||||
import com.songoda.ultimatestacker.UltimateStacker;
|
import com.songoda.ultimatestacker.UltimateStacker;
|
||||||
|
@ -681,19 +681,40 @@ public class LootablesManager {
|
|||||||
.setMax(2).build()));
|
.setMax(2).build()));
|
||||||
|
|
||||||
// Add Zombie Pigman
|
// Add Zombie Pigman
|
||||||
lootManager.addLootable(new Lootable("PIG_ZOMBIE",
|
if (ServerVersion.isServerVersionBelow(ServerVersion.V1_16))
|
||||||
new LootBuilder()
|
lootManager.addLootable(new Lootable("PIG_ZOMBIE",
|
||||||
.setMaterial(CompatibleMaterial.ROTTEN_FLESH)
|
new LootBuilder()
|
||||||
.setMin(0)
|
.setMaterial(CompatibleMaterial.ROTTEN_FLESH)
|
||||||
.setMax(1).build(),
|
.setMin(0)
|
||||||
new LootBuilder()
|
.setMax(1).build(),
|
||||||
.setMaterial(CompatibleMaterial.GOLD_NUGGET)
|
new LootBuilder()
|
||||||
.setMin(0)
|
.setMaterial(CompatibleMaterial.GOLD_NUGGET)
|
||||||
.setMax(1).build(),
|
.setMin(0)
|
||||||
new LootBuilder()
|
.setMax(1).build(),
|
||||||
.setMaterial(CompatibleMaterial.GOLD_INGOT)
|
new LootBuilder()
|
||||||
.setChance(2.5)
|
.setMaterial(CompatibleMaterial.GOLD_INGOT)
|
||||||
.addOnlyDropFors(EntityType.PLAYER).build()));
|
.setChance(2.5)
|
||||||
|
.addOnlyDropFors(EntityType.PLAYER).build()));
|
||||||
|
else {
|
||||||
|
// Add Strider
|
||||||
|
lootManager.addLootable(new Lootable("STRIDER",
|
||||||
|
new LootBuilder()
|
||||||
|
.setMaterial(CompatibleMaterial.PORKCHOP)
|
||||||
|
.setBurnedMaterial(CompatibleMaterial.COOKED_PORKCHOP)
|
||||||
|
.setMin(2)
|
||||||
|
.setMax(4).build(),
|
||||||
|
new LootBuilder()
|
||||||
|
.setMaterial(CompatibleMaterial.LEATHER)
|
||||||
|
.setMin(0)
|
||||||
|
.setMax(2).build()));
|
||||||
|
|
||||||
|
// Add Hoglin
|
||||||
|
lootManager.addLootable(new Lootable("HOGLIN",
|
||||||
|
new LootBuilder()
|
||||||
|
.setMaterial(CompatibleMaterial.STRING)
|
||||||
|
.setMin(0)
|
||||||
|
.setMax(5).build()));
|
||||||
|
}
|
||||||
|
|
||||||
// Add Wither.
|
// Add Wither.
|
||||||
lootManager.addLootable(new Lootable("WITHER",
|
lootManager.addLootable(new Lootable("WITHER",
|
||||||
|
@ -7,10 +7,10 @@ main: com.songoda.ultimatestacker.UltimateStacker
|
|||||||
author: songoda
|
author: songoda
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
commands:
|
commands:
|
||||||
UltimateStacker:
|
us:
|
||||||
description: Reloads the configuration file
|
description: Reloads the configuration file
|
||||||
default: true
|
default: true
|
||||||
aliases: [us]
|
aliases: [UltimateStacker]
|
||||||
usage: /ultimatestacker reload
|
usage: /ultimatestacker reload
|
||||||
permissions:
|
permissions:
|
||||||
ultimatestacker.*:
|
ultimatestacker.*:
|
||||||
|
Loading…
Reference in New Issue
Block a user