Fix bug & Add something

Add: - Attached Pumpkin Stem - Pumpkin Stem - Attached Melon Stem - Melon Stem
davidmayr · Dec 19, 2023 · 595dd0a · 595dd0a
1 parent ef1b7d1
commit 595dd0a
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 2 deletions.
diff --git a/src/main/java/cm/ptks/craftflowers/flower/FlowerRegistry.java b/src/main/java/cm/ptks/craftflowers/flower/FlowerRegistry.java
@@ -272,6 +272,32 @@ public class FlowerRegistry {
                 new AgingFlower(Material.CARROT, Messages.FLOWER.CARROT, Material.CARROTS, 7)
         )));
 
+        registerFlower(new Flower(Material.PUMPKIN_SEEDS,Messages.FLOWER.ATTACHED_PUMPKIN_STEM,Material.ATTACHED_PUMPKIN_STEM));
+
+        registerFlower(new FlowerGroup(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Arrays.asList(
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,0),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,1),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,2),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,3),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,4),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,5),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,6),
+                new AgingFlower(Material.PUMPKIN_SEEDS,Messages.FLOWER.PUMPKIN_STEM,Material.PUMPKIN_STEM,7)
+        )));
+
+        registerFlower(new Flower(Material.MELON_SEEDS,Messages.FLOWER.ATTACHED_MELON_STEM,Material.ATTACHED_MELON_STEM));
+
+        registerFlower(new FlowerGroup(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Arrays.asList(
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,0),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,1),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,2),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,3),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,4),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,5),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,6),
+                new AgingFlower(Material.MELON_SEEDS,Messages.FLOWER.MELON_STEM,Material.MELON_STEM,7)
+        )));
+
         if (isValidMaterial("SWEET_BERRY_BUSH")){
             registerFlower(new FlowerGroup(Material.SWEET_BERRIES,Messages.FLOWER.SWEET_BERRY_BUSH, Arrays.asList(
                     new AgingFlower(Material.SWEET_BERRIES, Messages.FLOWER.SWEET_BERRY_BUSH, Material.SWEET_BERRY_BUSH,0),

diff --git a/src/main/java/cm/ptks/craftflowers/languages/Messages.java b/src/main/java/cm/ptks/craftflowers/languages/Messages.java
@@ -188,6 +188,10 @@ public final static class FLOWER {
         public static final String WHEAT = "FLOWER.WHEAT";
         public static final String POTATO = "FLOWER.POTATO";
         public static final String CARROT = "FLOWER.CARROT";
+        public static final String ATTACHED_PUMPKIN_STEM = "FLOWER.ATTACHED_PUMPKIN_STEM";
+        public static final String PUMPKIN_STEM = "FLOWER.PUMPKIN_STEM";
+        public static final String ATTACHED_MELON_STEM = "FLOWER.ATTACHED_MELON_STEM";
+        public static final String MELON_STEM = "FLOWER.MELON_STEM";
 
         public static final String SWEET_BERRY_BUSH = "FLOWER.SWEET_BERRY_BUSH";
 

diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml
@@ -204,7 +204,34 @@ FLOWER:
     CARROT_6: "§2Carrot"
     CARROT_7: "§2Carrot"
 
-  SWEET_BERRY_BUSH:
+  ATTACHED_PUMPKIN_STEM: "§2Attached Pumpkin Stem"
+
+  PUMPKIN_STEM: "§2Pumpkin Stem"
+  PUMPKIN_STEM_AGE:
+    PUMPKIN_STEM_0: "§2Pumpkin Stem"
+    PUMPKIN_STEM_1: "§2Pumpkin Stem"
+    PUMPKIN_STEM_2: "§2Pumpkin Stem"
+    PUMPKIN_STEM_3: "§2Pumpkin Stem"
+    PUMPKIN_STEM_4: "§2Pumpkin Stem"
+    PUMPKIN_STEM_5: "§2Pumpkin Stem"
+    PUMPKIN_STEM_6: "§2Pumpkin Stem"
+    PUMPKIN_STEM_7: "§2Pumpkin Stem"
+
+  ATTACHED_MELON_STEM: "§2Attached Melon Stem"
+
+  MELON_STEM: "§2Melon Stem"
+  MELON_STEM_AGE:
+    MELOM_STEM_0: "§2Melon Stem"
+    MELOM_STEM_1: "§2Melon Stem"
+    MELOM_STEM_2: "§2Melon Stem"
+    MELOM_STEM_3: "§2Melon Stem"
+    MELON_STEM_4: "§2Melon Stem"
+    MELON_STEM_5: "§2Melon Stem"
+    MELON_STEM_6: "§2Melon Stem"
+    MELON_STEM_7: "§2Melon Stem"
+
+  SWEET_BERRY_BUSH: "§2Sweet Berry Bush"
+  SWEET_BERRY_BUSH_AGE:
     SWEET_BERRY_BUSH_0: "§2Sweet Berry Bush"
     SWEET_BERRY_BUSH_1: "§2Sweet Berry Bush"
     SWEET_BERRY_BUSH_2: "§2Sweet Berry Bush"

diff --git a/src/main/resources/lang/zh_tw.yml b/src/main/resources/lang/zh_tw.yml
@@ -207,7 +207,34 @@ FLOWER:
     CARROT_6: "§2胡蘿蔔"
     CARROT_7: "§2胡蘿蔔"
 
-  SWEET_BERRY_BUSH:
+  ATTACHED_PUMPKIN_STEM: "§2Attached Pumpkin Stem"
+
+  PUMPKIN_STEM: "§2Pumpkin Stem"
+  PUMPKIN_STEM_AGE:
+    PUMPKIN_STEM_0: "§2Pumpkin Stem"
+    PUMPKIN_STEM_1: "§2Pumpkin Stem"
+    PUMPKIN_STEM_2: "§2Pumpkin Stem"
+    PUMPKIN_STEM_3: "§2Pumpkin Stem"
+    PUMPKIN_STEM_4: "§2Pumpkin Stem"
+    PUMPKIN_STEM_5: "§2Pumpkin Stem"
+    PUMPKIN_STEM_6: "§2Pumpkin Stem"
+    PUMPKIN_STEM_7: "§2Pumpkin Stem"
+
+  ATTACHED_MELON_STEM: "§2Attached Melon Stem"
+
+  ELON_STEM: "§2Melon Stem"
+  MELON_STEM_AGE:
+    MELON_STEM_0: "§2Melon Stem"
+    MELON_STEM_1: "§2Melon Stem"
+    MELON_STEM_2: "§2Melon Stem"
+    MELON_STEM_3: "§2Melon Stem"
+    MELON_STEM_4: "§2Melon Stem"
+    MELON_STEM_5: "§2Melon Stem"
+    MELON_STEM_6: "§2Melon Stem"
+    MELON_STEM_7: "§2Melon Stem"
+
+  SWEET_BERRY_BUSH: "§2Sweet Berry Bush"
+  SWEET_BERRY_BUSH_AGE:
     SWEET_BERRY_BUSH_0: "§2甜莓灌木叢"
     SWEET_BERRY_BUSH_1: "§2甜莓灌木叢"
     SWEET_BERRY_BUSH_2: "§2甜莓灌木叢"