Merge pull request #410 from okocraft/dev/1.21.2

Minecraft 1.21.2/1.21.3
okocraft · Oct 31, 2024 · 2ccfd0b · 2ccfd0b
2 parents d76d0cf + a281088
commit 2ccfd0b
Show file tree

Hide file tree

Showing 56 changed files with 1,887 additions and 108 deletions.
diff --git a/annotation-processor/build.gradle.kts b/annotation-processor/build.gradle.kts
@@ -1,8 +1,3 @@
 plugins {
     id("box.common-conventions")
 }
-
-dependencies {
-    implementation(projects.boxApi)
-    implementation(projects.boxVersionCommon)
-}
diff --git a/api/src/main/java/net/okocraft/box/api/model/customdata/CustomDataManager.java b/api/src/main/java/net/okocraft/box/api/model/customdata/CustomDataManager.java
@@ -1,6 +1,6 @@
 package net.okocraft.box.api.model.customdata;
 
-import com.github.siroshun09.configapi.core.node.MapNode;
+import dev.siroshun.configapi.core.node.MapNode;
 import net.kyori.adventure.key.Key;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/api/src/main/java/net/okocraft/box/api/transaction/WithdrawalImpl.java b/api/src/main/java/net/okocraft/box/api/transaction/WithdrawalImpl.java
