Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-10-22 20:30:41 +02:00
Code Issues Projects Releases Wiki Activity

Updated to support UltimateStacker 2.

Browse Source
This commit is contained in:
Brianna 2020-08-26 11:56:39 -05:00
parent 952763c6e5
commit 723117af43
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/pom.xml
View File

@ -298,7 +298,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId>
<version>1.9.6</version>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>

30
Core/src/main/java/com/songoda/core/hooks/stackers/UltimateStacker.java
View File

@ -1,26 +1,20 @@
package com.songoda.core.hooks.stackers;
import com.songoda.ultimatestacker.entity.EntityStack;
import com.songoda.ultimatestacker.stackable.entity.EntityStack;
import com.songoda.ultimatestacker.utils.Methods;
import java.lang.reflect.Method;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.Method;
public class UltimateStacker extends Stacker {
private final com.songoda.ultimatestacker.UltimateStacker plugin;
private boolean oldItemMethods = false;
private Method oldUltimateStacker_updateItemAmount;
public UltimateStacker() {
this.plugin = com.songoda.ultimatestacker.UltimateStacker.getInstance();
try {
oldUltimateStacker_updateItemAmount = com.songoda.ultimatestacker.utils.Methods.class.getDeclaredMethod("updateItemAmount", Item.class, int.class);
oldItemMethods = true;
} catch (NoSuchMethodException | SecurityException ex) {
}
}
@Override
@ -45,16 +39,7 @@ public class UltimateStacker extends Stacker {
@Override
public void setItemAmount(Item item, int amount) {
if (oldItemMethods) {
// TODO: direct reference when this is re-added to the API
try {
oldUltimateStacker_updateItemAmount.invoke(null, item, amount);
} catch (Exception ex) {
item.remove(); // not the best solution, but prevents duping
}
} else {
Methods.updateItemAmount(item, item.getItemStack(), amount);
}
com.songoda.ultimatestacker.UltimateStacker.updateItemAmount(item, amount);
}
@Override
@ -64,7 +49,7 @@ public class UltimateStacker extends Stacker {
@Override
public boolean isStacked(LivingEntity entity) {
return plugin.getEntityStackManager().isStacked(entity);
return plugin.getEntityStackManager().isStackedAndLoaded(entity);
}
@Override
@ -75,12 +60,13 @@ public class UltimateStacker extends Stacker {
@Override
public void remove(LivingEntity entity, int amount) {
EntityStack stack = plugin.getEntityStackManager().getStack(entity);
stack.setAmount(stack.getAmount() - amount);
stack.takeEntities(amount);
stack.updateStack();
}
@Override
public void add(LivingEntity entity, int amount) {
plugin.getEntityStackManager().getStack(entity).addAmount(amount);
plugin.getEntityStackManager().getStack(entity).createDuplicates(amount);
}
@Override