Skip to content

Commit dce68de

Browse files
acrylic-styleacrylic-style
committed
Update to 1.21.11
1 parent efc86d6 commit dce68de

File tree

7 files changed

+32
-46
lines changed

7 files changed

+32
-46
lines changed

‎build.gradle.kts‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("io.papermc.paperweight.userdev") version "1.7.1"
2+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
33
java
44
id("com.gradleup.shadow") version "8.3.3"
55
}
@@ -9,48 +9,28 @@ version = "2.0.0-SNAPSHOT"
99

1010
repositories {
1111
mavenCentral()
12-
maven {
13-
name = "papermc-repo"
14-
url = uri("https://papermc.io/repo/repository/maven-public/")
15-
}
16-
maven {
17-
name = "sonatype"
18-
url = uri("https://oss.sonatype.org/content/groups/public/")
19-
}
20-
maven {
21-
name = "azisaba"
22-
url = uri("https://repo.azisaba.net/repository/maven-public/")
23-
}
24-
maven {
25-
name = "essentialsx"
26-
url = uri("https://repo.essentialsx.net/releases/")
27-
}
28-
maven {
29-
name = "lumine"
30-
url = uri("https://mvn.lumine.io/repository/maven-public/")
31-
}
32-
maven { url = uri("https://jitpack.io") }
33-
if (properties["azisabaNmsUsername"] != null && properties["azisabaNmsPassword"] != null) {
34-
maven {
35-
name = "azisabaNms"
36-
credentials(PasswordCredentials::class)
37-
url = uri("https://repo.azisaba.net/repository/nms/")
38-
}
39-
}
12+
maven("https://repo.papermc.io/repository/maven-public/")
13+
maven("https://oss.sonatype.org/content/groups/public/")
14+
maven("https://repo.azisaba.net/repository/maven-public/")
15+
maven("https://repo.essentialsx.net/releases/")
16+
maven("https://mvn.lumine.io/repository/maven-public/")
17+
maven("https://jitpack.io")
4018
}
4119

4220
dependencies {
4321
// implementation("net.blueberrymc:native-util:2.1.0")
44-
implementation("xyz.acrylicstyle.java-util:common:2.0.0-SNAPSHOT")
45-
implementation("xyz.acrylicstyle.java-util:expression:2.0.0-SNAPSHOT")
22+
implementation("xyz.acrylicstyle.java-util:common:2.1.1")
23+
implementation("xyz.acrylicstyle.java-util:expression:2.1.1")
4624
compileOnly("net.azisaba.ballotbox:receiver:1.0.1")
4725
compileOnly("net.azisaba:ItemStash:1.0.0-SNAPSHOT")
48-
compileOnly("net.essentialsx:EssentialsX:2.20.1")
26+
compileOnly("net.essentialsx:EssentialsX:2.20.1") {
27+
exclude("org.spigotmc", "spigot-api")
28+
}
4929
compileOnly("io.lumine:Mythic-Dist:5.4.0")
50-
compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
30+
compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
5131
compileOnly("net.azisaba:TAB-BukkitBridge:3.1.0")
5232
compileOnly("org.jetbrains:annotations:26.0.1")
53-
paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
33+
paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
5434
}
5535

5636
java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/java/net/azisaba/afnw/afnwcore2/AfnwCore2.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ public void onEnable() {
107107
getLogger().info("コマンド 設定完了");
108108

109109
Bukkit.getScheduler().runTask(this, () -> {
110-
if (Bukkit.getPluginManager().isPluginEnabled("TAB")) {
110+
if (Bukkit.getPluginManager().isPluginEnabled("TAB-BukkitBridge")) {
111111
TheTAB.enable();
112112
getLogger().info("TABの連携が有効です。");
113113
} else {
114114
getLogger().info("TABの連携は無効です。");
115115
}
116116
});
117117

118-
if(getConfig().getBoolean("settings.maintenance-mode-toggle", false)) {
118+
if (getConfig().getBoolean("settings.maintenance-mode-toggle", false)) {
119119
getServer().setWhitelist(true);
120120
getLogger().info("正常に起動しました。(メンテナンスモード)");
121121
return;
@@ -128,10 +128,16 @@ public void onEnable() {
128128
((CraftDolphin) entity).getHandle().goalSelector.removeAllGoals(goal -> goal.getClass().getTypeName().equals("net.minecraft.world.entity.animal.EntityDolphin$a"));
129129
}
130130
}
131-
}, 10, 10);
131+
}, 5, 5);
132132

