Unused imports and Lightning rod

This commit is contained in:
drcrazy 2019-07-25 15:20:32 +03:00
parent 52da17dfd5
commit 80f2440323
2 changed files with 14 additions and 14 deletions

View file

@ -28,6 +28,7 @@ import net.minecraft.block.Block;
import net.minecraft.entity.LightningEntity; import net.minecraft.entity.LightningEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
@ -62,12 +63,17 @@ public class LightningRodBlockEntity extends PowerAcceptorBlockEntity implements
public void tick() { public void tick() {
super.tick(); super.tick();
if (onStatusHoldTicks > 0) if (onStatusHoldTicks > 0) { --onStatusHoldTicks; }
--onStatusHoldTicks;
Block BEBlock = getCachedState().getBlock();
if (! (BEBlock instanceof BlockMachineBase)) {
return;
}
BlockMachineBase machineBaseBlock = (BlockMachineBase) BEBlock;
if (onStatusHoldTicks == 0 || getEnergy() <= 0) { if (onStatusHoldTicks == 0 || getEnergy() <= 0) {
if (getCachedState().getBlock() instanceof BlockMachineBase) machineBaseBlock.setActive(false, world, pos);
((BlockMachineBase) getCachedState().getBlock()).setActive(false, world, pos);
onStatusHoldTicks = -1; onStatusHoldTicks = -1;
} }
@ -84,13 +90,12 @@ public class LightningRodBlockEntity extends PowerAcceptorBlockEntity implements
final LightningEntity lightningBolt = new LightningEntity(world, final LightningEntity lightningBolt = new LightningEntity(world,
pos.getX() + 0.5F, world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, getPos()).getY(), pos.getX() + 0.5F, world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, getPos()).getY(),
pos.getZ() + 0.5F, false); pos.getZ() + 0.5F, false);
if(true){
throw new RuntimeException("fix me"); if (!world.isClient) {
((ServerWorld) world).addLightning(lightningBolt);
} }
//world.addWeatherEffect(lightningBolt);
world.spawnEntity(lightningBolt);
addEnergy(baseEnergyStrike * (0.3F + weatherStrength)); addEnergy(baseEnergyStrike * (0.3F + weatherStrength));
((BlockMachineBase) world.getBlockState(pos).getBlock()).setActive(true, world, pos); machineBaseBlock.setActive(true, world, pos);
onStatusHoldTicks = 400; onStatusHoldTicks = 400;
} }
} }

View file

@ -26,20 +26,15 @@ package techreborn.utils;
import io.github.prospector.silk.fluid.FluidInstance; import io.github.prospector.silk.fluid.FluidInstance;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.FluidBlock;
import net.minecraft.fluid.Fluids; import net.minecraft.fluid.Fluids;
import net.minecraft.inventory.Inventory; import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import reborncore.common.fluid.container.GenericFluidContainer; import reborncore.common.fluid.container.GenericFluidContainer;
import reborncore.common.util.ItemUtils;
import reborncore.common.util.RebornInventory;
import reborncore.common.util.Tank;
import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluid;
import reborncore.mixin.extensions.FluidBlockExtensions; import reborncore.mixin.extensions.FluidBlockExtensions;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;