Przeglądaj źródła

Revert "Improve screen builder"

This reverts commit 56e42ae2
Lortseam 4 lat temu
rodzic
commit
7177c7605e

+ 3 - 7
src/main/java/me/lortseam/completeconfig/gui/ConfigScreenBuilder.java

@@ -1,24 +1,20 @@
 package me.lortseam.completeconfig.gui;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
 import me.lortseam.completeconfig.data.Config;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
 
-@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class ConfigScreenBuilder {
 
-    protected final Config config;
-
     /**
-     * Builds the screen.
+     * Builds a screen based on a config.
      *
      * @param parentScreen the parent screen
+     * @param config the config to build the screen of
      * @return the built screen
      */
     @Environment(EnvType.CLIENT)
-    public abstract Screen build(Screen parentScreen);
+    public abstract Screen build(Screen parentScreen, Config config);
 
 }

+ 4 - 5
src/main/java/me/lortseam/completeconfig/gui/cloth/ClothConfigScreenBuilder.java

@@ -31,17 +31,16 @@ public final class ClothConfigScreenBuilder extends ConfigScreenBuilder {
     @Getter
     private final GuiRegistry registry = new GuiRegistry();
 
-    public ClothConfigScreenBuilder(Config config, Supplier<ConfigBuilder> supplier) {
-        super(config);
+    public ClothConfigScreenBuilder(Supplier<ConfigBuilder> supplier) {
         this.supplier = supplier;
     }
 
-    public ClothConfigScreenBuilder(Config config) {
-        this(config, ConfigBuilder::create);
+    public ClothConfigScreenBuilder() {
+        this(ConfigBuilder::create);
     }
 
     @Override
-    public Screen build(Screen parentScreen) {
+    public Screen build(Screen parentScreen, Config config) {
         ConfigBuilder builder = supplier.get()
                 .setParentScreen(parentScreen)
                 .setSavingRunnable(config::save);