From d835a8be01e0b83ca9f7e63e15a7abddd3db9bde Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 13 Nov 2020 17:19:05 +0000 Subject: [PATCH] CableElectrocutionEvent --- .../api/events/CableElectrocutionEvent.java | 53 +++++++++++++++++++ .../techreborn/blocks/cable/CableBlock.java | 21 +++++--- 2 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 src/main/java/techreborn/api/events/CableElectrocutionEvent.java diff --git a/src/main/java/techreborn/api/events/CableElectrocutionEvent.java b/src/main/java/techreborn/api/events/CableElectrocutionEvent.java new file mode 100644 index 000000000..d7f8ad3c3 --- /dev/null +++ b/src/main/java/techreborn/api/events/CableElectrocutionEvent.java @@ -0,0 +1,53 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2020 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package techreborn.api.events; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.entity.LivingEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import techreborn.blockentity.cable.CableBlockEntity; +import techreborn.init.TRContent; + +public interface CableElectrocutionEvent { + Event EVENT = EventFactory.createArrayBacked(CableElectrocutionEvent.class, (listeners) -> + (livingEntity, cableType, blockPos, world, cableBlockEntity) -> { + for (CableElectrocutionEvent listener : listeners) { + if (!listener.electrocute(livingEntity, cableType, blockPos, world, cableBlockEntity)) { + return false; + } + } + return true; + } + ); + + /** + * Fired before an entity is electrocuted + * + * @return true to electrocute the entity (if not other listeners return false), false to do nothing + */ + boolean electrocute(LivingEntity livingEntity, TRContent.Cables cableType, BlockPos blockPos, World world, CableBlockEntity cableBlockEntity); +} diff --git a/src/main/java/techreborn/blocks/cable/CableBlock.java b/src/main/java/techreborn/blocks/cable/CableBlock.java index 7f63880eb..282cac742 100644 --- a/src/main/java/techreborn/blocks/cable/CableBlock.java +++ b/src/main/java/techreborn/blocks/cable/CableBlock.java @@ -56,6 +56,7 @@ import reborncore.api.ToolManager; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; import team.reborn.energy.Energy; +import techreborn.api.events.CableElectrocutionEvent; import techreborn.blockentity.cable.CableBlockEntity; import techreborn.config.TechRebornConfig; import techreborn.init.ModSounds; @@ -229,16 +230,16 @@ public class CableBlock extends BlockWithEntity implements Waterloggable { @SuppressWarnings("deprecation") @Override - public void onEntityCollision(BlockState state, World worldIn, BlockPos pos, Entity entityIn) { - super.onEntityCollision(state, worldIn, pos, entityIn); + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + super.onEntityCollision(state, world, pos, entity); if (!type.canKill) { return; } - if (!(entityIn instanceof LivingEntity)) { + if (!(entity instanceof LivingEntity)) { return; } - BlockEntity blockEntity = worldIn.getBlockEntity(pos); + BlockEntity blockEntity = world.getBlockEntity(pos); if (blockEntity == null) { return; } @@ -251,19 +252,23 @@ public class CableBlock extends BlockWithEntity implements Waterloggable { return; } + if (!CableElectrocutionEvent.EVENT.invoker().electrocute((LivingEntity) entity, type, pos, world, blockEntityCable)) { + return; + } + if (TechRebornConfig.uninsulatedElectrocutionDamage) { if (type == TRContent.Cables.HV) { - entityIn.setOnFireFor(1); + entity.setOnFireFor(1); } - entityIn.damage(new ElectrialShockSource(), 1F); + entity.damage(new ElectrialShockSource(), 1F); blockEntityCable.setEnergy(0d); } if (TechRebornConfig.uninsulatedElectrocutionSound) { - worldIn.playSound(null, entityIn.getX(), entityIn.getY(), entityIn.getZ(), ModSounds.CABLE_SHOCK, SoundCategory.BLOCKS, + world.playSound(null, entity.getX(), entity.getY(), entity.getZ(), ModSounds.CABLE_SHOCK, SoundCategory.BLOCKS, 0.6F, 1F); } if (TechRebornConfig.uninsulatedElectrocutionParticles) { - worldIn.addParticle(ParticleTypes.CRIT, entityIn.getX(), entityIn.getY(), entityIn.getZ(), 0, 0, 0); + world.addParticle(ParticleTypes.CRIT, entity.getX(), entity.getY(), entity.getZ(), 0, 0, 0); } }