Fix changing the preview color of the MekaSuit actually changing the color (#8091)

Author: pupnewfster

src/api/java/mekanism/api/gear/IModuleContainer.java

@@ -56,7 +56,7 @@ default Set<ModuleData<?>> moduleTypes() {
      * @throws IllegalStateException If no module of the given type is installed, or there is no config with the same name is not found installed on the module of the
      *                               given type.
      */
-    <MODULE extends ICustomModule<MODULE>> IModuleContainer replaceModuleConfig(HolderLookup.Provider provider, ItemStack stack, ModuleData<MODULE> type,
+    <MODULE extends ICustomModule<MODULE>> IModuleContainer replaceModuleConfig(HolderLookup.Provider provider, ItemStack stack, IModuleDataProvider<MODULE> type,
           ModuleConfig<?> config);
 
     /**

src/main/java/mekanism/client/gui/element/GuiColorPickerSlot.java

@@ -52,8 +52,6 @@ public void renderForeground(GuiGraphics guiGraphics, int mouseX, int mouseY) {
 
     @Override
     public void onClick(double mouseX, double mouseY, int button) {
-        GuiColorWindow window = new GuiColorWindow(gui(), getGuiWidth() / 2 - 160 / 2, getGuiHeight() / 2 - 120 / 2, handlesAlpha, consumer);
-        window.setColor(supplier.get());
-        gui().addWindow(window);
+        gui().addWindow(new GuiColorWindow(gui(), getGuiWidth() / 2 - 160 / 2, getGuiHeight() / 2 - 120 / 2, handlesAlpha, supplier.get(), consumer));
     }
 }

src/main/java/mekanism/client/gui/element/custom/module/ColorSelection.java

@@ -2,6 +2,8 @@
 
 import java.util.function.Consumer;
 import mekanism.api.gear.IModule;
+import mekanism.api.gear.IModuleContainer;
+import mekanism.api.gear.IModuleHelper;
 import mekanism.api.gear.config.ModuleColorConfig;
 import mekanism.client.gui.GuiModuleTweaker;
 import mekanism.client.gui.GuiUtils;
@@ -11,7 +13,9 @@
 import mekanism.common.MekanismLang;
 import mekanism.common.content.gear.shared.ModuleColorModulationUnit;
 import mekanism.common.lib.Color;
+import mekanism.common.registries.MekanismModules;
 import mekanism.common.util.text.TextUtils;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -76,21 +80,26 @@ protected void click(double mouseX, double mouseY) {
             Runnable previewReset = null;
             IModule<?> currentModule = parent.getCurrentModule();
             if (armorPreview != null && data.name().equals(ModuleColorModulationUnit.COLOR) && currentModule != null) {
-                ItemStack stack = parent.getContainerStack();
+                ItemStack stack = parent.getContainerStack().copy();
                 if (stack.getItem() instanceof ArmorItem armorItem) {
                     //Ensure the preview has been initialized
                     armorPreview.get();
                     EquipmentSlot slot = armorItem.getEquipmentSlot();
                     //Replace the current preview with our copy
                     armorPreview.updatePreview(slot, stack);
-                    updatePreviewColor = c -> setData(c.argb());
+                    updatePreviewColor = c -> {
+                        IModuleContainer moduleContainer = IModuleHelper.INSTANCE.getModuleContainer(stack);
+                        if (moduleContainer != null) {//Note: Should always be present
+                            //Note: We can use the source data to ensure we have the correct config option, as with does not mutate it
+                            moduleContainer.replaceModuleConfig(Minecraft.getInstance().level.registryAccess(), stack, MekanismModules.COLOR_MODULATION_UNIT,
+                                  data.with(c.argb()));
+                        }
+                    };
                     previewReset = () -> armorPreview.resetToDefault(slot);
                 }
             }
-            GuiColorWindow window = new GuiColorWindow(parent.gui(), parent.getGuiWidth() / 2 - 160 / 2, parent.getGuiHeight() / 2 - 120 / 2, supportsAlpha,
-                  color -> setData(color.argb()), armorPreview, updatePreviewColor, previewReset);
-            window.setColor(getColor());
-            parent.gui().addWindow(window);
+            parent.gui().addWindow(new GuiColorWindow(parent.gui(), parent.getGuiWidth() / 2 - 160 / 2, parent.getGuiHeight() / 2 - 120 / 2, supportsAlpha,
+                              getColor(), color -> setData(color.argb()), armorPreview, updatePreviewColor, previewReset));
         }
     }
 }

src/main/java/mekanism/client/gui/element/window/GuiColorWindow.java

@@ -51,11 +51,11 @@ public class GuiColorWindow extends GuiWindow {
     private float value = 0.5F;
     private float alpha = 1;
 
-    public GuiColorWindow(IGuiWrapper gui, int x, int y, boolean handlesAlpha, Consumer<Color> callback) {
-        this(gui, x, y, handlesAlpha, callback, null, null, null);
+    public GuiColorWindow(IGuiWrapper gui, int x, int y, boolean handlesAlpha, Color initialColor, Consumer<Color> callback) {
+        this(gui, x, y, handlesAlpha, initialColor, callback, null, null, null);
     }
 
-    public GuiColorWindow(IGuiWrapper gui, int x, int y, boolean handlesAlpha, Consumer<Color> callback, @Nullable Supplier<LivingEntity> armorPreview,
+    public GuiColorWindow(IGuiWrapper gui, int x, int y, boolean handlesAlpha, Color initialColor, Consumer<Color> callback, @Nullable Supplier<LivingEntity> armorPreview,
           @Nullable Consumer<Color> updatePreviewColor, @Nullable Runnable previewReset) {
         super(gui, x, y, (handlesAlpha ? 184 : 158) + (armorPreview == null ? 0 : 83), handlesAlpha ? 152 : 140, WindowType.COLOR);
         interactionStrategy = InteractionStrategy.NONE;
@@ -95,7 +95,7 @@ public GuiColorWindow(IGuiWrapper gui, int x, int y, boolean handlesAlpha, Consu
             addChild(new GuiEntityPreview(gui, relativeX + 155 + extraWidth, relativeY + 17, 80, height - 24, armorPreview));
         }
 
-        setColor(Color.rgbi(128, 70, 70));
+        setColor(initialColor);
     }
 
     @Override

src/main/java/mekanism/common/content/gear/ModuleContainer.java

@@ -108,9 +108,9 @@ public List<Component> getHUDStrings(Player player, ItemStack stack) {
     }
 
     @Override
-    public <MODULE extends ICustomModule<MODULE>> ModuleContainer replaceModuleConfig(HolderLookup.Provider provider, ItemStack stack, ModuleData<MODULE> type,
+    public <MODULE extends ICustomModule<MODULE>> ModuleContainer replaceModuleConfig(HolderLookup.Provider provider, ItemStack stack, IModuleDataProvider<MODULE> type,
           ModuleConfig<?> config) {
-        return replaceModuleConfig(provider, stack, type, config, false);
+        return replaceModuleConfig(provider, stack, type.getModuleData(), config, false);
     }
 
     /**