Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-01-30 19:21:22 +01:00
Code Issues Projects Releases Wiki Activity

Updated to use the new Lootables engine.

Browse Source
This commit is contained in:
Brianna 2021-09-23 15:14:43 -05:00
parent 3094d0dd46
commit 841c538c9d
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -56,7 +56,6 @@
<artifactSet> <artifactSet>
<includes> <includes>
<include>com.songoda:SongodaCore</include> <include>com.songoda:SongodaCore</include>
<include>com.songoda:Lootables</include>
<include>com.zaxxer:HikariCP</include> <include>com.zaxxer:HikariCP</include>
<include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-nop</include> <include>org.slf4j:slf4j-nop</include>
@ -127,11 +126,6 @@
<version>LATEST</version> <version>LATEST</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>Lootables</artifactId>
<version>1.0.9</version>
</dependency>
<dependency> <dependency>
<groupId>com.bgsoftware</groupId> <groupId>com.bgsoftware</groupId>
<artifactId>wildstacker</artifactId> <artifactId>wildstacker</artifactId>

2
src/main/java/com/songoda/ultimatestacker/commands/CommandLootables.java
View File

@ -1,7 +1,7 @@
package com.songoda.ultimatestacker.commands; package com.songoda.ultimatestacker.commands;
import com.songoda.core.commands.AbstractCommand; import com.songoda.core.commands.AbstractCommand;
import com.songoda.lootables.gui.GuiEditor; import com.songoda.core.lootables.gui.GuiEditor;
import com.songoda.ultimatestacker.UltimateStacker; 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;

4
src/main/java/com/songoda/ultimatestacker/listeners/DeathListeners.java
View File

@ -2,8 +2,8 @@ package com.songoda.ultimatestacker.listeners;
import com.songoda.core.compatibility.ServerProject; import com.songoda.core.compatibility.ServerProject;
import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.compatibility.ServerVersion;
import com.songoda.lootables.loot.Drop; import com.songoda.core.lootables.loot.Drop;
import com.songoda.lootables.loot.DropUtils; import com.songoda.core.lootables.loot.DropUtils;
import com.songoda.ultimatestacker.UltimateStacker; import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings; import com.songoda.ultimatestacker.settings.Settings;
import com.songoda.ultimatestacker.stackable.entity.EntityStack; import com.songoda.ultimatestacker.stackable.entity.EntityStack;

29
src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
View File

@ -2,13 +2,13 @@ package com.songoda.ultimatestacker.lootables;
import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.compatibility.ServerVersion;
import com.songoda.lootables.Lootables; import com.songoda.core.lootables.Lootables;
import com.songoda.lootables.Modify; import com.songoda.core.lootables.Modify;
import com.songoda.lootables.loot.Drop; import com.songoda.core.lootables.loot.Drop;
import com.songoda.lootables.loot.Loot; import com.songoda.core.lootables.loot.Loot;
import com.songoda.lootables.loot.LootBuilder; import com.songoda.core.lootables.loot.LootBuilder;
import com.songoda.lootables.loot.LootManager; import com.songoda.core.lootables.loot.LootManager;
import com.songoda.lootables.loot.Lootable; import com.songoda.core.lootables.loot.Lootable;
import com.songoda.ultimatestacker.UltimateStacker; import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings; import com.songoda.ultimatestacker.settings.Settings;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@ -96,6 +96,21 @@ public class LootablesManager {
} }
public void createDefaultLootables() { public void createDefaultLootables() {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_17)) {
// Add Glow Squid.
lootManager.addLootable(new Lootable("GLOW_SQUID",
new LootBuilder()
.setMaterial(CompatibleMaterial.GLOW_INK_SAC)
.setMin(1)
.setMax(3).build()));
// Add Glow Squid.
lootManager.addLootable(new Lootable("SQUID",
new LootBuilder()
.setMaterial(CompatibleMaterial.GLOW_INK_SAC)
.setMin(1)
.setMax(3).build()));
}
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14)) { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14)) {
// Add Trader Llama. // Add Trader Llama.
lootManager.addLootable(new Lootable("TRADER_LLAMA", lootManager.addLootable(new Lootable("TRADER_LLAMA",

4
src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStack.java
View File

@ -1,8 +1,8 @@
package com.songoda.ultimatestacker.stackable.entity; package com.songoda.ultimatestacker.stackable.entity;
import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.compatibility.ServerVersion;
import com.songoda.lootables.loot.Drop; import com.songoda.core.lootables.loot.Drop;
import com.songoda.lootables.loot.DropUtils; import com.songoda.core.lootables.loot.DropUtils;
import com.songoda.ultimatestacker.UltimateStacker; import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings; import com.songoda.ultimatestacker.settings.Settings;
import com.songoda.ultimatestacker.utils.Methods; import com.songoda.ultimatestacker.utils.Methods;