Skip to content

Performance optimizations and minor cleanup #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgdc3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Performance optimizations and minor cleanup #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/HopperListeners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,15 @@ public HopperListeners(MoneyFromMobs plugin){

@EventHandler
public void onHopperPickupItem(InventoryPickupItemEvent e) {
if (!plugin.getDropsManager().doesMoneyDropOnGround()) {
return;
}
PickUpManager pickUpManager = plugin.getPickUpManager();
if (pickUpManager.getWhoHopperGivesMoneyTo().equalsIgnoreCase("NONE")) {
return;
}
Item item = e.getItem();
ItemStack itemStack = item.getItemStack();
PickUpManager pickUpManager = plugin.getPickUpManager();
if (pickUpManager.isMoneyPickedUp(itemStack)){
e.setCancelled(true);
// checks if user is using 1.14+ and config option is set to PLACER
Expand Down
30 changes: 21 additions & 9 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/OnJoinListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@
import me.chocolf.moneyfrommobs.managers.MessageManager;
import me.chocolf.moneyfrommobs.utils.UpdateChecker;

import java.time.Duration;
import java.time.Instant;

public class OnJoinListener implements Listener{

MoneyFromMobs plugin;
private final MoneyFromMobs plugin;
private Instant lastCheckAt;

public OnJoinListener(MoneyFromMobs plugin) {
this.plugin = plugin;
Expand All @@ -21,14 +25,22 @@ public OnJoinListener(MoneyFromMobs plugin) {

@EventHandler
public void onPlayerJoin(PlayerJoinEvent e) {
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
if (!e.getPlayer().isOp()) {
return;
}
if (lastCheckAt != null && Duration.between(lastCheckAt, Instant.now()).toMinutes() < 30) {
return;
}
lastCheckAt = Instant.now();
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
if (!UpdateChecker.checkForUpdate()) {
return;
}
Player p = e.getPlayer();
if (p.isOp() && UpdateChecker.checkForUpdate()) {
p.sendMessage("");
p.sendMessage(MessageManager.applyColour("&aUpdate Available for &lMoneyFromMobs&a: "));
p.sendMessage(MessageManager.applyColour("https://www.spigotmc.org/resources/money-from-mobs.79137/"));
p.sendMessage("");
}
}, 0L);
p.sendMessage("");
p.sendMessage(MessageManager.applyColour("&aUpdate Available for &lMoneyFromMobs&a: "));
p.sendMessage(MessageManager.applyColour("https://www.spigotmc.org/resources/money-from-mobs.79137/"));
p.sendMessage("");
});
}
}
4 changes: 4 additions & 0 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/PaperListeners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ public PaperListeners(MoneyFromMobs plugin) {

@EventHandler
public void onAttemptToPickUp(PlayerAttemptPickupItemEvent e) {
if (!plugin.getDropsManager().doesMoneyDropOnGround()) {
return;
}

PickUpManager pickUpManager = plugin.getPickUpManager();
// gets item picked up
Item item = e.getItem();
Expand Down
7 changes: 5 additions & 2 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/PickUpListeners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import java.util.List;

public class PickUpListeners implements Listener{
public class PickUpListeners implements Listener {

private final MoneyFromMobs plugin;

Expand All @@ -21,9 +21,12 @@ public PickUpListeners(MoneyFromMobs plugin) {
Bukkit.getPluginManager().registerEvents(this, plugin);
}


@EventHandler
public void onPickup(EntityPickupItemEvent e) {
if (!plugin.getDropsManager().doesMoneyDropOnGround()) {
return;
}

PickUpManager pickUpManager = plugin.getPickUpManager();
// gets item picked up
Item item = e.getItem();
Expand Down
2 changes: 2 additions & 0 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/PlaceMinecartHopperListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
import org.bukkit.persistence.PersistentDataType;

public class PlaceMinecartHopperListener implements Listener {

private final MoneyFromMobs plugin;

public PlaceMinecartHopperListener(MoneyFromMobs plugin){
this.plugin = plugin;
Bukkit.getPluginManager().registerEvents(this, plugin);
}

@EventHandler
private void onHopperMinecartPlaced(EntityPlaceEvent e){
Entity hopperMinecart = e.getEntity();
Expand Down
7 changes: 1 addition & 6 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/PlaceholderAPIListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,21 @@
import me.chocolf.moneyfrommobs.MoneyFromMobs;
import me.chocolf.moneyfrommobs.api.events.GiveMoneyEvent;

public class PlaceholderAPIListener implements Listener{
public class PlaceholderAPIListener implements Listener {

private final HashMap<UUID, Double> latestPickedUp = new HashMap<>();



public PlaceholderAPIListener(MoneyFromMobs plugin) {
Bukkit.getPluginManager().registerEvents(this, plugin);
}

@EventHandler
public void onPickUpMoney(GiveMoneyEvent e) {
UUID uuid = e.getPlayer().getUniqueId();
latestPickedUp.remove(uuid);

latestPickedUp.put(uuid, e.getAmount());
}

public Map<UUID, Double> getLatestPickedUp(){
return latestPickedUp;
}

}
4 changes: 2 additions & 2 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/listeners/WorldGuardListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import me.chocolf.moneyfrommobs.MoneyFromMobs;
import me.chocolf.moneyfrommobs.api.events.AttemptToDropMoneyEvent;

public class WorldGuardListener implements Listener{
public class WorldGuardListener implements Listener {

MoneyFromMobs plugin;
private final MoneyFromMobs plugin;

public WorldGuardListener(MoneyFromMobs plugin) {
this.plugin = plugin;
Expand Down
4 changes: 4 additions & 0 deletions MoneyFromMobs/src/me/chocolf/moneyfrommobs/runnables/NearEntitiesRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ public NearEntitiesRunnable(MoneyFromMobs plugin) {
}

public void run() {
if (!plugin.getDropsManager().doesMoneyDropOnGround()) {
return;
}

for ( Player p : Bukkit.getOnlinePlayers()) {
if (p.getInventory().firstEmpty() == -1) {
for ( Entity entity : p.getNearbyEntities(radius, radius, radius)) {
Expand Down
2 changes: 1 addition & 1 deletion MoneyFromMobs/src/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
main: me.chocolf.moneyfrommobs.MoneyFromMobs
name: MoneyFromMobs
version: 4.9
version: ${project.version}
api-version: 1.13
author: Chocolf
description: Makes mobs drop money with looting multiplier
Expand Down
14 changes: 4 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>MoneyFromMobs</groupId>
<artifactId>MoneyFromMobs</artifactId>
<version>4.8.1</version>
<version>4.9.1-SNAPSHOT</version>
<name>MoneyFromMobs</name>
<description>Makes mobs drop money with looting multiplier</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<sourceDirectory>MoneyFromMobs/src</sourceDirectory>
Expand All @@ -16,16 +17,13 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<resources>
<resource>
<directory>MoneyFromMobs/src/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
Expand Down Expand Up @@ -111,6 +109,7 @@
<groupId>dev.rosewood</groupId>
<artifactId>rosestacker</artifactId>
<version>1.5.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.lumine</groupId>
Expand Down Expand Up @@ -142,10 +141,5 @@
<version>5.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.chocolf</groupId>
<artifactId>MoneyFromMobs</artifactId>
<version>4.82</version>
</dependency>
</dependencies>
</project>