3.0.0-beta

2025-12-27 10:59:20 +00:00 · 2023-04-17 20:07:15 +08:00
parent 5a300c1085
commit 9092ee0fdc
112 changed files with 3047 additions and 397 deletions
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -43,7 +43,7 @@ schedule-system:
  # 线程池设置
  thread-pool-settings:
    # 核心线程池大小
-    corePoolSize: 2
+    corePoolSize: 1
    # 最大线程池大小
    maximumPoolSize: 4
    # seconds (秒)
--- a/src/main/resources/contents/crops/tomato.yml
+++ b/src/main/resources/contents/crops/tomato.yml
@@ -1,6 +1,6 @@
 tomato:
-  # TripWire / Item_Frame / Item_Display
-  crop-mode: TripWire
+  # TripWire / Item_Frame / Item_Display (1.19.4+)
+  crop-mode: Item_Frame

  # The crop can only be planted on certain pots
  pot-whitelist:
@@ -43,6 +43,7 @@ tomato:
  points:
    0:
      model: customcrops:tomato_stage_1
+      hologram-offset-correction: 0.2
      events:
        break:
          action_1:
@@ -63,6 +64,7 @@ tomato:
              pitch: 1
    1:
      model: customcrops:tomato_stage_2
+      hologram-offset-correction: 0.2
      events:
        break:
          action_1:
@@ -83,6 +85,7 @@ tomato:
              pitch: 1
    3:
      model: customcrops:tomato_stage_3
+      hologram-offset-correction: 0.2
      events:
        break:
          action_1:
@@ -103,6 +106,7 @@ tomato:
              pitch: 1
    5:
      model: customcrops:tomato_stage_4
+      hologram-offset-correction: 0.2
      events:
        break:
          action_1:
@@ -155,18 +159,6 @@ tomato:
              model: customcrops:tomato_stage_1
        interact-with-item:
          interact_1:
-            item: customcrops:hoe
-            reduce-amount: false
-            actions:
-              action_1:
-                type: break
-              action_2:
-                type: replant
-                value:
-                  point: 0
-                  crop: tomato  # Replant the crop
-                  model: customcrops:tomato_stage_1  
-          interact_2:
            item: customcrops:i_want_overgrown_tomato_right_now
            reduce-amount: true
            return: customcrops:returned_item
@@ -222,6 +214,19 @@ tomato:
              point: 0
              crop: tomato  # Replant the crop
              model: customcrops:tomato_stage_1
+        interact-with-item:
+          interact_1:
+            item: GOLDEN_HOE
+            reduce-amount: false
+            actions:
+              action_1:
+                type: break
+              action_2:
+                type: replant
+                value:
+                  point: 0
+                  crop: tomato
+                  model: customcrops:tomato_stage_1

  # grow conditions
  grow-conditions:
--- a/src/main/resources/contents/fertilizers/quality.yml
+++ b/src/main/resources/contents/fertilizers/quality.yml
@@ -1,6 +1,6 @@
 quality_1:
  type: QUALITY
-  name: '뀆'
+  icon: '뀆'
  chance: 1
  times: 28
  ratio: 7/2/1
@@ -12,7 +12,7 @@ quality_1:
    - default
 quality_2:
  type: QUALITY
-  name: '뀇'
+  icon: '뀇'
  chance: 1
  times: 28
  ratio: 11/6/3
@@ -24,7 +24,7 @@ quality_2:
    - default
 quality_3:
  type: QUALITY
-  name: '뀈'
+  icon: '뀈'
  chance: 1
  times: 28
  ratio: 2/2/1
--- a/src/main/resources/contents/fertilizers/soil-retain.yml
+++ b/src/main/resources/contents/fertilizers/soil-retain.yml
@@ -1,6 +1,6 @@
 soil_retain_1:
  type: SOIL_RETAIN
-  name: '뀉'
+  icon: '뀉'
  chance: 0.1
  times: 28
  item: customcrops:soil_retain_1
@@ -11,7 +11,7 @@ soil_retain_1:
    - default
 soil_retain_2:
  type: SOIL_RETAIN
-  name: '뀊'
+  icon: '뀊'
  chance: 0.2
  times: 28
  item: customcrops:soil_retain_2
@@ -22,7 +22,7 @@ soil_retain_2:
    - default
 soil_retain_3:
  type: SOIL_RETAIN
-  name: '뀋'
+  icon: '뀋'
  chance: 0.3
  times: 28
  item: customcrops:soil_retain_3
