From 6db763ed5d7f0cc23e08c5b2d8c090b44f5717f0 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 16 Apr 2021 01:13:46 +0200 Subject: [PATCH] Seat-hopping into oblivion - Fixed Seat interaction being too restrictive with max reach - Contraption seats can no longer be mounted while riding something else --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 2 +- src/generated/resources/assets/create/sounds.json | 2 +- src/main/java/com/simibubi/create/AllSoundEvents.java | 4 ++-- src/main/java/com/simibubi/create/Create.java | 2 +- .../components/press/MechanicalPressTileEntity.java | 2 +- .../structureMovement/ContraptionHandlerClient.java | 2 ++ .../structureMovement/sync/ContraptionInteractionPacket.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index cb210473c..6f4a1d878 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # mod version info -mod_version=0.3.1b +mod_version=0.3.1c minecraft_version=1.16.5 forge_version=36.0.42 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 25603aa31..dc18e2d28 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1648,7 +1648,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear 866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json -56fa207f8d0d76e0435252d13dbe4b967c61aa89 assets/create/sounds.json +f98bf9f870ac5ee5b31c12a20739773c5fee4949 assets/create/sounds.json 5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json diff --git a/src/generated/resources/assets/create/sounds.json b/src/generated/resources/assets/create/sounds.json index f53419501..bfba50746 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -38,7 +38,7 @@ "mechanical_press_activation": { "sounds": [ { - "name": "minecraft:block.netherite_block.hit", + "name": "minecraft:block.anvil.land", "type": "event" } ], diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index 721bdc982..78e387233 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -51,8 +51,8 @@ public class AllSoundEvents { .build(), MECHANICAL_PRESS_ACTIVATION = create("mechanical_press_activation").subtitle("Mechanical Press clangs") - .playExisting(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT, .5f, 1.25f) - .playExisting(SoundEvents.ENTITY_ITEM_BREAK, .15f, .75f) + .playExisting(SoundEvents.BLOCK_ANVIL_LAND, .125f, 1f) + .playExisting(SoundEvents.ENTITY_ITEM_BREAK, .5f, 1f) .category(SoundCategory.BLOCKS) .build(), diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 6cd979ead..8880d98f4 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -55,7 +55,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.3.1b"; + public static final String VERSION = "0.3.1c"; public static Logger logger = LogManager.getLogger(); public static ItemGroup baseCreativeTab = new CreateItemGroup(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java index 5ff38295f..e840bc3ae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java @@ -186,7 +186,7 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity { if (world.getBlockState(pos.down(2)).getSoundType() == SoundType.CLOTH) AllSoundEvents.MECHANICAL_PRESS_ACTIVATION_ON_BELT.playOnServer(world, pos); else - AllSoundEvents.MECHANICAL_PRESS_ACTIVATION.playOnServer(world, pos); + AllSoundEvents.MECHANICAL_PRESS_ACTIVATION.playOnServer(world, pos, .5f, .75f + (Math.abs(getSpeed()) / 1024f)); if (!world.isRemote) sendData(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java index f3b6d2d29..3ab9bb670 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandlerClient.java @@ -63,6 +63,8 @@ public class ContraptionHandlerClient { ClientPlayerEntity player = mc.player; if (player == null) return; + if (player.isPassenger()) + return; if (mc.world == null) return; if (!event.isUseItem()) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java index aa286757c..1120719d6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/sync/ContraptionInteractionPacket.java @@ -54,7 +54,7 @@ public class ContraptionInteractionPacket extends SimplePacketBase { if (!(entityByID instanceof AbstractContraptionEntity)) return; AbstractContraptionEntity contraptionEntity = (AbstractContraptionEntity) entityByID; - double d = sender.getAttribute(ForgeMod.REACH_DISTANCE.get()).getValue(); + double d = sender.getAttribute(ForgeMod.REACH_DISTANCE.get()).getValue() + 10; if (!sender.canEntityBeSeen(entityByID)) d -= 3; d *= d; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4a93dd067..3c8e798a7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -15,7 +15,7 @@ Technology that empowers the player.''' [[dependencies.create]] modId="forge" mandatory=true - versionRange="[34.0.0,)" + versionRange="[35.1.16,)" ordering="NONE" side="BOTH"