Skip to content

Auto disable pinyinSouSuo related features if jecharacters loaded #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hendrix-Shen merged 1 commit into from
May 25, 2025
Merged

Auto disable pinyinSouSuo related features if jecharacters loaded #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ mod.version=4.0
## Annotation processor
dependencies.lombok_version=1.18.38
## MagicLib
dependencies.magiclib_dependency=0.8.697-beta
dependencies.magiclib_version=0.8.697-beta
dependencies.magiclib_dependency=0.8.708
dependencies.magiclib_version=0.8.702
dependencies.pinin_version=1.6.0

# Gradle Plugins
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/plusls/MasaGadget/game/Configs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,30 +173,39 @@ public class Configs {
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean optimizeConfigWidgetSearch = Configs.cf.newConfigBoolean("optimizeConfigWidgetSearch", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuo = Configs.cf.newConfigBoolean("pinyinSouSuo", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFZh2Z = Configs.cf.newConfigBoolean("pinyinSouSuoFZh2Z", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFSh2S = Configs.cf.newConfigBoolean("pinyinSouSuoFSh2S", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFCh2C = Configs.cf.newConfigBoolean("pinyinSouSuoFCh2C", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFAng2An = Configs.cf.newConfigBoolean("pinyinSouSuoFAng2An", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFIng2In = Configs.cf.newConfigBoolean("pinyinSouSuoFIng2In", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFEng2En = Configs.cf.newConfigBoolean("pinyinSouSuoFEng2En", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigBoolean pinyinSouSuoFU2V = Configs.cf.newConfigBoolean("pinyinSouSuoFU2V", false);

@Dependencies(conflict = @Dependency("jecharacters"))
@Config(category = ConfigCategory.MALILIB)
public static MagicConfigOptionList pinyinSouSuoKeyboard = Configs.cf.newConfigOptionList("pinyinSouSuoKeyboard", PinYinSouSuoKeyboard.QUANPIN);

Expand Down
3 changes: 3 additions & 0 deletions .../java/com/plusls/MasaGadget/mixin/mod_tweak/malilib/pinyinSouSuo/MixinWidgetListBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
import fi.dy.masa.malilib.gui.widgets.WidgetListBase;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import top.hendrixshen.magiclib.api.dependency.annotation.Dependencies;
import top.hendrixshen.magiclib.api.dependency.annotation.Dependency;

@Dependencies(conflict = @Dependency("jecharacters"))
@Mixin(value = WidgetListBase.class, remap = false)
public class MixinWidgetListBase {
//#if MC > 11701
Expand Down