--- a/src/main/resources/contents/fertilizers/speed-grow.yml
+++ b/src/main/resources/contents/fertilizers/speed-grow.yml
@@ -1,7 +1,7 @@
 speed_grow_1:
  type: SPEED_GROW
  # Fertilizer Hologram display name
-  name: '뀌'
+  icon: '뀌'
  # How many days can this fertilizer stay in pot
  times: 14
  # ItemsAdder item namespacedID
@@ -18,7 +18,7 @@ speed_grow_1:
    1: 0.5
 speed_grow_2:
  type: SPEED_GROW
-  name: '뀍'
+  icon: '뀍'
  times: 14
  item: customcrops:speed_grow_2
  before-plant: true
@@ -30,7 +30,7 @@ speed_grow_2:
    1: 0.9
 speed_grow_3:
  type: SPEED_GROW
-  name: '뀎'
+  icon: '뀎'
  times: 14
  item: customcrops:speed_grow_3
  before-plant: true
--- a/src/main/resources/contents/fertilizers/variation.yml
+++ b/src/main/resources/contents/fertilizers/variation.yml
@@ -1,6 +1,6 @@
 variation_1:
  type: VARIATION
-  name: '뀒'
+  icon: '뀒'
  times: 14
  # If a crop's default variation chance is 0.01, now it's 0.03
  chance: 0.02
@@ -12,7 +12,7 @@ variation_1:
    - default
 variation_2:
  type: VARIATION
-  name: '뀓'
+  icon: '뀓'
  times: 14
  chance: 0.04
  item: customcrops:variation_2
@@ -23,7 +23,7 @@ variation_2:
    - default
 variation_3:
  type: VARIATION
-  name: '뀔'
+  icon: '뀔'
  times: 14
  chance: 0.08
  item: customcrops:variation_3
--- a/src/main/resources/contents/fertilizers/yield-increase.yml
+++ b/src/main/resources/contents/fertilizers/yield-increase.yml
@@ -1,6 +1,6 @@
 yield_increase_1:
  type: YIELD_INCREASE
-  name: '뀏'
+  icon: '뀏'
  times: 14
  item: customcrops:yield_increase_1
  before-plant: true
@@ -14,7 +14,7 @@ yield_increase_1:
    1: 0.8
 yield_increase_2:
  type: YIELD_INCREASE
-  name: '뀐'
+  icon: '뀐'
  times: 14
  item: customcrops:yield_increase_2
  before-plant: true
@@ -28,7 +28,7 @@ yield_increase_2:
    1: 1
 yield_increase_3:
  type: YIELD_INCREASE
-  name: '뀑'
+  icon: '뀑'
  times: 14
  item: customcrops:yield_increase_3
  before-plant: true
--- a/src/main/resources/contents/pots/default.yml
+++ b/src/main/resources/contents/pots/default.yml
@@ -1,5 +1,5 @@
 default:
-  max-water-storage: 10
+  max-water-storage: 4
  base:
    # basic models
    dry: customcrops:dry_pot
@@ -45,4 +45,21 @@ default:
      item: customcrops:magic_water
      amount: 10
      particle: WATER_SPLASH
-      sound: minecraft:block.water.ambient
+      sound: minecraft:block.water.ambient
+  hologram:
+    enable: true
+    # ARMOR_STAND / TEXT_DISPLAY (1.19.4+)
+    type: ARMOR_STAND
+    duration: 2
+    fertilizer:
+      vertical-offset: 0.8
+      text: '<font:customcrops:default>{icon}</font> {left_times}/{max_times}'
+    water:
+      vertical-offset: 1.05
+      text: '<font:customcrops:default>{water_bar}</font>'
+      #text: '{current}/{storage}'
+      water-bar:
+        left: '뀂'
+        full: '뀁뀃'
+        empty: '뀁뀄'
+        right: '뀁뀅'
--- a/src/main/resources/contents/sprinklers/default.yml
+++ b/src/main/resources/contents/sprinklers/default.yml
@@ -5,26 +5,31 @@ sprinkler_1:
  storage: 5
  3D-item: customcrops:sprinkler_1
  2D-item: customcrops:sprinkler_1_item
-  # Item_Frame / Item_Display / Tripwire
+  # Item_Frame / Tripwire / Item_Display (1.19.4+)
  type: Item_Frame
  place-sound: minecraft:block.bone_block.place
  hologram:
    enable: true
+    # ARMOR_STAND / TEXT_DISPLAY (1.19.4+)
+    type: ARMOR_STAND
    y-offset: 0.8
    duration: 1
    # Available variables:
+    # {water_bar} water bar image
    # {current} current water
    # {storage} max storage
