Skip to content

Commit

Permalink
remove ConfigManager from screen parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@moehreag
moehreag committed Dec 16, 2023
1 parent d91523c commit aa1634e
Show file tree
Hide file tree
Showing 48 changed files with 94 additions and 132 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ workspace/

# macOS
*.DS_Store
.profileconfig.json
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public class RoundedConfigScreen extends io.github.axolotlclient.AxolotlClientCo
private final ConfigManager configManager;
private final OptionCategory category;

public RoundedConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public RoundedConfigScreen(Screen parent, OptionCategory category) {
super(category.getName());
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand All @@ -73,6 +73,6 @@ public void init() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().openScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}
}
}
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class VanillaConfigScreen extends io.github.axolotlclient.AxolotlClientCo
private final ConfigManager configManager;
private final OptionCategory category;

public VanillaConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public VanillaConfigScreen(Screen parent, OptionCategory category) {
super(category.getName());
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand All @@ -65,6 +65,6 @@ public void render(MatrixStack graphics, int mouseX, int mouseY, float delta) {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.vanilla.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().openScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}


Expand Down
2 changes: 1 addition & 1 deletion ...ava/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
AxolotlClientConfigImpl.getInstance().getRegisteredManagers().forEach((s, manager) ->
map.put(s, parent -> ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent)));
manager.getRoot(), parent)));
return map;
}
}
5 changes: 2 additions & 3 deletions ...t-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

package io.github.axolotlclient.AxolotlClientConfig.impl.util;

import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager;
import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.options.WidgetIdentifieable;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
Expand All @@ -33,8 +32,8 @@
@UtilityClass
public class ConfigStyles {

public Screen createScreen(Screen parent, ConfigManager configManager, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), configManager, category, parent);
public Screen createScreen(Screen parent, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), category, parent);
}

@SuppressWarnings("unchecked")
Expand Down
2 changes: 1 addition & 1 deletion 1.16_combat-6/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void onInitializeClient() {
public Function<Screen, ? extends Screen> getConfigScreenFactory(String name) {
ConfigManager manager = AxolotlClientConfig.getInstance().getConfigManager(name);
return parent -> (Screen) ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent);
manager.getRoot(), parent);
}


Expand Down
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public class RoundedConfigScreen extends Screen implements ConfigScreen, Drawing
private final ConfigManager configManager;
private final OptionCategory category;

public RoundedConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public RoundedConfigScreen(Screen parent, OptionCategory category) {
super(Text.translatable(category.getName()));
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand Down Expand Up @@ -77,6 +77,6 @@ public void closeScreen() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().setScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}
}
}
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class VanillaConfigScreen extends Screen implements ConfigScreen {
private final ConfigManager configManager;
private final OptionCategory category;

public VanillaConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public VanillaConfigScreen(Screen parent, OptionCategory category) {
super(Text.translatable(category.getName()));
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand All @@ -69,6 +69,6 @@ public void closeScreen() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.vanilla.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().setScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}


Expand Down
2 changes: 1 addition & 1 deletion ...ava/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
AxolotlClientConfigImpl.getInstance().getRegisteredManagers().forEach((s, manager) ->
map.put(s, parent -> ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent)));
manager.getRoot(), parent)));
return map;
}
}
5 changes: 2 additions & 3 deletions 1.19.2/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

package io.github.axolotlclient.AxolotlClientConfig.impl.util;

import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager;
import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.options.WidgetIdentifieable;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
Expand All @@ -33,8 +32,8 @@
@UtilityClass
public class ConfigStyles {

public Screen createScreen(Screen parent, ConfigManager manager, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), manager, category, parent);
public Screen createScreen(Screen parent, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), category, parent);
}

public ClickableWidget createWidget(int x, int y, int width, int height, WidgetIdentifieable option) {
Expand Down
2 changes: 1 addition & 1 deletion 1.19.2/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void onInitializeClient(ModContainer mod) {
public Function<Screen, ? extends Screen> getConfigScreenFactory(String name) {
ConfigManager manager = AxolotlClientConfig.getInstance().getConfigManager(name);
return parent -> (Screen) ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent);
manager.getRoot(), parent);
}


