Merge branch 'master' into forge-recipes

NotEnoughUpdates · Nov 20, 2024 · 41400a4 · 41400a4
2 parents 46f59fc + 6c3867c
commit 41400a4
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 62 deletions.
diff --git a/items/GLACITE_GOLEM;3.json b/items/GLACITE_GOLEM;3.json
@@ -34,7 +34,7 @@
     "C3": "FLAWLESS_AQUAMARINE_GEM:1"
   },
   "internalname": "GLACITE_GOLEM;3",
-  "crafttext": "Requires: Glacite IX, 50% Chance",
+  "crafttext": "Requires: Glacite IX, 80% Chance",
   "clickcommand": "viewrecipe",
   "modver": "",
   "infoType": "WIKI_URL",

diff --git a/items/GLACITE_GOLEM;4.json b/items/GLACITE_GOLEM;4.json
@@ -39,7 +39,7 @@
     "C3": "FLAWLESS_AQUAMARINE_GEM:1"
   },
   "internalname": "GLACITE_GOLEM;4",
-  "crafttext": "Requires: Glacite IX, 50% Chance",
+  "crafttext": "Requires: Glacite IX, 20% Chance",
   "clickcommand": "viewrecipe",
   "modver": "",
   "infoType": "WIKI_URL",

diff --git a/items/PEST_BEETLE_MONSTER.json b/items/PEST_BEETLE_MONSTER.json
@@ -29,12 +29,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_NETHER_STALK:1",
-          "extra": [],
-          "chance": "100%"
-        },
-        {
-          "id": "ENCHANTED_BROWN_MUSHROOM:1",
+          "id": "ENCHANTED_NETHER_STALK:3",
           "extra": [],
           "chance": "100%"
         },
@@ -74,14 +69,14 @@
           "chance": "2%"
         },
         {
-          "id": "MUTANT_NETHER_STALK:1",
+          "id": "MUTANT_NETHER_STALK:9",
           "extra": [],
-          "chance": "3%"
+          "chance": "0.5%"
         },
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_CRICKET_MONSTER.json b/items/PEST_CRICKET_MONSTER.json
@@ -30,7 +30,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_CARROT:1",
+          "id": "ENCHANTED_CARROT:3",
           "extra": [],
           "chance": "100%"
         },
@@ -60,9 +60,9 @@
           "chance": "10%"
         },
         {
-          "id": "ENCHANTED_GOLDEN_CARROT:1",
+          "id": "ENCHANTED_GOLDEN_CARROT:12",
           "extra": [],
-          "chance": "3%"
+          "chance": "0.5%"
         },
         {
           "id": "VINYL_CRICKET_CHOIR:1",
@@ -77,7 +77,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_EARTHWORM_MONSTER.json b/items/PEST_EARTHWORM_MONSTER.json
@@ -29,7 +29,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_MELON:1",
+          "id": "ENCHANTED_MELON:5",
           "extra": [],
           "chance": "100%"
         },
@@ -64,9 +64,9 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_MELON_BLOCK:1",
+          "id": "ENCHANTED_MELON_BLOCK:15",
           "extra": [],
-          "chance": "4%"
+          "chance": "0.5%"
         },
         {
           "id": "BOOKWORM_BOOK:1",
@@ -76,7 +76,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_FLY_MONSTER.json b/items/PEST_FLY_MONSTER.json
@@ -30,7 +30,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_HAY_BLOCK:1",
+          "id": "ENCHANTED_WHEAT:1",
           "extra": [],
           "chance": "100%"
         },
@@ -70,14 +70,14 @@
           "chance": "2%"
         },
         {
-          "id": "TIGHTLY_TIED_HAY_BALE:1",
+          "id": "ENCHANTED_HAY_BALE:3",
           "extra": [],
-          "chance": "1%"
+          "chance": "0.5%"
         },
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_LOCUST_MONSTER.json b/items/PEST_LOCUST_MONSTER.json
@@ -30,15 +30,10 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_POTATO:1",
+          "id": "ENCHANTED_POTATO:3",
           "extra": [],
           "chance": "100%"
         },
-        {
-          "id": "ENCHANTED_POISONOUS_POTATO:1",
-          "extra": [],
-          "chance": "5%"
-        },
         {
           "id": "COMPOST:1",
           "extra": [],
@@ -70,19 +65,19 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_BAKED_POTATO:1",
+          "id": "ENCHANTED_BAKED_POTATO:10",
           "extra": [],
-          "chance": "3%"
+          "chance": "0.5%"
         },
         {
           "id": "SUNDER;6:1",
           "extra": [],
-          "chance": "1%"
+          "chance": "0.5%"
         },
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_MITE_MONSTER.json b/items/PEST_MITE_MONSTER.json
@@ -29,7 +29,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_CACTUS_GREEN:1",
+          "id": "ENCHANTED_CACTUS_GREEN:2",
           "extra": [],
           "chance": "100%"
         },
@@ -64,9 +64,9 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_CACTUS:1",
+          "id": "ENCHANTED_CACTUS:6",
           "extra": [],
