fix the merge that happened [MUI2]

src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java

@@ -210,14 +210,6 @@ public static MachineDefinition[] registerTieredMachines(String name,
         return registerTieredMachines(REGISTRATE, name, factory, builder, tiers);
     }
 
-    public static MachineDefinition[] registerTieredMachines(GTRegistrate registrate,
-                                                             String name,
-                                                             BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
-                                                             BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
-                                                             int... tiers) {
-        return registerTieredMachines(REGISTRATE, name, factory, builder, tiers);
-    }
-
     public static MachineDefinition[] registerTieredMachines(GTRegistrate registrate,
                                                              String name,
                                                              BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
@@ -262,14 +254,6 @@ public static MachineDefinition[] registerFluidHatches(String name, String displ
                 abilities);
     }
 
-    public static MachineDefinition[] registerFluidHatches(GTRegistrate registrate, String name, String displayName,
-                                                           String tooltip,
-                                                           IO io, int initialCapacity, int slots,
-                                                           int[] tiers, PartAbility... abilities) {
-        return registerFluidHatches(REGISTRATE, name, displayName, tooltip, io, initialCapacity, slots, tiers,
-                abilities);
-    }
-
     public static MachineDefinition[] registerFluidHatches(GTRegistrate registrate, String name, String displayName,
                                                            String tooltip,
                                                            IO io, int initialCapacity, int slots,

src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ParallelHatchPartMachine.java

@@ -26,6 +26,7 @@
 import net.minecraft.util.Mth;
 
 import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
 
 public class ParallelHatchPartMachine extends TieredPartMachine implements IMuiMachine, IParallelHatch {
 

src/main/java/com/gregtechceu/gtceu/common/network/GTNetwork.java

@@ -101,7 +101,6 @@ public static void init() {
         register(CPacketImageRequest.class, CPacketImageRequest::new, NetworkDirection.PLAY_TO_SERVER);
         register(SPacketImageResponse.class, SPacketImageResponse::new, NetworkDirection.PLAY_TO_CLIENT);
 
-        register(CPacketKeysPressed.class, CPacketKeysPressed::new, NetworkDirection.PLAY_TO_SERVER);
         register(SCPacketMonitorGroupNBTChange.class, SCPacketMonitorGroupNBTChange::new, null);
         register(CPacketImageRequest.class, CPacketImageRequest::new, NetworkDirection.PLAY_TO_SERVER);
         register(SPacketImageResponse.class, SPacketImageResponse::new, NetworkDirection.PLAY_TO_CLIENT);

src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java

@@ -481,11 +481,6 @@ public static class MachineConfigs {
                 "Default: true" })
         public boolean replaceWithCobbleVersion = true;
         @Configurable
-        @Configurable.Comment({
-                "Whether the miner should attempt to replace the block mined with a cobbled version of the ore",
-                "Default: true" })
-        public boolean replaceWithCobbleVersion = true;
-        @Configurable
         @Configurable.Comment({ "Block to replace mined ores with in the miner and multiblock miner.",
                 "Default: minecraft:cobblestone" })
         public String replaceMinedBlocksWith = "minecraft:cobblestone";
@@ -758,11 +753,6 @@ public static class ClientConfigs {
                 "Disable if experiencing performance issues.", "Default: true" })
         public boolean machinesHaveBERsByDefault = true;
         @Configurable
-        @Configurable.Comment({
-                "Whether most machines will have block entity renderers, mainly used for rendering certain covers. (Restart required)",
-                "Disable if experiencing performance issues.", "Default: true" })
-        public boolean machinesHaveBERsByDefault = true;
-        @Configurable
         @Configurable.Comment({ "Whether or not sounds should be played when using tools outside of crafting.",
                 "Default: true" })
         public boolean toolUseSounds = true;

src/main/java/com/gregtechceu/gtceu/utils/GTMath.java

@@ -56,10 +56,6 @@ public static int lerpInt(double delta, int start, int end) {
         return start + Mth.floor(delta * (end - start));
     }
 
-    public static int lerpInt(double delta, int start, int end) {
-        return start + Mth.floor(delta * (end - start));
-    }
-
     public static List<ItemStack> splitStacks(ItemStack stack, long amount) {
         int fullStacks = (int) (amount / Integer.MAX_VALUE);
         int rem = (int) (amount % Integer.MAX_VALUE);

src/test/java/com/gregtechceu/gtceu/common/cover/SolarPanelTest.java

@@ -1,16 +1,10 @@
 package com.gregtechceu.gtceu.common.cover;
 
 import com.gregtechceu.gtceu.GTCEu;
-import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity;
-import com.gregtechceu.gtceu.api.machine.MetaMachine;
-import com.gregtechceu.gtceu.common.data.GTItems;
-import com.gregtechceu.gtceu.common.data.GTMachines;
 import com.gregtechceu.gtceu.common.machine.electric.BatteryBufferMachine;
-import com.gregtechceu.gtceu.gametest.util.TestUtils;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.world.level.block.Blocks;