CableElectrocutionEvent

This commit is contained in:
modmuss50 2020-11-13 17:19:05 +00:00
parent 9fc506b517
commit d835a8be01
2 changed files with 66 additions and 8 deletions

View file

@ -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<CableElectrocutionEvent> 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);
}

View file

@ -56,6 +56,7 @@ import reborncore.api.ToolManager;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.util.WrenchUtils; import reborncore.common.util.WrenchUtils;
import team.reborn.energy.Energy; import team.reborn.energy.Energy;
import techreborn.api.events.CableElectrocutionEvent;
import techreborn.blockentity.cable.CableBlockEntity; import techreborn.blockentity.cable.CableBlockEntity;
import techreborn.config.TechRebornConfig; import techreborn.config.TechRebornConfig;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
@ -229,16 +230,16 @@ public class CableBlock extends BlockWithEntity implements Waterloggable {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public void onEntityCollision(BlockState state, World worldIn, BlockPos pos, Entity entityIn) { public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) {
super.onEntityCollision(state, worldIn, pos, entityIn); super.onEntityCollision(state, world, pos, entity);
if (!type.canKill) { if (!type.canKill) {
return; return;
} }
if (!(entityIn instanceof LivingEntity)) { if (!(entity instanceof LivingEntity)) {
return; return;
} }
BlockEntity blockEntity = worldIn.getBlockEntity(pos); BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity == null) { if (blockEntity == null) {
return; return;
} }
@ -251,19 +252,23 @@ public class CableBlock extends BlockWithEntity implements Waterloggable {
return; return;
} }
if (!CableElectrocutionEvent.EVENT.invoker().electrocute((LivingEntity) entity, type, pos, world, blockEntityCable)) {
return;
}
if (TechRebornConfig.uninsulatedElectrocutionDamage) { if (TechRebornConfig.uninsulatedElectrocutionDamage) {
if (type == TRContent.Cables.HV) { if (type == TRContent.Cables.HV) {
entityIn.setOnFireFor(1); entity.setOnFireFor(1);
} }
entityIn.damage(new ElectrialShockSource(), 1F); entity.damage(new ElectrialShockSource(), 1F);
blockEntityCable.setEnergy(0d); blockEntityCable.setEnergy(0d);
} }
if (TechRebornConfig.uninsulatedElectrocutionSound) { 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); 0.6F, 1F);
} }
if (TechRebornConfig.uninsulatedElectrocutionParticles) { 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);
} }
} }