diff --git a/readme.md b/readme.md index 27ae7bb..8800f21 100644 --- a/readme.md +++ b/readme.md @@ -20,6 +20,7 @@ Mod sources for Minecraft version 1.16.x. [A] Added Solar Panel power balancing. [M] GUI Button tooltip delay reduced to 800ms. [M] Hopper and Placer: Added "Redstone ignored" mode, changed icons from signal-like to Redstone-Torch-like. + [M] Treated Wood Ladder now crafted from Old Industrial Wood, as Treated Wood Sticks now count as normal Sticks. - v1.1.4-b1 [U] Ported to 1.16.4. diff --git a/src/main/java/wile/engineersdecor/blocks/EdMilker.java b/src/main/java/wile/engineersdecor/blocks/EdMilker.java index 856bd1e..94683e7 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdMilker.java +++ b/src/main/java/wile/engineersdecor/blocks/EdMilker.java @@ -581,9 +581,9 @@ public class EdMilker } } // Adjacent inventory update, only done just after milking to prevent waste of server cpu. - if((!dirty) && (fluid_level() >= BUCKET_SIZE)) { + if((!dirty) && (fluid_level() > 0)) { log("Try item transfer"); - if(fill_adjacent_tank() || fill_adjacent_inventory_item_containers(block_state.get(MilkerBlock.HORIZONTAL_FACING))) dirty = true; + if(fill_adjacent_tank() || ((fluid_level() >= BUCKET_SIZE) && fill_adjacent_inventory_item_containers(block_state.get(MilkerBlock.HORIZONTAL_FACING)))) dirty = true; } } // State update diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/treated_wood_ladder_recipe.json similarity index 89% rename from src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json rename to src/main/resources/data/engineersdecor/recipes/independent/treated_wood_ladder_recipe.json index 445f3b4..82d9dd5 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/independent/treated_wood_ladder_recipe.json @@ -1,30 +1,6 @@ { "type": "forge:conditional", "recipes": [ - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:treated_wood_ladder", - "required": ["#forge:rods/treated_wood"] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "S S", - "SSS", - "S S" - ], - "key": { - "S": { "tag": "forge:rods/treated_wood"} - }, - "result": { - "item": "engineersdecor:treated_wood_ladder", - "count": 3 - } - } - }, { "conditions": [ { @@ -48,6 +24,30 @@ "count": 6 } } + }, + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:treated_wood_ladder", + "required": ["minecraft:ladder"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "S S" + ], + "key": { + "S": { "item": "minecraft:ladder"} + }, + "result": { + "item": "engineersdecor:treated_wood_ladder", + "count": 7 + } + } } ] } \ No newline at end of file