From 3f12390dd55801301428a63feffd87651f3a4fa2 Mon Sep 17 00:00:00 2001 From: stfwi Date: Tue, 2 Mar 2021 17:00:16 +0100 Subject: [PATCH] Dark Shingle Roof Wire Conduit recipe added. Fixed Ladder climbing (issue #167). --- gradle.properties | 2 +- meta/update.json | 5 ++-- readme.md | 3 +++ .../engineersdecor/blocks/EdLadderBlock.java | 6 +++++ .../dark_shingle_roof_wireconduit_recipe.json | 23 +++++++++++++++++++ .../data/minecraft/tags/blocks/climbable.json | 8 +++++++ 6 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_wireconduit_recipe.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/climbable.json diff --git a/gradle.properties b/gradle.properties index 1d08100..41cac16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.16.4 version_forge_minecraft=1.16.4-35.1.10 version_fml_mappings=20201028-1.16.3 version_jei=1.16.4:7.6.1.63 -version_engineersdecor=1.1.8 +version_engineersdecor=1.1.9 diff --git a/meta/update.json b/meta/update.json index 2221abd..78beca7 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.16.4": { + "1.1.9": "[A] Dark Shingle Roof Wire Conduit recipe added.\n[F] Fixed Ladder climbing (affects forge>=36.0.45, issue #167, thx ZED).", "1.1.8": "[F] Crafting Table Output slot sync rework (issue #138).\n[A] Dark Shingle Roof Wire Conduit added (CFR#347).", "1.1.8-b2": "[F] Fixed Iron Hatch isLadder bug (thx jerryw09).\n[F] Fixed Block Placer block placing pre-conditions (issue #160, ty XFactHD).\n[F] Added explicit scheduled Crafting Table client sync.\n[F] Fixed directional waterloggable block default state forwarding (issue #162, ty b52src).", "1.1.8-b1": "[F] Fluid Funnel waterlogged fluid picking fixed (issue #158, thx ZoMadeStuff).\n[F] Roof rendering fixes (issues #153/#159, thx Salamance73/Murph).\n[A] Recessed Clinkers, Vertically Slit Clinkers, and Structured Vertical Clinker Slab added.", @@ -28,7 +29,7 @@ "1.1.2-b1": "[U] Ported to MC1.16.2." }, "promos": { - "1.16.4-recommended": "1.1.8", - "1.16.4-latest": "1.1.8" + "1.16.4-recommended": "1.1.9", + "1.16.4-latest": "1.1.9" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 6e2475f..2bcb914 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.16.x. ## Version history + - v1.1.9 [A] Dark Shingle Roof Wire Conduit recipe added. + [F] Fixed Ladder climbing (affects forge>=36.0.45, issue #167, thx ZED). + - v1.1.8 [F] Crafting Table Output slot sync rework (issue #138). [A] Dark Shingle Roof Wire Conduit added (CFR#347). diff --git a/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java b/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java index 557c08c..1c3af1b 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java @@ -13,6 +13,8 @@ package wile.engineersdecor.blocks; import net.minecraft.entity.EntitySpawnPlacementRegistry; +import net.minecraft.entity.LivingEntity; +import net.minecraft.world.IWorldReader; import wile.engineersdecor.ModConfig; import wile.engineersdecor.libmc.detail.Auxiliaries; import net.minecraft.entity.EntityType; @@ -86,6 +88,10 @@ public class EdLadderBlock extends LadderBlock implements IDecorBlock public PushReaction getPushReaction(BlockState state) { return PushReaction.NORMAL; } + @Override + public boolean isLadder(BlockState state, IWorldReader world, BlockPos pos, LivingEntity entity) + { return true; } + // Player update event, forwarded from the main mod instance. public static void onPlayerUpdateEvent(final PlayerEntity player) { diff --git a/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_wireconduit_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_wireconduit_recipe.json new file mode 100644 index 0000000..3dc4d36 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_wireconduit_recipe.json @@ -0,0 +1,23 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:dark_shingle_roof_wireconduit", + "required": [ "engineersdecor:dark_shingle_roof_chimneytrunk" ] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:dark_shingle_roof_chimneytrunk" } + ], + "result": { + "item": "engineersdecor:dark_shingle_roof_wireconduit" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/climbable.json b/src/main/resources/data/minecraft/tags/blocks/climbable.json new file mode 100644 index 0000000..e8574b0 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/climbable.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "engineersdecor:metal_rung_ladder", + "engineersdecor:metal_rung_steps", + "engineersdecor:treated_wood_ladder" + ] +} \ No newline at end of file