Revert back to mutablequad

Author: shartte

src/main/java/dev/technici4n/moderndynamics/ModernDynamics.java

@@ -19,7 +19,6 @@
 package dev.technici4n.moderndynamics;
 
 import dev.technici4n.moderndynamics.attachment.upgrade.AttachmentUpgradesLoader;
-import dev.technici4n.moderndynamics.client.ModernDynamicsClient;
 import dev.technici4n.moderndynamics.init.MdAttachments;
 import dev.technici4n.moderndynamics.init.MdBlockEntities;
 import dev.technici4n.moderndynamics.init.MdBlocks;
@@ -36,8 +35,6 @@
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.server.ServerStoppedEvent;
 import net.neoforged.neoforge.event.tick.ServerTickEvent;

src/main/java/dev/technici4n/moderndynamics/attachment/IoAttachmentItem.java

@@ -24,10 +24,8 @@
 import dev.technici4n.moderndynamics.network.NodeHost;
 import dev.technici4n.moderndynamics.network.item.ItemHost;
 import java.util.EnumSet;
-import java.util.List;
 import java.util.Set;
 import java.util.function.Consumer;
-
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
@@ -86,9 +84,11 @@ public Set<Setting> getSupportedSettings() {
     }
 
     @Override
-    public void appendHoverText(ItemStack itemStack, TooltipContext context, TooltipDisplay display, Consumer<Component> builder, TooltipFlag tooltipFlag) {
+    public void appendHoverText(ItemStack itemStack, TooltipContext context, TooltipDisplay display, Consumer<Component> builder,
+            TooltipFlag tooltipFlag) {
         builder
-                .accept(Component.translatable("gui.moderndynamics.tooltip.attachment_upgrades").setStyle(Style.EMPTY.withColor(ChatFormatting.GOLD)));
+                .accept(Component.translatable("gui.moderndynamics.tooltip.attachment_upgrades")
+                        .setStyle(Style.EMPTY.withColor(ChatFormatting.GOLD)));
         /*
          * if (level != null && level.isClientSide()) {
          * if (MdProxy.INSTANCE.isShiftDown()) {

src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedAttachment.java

@@ -26,7 +26,6 @@
 import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
 import java.util.List;
 import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;

src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedInhibitor.java

@@ -19,7 +19,6 @@
 package dev.technici4n.moderndynamics.attachment.attached;
 
 import dev.technici4n.moderndynamics.attachment.InhibitorAttachmentItem;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.storage.ValueInput;
 
 public class AttachedInhibitor extends AttachedAttachment {

src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedIo.java

@@ -31,8 +31,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;

src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java

@@ -19,19 +19,16 @@
 package dev.technici4n.moderndynamics.attachment.attached;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.technici4n.moderndynamics.Constants;
 import dev.technici4n.moderndynamics.attachment.IoAttachmentItem;
 import dev.technici4n.moderndynamics.gui.menu.AttachmentMenuType;
 import dev.technici4n.moderndynamics.gui.menu.FluidAttachedIoMenu;
 import dev.technici4n.moderndynamics.pipe.PipeBlockEntity;
 import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
 import dev.technici4n.moderndynamics.util.FluidVariant;
-import dev.technici4n.moderndynamics.util.ItemVariant;
+import java.util.List;
 import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -41,8 +38,6 @@
 import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 // TODO: also allow nbt filtering
 public class FluidAttachedIo extends AttachedIo {
     private static final Codec<List<FluidVariant>> FILTER_LIST_CODEC = FluidVariant.CODEC.listOf(0, Constants.Upgrades.MAX_FILTER);

src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java

@@ -37,10 +37,12 @@
 import dev.technici4n.moderndynamics.util.ExtendedMenuProvider;
 import dev.technici4n.moderndynamics.util.ItemVariant;
 import dev.technici4n.moderndynamics.util.TransferUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
@@ -53,11 +55,6 @@
 import net.neoforged.neoforge.items.IItemHandler;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 public class ItemAttachedIo extends AttachedIo {
 
     private static final Codec<List<ItemVariant>> FILTER_LIST_CODEC = ItemVariant.CODEC.listOf(0, Constants.Upgrades.MAX_FILTER);
@@ -93,8 +90,7 @@ public class ItemAttachedIo extends AttachedIo {
     record StuffedEntry(ItemVariant item, int amount) {
         public static final Codec<StuffedEntry> CODEC = RecordCodecBuilder.create(builder -> builder.group(
                 ItemVariant.CODEC.fieldOf("v").forGetter(StuffedEntry::item),
-                Codec.INT.fieldOf("a").forGetter(StuffedEntry::amount)
-        ).apply(builder, StuffedEntry::new));
+                Codec.INT.fieldOf("a").forGetter(StuffedEntry::amount)).apply(builder, StuffedEntry::new));
     }
 
     public ItemAttachedIo(IoAttachmentItem item, ValueInput configData, Runnable setChangedCallback) {
@@ -374,7 +370,7 @@ public void incrementRoundRobin(int incrementSize) {
     public int moveStuffedToStorage(IItemHandler targetStorage, int maxAmount) {
         int totalMoved = 0;
 
-        for (var it = stuffedItems.entrySet().iterator(); it.hasNext() && totalMoved < maxAmount; ) {
+        for (var it = stuffedItems.entrySet().iterator(); it.hasNext() && totalMoved < maxAmount;) {
             var entry = it.next();
             int stuffedAmount = entry.getValue();
             int inserted = TransferUtil.insertItemStacked(targetStorage, entry.getKey(), Math.min(stuffedAmount, maxAmount - totalMoved));

src/main/java/dev/technici4n/moderndynamics/attachment/attached/UpgradeContainer.java

@@ -22,9 +22,7 @@
 import dev.technici4n.moderndynamics.attachment.upgrade.LoadedUpgrades;
 import dev.technici4n.moderndynamics.attachment.upgrade.UpgradeType;
 import java.util.function.ToIntFunction;
-import net.minecraft.core.HolderLookup;
 import net.minecraft.core.NonNullList;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
 import net.minecraft.world.ContainerHelper;
 import net.minecraft.world.item.Item;

src/main/java/dev/technici4n/moderndynamics/attachment/upgrade/AttachmentUpgradesLoader.java

@@ -25,6 +25,7 @@
 import com.google.gson.JsonParser;
 import com.mojang.serialization.JsonOps;
 import dev.technici4n.moderndynamics.ModernDynamics;
+import dev.technici4n.moderndynamics.util.MdId;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -34,8 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
-
-import dev.technici4n.moderndynamics.util.MdId;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
 import net.minecraft.util.GsonHelper;

src/main/java/dev/technici4n/moderndynamics/client/ClientProxy.java

@@ -20,7 +20,6 @@
 
 import dev.technici4n.moderndynamics.MdProxy;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
 
 public class ClientProxy extends MdProxy {
     @Override