diff options
4 files changed, 14 insertions, 10 deletions
@@ -29,3 +29,5 @@ mods/* /.mixin.out/audit/mixin_implementation_report.csv /.mixin.out/audit/mixin_implementation_report.txt /modcore/metadata.json +/.ReAuth.cfg +/libdiscord-rpc.so diff --git a/options.txt b/options.txt index 1ab7c938..adb7fe67 100755 --- a/options.txt +++ b/options.txt @@ -1,22 +1,22 @@ invertYMouse:false mouseSensitivity:0.5 fov:1.0 -gamma:1.0 +gamma:100000.0 saturation:0.0 -renderDistance:9 +renderDistance:4 guiScale:2 particles:0 bobView:true anaglyph3d:false -maxFps:120 +maxFps:60 fboEnable:true difficulty:3 -fancyGraphics:true -ao:2 +fancyGraphics:false +ao:0 renderClouds:fast resourcePacks:[] incompatibleResourcePacks:[] -lastServer:localhost +lastServer:mc.skyblocksandbox.net lang:en_US chatVisibility:0 chatColors:true @@ -111,7 +111,7 @@ key_Flip (Hold):0 key_Rotate (Hold):0 key_Flip (Toggle):0 key_Rotate (Toggle):0 -soundCategory_master:0.0 +soundCategory_master:1.0 soundCategory_music:0.0 soundCategory_record:1.0 soundCategory_weather:1.0 diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/DungeonSpecificDataProviderRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/DungeonSpecificDataProviderRegistry.java index 9695c06e..5d8e78b4 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/DungeonSpecificDataProviderRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/DungeonSpecificDataProviderRegistry.java @@ -8,8 +8,8 @@ public class DungeonSpecificDataProviderRegistry { private static final Map<Pattern, DungeonSpecificDataProvider> doorFinders = new HashMap<Pattern, DungeonSpecificDataProvider>(); static { - doorFinders.put(Pattern.compile("The Catacombs (?:F[0-9]|E)"), new CatacombDataProvider()); - doorFinders.put(Pattern.compile("The Catacombs (?:M[0-9]|E)"), new CatacombMasterDataProvider()); + doorFinders.put(Pattern.compile("The Catacombs (?:F[0-9]|E0)"), new CatacombDataProvider()); + doorFinders.put(Pattern.compile("The Catacombs (?:M[0-9])"), new CatacombMasterDataProvider()); } public static DungeonSpecificDataProvider getDoorFinder(String dungeonName) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java index a2208844..469290e4 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/ability/FeatureAbilityCooldown.java @@ -3,6 +3,7 @@ package kr.syeyoung.dungeonsguide.features.impl.etc.ability; import kr.syeyoung.dungeonsguide.SkyblockStatus; import kr.syeyoung.dungeonsguide.config.types.AColor; import kr.syeyoung.dungeonsguide.e; +import kr.syeyoung.dungeonsguide.features.FeatureParameter; import kr.syeyoung.dungeonsguide.features.listener.ChatListener; import kr.syeyoung.dungeonsguide.features.listener.TickListener; import kr.syeyoung.dungeonsguide.features.text.StyledText; @@ -30,11 +31,12 @@ public class FeatureAbilityCooldown extends TextHUDFeature implements ChatListen getStyles().add(new TextStyle("number", new AColor(0x55, 0xFF,0xFF,255), new AColor(0, 0,0,0), false)); getStyles().add(new TextStyle("unit",new AColor(0x00, 0xAA,0xAA,255), new AColor(0, 0,0,0), false)); getStyles().add(new TextStyle("ready",new AColor(0xDF, 0x00,0x67,255), new AColor(0, 0,0,0), false)); + this.parameters.put("disable", new FeatureParameter<Boolean>("disable", "Disable outside of dungeon", "Disable the feature when out of dungeon", false, "boolean")); } @Override public boolean isHUDViewable() { - return skyblockStatus.isOnSkyblock(); + return skyblockStatus.isOnSkyblock() && (!this.<Boolean>getParameter("disable").getValue() || (this.<Boolean>getParameter("disable").getValue() && skyblockStatus.isOnDungeon())); } @Override |