Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2025-02-21 15:01:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2022-03-20 11:29:46 +01:00
commit 4049015f19
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicFarming</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<build>
<defaultGoal>clean install</defaultGoal>
@ -124,7 +124,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.6.9</version>
<version>2.6.12</version>
<scope>compile</scope>
</dependency>
@ -132,6 +132,7 @@
<groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId>
<version>2.3.30</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

15
src/main/java/com/songoda/epicfarming/EpicFarming.java
View File

@ -12,8 +12,7 @@ import com.songoda.core.gui.GuiManager;
import com.songoda.core.hooks.EconomyManager;
import com.songoda.core.hooks.EntityStackerManager;
import com.songoda.core.hooks.ProtectionManager;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.core.utils.TextUtils;
import com.songoda.epicfarming.boost.BoostData;
import com.songoda.epicfarming.boost.BoostManager;
@ -338,10 +337,10 @@ public class EpicFarming extends SongodaPlugin {
}
public int getLevelFromItem(ItemStack item) {
NBTItem nbtItem = NmsManager.getNbt().of(item);
NBTItem nbtItem = new NBTItem(item);
if (nbtItem.has("level"))
return nbtItem.getNBTObject("level").asInt();
if (nbtItem.hasKey("level"))
return nbtItem.getInteger("level");
// Legacy trash.
if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 0;
@ -359,9 +358,9 @@ public class EpicFarming extends SongodaPlugin {
if (!line.equals("")) meta.setLore(Collections.singletonList(line));
item.setItemMeta(meta);
NBTItem nbtItem = NmsManager.getNbt().of(item);
nbtItem.set("level", level.getLevel());
return nbtItem.finish();
NBTItem nbtItem = new NBTItem(item);
nbtItem.setInteger("level", level.getLevel());
return nbtItem.getItem();
}
public FarmManager getFarmManager() {

9
src/main/java/com/songoda/epicfarming/database/DataManager.java
View File

@ -2,9 +2,6 @@ package com.songoda.epicfarming.database;
import com.songoda.core.database.DataManagerAbstract;
import com.songoda.core.database.DatabaseConnector;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTCore;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.utils.ItemSerializer;
import com.songoda.epicfarming.EpicFarming;
import com.songoda.epicfarming.boost.BoostData;
@ -19,7 +16,11 @@ import org.bukkit.plugin.Plugin;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.function.Consumer;
public class DataManager extends DataManagerAbstract {

1
src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java
View File

@ -40,6 +40,7 @@ public class GrowthTask extends BukkitRunnable {
}
// TODO: This should be in config.
// TODO: What does cap stand for? What needs to be in the config? (asked by Sprax)
int cap = (int) Math.ceil(60 / crop.getFarm().getLevel().getSpeedMultiplier()) - crop.getTicksLived();
if (cap > 2) {
int rand = random.nextInt(cap) + 1;