diff --git a/build.gradle b/build.gradle
index 1a70dd0..803a8d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
diff --git a/src/main/java/com/thebrokenrail/energonrelics/api/block/SimpleBlock.java b/src/main/java/com/thebrokenrail/energonrelics/api/block/SimpleBlock.java
index 19370ed..c67f430 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/api/block/SimpleBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/api/block/SimpleBlock.java
@@ -49,6 +49,7 @@ public class SimpleBlock extends Block {
      * Get Item Group To Add Block Item To
      * @return Item Group
      */
+    @SuppressWarnings("SameReturnValue")
     protected ItemGroup getItemGroup() {
         return EnergonRelics.ITEM_GROUP;
     }
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java
index 71e3355..ca6e409 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java
@@ -59,7 +59,6 @@ public class IndustrialLaserBlock extends AbstractFieldBlock {
         }
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
         return VoxelShapes.empty();
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java
index e5e4ef6..c6cb4d8 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java
@@ -4,15 +4,11 @@ import com.thebrokenrail.energonrelics.EnergonRelics;
 import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock;
 import com.thebrokenrail.energonrelics.config.HardcodedConfig;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.ShapeContext;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 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;
 
 public class BeamBlock extends AbstractFieldBlock {
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java
index a4eb18d..9e323a6 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/structure/StructureGeneratorPiece.java
@@ -9,7 +9,6 @@ import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.ServerWorldAccess;
 import net.minecraft.world.StructureWorldAccess;
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
diff --git a/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java b/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java
index 6519ca6..9e2ceef 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java
@@ -187,11 +187,7 @@ public class NetworkComponent extends PersistentState {
         List<EnergyProviderBlockEntity> result;
 
         List<EnergyProviderBlockEntity> cacheResult = getSourcesFromCache(world, id);
-        if (cacheResult != null) {
-            result = cacheResult;
-        } else {
-            result = getSourcesFromCacheMiss(world, id);
-        }
+        result = Objects.requireNonNullElseGet(cacheResult, () -> getSourcesFromCacheMiss(world, id));
 
         world.getProfiler().pop();
         return result;