diff --git a/resources/assets.py b/resources/assets.py index 981f3efd..ac2cbd8c 100644 --- a/resources/assets.py +++ b/resources/assets.py @@ -87,7 +87,7 @@ def generate(rm: ResourceManager): tex = 'firmalife:block/%s_%s' % (trd, variant) rm.block_model('firmalife:%s_%s' % (trd, variant), {'west': tex, 'east': tex, 'north': tex, 'south': tex, 'particle': tex, 'up': 'firmalife:block/%s_top' % trd, 'down': 'firmalife:block/%s_top' % trd}) - rm.blockstate('sprinkler', model='firmalife:block/sprinkler').with_lang(lang('sprinkler')).with_tag('minecraft:mineable/pickaxe').with_block_loot('firmalfie:sprinkler') + rm.blockstate('sprinkler', model='firmalife:block/sprinkler').with_lang(lang('sprinkler')).with_tag('minecraft:mineable/pickaxe').with_block_loot('firmalife:sprinkler') rm.item_model('sprinkler', parent='firmalife:block/sprinkler') rm.blockstate('beehive', variants={ diff --git a/src/main/java/com/eerussianguy/firmalife/common/blockentities/LargePlanterBlockEntity.java b/src/main/java/com/eerussianguy/firmalife/common/blockentities/LargePlanterBlockEntity.java index 6be6a8b8..0b8023da 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blockentities/LargePlanterBlockEntity.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blockentities/LargePlanterBlockEntity.java @@ -280,7 +280,7 @@ public void setAndUpdateSlots(int slot) public boolean addWater(float amount) { assert level != null; - if (water < 1f) + if (water < 0.99f) { water = Math.min(water + amount, 1f); updateBlockState(level.getBlockState(worldPosition)); diff --git a/src/main/resources/data/firmalife/loot_tables/blocks/sprinkler.json b/src/main/resources/data/firmalife/loot_tables/blocks/sprinkler.json index a46b4455..e683602c 100644 --- a/src/main/resources/data/firmalife/loot_tables/blocks/sprinkler.json +++ b/src/main/resources/data/firmalife/loot_tables/blocks/sprinkler.json @@ -8,7 +8,7 @@ "entries": [ { "type": "minecraft:item", - "name": "firmalfie:sprinkler" + "name": "firmalife:sprinkler" } ], "conditions": [