big-duckie/omega-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

🦀 proguard is dead, clean up build.gradle

Browse Source
This commit is contained in:
Draylar
2021-12-20 15:23:52 -06:00
parent a3cde2c8e7
commit 36ce7bc924
8 changed files with 39 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
omega-config-gui/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java
+2 -4
View File
@@ -1,8 +1,6 @@
package draylar.omegaconfiggui;
import draylar.omegaconfig.api.Config;
import draylar.omegaconfiggui.api.screen.ModMenuHelper;
import draylar.omegaconfiggui.api.screen.OmegaConfigScreen;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.loader.api.FabricLoader;
@@ -17,8 +15,8 @@ public class OmegaConfigGui {
* @param <T> config type
*/
public static <T extends Config> void registerConfigScreen(T config) {
if (FabricLoader.getInstance().isModLoaded("modmenu")) {
ModMenuHelper.injectScreen(config, parent -> new OmegaConfigScreen<>(config, parent));
if(FabricLoader.getInstance().isModLoaded("modmenu")) {
// ModMenuHelper.injectScreen(config, parent -> new OmegaConfigScreen<>(config, parent));
}
}
}
omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/ModMenuHelper.java
+1 -12
View File
@@ -1,21 +1,10 @@
package draylar.omegaconfiggui.api.screen;
import com.google.common.collect.ImmutableMap;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import draylar.omegaconfig.api.Config;
import draylar.omegaconfiggui.mixin.ModMenuAccessor;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@Environment(EnvType.CLIENT)
public class ModMenuHelper {
public static <T extends Config> void injectScreen(T config, OmegaConfigScreenSupplier<T> factory) {
// they will suspect nothing
ModMenuAccessor.setConfigScreenFactories(
new ImmutableMap.Builder<String, ConfigScreenFactory<?>>()
.putAll(ModMenuAccessor.getConfigScreenFactories())
.put(config.getModid(), factory::get)
.build());
}
}
omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ModMenuAccessor.java
-20
View File
@@ -1,20 +0,0 @@
package draylar.omegaconfiggui.mixin;
import com.google.common.collect.ImmutableMap;
import com.terraformersmc.modmenu.ModMenu;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ModMenu.class)
public interface ModMenuAccessor {
@Accessor
static ImmutableMap<String, ConfigScreenFactory<?>> getConfigScreenFactories() {
throw new UnsupportedOperationException();
}
@Accessor
static void setConfigScreenFactories(ImmutableMap<String, ConfigScreenFactory<?>> configScreenFactories) {
throw new UnsupportedOperationException();
}
}