-          "chance": "2%"
+          "chance": "0.5%"
         },
         {
           "id": "ATMOSPHERIC_FILTER:1",
@@ -76,7 +76,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_MOSQUITO_MONSTER.json b/items/PEST_MOSQUITO_MONSTER.json
@@ -30,7 +30,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_SUGAR:1",
+          "id": "ENCHANTED_SUGAR:2",
           "extra": [],
           "chance": "100%"
         },
@@ -65,9 +65,9 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_SUGAR_CANE:1",
+          "id": "ENCHANTED_SUGAR_CANE:6",
           "extra": [],
-          "chance": "2%"
+          "chance": "0.5%"
         },
         {
           "id": "CLIPPED_WINGS:1",
@@ -77,7 +77,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_MOTH_MONSTER.json b/items/PEST_MOTH_MONSTER.json
@@ -30,7 +30,7 @@
       "type": "drops",
       "drops": [
         {
-          "id": "ENCHANTED_COCOA:1",
+          "id": "ENCHANTED_COCOA:3",
           "extra": [],
           "chance": "100%"
         },
@@ -65,9 +65,9 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_COOKIE:1",
+          "id": "ENCHANTED_COOKIE:11",
           "extra": [],
-          "chance": "3%"
+          "chance": "0.5%"
         },
         {
           "id": "WRIGGLING_LARVA:1",
@@ -77,7 +77,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_RAT_MONSTER.json b/items/PEST_RAT_MONSTER.json
@@ -16,7 +16,7 @@
   "modver": "2.1.1-PRE",
   "infoType": "WIKI_URL",
   "info": [
-    "https://wiki.hypixel.net/Rat(Pest)"
+    "https://wiki.hypixel.net/Rat_(Pest)"
   ],
   "crafttext": "",
   "recipes": [
@@ -65,9 +65,9 @@
           "chance": "2%"
         },
         {
-          "id": "POLISHED_PUMPKIN:1",
+          "id": "POLISHED_PUMPKIN:3",
           "extra": [],
-          "chance": "1%"
+          "chance": "0.5%"
         },
         {
           "id": "RAT;4:1",
@@ -77,7 +77,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/PEST_SLUG_MONSTER.json b/items/PEST_SLUG_MONSTER.json
@@ -70,14 +70,14 @@
           "chance": "2%"
         },
         {
-          "id": "ENCHANTED_HUGE_MUSHROOM_1:1",
+          "id": "ENCHANTED_HUGE_MUSHROOM_1:3",
           "extra": [],
-          "chance": "0.5%"
+          "chance": "0.25%"
         },
         {
-          "id": "ENCHANTED_HUGE_MUSHROOM_2:1",
+          "id": "ENCHANTED_HUGE_MUSHROOM_2:3",
           "extra": [],
-          "chance": "0.5%"
+          "chance": "0.25%"
         },
         {
           "id": "SLUG;3:1",
@@ -92,7 +92,7 @@
         {
           "id": "DYE_DUNG:1",
           "extra": [],
-          "chance": "0.0002%"
+          "chance": "0.0004%"
         }
       ]
     }

diff --git a/items/THEORETICAL_HOE_WHEAT_2.json b/items/THEORETICAL_HOE_WHEAT_2.json
@@ -29,13 +29,13 @@
   ],
   "recipe": {
     "A1": "JACOBS_TICKET:16",
-    "A2": "ENCHANTED_HAY_BLOCK:64",
+    "A2": "ENCHANTED_WHEAT:16",
     "A3": "JACOBS_TICKET:16",
-    "B1": "ENCHANTED_HAY_BLOCK:64",
+    "B1": "ENCHANTED_WHEAT:16",
     "B2": "THEORETICAL_HOE_WHEAT_1:1",
-    "B3": "ENCHANTED_HAY_BLOCK:64",
+    "B3": "ENCHANTED_WHEAT:16",
     "C1": "JACOBS_TICKET:16",
-    "C2": "ENCHANTED_HAY_BLOCK:64",
+    "C2": "ENCHANTED_WHEAT:16",
     "C3": "JACOBS_TICKET:16"
   },
   "internalname": "THEORETICAL_HOE_WHEAT_2",

diff --git a/items/THEORETICAL_HOE_WHEAT_3.json b/items/THEORETICAL_HOE_WHEAT_3.json
@@ -32,13 +32,13 @@
   ],
   "recipe": {
     "A1": "JACOBS_TICKET:64",
-    "A2": "TIGHTLY_TIED_HAY_BALE:16",
+    "A2": "ENCHANTED_HAY_BALE:16",
     "A3": "JACOBS_TICKET:64",
-    "B1": "TIGHTLY_TIED_HAY_BALE:16",
+    "B1": "ENCHANTED_HAY_BALE:16",
     "B2": "THEORETICAL_HOE_WHEAT_2:1",
-    "B3": "TIGHTLY_TIED_HAY_BALE:16",
+    "B3": "ENCHANTED_HAY_BALE:16",
     "C1": "JACOBS_TICKET:64",
-    "C2": "TIGHTLY_TIED_HAY_BALE:16",
+    "C2": "ENCHANTED_HAY_BALE:16",
     "C3": "JACOBS_TICKET:64"
   },
   "internalname": "THEORETICAL_HOE_WHEAT_3",