@@ -40,7 +40,7 @@ record WithdrawalImpl(@NotNull StockHolder stockHolder, @NotNull BoxItem boxItem
             var item = contents[i];
 
             if (item == null) {
-                if (view != null && !checkClickEvent(view, i)) {
+                if (view != null && fireClickEventAndCheckCancelled(view, i)) {
                     continue;
                 }
 
@@ -53,7 +53,7 @@ record WithdrawalImpl(@NotNull StockHolder stockHolder, @NotNull BoxItem boxItem
                 withdrawnAmount += withdrawn;
                 contents[i] = this.boxItem.getOriginal().asQuantity(withdrawn);
             } else if (item.isSimilar(this.boxItem.getOriginal())) {
-                if (view != null && !checkClickEvent(view, i)) {
+                if (view != null && fireClickEventAndCheckCancelled(view, i)) {
                     continue;
                 }
 
@@ -79,7 +79,7 @@ record WithdrawalImpl(@NotNull StockHolder stockHolder, @NotNull BoxItem boxItem
         return TransactionResult.create(this.boxItem, withdrawnAmount);
     }
 
-    private static boolean checkClickEvent(@NotNull InventoryView view, int slot) {
-        return new InventoryClickEvent(view, InventoryType.SlotType.CONTAINER, slot, ClickType.LEFT, InventoryAction.PLACE_ALL).callEvent();
+    private static boolean fireClickEventAndCheckCancelled(@NotNull InventoryView view, int slot) {
+        return !new InventoryClickEvent(view, InventoryType.SlotType.CONTAINER, slot, ClickType.LEFT, InventoryAction.PLACE_ALL).callEvent();
     }
 }
diff --git a/api/src/test/java/net/okocraft/box/api/transaction/DepositAllTest.java b/api/src/test/java/net/okocraft/box/api/transaction/DepositAllTest.java
@@ -1,7 +1,7 @@
 package net.okocraft.box.api.transaction;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.CollectionType;
-import com.github.siroshun09.configapi.core.serialization.annotation.MapType;
+import dev.siroshun.configapi.core.serialization.annotation.CollectionType;
+import dev.siroshun.configapi.core.serialization.annotation.MapType;
 import net.okocraft.box.api.model.item.BoxItem;
 import net.okocraft.box.api.model.manager.ItemManager;
 import net.okocraft.box.api.util.ItemNameGenerator;

diff --git a/api/src/test/java/net/okocraft/box/api/transaction/DepositTest.java b/api/src/test/java/net/okocraft/box/api/transaction/DepositTest.java
@@ -1,6 +1,6 @@
 package net.okocraft.box.api.transaction;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.Inline;
+import dev.siroshun.configapi.core.serialization.annotation.Inline;
 import net.okocraft.box.test.shared.event.StockEventCollector;
 import net.okocraft.box.test.shared.mock.bukkit.inventory.InventoryInfo;
 import net.okocraft.box.test.shared.model.item.ItemType;

diff --git a/api/src/test/java/net/okocraft/box/api/transaction/WithdrawalTest.java b/api/src/test/java/net/okocraft/box/api/transaction/WithdrawalTest.java
@@ -1,6 +1,6 @@
 package net.okocraft.box.api.transaction;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.Inline;
+import dev.siroshun.configapi.core.serialization.annotation.Inline;
 import net.okocraft.box.api.model.stock.StockData;
 import net.okocraft.box.test.shared.event.StockEventCollector;
 import net.okocraft.box.test.shared.mock.bukkit.inventory.InventoryInfo;

diff --git a/api/src/test/java/net/okocraft/box/api/util/InventoryUtilTest.java b/api/src/test/java/net/okocraft/box/api/util/InventoryUtilTest.java
@@ -1,6 +1,6 @@
 package net.okocraft.box.api.util;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.Inline;
+import dev.siroshun.configapi.core.serialization.annotation.Inline;
 import net.okocraft.box.test.shared.mock.bukkit.inventory.InventoryInfo;
 import net.okocraft.box.test.shared.model.item.ItemType;
 import net.okocraft.box.test.shared.util.TestCaseLoader;

diff --git a/build-logic/src/main/kotlin/box.base-conventions.gradle.kts b/build-logic/src/main/kotlin/box.base-conventions.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
     testImplementation(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.annotations)
-    testImplementation(libs.configapi.test.shared.classes)
     testImplementation(libs.fastutil)
     testImplementation(libs.mockito)
 

diff --git a/bundle/build.gradle.kts b/bundle/build.gradle.kts
@@ -40,7 +40,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.21.1")
+        minecraftVersion("1.21.3")
         systemProperty("com.mojang.eula.agree", "true")
         systemProperty("paper.disablePluginRemapping", "true")
     }

diff --git a/core/src/main/java/net/okocraft/box/core/config/Config.java b/core/src/main/java/net/okocraft/box/core/config/Config.java
@@ -1,13 +1,13 @@
 package net.okocraft.box.core.config;
 
-import com.github.siroshun09.configapi.core.comment.SimpleComment;
-import com.github.siroshun09.configapi.core.node.CommentableNode;
-import com.github.siroshun09.configapi.core.node.MapNode;
-import com.github.siroshun09.configapi.core.node.StringValue;
-import com.github.siroshun09.configapi.core.serialization.key.KeyGenerator;
-import com.github.siroshun09.configapi.core.serialization.record.RecordDeserializer;
-import com.github.siroshun09.configapi.core.serialization.record.RecordSerializer;
-import com.github.siroshun09.configapi.format.yaml.YamlFormat;
+import dev.siroshun.configapi.core.comment.SimpleComment;
+import dev.siroshun.configapi.core.node.CommentableNode;
+import dev.siroshun.configapi.core.node.MapNode;
+import dev.siroshun.configapi.core.node.StringValue;
+import dev.siroshun.configapi.core.serialization.key.KeyGenerator;
+import dev.siroshun.configapi.core.serialization.record.RecordDeserializer;
+import dev.siroshun.configapi.core.serialization.record.RecordSerializer;
+import dev.siroshun.configapi.format.yaml.YamlFormat;
 import net.okocraft.box.api.util.BoxLogger;
 import net.okocraft.box.storage.api.model.Storage;
 import net.okocraft.box.storage.api.registry.StorageRegistry;

diff --git a/core/src/main/java/net/okocraft/box/core/config/CoreSetting.java b/core/src/main/java/net/okocraft/box/core/config/CoreSetting.java
@@ -1,7 +1,7 @@
 package net.okocraft.box.core.config;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.CollectionType;
-import com.github.siroshun09.configapi.core.serialization.annotation.Comment;
+import dev.siroshun.configapi.core.serialization.annotation.CollectionType;
+import dev.siroshun.configapi.core.serialization.annotation.Comment;
 
 import java.util.Set;
 

diff --git a/core/src/main/java/net/okocraft/box/core/config/StockDataSetting.java b/core/src/main/java/net/okocraft/box/core/config/StockDataSetting.java
@@ -1,7 +1,7 @@
 package net.okocraft.box.core.config;
 
-import com.github.siroshun09.configapi.core.serialization.annotation.Comment;
-import com.github.siroshun09.configapi.core.serialization.annotation.DefaultLong;
+import dev.siroshun.configapi.core.serialization.annotation.Comment;
+import dev.siroshun.configapi.core.serialization.annotation.DefaultLong;
 import net.okocraft.box.api.util.BoxLogger;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/core/src/main/java/net/okocraft/box/core/model/manager/customdata/BoxCustomDataManager.java b/core/src/main/java/net/okocraft/box/core/model/manager/customdata/BoxCustomDataManager.java
@@ -1,6 +1,6 @@
 package net.okocraft.box.core.model.manager.customdata;
 
-import com.github.siroshun09.configapi.core.node.MapNode;
+import dev.siroshun.configapi.core.node.MapNode;
 import net.kyori.adventure.key.Key;
 import net.okocraft.box.api.model.customdata.CustomDataManager;
 import net.okocraft.box.storage.api.model.data.CustomDataStorage;

diff --git a/core/src/main/java/net/okocraft/box/core/model/manager/item/BukkitBoxItemMap.java b/core/src/main/java/net/okocraft/box/core/model/manager/item/BukkitBoxItemMap.java
@@ -6,7 +6,6 @@
 import net.okocraft.box.api.event.BoxEvent;
 import net.okocraft.box.api.event.item.ItemImportEvent;
 import net.okocraft.box.api.model.item.BoxItem;
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -60,10 +59,6 @@ boolean isRegistered(@NotNull ItemStack itemStack) {
     @Nullable BoxItem getByItemStack(@NotNull ItemStack item) {
         Objects.requireNonNull(item);
 
-        if (!item.hasItemMeta() && item.getType() != Material.FIREWORK_ROCKET) {
-            return this.getByItemName(item.getType().name());
-        }
-
         var one = item.getAmount() == 1 ? item : item.asOne();
 
         {

diff --git a/data-generator/build.gradle.kts b/data-generator/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 group = "net.okocraft.box.datagenerator"
 version = "1.0"
 
-val previousMinecraftVersion = "1.20.6"
-val minecraftVersion = "1.21.1"
+val previousMinecraftVersion = "1.21"
+val minecraftVersion = "1.21.3"
 val javaVersion = JavaVersion.VERSION_21
 
 java {

diff --git a/data-generator/src/main/java/net/okocraft/box/datagenerator/DataGenerator.java b/data-generator/src/main/java/net/okocraft/box/datagenerator/DataGenerator.java
@@ -78,7 +78,6 @@ public void newDefaultItems(@NotNull Path dir, @NotNull String prev) throws IOEx
         }
     }
 
-    @SuppressWarnings("deprecation")
     public void uncategorizedItems(@NotNull Path dir) throws IOException {
         var categorizedItems =
             DefaultCategories.loadDefaultCategories(MCDataVersion.current())
@@ -93,7 +92,7 @@ public void uncategorizedItems(@NotNull Path dir) throws IOException {
                 .forEach(name -> {
                     try {
                         writer.write("  - ");
-                        writer.write(String.valueOf(Bukkit.getUnsafe().getDataVersion()));
+                        writer.write(String.valueOf(MCDataVersion.current().dataVersion()));
                         writer.write(":");
                         writer.write(name);
                         writer.newLine();