simplify and remove optional chaining

add helper methods in GTUtility

Author: ghzdude

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -54,7 +54,6 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
@@ -74,7 +73,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 
@@ -267,14 +265,13 @@ public boolean recolorBlock(@NotNull World world, @NotNull BlockPos pos, @NotNul
     @Override
     public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBlockState state,
                                 @NotNull EntityLivingBase placer, ItemStack stack) {
-        MetaTileEntity metaTileEntity = Optional.of(stack)
-                .map(GTUtility::getMetaTileEntity)
-                .map(MetaTileEntity::copy)
-                .orElse(null);
+        MetaTileEntity sampleMetaTileEntity = GTUtility.getMetaTileEntity(stack);
 
-        if (metaTileEntity == null)
+        if (sampleMetaTileEntity == null)
             return;
 
+        MetaTileEntity metaTileEntity = sampleMetaTileEntity.copy();
+
         var stackTag = stack.getTagCompound();
         NBTTagCompound mteTag = null;
         if (stackTag != null && !stackTag.isEmpty()) {
@@ -300,7 +297,7 @@ public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBloc
             metaTileEntity.readMTETag(mteTag);
         }
 
-        if (worldIn.getChunk(pos).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) == null) {
+        if (!GTUtility.hasTileEntity(worldIn, pos)) {
             worldIn.setTileEntity(pos, metaTileEntity);
         }
 

src/main/java/gregtech/api/util/GTUtility.java

@@ -43,6 +43,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
+import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fluids.Fluid;
@@ -769,6 +770,30 @@ public static MetaTileEntity getMetaTileEntity(ItemStack stack) {
         return registry.getObjectById(stack.getItemDamage());
     }
 
+    public static MetaTileEntity getMetaTileEntity(NBTTagCompound tagCompound) {
+        if (tagCompound.hasKey("MetaId")) {
+            return getMetaTileEntity(tagCompound.getString("MetaId"));
+        }
+        return null;
+    }
+
+    public static MetaTileEntity getMetaTileEntity(String resloc) {
+        return getMetaTileEntity(new ResourceLocation(resloc));
+    }
+
+    public static MetaTileEntity getMetaTileEntity(ResourceLocation location) {
+        return getMetaTileEntity(location.getNamespace(), location);
+    }
+
+    public static MetaTileEntity getMetaTileEntity(String modid, ResourceLocation location) {
+        return GregTechAPI.mteManager.getRegistry(modid).getObject(location);
+    }
+
+    public static boolean hasTileEntity(World world, BlockPos pos) {
+        // it is technically possible for the world to have a TE, but not the chunk
+        return world.getChunk(pos).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) != null;
+    }
+
     /**
      * @param world    the world containing the block
      * @param blockPos the position of the block to check

src/main/java/gregtech/client/utils/ClientHandlerHooks.java

@@ -3,12 +3,12 @@
 import gregtech.api.GregTechAPI;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.registry.MTERegistry;
+import gregtech.api.util.GTUtility;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
 
 import org.spongepowered.asm.mixin.Unique;
 
@@ -35,9 +35,11 @@ public static void handleTags(World world, List<NBTTagCompound> tagCompounds) {
      * @param tagCompound TileEntity tag data
      */
     public static void handleTag(World world, NBTTagCompound tagCompound) {
-        MetaTileEntity mte = fromTag(tagCompound);
+        MetaTileEntity mte = GTUtility.getMetaTileEntity(tagCompound);
         if (mte != null) {
-            BlockPos pos = new BlockPos(tagCompound.getInteger("x"), tagCompound.getInteger("y"),
+            BlockPos pos = new BlockPos(
+                    tagCompound.getInteger("x"),
+                    tagCompound.getInteger("y"),
                     tagCompound.getInteger("z"));
             placeTile(world, mte, pos);
         }
@@ -69,9 +71,8 @@ private static void placeTile(World world, MetaTileEntity mte, BlockPos pos) {
         // set te in world directly
         // check if world contains a TE at this pos?
         // is null checking good enough?
-        if (world.getChunk(pos).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) == null) {
-            if (world.getBlockState(pos).getBlock() != mte.getBlock())
-                world.setBlockState(pos, mte.getBlock().getDefaultState());
+        if (!GTUtility.hasTileEntity(world, pos)) {
+            world.setBlockState(pos, mte.getBlock().getDefaultState());
             world.setTileEntity(pos, mte.copy());
         }
     }

src/main/java/gregtech/mixins/minecraft/TileEntityMixin.java

@@ -1,14 +1,12 @@
 package gregtech.mixins.minecraft;
 
-import gregtech.api.GregTechAPI;
 import gregtech.api.metatileentity.GTBaseTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
-import gregtech.api.util.GTLog;
+import gregtech.api.util.GTUtility;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -36,11 +34,7 @@ private static Object wrapNewInstance(Class<? extends TileEntity> instance,
                                           @Local(argsOnly = true) NBTTagCompound tagCompound) {
         if (IGregTechTileEntity.class.isAssignableFrom(instance)) {
             // this is necessary to avoid the no args constructor call
-            var location = new ResourceLocation(tagCompound.getString("MetaId"));
-            MetaTileEntity mte = GregTechAPI.mteManager
-                    .getRegistry(location.getNamespace())
-                    .getObject(location);
-
+            MetaTileEntity mte = GTUtility.getMetaTileEntity(tagCompound.getString("MetaId"));
             if (mte != null) return mte.copy();
         }
         return original.call(instance);