Update
EnergonRelics/pipeline/head There was a failure building this commit Details

This commit is contained in:
TheBrokenRail 2020-08-04 19:24:25 -04:00
parent 96f7dd2fce
commit 2e4104b38c
6 changed files with 3 additions and 12 deletions

View File

@ -4,7 +4,7 @@ plugins {
} }
compileJava { compileJava {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }

View File

@ -49,6 +49,7 @@ public class SimpleBlock extends Block {
* Get Item Group To Add Block Item To * Get Item Group To Add Block Item To
* @return Item Group * @return Item Group
*/ */
@SuppressWarnings("SameReturnValue")
protected ItemGroup getItemGroup() { protected ItemGroup getItemGroup() {
return EnergonRelics.ITEM_GROUP; return EnergonRelics.ITEM_GROUP;
} }

View File

@ -59,7 +59,6 @@ public class IndustrialLaserBlock extends AbstractFieldBlock {
} }
} }
@SuppressWarnings("deprecation")
@Override @Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
return VoxelShapes.empty(); return VoxelShapes.empty();

View File

@ -4,15 +4,11 @@ import com.thebrokenrail.energonrelics.EnergonRelics;
import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock;
import com.thebrokenrail.energonrelics.config.HardcodedConfig; import com.thebrokenrail.energonrelics.config.HardcodedConfig;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.ShapeContext;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
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.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World; import net.minecraft.world.World;
public class BeamBlock extends AbstractFieldBlock { public class BeamBlock extends AbstractFieldBlock {

View File

@ -9,7 +9,6 @@ import net.minecraft.util.BlockRotation;
import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockBox;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.ServerWorldAccess;
import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.ChunkGenerator;

View File

@ -187,11 +187,7 @@ public class NetworkComponent extends PersistentState {
List<EnergyProviderBlockEntity> result; List<EnergyProviderBlockEntity> result;
List<EnergyProviderBlockEntity> cacheResult = getSourcesFromCache(world, id); List<EnergyProviderBlockEntity> cacheResult = getSourcesFromCache(world, id);
if (cacheResult != null) { result = Objects.requireNonNullElseGet(cacheResult, () -> getSourcesFromCacheMiss(world, id));
result = cacheResult;
} else {
result = getSourcesFromCacheMiss(world, id);
}
world.getProfiler().pop(); world.getProfiler().pop();
return result; return result;