Merge pull request #1607 from GiganticMinecraft/develop

バージョン 53 リリース
GiganticMinecraft · Aug 9, 2022 · 2bedddb · 2bedddb
2 parents c1d6967 + 8cee36d
commit 2bedddb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,7 @@ import java.io._
 ThisBuild / scalaVersion := "2.13.4"
 // ThisBuild / version はGitHub Actionsによって取得/自動更新される。
 // 次の行は ThisBuild / version := "(\d*)" の形式でなければならない。
-ThisBuild / version := "52"
+ThisBuild / version := "53"
 ThisBuild / organization := "click.seichi"
 ThisBuild / description := "ギガンティック☆整地鯖の独自要素を司るプラグイン"
 

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -18,6 +18,8 @@ chunk-search-command-base: "chunk-search-rs --protobuf --threads 12"
 
 # 色々な設定、説明は割愛
 defaultmineamount: '3'
+minutespeedamount: '0.01'
+onlineplayersamount: '0.5'
 dualbreaklevel: '10'
 trialbreaklevel: '20'
 explosionlevel: '30'

diff --git a/src/main/scala/com/github/unchama/seichiassist/MineStackObjectList.scala b/src/main/scala/com/github/unchama/seichiassist/MineStackObjectList.scala
@@ -121,7 +121,7 @@ object MineStackObjectList {
     materialMineStackObject(AGRICULTURAL, "sugar_cane", "サトウキビ", Material.SUGAR_CANE, 0),
     materialMineStackObject(AGRICULTURAL, "pumpkin", "カボチャ", Material.PUMPKIN, 0),
     materialMineStackObject(AGRICULTURAL, "ink_sack3", "カカオ豆", Material.INK_SACK, 3),
-    materialMineStackObject(AGRICULTURAL, "huge_mushroom_1", "キノコ", Material.HUGE_MUSHROOM_1,1),
+    materialMineStackObject(AGRICULTURAL, "huge_mushroom_1", "キノコ", Material.HUGE_MUSHROOM_1,0),
     materialMineStackObject(AGRICULTURAL, "huge_mushroom_2", "キノコ", Material.HUGE_MUSHROOM_2, 0),
     materialMineStackObject(AGRICULTURAL, "melon", "スイカ", Material.MELON, 0),
     materialMineStackObject(AGRICULTURAL, "melon_block", "スイカ", Material.MELON_BLOCK, 0),

diff --git a/src/main/scala/com/github/unchama/seichiassist/listener/PlayerInventoryListener.scala b/src/main/scala/com/github/unchama/seichiassist/listener/PlayerInventoryListener.scala
@@ -59,8 +59,8 @@ class PlayerInventoryListener(
     val name = playerdata.lowercaseName
     val inventory = event.getInventory
 
-    // インベントリサイズが36でない時終了
-    if (inventory.row != 4) {
+    // インベントリサイズが54でない時終了
+    if (inventory.row != 6) {
       return
     }
     if (inventory.getTitle == s"${LIGHT_PURPLE.toString}${BOLD}交換したい景品を入れてください") {

diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/minestack/MineStackButtons.scala b/src/main/scala/com/github/unchama/seichiassist/menus/minestack/MineStackButtons.scala
@@ -13,12 +13,13 @@ import com.github.unchama.seichiassist.MineStackObjectList.{
 }
 import com.github.unchama.seichiassist.SeichiAssist
 import com.github.unchama.seichiassist.minestack.{
-  MineStackObjectWithColorVariants,
   MineStackObject,
-  MineStackObjectCategory
+  MineStackObjectCategory,
+  MineStackObjectWithColorVariants
 }
 import com.github.unchama.seichiassist.util.InventoryOperations.grantItemStacksEffect
 import com.github.unchama.targetedeffect
+import com.github.unchama.targetedeffect.TargetedEffect.emptyEffect
 import com.github.unchama.targetedeffect.commandsender.MessageEffect
 import com.github.unchama.targetedeffect.player.FocusedSoundEffect
 import org.bukkit.ChatColor._
@@ -144,6 +145,8 @@ private[minestack] case class MineStackButtons(player: Player) {
             }
             (itemDetail ++ operationDetail).asJava
           }
+
+          setAmount(1)
         }
       }
     }
@@ -199,11 +202,13 @@ private[minestack] case class MineStackButtons(player: Player) {
             MineStackSelectItemColorMenu(mineStackObjectWithColorVariants, oldPage)
           )
       },
-      targetedeffect.UnfocusedEffect {
-        playerData
-          .hisotryData
-          .addHistory(getMineStackObjectFromMineStackObjectGroup(mineStackObjectGroup))
-      }
+      if (mineStackObjectGroup.isLeft)
+        targetedeffect.UnfocusedEffect {
+          playerData
+            .hisotryData
+            .addHistory(getMineStackObjectFromMineStackObjectGroup(mineStackObjectGroup))
+        }
+      else emptyEffect
     )
   }