Texture Changes & Bug Fixes

Many texture changes Many bug fixes
jaoreir · Aug 1, 2022 · bcb4eef · bcb4eef
1 parent 017ed65
commit bcb4eef
Show file tree

Hide file tree

Showing 40 changed files with 32 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -187,6 +187,7 @@ dependencies {
 
     //implementation fg.deobf("curse.maven:abnormals-core:3457851")
     implementation fg.deobf("curse.maven:farmersdelight-398521:3765351")
+    runtimeOnly fg.deobf("curse.maven:brewinandchewin-637808:3854764")
     runtimeOnly fg.deobf("curse.maven:appleskin-248787:3686482")
 
 

diff --git a/src/main/resources/assets/culturaldelights/textures/block/avocado_sapling.png b/src/main/resources/assets/culturaldelights/textures/block/avocado_sapling.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_stage0.png b/src/main/resources/assets/culturaldelights/textures/block/corn_stage0.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_stage1.png b/src/main/resources/assets/culturaldelights/textures/block/corn_stage1.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_stage2.png b/src/main/resources/assets/culturaldelights/textures/block/corn_stage2.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_stage3.png b/src/main/resources/assets/culturaldelights/textures/block/corn_stage3.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_supporting.png b/src/main/resources/assets/culturaldelights/textures/block/corn_supporting.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage0.png b/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage0.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage1.png b/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage1.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage2.png b/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage2.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage3.png b/src/main/resources/assets/culturaldelights/textures/block/corn_upper_stage3.png
diff --git a/src/main/resources/assets/culturaldelights/textures/block/wild_corn.png b/src/main/resources/assets/culturaldelights/textures/block/wild_corn.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/avocado.png b/src/main/resources/assets/culturaldelights/textures/item/avocado.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/corn_dough.png b/src/main/resources/assets/culturaldelights/textures/item/corn_dough.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/cucumber_seeds.png b/src/main/resources/assets/culturaldelights/textures/item/cucumber_seeds.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/cut_avocado.png b/src/main/resources/assets/culturaldelights/textures/item/cut_avocado.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/eggplant_seeds.png b/src/main/resources/assets/culturaldelights/textures/item/eggplant_seeds.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/mutton_sandwich.png b/src/main/resources/assets/culturaldelights/textures/item/mutton_sandwich.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/pickle.png b/src/main/resources/assets/culturaldelights/textures/item/pickle.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/tortilla_chips.png b/src/main/resources/assets/culturaldelights/textures/item/tortilla_chips.png
diff --git a/src/main/resources/assets/culturaldelights/textures/item/white_eggplant_seeds.png b/src/main/resources/assets/culturaldelights/textures/item/white_eggplant_seeds.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado_toast.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/avocado_toast.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/cod_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/cod_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/cucumber.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/cucumber.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/cucumber_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/cucumber_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/cut_avocado.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/cut_avocado.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/cut_cucumber.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/cut_cucumber.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/koi_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/koi_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/lionfish_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/lionfish_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/onigiri.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/onigiri.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/perch_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/perch_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/pike_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/pike_sushi.png
diff --git a/...main/resources/assets/culturaldelights/textures/pickle.png/pufferfish_sushi.png b/...main/resources/assets/culturaldelights/textures/pickle.png/pufferfish_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/salmon_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/salmon_sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/sushi.png
diff --git a/src/main/resources/assets/culturaldelights/textures/pickle.png/tropical_sushi.png b/src/main/resources/assets/culturaldelights/textures/pickle.png/tropical_sushi.png
diff --git a/src/main/resources/data/culturaldelights/advancements/pickle.json b/src/main/resources/data/culturaldelights/advancements/pickle.json
@@ -5,7 +5,7 @@
       "item": "culturaldelights:pickle"
     },
     "title": "Funniest thing I've ever seen!",
-    "description": "Obtain a pickle through pickling",
+    "description": "Pickle a cucumber in the fermenter",
     "frame": "task",
     "show_toast": true,
     "announce_to_chat": true,
@@ -17,7 +17,9 @@
       "conditions": {
         "items": [
           {
-            "item": "culturaldelights:pickle"
+            "items": [
+	      "culturaldelights:pickle"
+ 	    ]
           }
         ]
       }

diff --git a/src/main/resources/data/culturaldelights/recipes/fermenting/pickle.json b/src/main/resources/data/culturaldelights/recipes/fermenting/pickle.json
@@ -0,0 +1,27 @@
+{
+  "type": "brewinandchewin:fermenting",
+  "ingredients": [
+    {
+      "item": "culturaldelights:cucumber"
+    },
+    {
+      "item": "culturaldelights:cucumber"
+    },
+    {
+      "item": "culturaldelights:cucumber"
+    },
+    {
+      "item": "culturaldelights:cucumber"
+    }
+  ],
+  "result": {
+    "item": "culturaldelights:pickle",
+    "count": 4
+  },
+  "liquid": {
+    "item": "farmersdelight:apple_cider"
+  },
+  "experience": 0.6,
+  "cookingtime": 12000,
+  "temperature": 3
+}