Skip to content
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
5 changes: 3 additions & 2 deletions src/main/java/troy/autofish/GuiChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;

public class GuiChecker {
private FabricModAutofish modAutofish;
private final FabricModAutofish modAutofish;

public GuiChecker(FabricModAutofish modAutofish) {
this.modAutofish = modAutofish;
}

public void toggleAutoFish(MinecraftClient client) {
if(modAutofish.getConfig().isDisableInGUI())
if (this.modAutofish.getConfig().isDisableInContainer()) {
this.modAutofish.getConfig().setAutofishEnabled(!(client.currentScreen instanceof GenericContainerScreen));
}
}
}
9 changes: 9 additions & 0 deletions src/main/java/troy/autofish/config/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class Config {
@Expose boolean useSoundDetection = false;
@Expose boolean forceMPDetection = false;
@Expose boolean autoTurnView = false;
@Expose boolean disableInContainer = true;
@Expose float turnAngle = 30.0f;
@Expose int turnDuration = 500;
@Expose long recastDelay = 1500;
Expand Down Expand Up @@ -52,6 +53,14 @@ public void setAutoTurnView(boolean autoTurnView) {
this.autoTurnView = autoTurnView;
}

public boolean isDisableInContainer() {
return disableInContainer;
}

public void setDisableInContainer(boolean disableInContainer) {
this.disableInContainer = disableInContainer;
}

public float getTurnAngle() {
return turnAngle;
}
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/troy/autofish/gui/AutofishScreenBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ public static Screen buildScreen(FabricModAutofish modAutofish, Screen parentScr
.setYesNoTextSupplier(yesNoTextSupplier)
.build();

AbstractConfigListEntry toggleGUIChecker = entryBuilder.startBooleanToggle(Text.translatable("options.autofish.guichecker.title"), config.isPersistentMode())
.setDefaultValue(defaults.isDisableInGUI())
//Disable in Container
AbstractConfigListEntry toggleDisableInContainer = entryBuilder.startBooleanToggle(Text.translatable("options.autofish.disable_in_container.title"), config.isDisableInContainer())
.setDefaultValue(defaults.isDisableInContainer())
.setTooltip(
Text.translatable("options.autofish.guichecker.tooltip_0"),
Text.translatable("options.autofish.guichecker.tooltip_1")
Text.translatable("options.autofish.disable_in_container.tooltip_0"),
Text.translatable("options.autofish.disable_in_container.tooltip_1")
)
.setSaveConsumer(newValue -> {
modAutofish.getConfig().setDisableInGUI(newValue);
modAutofish.getConfig().setDisableInContainer(newValue);
})
.setYesNoTextSupplier(yesNoTextSupplier)
.build();
Expand Down Expand Up @@ -249,7 +250,8 @@ public static Screen buildScreen(FabricModAutofish modAutofish, Screen parentScr
subCatBuilderBasic.add(toggleOpenWaterDetection);
subCatBuilderBasic.add(toggleBreakProtection);
subCatBuilderBasic.add((togglePersistentMode));
subCatBuilderBasic.add(toggleGUIChecker);
subCatBuilderBasic.add(toggleDisableInContainer);
subCatBuilderBasic.setExpanded(true);
subCatBuilderBasic.add(toggleAutoTurnView);
subCatBuilderBasic.add(turnAngleSlider);
subCatBuilderBasic.add(turnDurationSlider);
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/assets/autofish/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
"options.autofish.persistent.tooltip_4": "This is useful for lag issues or when",
"options.autofish.persistent.tooltip_5": "fishing for long periods of time.",

"options.autofish.disable_in_container.title": "Disable in Chests",
"options.autofish.disable_in_container.tooltip_0": "Automatically disable autofish when",
"options.autofish.disable_in_container.tooltip_1": "opening chests.",

"options.autofish.sound.title": "Use Sound Detection",
"options.autofish.sound.tooltip_0": "\u00A76Newer, more accurate detection based",
"options.autofish.sound.tooltip_1": "\u00A76on bobber sounds rather than the",
Expand Down
Loading