windowSize tweaks conflict with the locked_window_size mod

Fallen-Breath · May 29, 2024 · 2f3a281 · 2f3a281
1 parent 68d076f
commit 2f3a281
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java b/src/main/java/me/fallenbreath/tweakermore/config/TweakerMoreConfigs.java
@@ -56,6 +56,7 @@
 import me.fallenbreath.tweakermore.impl.mod_tweaks.serverDataSyncer.ServerDataSyncer;
 import me.fallenbreath.tweakermore.impl.porting.lmCustomSchematicBaseDirectoryPorting.LitematicaCustomSchematicBaseDirectoryPorting;
 import me.fallenbreath.tweakermore.impl.setting.debug.TweakerMoreDebugHelper;
+import me.fallenbreath.tweakermore.util.ModIds;
 import me.fallenbreath.tweakermore.util.RegistryUtil;
 import me.fallenbreath.tweakermore.util.doc.DocumentGenerator;
 import me.fallenbreath.tweakermore.util.render.TweakerMoreRenderEventHandler;
@@ -590,16 +591,16 @@ public class TweakerMoreConfigs
 	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigBoolean YEET_SERVER_IP_REVERSED_DNS_LOOKUP = newConfigBoolean("yeetServerIpReversedDnsLookup", false);
 
-	@Config(type = Config.Type.HOTKEY, category = Config.Category.MC_TWEAKS)
+	@Config(type = Config.Type.HOTKEY, restriction = @Restriction(conflict = @Condition(ModIds.locked_window_size)), category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigHotkey WINDOW_SIZE_APPLY = newConfigHotKey("windowSizeApply", "");
 
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	@Config(type = Config.Type.GENERIC, restriction = @Restriction(conflict = @Condition(ModIds.locked_window_size)), category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigInteger WINDOW_SIZE_WIDTH = newConfigInteger("windowSizeWidth", 854, 160, 15360);
 
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	@Config(type = Config.Type.GENERIC, restriction = @Restriction(conflict = @Condition(ModIds.locked_window_size)), category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigInteger WINDOW_SIZE_HEIGHT = newConfigInteger("windowSizeHeight", 480, 90, 8640);
 
-	@Config(type = Config.Type.GENERIC, category = Config.Category.MC_TWEAKS)
+	@Config(type = Config.Type.GENERIC, restriction = @Restriction(conflict = @Condition(ModIds.locked_window_size)), category = Config.Category.MC_TWEAKS)
 	public static final TweakerMoreConfigBoolean WINDOW_SIZE_PINNED = newConfigBoolean("windowSizePinned", false);
 
 	////////////////////

diff --git a/src/main/java/me/fallenbreath/tweakermore/util/ModIds.java b/src/main/java/me/fallenbreath/tweakermore/util/ModIds.java
@@ -55,6 +55,7 @@ public class ModIds
 	public static final String extra_player_renderer = "explayerenderer";
 	public static final String fabric_carpet = "carpet";
 	public static final String iris = "iris";
+	public static final String locked_window_size = "locked_window_size";
 	public static final String optifine = "optifabric";
 	public static final String pistorder = "pistorder";
 	public static final String replay_mod = "replaymod";

diff --git a/src/main/resources/assets/tweakermore/lang/en_us.yml b/src/main/resources/assets/tweakermore/lang/en_us.yml
@@ -1167,6 +1167,7 @@ tweakermore:
       iris: Iris
       itemscroller: Item Scroller
       litematica: Litematica
+      locked_window_size: Locked Window Size
       minecraft: Minecraft
       minihud: MiniHUD
       morechathistory: MoreChatHistory

diff --git a/src/main/resources/assets/tweakermore/lang/zh_cn.yml b/src/main/resources/assets/tweakermore/lang/zh_cn.yml
@@ -1167,6 +1167,7 @@ tweakermore:
       iris: Iris
       itemscroller: Item Scroller
       litematica: Litematica
+      locked_window_size: Locked Window Size
       minecraft: Minecraft
       minihud: MiniHUD
       morechathistory: MoreChatHistory