mirror of
https://github.com/PretzelJohn/VillagerTradeLimiter.git
synced 2024-09-28 22:07:27 +02:00
Compare commits
No commits in common. "b8b14941dfd18c00fdfbeced66254b781afb47fd" and "58d1b24ff048db295b93f3c34bc7a1d2c678178c" have entirely different histories.
b8b14941df
...
58d1b24ff0
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.pretzel.dev</groupId>
|
<groupId>com.pretzel.dev</groupId>
|
||||||
<artifactId>VillagerTradeLimiter</artifactId>
|
<artifactId>VillagerTradeLimiter</artifactId>
|
||||||
<version>1.6.2</version>
|
<version>1.6.0</version>
|
||||||
<build>
|
<build>
|
||||||
<sourceDirectory>src</sourceDirectory>
|
<sourceDirectory>src</sourceDirectory>
|
||||||
<plugins>
|
<plugins>
|
||||||
@ -52,7 +52,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot-api</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<version>1.19.4-R0.1-SNAPSHOT</version>
|
<version>1.19.3-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
@ -63,10 +63,6 @@
|
|||||||
<artifactId>gson</artifactId>
|
<artifactId>gson</artifactId>
|
||||||
<groupId>com.google.code.gson</groupId>
|
<groupId>com.google.code.gson</groupId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<artifactId>joml</artifactId>
|
|
||||||
<groupId>org.joml</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<artifactId>bungeecord-chat</artifactId>
|
<artifactId>bungeecord-chat</artifactId>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
@ -92,7 +88,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.xerial</groupId>
|
<groupId>org.xerial</groupId>
|
||||||
<artifactId>sqlite-jdbc</artifactId>
|
<artifactId>sqlite-jdbc</artifactId>
|
||||||
<version>3.40.1.0</version>
|
<version>3.40.0.0</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
8
pom.xml
8
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.pretzel.dev</groupId>
|
<groupId>com.pretzel.dev</groupId>
|
||||||
<artifactId>VillagerTradeLimiter</artifactId>
|
<artifactId>VillagerTradeLimiter</artifactId>
|
||||||
<version>1.6.2</version>
|
<version>1.6.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
@ -62,13 +62,13 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot-api</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<version>1.19.4-R0.1-SNAPSHOT</version>
|
<version>1.19.3-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.tr7zw</groupId>
|
<groupId>de.tr7zw</groupId>
|
||||||
<artifactId>item-nbt-api</artifactId>
|
<artifactId>item-nbt-api</artifactId>
|
||||||
<version>2.11.2</version>
|
<version>2.11.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.tr7zw</groupId>
|
<groupId>de.tr7zw</groupId>
|
||||||
@ -85,7 +85,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.xerial</groupId>
|
<groupId>org.xerial</groupId>
|
||||||
<artifactId>sqlite-jdbc</artifactId>
|
<artifactId>sqlite-jdbc</artifactId>
|
||||||
<version>3.40.1.0</version>
|
<version>3.40.0.0</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -4,19 +4,15 @@ import com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter;
|
|||||||
import com.pretzel.dev.villagertradelimiter.data.Cooldown;
|
import com.pretzel.dev.villagertradelimiter.data.Cooldown;
|
||||||
import com.pretzel.dev.villagertradelimiter.data.PlayerData;
|
import com.pretzel.dev.villagertradelimiter.data.PlayerData;
|
||||||
import com.pretzel.dev.villagertradelimiter.settings.Settings;
|
import com.pretzel.dev.villagertradelimiter.settings.Settings;
|
||||||
import org.bukkit.entity.Item;
|
|
||||||
import org.bukkit.entity.Villager;
|
import org.bukkit.entity.Villager;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.VillagerAcquireTradeEvent;
|
|
||||||
import org.bukkit.event.entity.VillagerCareerChangeEvent;
|
|
||||||
import org.bukkit.event.entity.VillagerReplenishTradeEvent;
|
import org.bukkit.event.entity.VillagerReplenishTradeEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.MerchantRecipe;
|
import org.bukkit.inventory.MerchantRecipe;
|
||||||
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class VillagerListener implements Listener {
|
public class VillagerListener implements Listener {
|
||||||
@ -32,41 +28,6 @@ public class VillagerListener implements Listener {
|
|||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Handles villager promotions */
|
|
||||||
@EventHandler
|
|
||||||
public void onVillagerPromotion(final VillagerAcquireTradeEvent event) {
|
|
||||||
//Gets the items in the trade
|
|
||||||
final MerchantRecipe recipe = event.getRecipe();
|
|
||||||
List<ItemStack> items = recipe.getIngredients();
|
|
||||||
items.add(recipe.getResult());
|
|
||||||
|
|
||||||
//Gets the disabled item list from config
|
|
||||||
List<String> disabledItems = instance.getCfg().getStringList("DisableItems");
|
|
||||||
|
|
||||||
//Checks each item if it should be removed from the trade list
|
|
||||||
for(ItemStack item : items) {
|
|
||||||
if(disabledItems.contains(item.getType().name().toLowerCase())) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Handles villager profession change **/
|
|
||||||
@EventHandler
|
|
||||||
public void onVillagerChangeProfession(final VillagerCareerChangeEvent event) {
|
|
||||||
//Gets the new profession
|
|
||||||
final Villager.Profession profession = event.getProfession();
|
|
||||||
|
|
||||||
//Gets the disabled profession list from config
|
|
||||||
List<String> disabledProfessions = instance.getCfg().getStringList("DisableProfessions");
|
|
||||||
|
|
||||||
//Changes the new profession to none if disabled in config
|
|
||||||
if(disabledProfessions.contains(profession.name().toLowerCase())) {
|
|
||||||
event.setProfession(Villager.Profession.NONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Handles villager restocks */
|
/** Handles villager restocks */
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onVillagerRestock(final VillagerReplenishTradeEvent event) {
|
public void onVillagerRestock(final VillagerReplenishTradeEvent event) {
|
||||||
|
@ -41,13 +41,6 @@ DisableTrading:
|
|||||||
- world_nether
|
- world_nether
|
||||||
- world_the_end
|
- world_the_end
|
||||||
|
|
||||||
# Add profession names that you want to prevent villagers from acquiring
|
|
||||||
DisableProfessions: []
|
|
||||||
|
|
||||||
# Add item names that you want to prevent villagers from offering as trades.
|
|
||||||
# This is a permanent change. The items can't be re-added to the villager's trades.
|
|
||||||
DisableItems: []
|
|
||||||
|
|
||||||
# The maximum level of the "Hero of the Village" (HotV) effect that a player can have. This limits HotV price decreases.
|
# The maximum level of the "Hero of the Village" (HotV) effect that a player can have. This limits HotV price decreases.
|
||||||
# * Set to -1 to disable this feature and keep vanilla behavior.
|
# * Set to -1 to disable this feature and keep vanilla behavior.
|
||||||
# * Set to a number between 0 and 5 to set the maximum HotV effect level players can have
|
# * Set to a number between 0 and 5 to set the maximum HotV effect level players can have
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
name: VillagerTradeLimiter
|
name: VillagerTradeLimiter
|
||||||
author: PretzelJohn
|
author: PretzelJohn
|
||||||
main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter
|
main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter
|
||||||
version: 1.6.2
|
version: 1.6.0
|
||||||
api-version: 1.14
|
api-version: 1.14
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
|
Loading…
Reference in New Issue
Block a user