Expand Down
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public class RoundedConfigScreen extends Screen implements ConfigScreen, Drawing
private final ConfigManager configManager;
private final OptionCategory category;

public RoundedConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public RoundedConfigScreen(Screen parent, OptionCategory category) {
super(Text.translatable(category.getName()));
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand Down Expand Up @@ -77,6 +77,6 @@ public void closeScreen() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().setScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}
}
}
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class VanillaConfigScreen extends Screen implements ConfigScreen {
private final ConfigManager configManager;
private final OptionCategory category;

public VanillaConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public VanillaConfigScreen(Screen parent, OptionCategory category) {
super(Text.translatable(category.getName()));
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand All @@ -69,6 +69,6 @@ public void closeScreen() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.vanilla.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().setScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}


Expand Down
2 changes: 1 addition & 1 deletion ...ava/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
AxolotlClientConfigImpl.getInstance().getRegisteredManagers().forEach((s, manager) ->
map.put(s, parent -> ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent)));
manager.getRoot(), parent)));
return map;
}
}
5 changes: 2 additions & 3 deletions 1.19.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

package io.github.axolotlclient.AxolotlClientConfig.impl.util;

import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager;
import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.options.WidgetIdentifieable;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
Expand All @@ -33,8 +32,8 @@
@UtilityClass
public class ConfigStyles {

public Screen createScreen(Screen parent, ConfigManager manager, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), manager, category, parent);
public Screen createScreen(Screen parent, OptionCategory category) {
return ConfigUI.getInstance().getScreen(ConfigStyles.class.getClassLoader(), category, parent);
}

public ClickableWidget createWidget(int x, int y, int width, int height, WidgetIdentifieable option) {
Expand Down
2 changes: 1 addition & 1 deletion 1.19.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void onInitializeClient(ModContainer mod) {
public Function<Screen, ? extends Screen> getConfigScreenFactory(String name) {
ConfigManager manager = AxolotlClientConfig.getInstance().getConfigManager(name);
return parent -> (Screen) ConfigUI.getInstance().getScreen(this.getClass().getClassLoader(),
manager, manager.getRoot(), parent);
manager.getRoot(), parent);
}


Expand Down
6 changes: 3 additions & 3 deletions .../github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public class RoundedConfigScreen extends Screen implements ConfigScreen, Drawing
private final ConfigManager configManager;
private final OptionCategory category;

public RoundedConfigScreen(Screen parent, ConfigManager manager, OptionCategory category) {
public RoundedConfigScreen(Screen parent, OptionCategory category) {
super(Text.translatable(category.getName()));
this.parent = parent;
this.configManager = manager;
this.configManager = AxolotlClientConfig.getInstance().getConfigManager(category);
this.category = category;
}

Expand Down Expand Up @@ -77,6 +77,6 @@ public void closeScreen() {

@Override
public void removed() {
AxolotlClientConfig.getInstance().save(category);
configManager.save();
}
}
4 changes: 1 addition & 3 deletions ...a/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
package io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded.widgets;

import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
import io.github.axolotlclient.AxolotlClientConfig.impl.options.OptionCategoryImpl;
import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles;
import net.minecraft.client.MinecraftClient;
Expand All @@ -43,8 +42,7 @@ public CategoryWidget(int x, int y, int width, int height, OptionCategoryImpl ca
public void onPress() {
if (MinecraftClient.getInstance().currentScreen != null) {
MinecraftClient.getInstance().setScreen(
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen,
((ConfigScreen) MinecraftClient.getInstance().currentScreen).getConfigManager(), category));
ConfigStyles.createScreen(MinecraftClient.getInstance().currentScreen, category));
}
}
}
Loading

0 comments on commit aa1634e

Please sign in to comment.