133-
((RangedAttribute) Objects.requireNonNull(BuiltInRegistries.ATTRIBUTE.get(Attributes.LUCK.unwrap().left().orElseThrow())))
134-
.maxValue = Double.MAX_VALUE;
133+
var optionalAttributeReference = Objects.requireNonNull(BuiltInRegistries.ATTRIBUTE.get(Attributes.LUCK.unwrap().left().orElseThrow()));
134+
optionalAttributeReference.ifPresent(attributeReference -> {
135+
var optional = attributeReference.unwrap().right();
136+
optional.ifPresent(attribute -> {
137+
((RangedAttribute) attribute).maxValue = Double.MAX_VALUE;
138+
getLogger().info("Luck attribute max value set to Double.MAX_VALUE");
139+
});
140+
});
135141
getLogger().info("正常に起動しました。");
136142
}
137143

‎src/main/java/net/azisaba/afnw/afnwcore2/commands/AfnwCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
131131
int itemSize = config.getInt("vote.item-size", 1);
132132
int scaffoldSize = config.getInt("vote.scaffold-size", 8);
133133

134-
int luck = (int) Math.ceil(Optional.ofNullable(((Player) sender).getAttribute(Attribute.GENERIC_LUCK)).map(AttributeInstance::getValue).orElse(0.0));
134+
int luck = (int) Math.ceil(Optional.ofNullable(((Player) sender).getAttribute(Attribute.LUCK)).map(AttributeInstance::getValue).orElse(0.0));
135135
ItemStack afnwItem = getRandomItem(luck, itemSize);
136136

137137
inv.removeItem(AfnwTicket.afnwTicket);

‎src/main/java/net/azisaba/afnw/afnwcore2/listeners/entity/DropShardListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void onEntityDeath(EntityDeathEvent e) {
1818
}
1919
Player killer = e.getEntity().getKiller();
2020
double baseChance = 0.001; // 0.1%
21-
double playerLuck = Optional.ofNullable(killer.getAttribute(Attribute.GENERIC_LUCK)).map(AttributeInstance::getValue).orElse(0.0);
21+
double playerLuck = Optional.ofNullable(killer.getAttribute(Attribute.LUCK)).map(AttributeInstance::getValue).orElse(0.0);
2222
double chance = baseChance + playerLuck * 0.0001; // 0.01% per luck level
2323
// calculate chance
2424
if (Math.random() < chance) {

‎src/main/java/net/azisaba/afnw/afnwcore2/listeners/player/FishingListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class FishingListener implements Listener {
1414
public void on(PlayerFishEvent e) {
1515
if (e.getCaught() != null) {
1616
double baseChance = 0.01; // 1%
17-
double playerLuck = Optional.ofNullable(e.getPlayer().getAttribute(Attribute.GENERIC_LUCK)).map(AttributeInstance::getValue).orElse(0.0);
17+
double playerLuck = Optional.ofNullable(e.getPlayer().getAttribute(Attribute.LUCK)).map(AttributeInstance::getValue).orElse(0.0);
1818
double chance = baseChance + playerLuck * 0.001; // 0.1% per luck level
1919
// calculate chance
2020
if (Math.random() < chance) {

‎src/main/java/net/azisaba/afnw/afnwcore2/util/item/ItemUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public static void addToStashIfEnabledAsync(@NotNull Plugin plugin, @NotNull UUI
3434
public static @NotNull String getStringTag(@NotNull ItemStack stack, @NotNull String name) {
3535
CompoundTag tag = getCustomData(stack);
3636
if (tag == null) return "";
37-
return tag.getString(name);
37+
return tag.getString(name).orElse("");
3838
}
3939

4040
public static @NotNull CompoundTag getCompoundTag(@NotNull ItemStack stack, @NotNull String name) {
4141
CompoundTag tag = getCustomData(stack);
4242
if (tag == null) return new CompoundTag();
43-
return tag.getCompound(name);
43+
return tag.getCompound(name).orElseGet(CompoundTag::new);
4444
}
4545

4646
@Contract("null -> null")
4747
public static @Nullable String getMythicType(@Nullable ItemStack stack) {
4848
if (stack == null) return null;
49-
String s = getCompoundTag(stack, "PublicBukkitValues").getString("mythicmobs:type");
49+
String s = getCompoundTag(stack, "PublicBukkitValues").getString("mythicmobs:type").orElse("");
5050
if (s.isBlank()) return null;
5151
return s;
5252
}

0 commit comments

Comments
 (0)