Skip to content
This repository was archived by the owner on Mar 8, 2022. It is now read-only.

Commit 26bbd65

Browse files
cyilincyilin
committed
update to 1.13.2
1 parent 841c578 commit 26bbd65

File tree

5 files changed

+25
-45
lines changed

5 files changed

+25
-45
lines changed

‎build.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configurations.all {
1010
// Note the spaces before and after the equals sign
1111
ext.majorVersion = 6
1212
ext.minorVersion = 2
13-
ext.minecraftVersion = "1.13.1"
13+
ext.minecraftVersion = "1.13.2"
1414

1515
sourceCompatibility = 1.8
1616
targetCompatibility = 1.8
@@ -22,11 +22,6 @@ repositories {
2222
url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
2323
}
2424

25-
maven {
26-
name 'sonatype'
27-
url 'https://oss.sonatype.org/content/groups/public'
28-
}
29-
3025
maven {
3126
name 'vault-repo'
3227
url 'http://nexus.hc.to/content/repositories/pub_releases'
@@ -49,8 +44,10 @@ repositories {
4944
}
5045

5146
dependencies {
52-
compile 'org.spigotmc:spigot-api:1.13.1-R0.1-SNAPSHOT'
53-
compile 'net.milkbowl.vault:VaultAPI:1.6'
47+
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
48+
compile ('net.milkbowl.vault:VaultAPI:1.7') {
49+
transitive = false
50+
}
5451
compile 'cat.nyaa:nyaacore:6.2-SNAPSHOT'
5552
compile('net.ess3:Essentials:2.13-SNAPSHOT') {
5653
transitive = false

‎src/main/java/cat/nyaa/HamsterEcoHelper/auction/AuctionInstance.java

+2-15
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ public AuctionInstance(OfflinePlayer player, ItemStack itemToGive, double startP
4242
this.owner = player;
4343
this.reservePrice = reservePrice;
4444

45-
String realName;
46-
if (itemToGive.hasItemMeta() && itemToGive.getItemMeta().hasDisplayName()) {
47-
realName = itemToGive.getItemMeta().getDisplayName();
48-
} else {
49-
realName = itemToGive.getType().name() + ":" + itemToGive.getDurability();
50-
}
45+
String realName = MiscUtils.getItemName(itemToGive);
5146

5247
if (hideName) {
5348
new Message(I18n.format("user.auc.new_auction_unknown", startPrice, stepPrice, (int) Math.floor(timeout / 20D))).broadcast(new Permission("heh.bid"));
@@ -68,15 +63,7 @@ public AuctionInstance(OfflinePlayer player, ItemStack itemToGive, double startP
6863
plugin.logger.info(I18n.format("log.info.auc_start", realName, itemToGive.getAmount(),
6964
Boolean.toString(hideName), startPrice, stepPrice, uid(this)));
7065
} else {
71-
realName = "";
72-
if (itemToGive.hasItemMeta() && itemToGive.getItemMeta().hasDisplayName()) {
73-
realName = itemToGive.getItemMeta().getDisplayName();
74-
}
75-
if (realName.length() == 0) {
76-
realName = itemToGive.getType().name() + ":" + itemToGive.getDurability();
77-
} else {
78-
realName += "(" + itemToGive.getType().name() + ":" + itemToGive.getDurability() + ")";
79-
}
66+
realName = MiscUtils.getItemName(itemToGive);
8067
long id = plugin.database.addItemLog(player, itemStack, startPrice, itemStack.getAmount());
8168
plugin.logger.info(I18n.format("log.info.player_auc_start", id, player.getName(), realName, itemToGive.getAmount(),
8269
Boolean.toString(hideName), startPrice, stepPrice, uid(this)));

‎src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionInstance.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ public RequisitionInstance(
4545
new Message(I18n.format("user.req.new_req_0")).append("{itemName}", tmp)
4646
.appendFormat(plugin.i18n, "user.req.new_req_1", reqAmount, (double) unitPrice, (double) templateItem.timeoutTicks / 20D)
4747
.broadcast();
48-
String name = templateItem.itemTemplate.hasItemMeta() && templateItem.itemTemplate.getItemMeta().hasDisplayName() ?
49-
templateItem.itemTemplate.getItemMeta().getDisplayName() :
50-
templateItem.itemTemplate.getType().name() + ":" + templateItem.itemTemplate.getDurability();
48+
String name = MiscUtils.getItemName(templateItem.itemTemplate);
5149
logger = plugin.getLogger();
5250
plugin.getLogger().info(I18n.format("log.info.req_start", name, reqAmount, (double) unitPrice, templateItem.timeoutTicks, uid(this)));
5351
}
@@ -77,15 +75,7 @@ public RequisitionInstance(Player player,
7775
new Message(I18n.format("user.req.player_req_0", player.getName())).append("{itemName}", item)
7876
.appendFormat(plugin.i18n, "user.req.player_req_1", reqAmount, unitPrice, (double) templateItem.timeoutTicks / 20D)
7977
.broadcast();
80-
String itemName = "";
81-
if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()) {
82-
itemName = item.getItemMeta().getDisplayName();
83-
}
84-
if (itemName.length() == 0) {
85-
itemName = item.getType().name() + ":" + item.getDurability();
86-
} else {
87-
itemName += "(" + item.getType().name() + ":" + item.getDurability() + ")";
88-
}
78+
String itemName = MiscUtils.getItemName(item);
8979
logger = plugin.getLogger();
9080
long id = plugin.database.addItemLog(player, item, unitPrice, amountRemains);
9181
plugin.getLogger().info(I18n.format("log.info.player_req_start", id, player.getName(), itemName,

‎src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionSpecification.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.bukkit.configuration.ConfigurationSection;
66
import org.bukkit.enchantments.Enchantment;
77
import org.bukkit.inventory.ItemStack;
8+
import org.bukkit.inventory.meta.Damageable;
89
import org.bukkit.inventory.meta.Repairable;
910

1011
import java.util.Arrays;
@@ -97,14 +98,14 @@ public boolean matches(ItemStack anotherItem) {
9798
return false;
9899
}
99100
}
100-
101-
int baseDamage = base.getDurability();
102-
int givenDamage = given.getDurability();
103-
if (minDamageValue == -2 && givenDamage < baseDamage) return false;
104-
if (minDamageValue >= 0 && givenDamage < minDamageValue) return false;
105-
if (maxDamageValue == -2 && givenDamage > baseDamage) return false;
106-
if (maxDamageValue >= 0 && givenDamage > maxDamageValue) return false;
107-
101+
if (base.getItemMeta() instanceof Damageable && ((Damageable) base.getItemMeta()).hasDamage()) {
102+
int baseDamage = ((Damageable) base.getItemMeta()).getDamage();
103+
int givenDamage = ((Damageable) given.getItemMeta()).getDamage();
104+
if (minDamageValue == -2 && givenDamage < baseDamage) return false;
105+
if (minDamageValue >= 0 && givenDamage < minDamageValue) return false;
106+
if (maxDamageValue == -2 && givenDamage > baseDamage) return false;
107+
if (maxDamageValue >= 0 && givenDamage > maxDamageValue) return false;
108+
}
108109
String baseDisplay = getDisplayName(base);
109110
String givenDisplay = getDisplayName(given);
110111
if (nameMatch == MatchingMode.EXACT && !baseDisplay.equals(givenDisplay)) return false;

‎src/main/java/cat/nyaa/HamsterEcoHelper/utils/MiscUtils.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.bukkit.command.CommandSender;
1010
import org.bukkit.entity.Player;
1111
import org.bukkit.inventory.ItemStack;
12+
import org.bukkit.inventory.meta.Damageable;
1213
import org.librazy.nclangchecker.LangKey;
1314
import org.librazy.nclangchecker.LangKeyType;
1415

@@ -79,10 +80,14 @@ public static String getItemName(ItemStack item) {
7980
if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()) {
8081
itemName = item.getItemMeta().getDisplayName();
8182
}
83+
String materialAndDamage = item.getType().name();
84+
if (item.getItemMeta() instanceof Damageable && ((Damageable) item.getItemMeta()).hasDamage()) {
85+
materialAndDamage += ":" + ((Damageable) item.getItemMeta()).getDamage();
86+
}
8287
if (itemName.length() == 0) {
83-
itemName = item.getType().name() + ":" + item.getDurability();
88+
itemName = materialAndDamage;
8489
} else {
85-
itemName += "(" + item.getType().name() + ":" + item.getDurability() + ")";
90+
itemName += "(" + materialAndDamage + ")";
8691
}
8792
return itemName;
8893
}

0 commit comments

Comments
 (0)