-    left: '<font:customcrops:default>뀂'
-    full: '뀁뀃'
-    empty: '뀁뀄'
-    right: '뀁뀅</font>'
+    content: '<font:customcrops:default>{water_bar}</font>'
+    water-bar:
+      left: '뀂'
+      full: '뀁뀃'
+      empty: '뀁뀄'
+      right: '뀁뀅'
  # Water splash animation when sprinkler works
  sprinkler-animation:
    enable: true
    y-offset: 0.4
    item: customcrops:water_animation
-    # ARMOR_STAND / ITEM_DISPLAY
+    # ARMOR_STAND / ITEM_DISPLAY (1.19.4+)
    type: ARMOR_STAND
  pot-whitelist:
    - default
@@ -52,12 +57,15 @@ sprinkler_2:
  place-sound: minecraft:block.bone_block.place
  hologram:
    enable: true
+    type: ARMOR_STAND
    y-offset: 0.8
    duration: 1
-    left: '<font:customcrops:default>뀂'
-    full: '뀁뀃'
-    empty: '뀁뀄'
-    right: '뀁뀅</font>'
+    content: '<font:customcrops:default>{water_bar}</font>'
+    water-bar:
+      left: '뀂'
+      full: '뀁뀃'
+      empty: '뀁뀄'
+      right: '뀁뀅'
  sprinkler-animation:
    enable: true
    y-offset: 0.4
@@ -88,12 +96,15 @@ sprinkler_3:
  place-sound: minecraft:block.bone_block.place
  hologram:
    enable: true
+    type: ARMOR_STAND
    y-offset: 0.8
    duration: 1
-    left: '<font:customcrops:default>뀂'
-    full: '뀁뀃'
-    empty: '뀁뀄'
-    right: '뀁뀅</font>'
+    content: '<font:customcrops:default>{water_bar}</font>'
+    water-bar:
+      left: '뀂'
+      full: '뀁뀃'
+      empty: '뀁뀄'
+      right: '뀁뀅'
  sprinkler-animation:
    enable: true
    y-offset: 0.4
--- a/src/main/resources/messages/messages_english.yml
+++ b/src/main/resources/messages/messages_english.yml
@@ -1,20 +1,21 @@
-prefix: '<gradient:#ff206c:#fdee55>[CustomCrops] </gradient>'
-reload: '<white>Reloaded! Took <green>{time}ms.'
-invalid-args: '<white>Invalid arguments.'
-no-console: '<white>This command can only be executed by a player.'
-not-online: '<white>Player {player} is not online.'
-lack-args: '<white>Arguments are insufficient.'
-not-none-args: '<white>Not a none argument command.'
-before-plant: '<white>This fertilizer must be used before planting!'
-unsuitable-pot: "<white>You can't plant the seed in this pot."
-reach-crop-limit: '<white>The number of crops has reached the limitation.'
-no-perm: "<red>You don't have permission to do that."
-spring: 'Spring'
-summer: 'Summer'
-autumn: 'Autumn'
-winter: 'Winter'
-no-season: 'SEASON DISABLED IN THIS WORLD'
-set-season: "<white>Successfully set {world}'s season to {season}."
-set-date: "<white>Successfully set {world}'s date to {date}."
-world-not-exist: '<white>World {world} does not exist.'
-season-not-exist: '<white>Season {season} does not exist.'
+messages:
+  prefix: '<gradient:#ff206c:#fdee55>[CustomCrops] </gradient>'
+  reload: '<white>Reloaded! Took <green>{time}ms.'
+  invalid-args: '<white>Invalid arguments.'
+  no-console: '<white>This command can only be executed by a player.'
+  not-online: '<white>Player {player} is not online.'
+  lack-args: '<white>Arguments are insufficient.'
+  not-none-args: '<white>Not a none argument command.'
+  before-plant: '<white>This fertilizer must be used before planting!'
+  unsuitable-pot: "<white>You can't plant the seed in this pot."
+  reach-crop-limit: '<white>The number of crops has reached the limitation.'
+  no-perm: "<red>You don't have permission to do that."
+  spring: 'Spring'
+  summer: 'Summer'
+  autumn: 'Autumn'
+  winter: 'Winter'
+  no-season: 'SEASON DISABLED IN THIS WORLD'
+  set-season: "<white>Successfully set {world}'s season to {season}."
+  set-date: "<white>Successfully set {world}'s date to {date}."
+  world-not-exist: '<white>World {world} does not exist.'
+  season-not-exist: '<white>Season {season} does not exist.'