Merge pull request #88 from GrowthcraftCE/bugfix/multiple-bugs-8.1.0-rc1

Bugfix/multiple bugs 8.1.0 rc1

src/main/java/growthcraft/cellar/block/entity/FruitPressBlockEntity.java

@@ -128,6 +128,7 @@ public void tick() {
     public void tick(Level level, BlockPos blockPos, BlockState blockState, FruitPressBlockEntity blockEntity) {
         if(!level.isClientSide
                 && level.getBlockState(blockPos.above()).getValue(PRESSED)
+                && this.isFluidTankNotFull()
         ) {
             List<FruitPressRecipe> recipes = this.getMatchingRecipes();
             FruitPressRecipe recipe = recipes.isEmpty() ? null : recipes.get(0);
@@ -202,6 +203,10 @@ public boolean isFluidEmpty() {
         return getFluidStackInTank(0).isEmpty();
     }
 
+    public boolean isFluidTankNotFull() {
+        return getFluidTank(0).getFluidAmount() < getFluidTank(0).getCapacity();
+    }
+
     public int getTickClock(String type) {
         switch (type) {
             case "current":

src/main/resources/assets/growthcraft_apples/lang/en_us.json

@@ -19,8 +19,8 @@
   "block.growthcraft_apples.apple_wood_log_stripped": "Stripped Apple Log",
   "block.growthcraft_apples.apple_wood_stripped": "Stripped Apple Wood",
   "block.growthcraft_apples.bee_box_apple": "Bee Box (Apple)",
-  "fluid_type.growthcraft_apples:apple_cider_fluid": "Apple Cider",
-  "fluid_type.growthcraft_apples:apple_juice_fluid": "Apple Juice",
+  "fluid_type.growthcraft_apples.apple_cider_fluid": "Apple Cider",
+  "fluid_type.growthcraft_apples.apple_juice_fluid": "Apple Juice",
   "item.growthcraft_apples.apple_cider_fluid_bucket": "Apple Cider Bucket",
   "item.growthcraft_apples.apple_juice_fluid_bucket": "Apple Juice Bucket",
   "item.growthcraft_apples.apple_seeds": "Apple Seeds"

src/main/resources/data/growthcraft_apples/recipes/bee_box_apple_plank.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SPS",
+    "PBP",
+    "SPS"
+  ],
+  "key": {
+    "B": {
+      "item": "growthcraft_apples:apple_plank_slab"
+    },
+    "P": {
+      "item": "growthcraft_apples:apple_plank"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "growthcraft_apples:bee_box_apple"
+  }
+}

src/main/resources/data/growthcraft_bamboo/recipes/bee_box_bamboo.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SPS",
+    "PBP",
+    "SPS"
+  ],
+  "key": {
+    "B": {
+      "item": "growthcraft_bamboo:bamboo_plank_slab"
+    },
+    "P": {
+      "item": "growthcraft_bamboo:bamboo_plank"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "growthcraft_bamboo:bee_box_bamboo"
+  }
+}

src/main/resources/data/growthcraft_cellar/loot_tables/blocks/fermentation_barrel_oak.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "growthcraft_cellar:fermentation_barrel_oak"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/growthcraft_cellar/loot_tables/blocks/roaster.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "growthcraft_cellar:roaster"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/growthcraft_cellar/recipes/brew_kettle_hopped_golden_wort.json

@@ -0,0 +1,23 @@
+{
+  "type": "growthcraft_cellar:brew_kettle_recipe",
+  "requires_heat": true,
+  "requires_lid": "false",
+  "processing_time": 600,
+  "by_product_chance": 10,
+  "input_fluid": {
+    "fluid": "growthcraft_cellar:golden_wort_fluid_source",
+    "amount": 250
+  },
+  "input_item": {
+    "item": "growthcraft_cellar:hops",
+    "count": 1
+  },
+  "output_fluid": {
+    "fluid": "growthcraft_cellar:hopped_golden_wort_fluid_source",
+    "amount": 250
+  },
+  "by_product": {
+    "item": "minecraft:bone_meal",
+    "count": 1
+  }
+}

src/main/resources/data/growthcraft_cellar/recipes/brown_ale_fermentation.json

@@ -1,6 +1,6 @@
 {
   "type": "growthcraft_cellar:fermentation_barrel_recipe",
-  "processing_time": 72000,
+  "processing_time": 7200,
   "ingredient_item": {
     "item": "growthcraft_cellar:yeast_brewers",
     "count": 1
@@ -16,7 +16,7 @@
   "effects": [
     {
       "effect": "minecraft:haste",
-      "duration": 72000,
+      "duration": 7200,
       "amplifier": 3
     }
   ],

src/main/resources/data/growthcraft_cellar/recipes/fruit_press.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "ABA",
+    "CCC",
+    "DDD"
+  ],
+  "key": {
+    "A": {
+      "tag": "minecraft:fences"
+    },
+    "B": {
+      "item": "minecraft:piston"
+    },
+    "C": {
+      "tag": "forge:ingots/iron"
+    },
+    "D": {
+      "tag": "minecraft:planks"
+    }
+  },
+  "result": {
+    "item": "growthcraft_cellar:fruit_press"
+  }
+}

src/main/resources/data/growthcraft_cellar/recipes/ipa_ale_fermentation.json

@@ -1,12 +1,12 @@
 {
   "type": "growthcraft_cellar:fermentation_barrel_recipe",
-  "processing_time": 120,
+  "processing_time": 3600,
   "ingredient_item": {
     "item": "growthcraft_cellar:yeast_brewers",
     "count": 1
   },
   "ingredient_fluid": {
-    "fluid": "growthcraft_cellar:golden_wort_fluid_source",
+    "fluid": "growthcraft_cellar:hopped_golden_wort_fluid_source",
     "amount": 1000
   },
   "result": {
@@ -16,7 +16,7 @@
   "effects": [
     {
       "effect": "minecraft:regeneration",
-      "duration": 120,
+      "duration": 3600,
       "amplifier": 1
     }
   ],

src/main/resources/data/growthcraft_milk/recipes/salted_butter.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "growthcraft_milk:butter"
+    },
+    {
+      "item": "growthcraft:salt"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "item": "growthcraft_milk:butter_salted"
+  }
+}

src/main/resources/data/growthcraft_rice/recipes/knife.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "  I",
+    " I ",
+    "S  "
+  ],
+  "key": {
+    "I": {
+      "tag": "forge:ingots/iron"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "growthcraft_rice:knife"
+  }
+}

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -7,6 +7,7 @@
     "growthcraft_cellar:fruit_press",
     "growthcraft_cellar:fruit_press_piston",
     "growthcraft_cellar:brew_kettle",
-    "growthcraft_milk:mixing_vat"
+    "growthcraft_milk:mixing_vat",
+    "growthcraft_cellar:roaster"
   ]
 }