Skip to content
This repository was archived by the owner on Jul 17, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class Config {
public static final String READ_TOOLTIPS_KEY = "read_tooltip";
public static final String READ_SIGNS_CONTENTS = "read_signs_contents";
public static final String INV_KEYBOARD_CONTROL_KEY = "inventory_keyboard_control";
public static final String ATION_BAR_KEY = "action_bar_key";

public Config() {
}
Expand All @@ -44,7 +45,14 @@ public static boolean get(String key) {
if (data == null) {
loadConfig();
}
return data.get(key).getAsBoolean();
boolean val;
try {
val = data.get(key).getAsBoolean();
} catch(Exception e) {
resetData();
val = data.get(key).getAsBoolean();
}
return val;
}

public static boolean toggle(String key) {
Expand Down Expand Up @@ -76,15 +84,20 @@ private static JsonObject loadConfig() {
data = new Gson().fromJson(jsonString, JsonObject.class);
return data;
} else {
return resetData();
}
}

public static JsonObject resetData(){
data = new JsonObject();
data.add(READ_BLOCKS_KEY, new JsonPrimitive(true));
data.add(READ_TOOLTIPS_KEY, new JsonPrimitive(true));
data.add(READ_SIGNS_CONTENTS, new JsonPrimitive(true));
data.add(INV_KEYBOARD_CONTROL_KEY, new JsonPrimitive(true));
data.add(ATION_BAR_KEY, new JsonPrimitive(true));

saveConfig(data);
return data;
}
}

public static void saveConfig(JsonObject newConfig) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public ConfigGui(ClientPlayerEntity player) {
"gui.accessibilityplus.config.buttons.inventorykeyboardcontrol", Config.INV_KEYBOARD_CONTROL_KEY);
root.add(inventoryKeyboardControllButton, 11, 2, 10, 1);

ConfigButton actionBarButton = new ConfigButton("gui.accessibilityplus.config.buttons.actionbar",
Config.ATION_BAR_KEY);
root.add(actionBarButton, 0, 3, 10, 1);

WButton doneButton = new WButton(new TranslatableText("gui.accessibilityplus.config.buttons.done"));
doneButton.setOnClick(this::onDoneClick);
root.add(doneButton, 7, 8, 7, 1);
Expand All @@ -64,4 +68,4 @@ public void addPainters() {
this.rootPanel.setBackgroundPainter(BackgroundPainter.createColorful(0x242424));
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.luissanchezdev.accessibilityplus.mixin;

import com.luissanchezdev.accessibilityplus.config.Config;

import com.luissanchezdev.accessibilityplus.NarratorPlus;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
Expand All @@ -12,6 +14,8 @@
public class ActionbarInject {
@Inject(at = @At("HEAD"), method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V")
public void speakActionbar(Text message, boolean tinted, CallbackInfo ci) {
NarratorPlus.narrate(message.getString());
if(Config.get(Config.ATION_BAR_KEY)){
NarratorPlus.narrate(message.getString());
}
}
}
}
41 changes: 21 additions & 20 deletions src/main/resources/assets/accessibilityplus/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"gui.accessibilityplus.config.title": "Accessibility Plus Configuration",
"gui.accessibilityplus.config.buttons.done": "Done",
"gui.accessibilityplus.config.buttons.cancel": "Cancel",
"gui.accessibilityplus.config.buttons.readblocks": "Read Blocks: %s",
"gui.accessibilityplus.config.buttons.readtooltips": "Read Tooltips: %s",
"gui.accessibilityplus.config.buttons.readsignscontents": "Read Sign Contents: %s",
"gui.accessibilityplus.config.buttons.inventorykeyboardcontrol": "Inventory Keyboard Control: %s",
"key.categories.accessibilityplus.inventorycontrol": "Accessibility Plus (Inventory)",
"key.accessibilityplus.left": "Move Left",
"key.accessibilityplus.right": "Move Right",
"key.accessibilityplus.up": "Move Up",
"key.accessibilityplus.down": "Move Down",
"key.accessibilityplus.group": "Switch Group",
"key.accessibilityplus.home": "Go To First Slot / Group",
"key.accessibilityplus.end": "Go To Last Slot / Group",
"key.accessibilityplus.mouseclick": "Mouse Click",
"key.accessibilityplus.mouserightclick": "Mouse Right Click",
"key.accessibilityplus.config": "Config Menu Key",
"key.categories.accessibilityplus.general": "Accessibility Plus (General)"
}
"gui.accessibilityplus.config.title": "Accessibility Plus Configuration",
"gui.accessibilityplus.config.buttons.done": "Done",
"gui.accessibilityplus.config.buttons.cancel": "Cancel",
"gui.accessibilityplus.config.buttons.readblocks": "Read Blocks: %s",
"gui.accessibilityplus.config.buttons.readtooltips": "Read Tooltips: %s",
"gui.accessibilityplus.config.buttons.readsignscontents": "Read Sign Contents: %s",
"gui.accessibilityplus.config.buttons.inventorykeyboardcontrol": "Inventory Keyboard Control: %s",
"gui.accessibilityplus.config.buttons.actionbar": "Action Bar: %s",
"key.categories.accessibilityplus.inventorycontrol": "Accessibility Plus (Inventory)",
"key.accessibilityplus.left": "Move Left",
"key.accessibilityplus.right": "Move Right",
"key.accessibilityplus.up": "Move Up",
"key.accessibilityplus.down": "Move Down",
"key.accessibilityplus.group": "Switch Group",
"key.accessibilityplus.home": "Go To First Slot / Group",
"key.accessibilityplus.end": "Go To Last Slot / Group",
"key.accessibilityplus.mouseclick": "Mouse Click",
"key.accessibilityplus.mouserightclick": "Mouse Right Click",
"key.accessibilityplus.config": "Config Menu Key",
"key.categories.accessibilityplus.general": "Accessibility Plus (General)"
}