From 41128fcf26364c9cddc48dcbd4606633b91bebd3 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:15:50 -0800 Subject: [PATCH] Ex Deorum 1.16 --- build.gradle | 2 +- changelog.md | 8 ++++++-- .../.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 | 4 ++-- .../data/minecraft/tags/blocks/mineable/pickaxe.json | 3 ++- .../exdeorum/blockentity/BarrelBlockEntity.java | 1 + src/main/java/thedarkcolour/exdeorum/data/ModTags.java | 2 +- .../java/thedarkcolour/exdeorum/registry/EBlocks.java | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index dd5b730e..98a4f78b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'org.spongepowered.mixin' version '0.7.+' } -version = '1.15' +version = '1.16' group = 'thedarkcolour.exdeorum' base { archivesName = 'exdeorum' diff --git a/changelog.md b/changelog.md index f22746af..c89c4321 100644 --- a/changelog.md +++ b/changelog.md @@ -1,10 +1,14 @@ -## Ex Deorum 1.16 +## Ex Deorum 1.17 - Added Mechanical Hammer, a machine that uses FE to hammer blocks automatically. Uses 20 FE a tick by default and takes 200 ticks (10 seconds) to hammer an item with a hammer that has no efficiency. +## Ex Deorum 1.16 +- Fixed barrels not correctly rendering their fluid contents when modified by pipes. +- Fixed Mechanical Sieve being instantly breakable with no tool. Now requires a pickaxe to destroy, like machines added by other mods. + ## Ex Deorum 1.15 - Fixed not being able to enchant sieve meshes in the Enchanting Table. - Fixed Barrels not rendering their contents properly -- Fixed Inventory Sorter by voxcpw voiding items when middle clicking slots in the Mechanical Sieve GUI. +- Fixed Inventory Sorter by voxcpw voiding items when middle-clicking slots in the Mechanical Sieve GUI. - Improved appearance of witch water to better match water so that the transformation animation looks smoother. ## Ex Deorum 1.14 diff --git a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 index 78a62835..86c795d3 100644 --- a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 +++ b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 @@ -1,7 +1,7 @@ -// 1.20.1 2023-11-25T21:07:59.265727 Tags for minecraft:block mod id exdeorum +// 1.20.1 2024-01-16T13:09:09.030463 Tags for minecraft:block mod id exdeorum 77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/blocks/watering_can_tickable.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/blocks/leaves.json 6118dd1a976e5c95335fe0271c784eef3dac5bf5 data/minecraft/tags/blocks/mineable/axe.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/blocks/mineable/hoe.json -bfedafec4139f53d4f5af45596fe448d134c86eb data/minecraft/tags/blocks/mineable/pickaxe.json +04df8bfadf9a85eec21f001c37015bf49fb3c95c data/minecraft/tags/blocks/mineable/pickaxe.json 0fc927ffe01dd23fd511dea057c7894680ae9807 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 46e67f2f..0c67ae07 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -5,6 +5,7 @@ "exdeorum:unfired_porcelain_crucible", "exdeorum:crystallized_barrel", "exdeorum:crystallized_crucible", - "exdeorum:crystallized_sieve" + "exdeorum:crystallized_sieve", + "exdeorum:mechanical_sieve" ] } \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java index a121bdba..18cdf4d2 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java @@ -602,6 +602,7 @@ public class BarrelBlockEntity extends EBlockEntity { protected void onContentsChanged() { if (!BarrelBlockEntity.this.isBeingFilledByPlayer) { BarrelBlockEntity.this.tryInWorldFluidMixing(); + BarrelBlockEntity.this.markUpdated(); } } } diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java index 9e8a28c2..9f61b9fd 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java @@ -80,7 +80,7 @@ class ModTags { // Blue Skies crucibles EBlocks.BLUEBRIGHT_CRUCIBLE.get(), EBlocks.STARLIT_CRUCIBLE.get(), EBlocks.FROSTBRIGHT_CRUCIBLE.get(), EBlocks.COMET_CRUCIBLE.get(), EBlocks.LUNAR_CRUCIBLE.get(), EBlocks.DUSK_CRUCIBLE.get(), EBlocks.MAPLE_CRUCIBLE.get() ); - tags.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(EBlocks.STONE_BARREL, EBlocks.PORCELAIN_CRUCIBLE, EBlocks.UNFIRED_PORCELAIN_CRUCIBLE, EBlocks.CRYSTALLIZED_BARREL, EBlocks.CRYSTALLIZED_CRUCIBLE, EBlocks.CRYSTALLIZED_SIEVE); + tags.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(EBlocks.STONE_BARREL, EBlocks.PORCELAIN_CRUCIBLE, EBlocks.UNFIRED_PORCELAIN_CRUCIBLE, EBlocks.CRYSTALLIZED_BARREL, EBlocks.CRYSTALLIZED_CRUCIBLE, EBlocks.CRYSTALLIZED_SIEVE, EBlocks.MECHANICAL_SIEVE); tags.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(EBlocks.DUST, EBlocks.CRUSHED_NETHERRACK, EBlocks.CRUSHED_END_STONE, EBlocks.CRUSHED_DEEPSLATE, EBlocks.CRUSHED_BLACKSTONE); tags.tag(BlockTags.MINEABLE_WITH_HOE).add(EBlocks.INFESTED_LEAVES); tags.tag(BlockTags.LEAVES).add(EBlocks.INFESTED_LEAVES); diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java index b300b0bf..1c62f472 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java @@ -119,8 +119,8 @@ public class EBlocks { public static final RegistryObject DUSK_SIEVE = registerSieve("dusk_sieve"); public static final RegistryObject MAPLE_SIEVE = registerSieve("maple_sieve"); public static final RegistryObject CRYSTALLIZED_SIEVE = registerSieve("crystallized_sieve", SoundType.GLASS); - // Mechanical Sieve (todo add properties) - public static final RegistryObject MECHANICAL_SIEVE = BLOCKS.register("mechanical_sieve", () -> new MechanicalSieveBlock(of())); + // Mechanical Sieve + public static final RegistryObject MECHANICAL_SIEVE = BLOCKS.register("mechanical_sieve", () -> new MechanicalSieveBlock(of().mapColor(MapColor.METAL).requiresCorrectToolForDrops().strength(5f, 1200f))); // Lava Crucibles public static final RegistryObject PORCELAIN_CRUCIBLE = registerLavaCrucible("porcelain_crucible", true, SoundType.STONE);