Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 01b7b58

Browse files
topi-bananatopi-banana
committed
[new] disableMassCraftPlayerInventory
# Fixes + cannot use keybind # New + modIcon, modMenuOption + disableMassCraftPlayerInventory version up to 1.0.3
1 parent d5baf0a commit 01b7b58

File tree

13 files changed

+123
-54
lines changed

13 files changed

+123
-54
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ masa mods addition made for [Taichi SMP](https://discord.gg/6U6Y8c7HQ2).
2727

2828
### gammaOverrideFix
2929

30-
## Disables
30+
## Disables
31+
32+
### disableMassCraftPlayerInventory

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
88
loader_version=0.15.7
99

1010
# Mod Properties
11-
mod_version = 1.0.1
11+
mod_version = 1.0.3
1212
maven_group = org.taichiServer
1313
archives_base_name = taichi-tweaks
1414

‎src/main/java/org/taichiserver/taichitweaks/InitHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
import org.taichiserver.taichitweaks.config.ConfigCallbacks;
77
import org.taichiserver.taichitweaks.config.Configs;
88

9-
public class InitHandler implements IInitializationHandler
10-
{
9+
public class InitHandler implements IInitializationHandler {
1110
@Override
12-
public void registerModHandlers()
13-
{
11+
public void registerModHandlers() {
1412
ConfigManager.getInstance().registerConfigHandler(TaichiTweaks.MOD_ID, new Configs());
1513
InputEventHandler.getKeybindManager().registerKeybindProvider(InputHandler.getInstance());
14+
InputEventHandler.getInputManager().registerKeyboardInputHandler(InputHandler.getInstance());
1615

1716
ConfigCallbacks.init();
1817
}

‎src/main/java/org/taichiserver/taichitweaks/InputHandler.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package org.taichiserver.taichitweaks;
22

3-
import java.util.List;
4-
import com.google.common.collect.ImmutableList;
3+
import fi.dy.masa.malilib.config.IConfigBase;
4+
import fi.dy.masa.malilib.config.options.ConfigBooleanHotkeyed;
55
import fi.dy.masa.malilib.hotkeys.IHotkey;
66
import fi.dy.masa.malilib.hotkeys.IKeybindManager;
77
import fi.dy.masa.malilib.hotkeys.IKeybindProvider;
8+
import fi.dy.masa.malilib.hotkeys.IKeyboardInputHandler;
89
import org.taichiserver.taichitweaks.config.Configs;
910

10-
public class InputHandler implements IKeybindProvider {
11+
public class InputHandler implements IKeybindProvider, IKeyboardInputHandler {
1112
private static final InputHandler INSTANCE = new InputHandler();
1213

1314
private InputHandler() {
@@ -23,6 +24,21 @@ public void addKeysToMap(IKeybindManager manager) {
2324
for (IHotkey hotkey : Configs.Hotkeys.OPTIONS) {
2425
manager.addKeybindToMap(hotkey.getKeybind());
2526
}
27+
for (IConfigBase config : Configs.Generic.OPTIONS) {
28+
if(config instanceof ConfigBooleanHotkeyed hotkey) {
29+
manager.addKeybindToMap(hotkey.getKeybind());
30+
}
31+
}
32+
for (IConfigBase config : Configs.Fixes.OPTIONS) {
33+
if(config instanceof ConfigBooleanHotkeyed hotkey) {
34+
manager.addKeybindToMap(hotkey.getKeybind());
35+
}
36+
}
37+
for (IConfigBase config : Configs.Disables.OPTIONS) {
38+
if(config instanceof ConfigBooleanHotkeyed hotkey) {
39+
manager.addKeybindToMap(hotkey.getKeybind());
40+
}
41+
}
2642
}
2743

2844
@Override

‎src/main/java/org/taichiserver/taichitweaks/ModMenuApiImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.terraformersmc.modmenu.api.ModMenuApi;
55
import org.taichiserver.taichitweaks.config.ConfigGui;
66

7-
public class ModMenuApiImpl implements ModMenuApi
8-
{
7+
public class ModMenuApiImpl implements ModMenuApi {
98
@Override
10-
public ConfigScreenFactory<?> getModConfigScreenFactory()
11-
{
9+
public ConfigScreenFactory<?> getModConfigScreenFactory() {
1210
return (screen) -> {
1311
ConfigGui gui = new ConfigGui();
1412
gui.setParent(screen);

‎src/main/java/org/taichiserver/taichitweaks/config/ConfigCallbacks.java‎

Lines changed: 59 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
package org.taichiserver.taichitweaks.config;
22

33
import fi.dy.masa.malilib.config.IConfigBoolean;
4+
import fi.dy.masa.malilib.config.options.ConfigBoolean;
5+
import fi.dy.masa.malilib.config.options.ConfigBooleanHotkeyed;
46
import fi.dy.masa.malilib.gui.GuiBase;
57
import fi.dy.masa.malilib.hotkeys.IHotkeyCallback;
68
import fi.dy.masa.malilib.hotkeys.IKeybind;
79
import fi.dy.masa.malilib.hotkeys.KeyAction;
8-
import fi.dy.masa.malilib.util.InfoUtils;
9-
import fi.dy.masa.malilib.util.StringUtils;
10-
import fi.dy.masa.minihud.util.DataStorage;
10+
import fi.dy.masa.malilib.interfaces.IValueChangeCallback;
1111
import net.minecraft.client.MinecraftClient;
12-
import net.minecraft.util.math.BlockPos;
1312
import org.taichiserver.taichitweaks.features.AimAngle;
14-
import org.taichiserver.taichitweaks.features.OverlayRendererBeaconRange;
1513

1614
public class ConfigCallbacks {
1715
public static void init() {
18-
Callbacks callback = new Callbacks();
16+
HotkeyCallbacks hotkeyCallback = new HotkeyCallbacks();
1917

20-
Configs.Hotkeys.OPEN_CONFIG_GUI.getKeybind().setCallback(callback);
21-
Configs.Hotkeys.SNAPAIM_ANGLE1_KEYBIND.getKeybind().setCallback(callback);
22-
Configs.Hotkeys.SNAPAIM_ANGLE2_KEYBIND.getKeybind().setCallback(callback);
23-
Configs.Hotkeys.SNAPAIM_ANGLE3_KEYBIND.getKeybind().setCallback(callback);
24-
Configs.Hotkeys.SNAPAIM_ANGLE4_KEYBIND.getKeybind().setCallback(callback);
18+
Configs.Generic.AUTOFILL_SCHEMATIC_INVENTORY.getKeybind().setCallback(hotkeyCallback);
19+
Configs.Generic.AUTO_VOID_TRADE.getKeybind().setCallback(hotkeyCallback);
20+
Configs.Generic.SCHEMATIC_BLOCK_PLACEMENT_RESTRICTION_SMART_CHECK.getKeybind().setCallback(hotkeyCallback);
2521

26-
Configs.Renders.OVERLAY_LIGHTNING_ROD_COLOR.setValueChangeCallback((config) -> OverlayRendererBeaconRange.INSTANCE.setNeedsUpdate());
27-
Configs.Renders.OVERLAY_LIGHTNING_ROD_RANGE.setValueChangeCallback(RendererCallbacks::onBeaconRangeToggled);
22+
Configs.Hotkeys.OPEN_CONFIG_GUI.getKeybind().setCallback(hotkeyCallback);
23+
Configs.Hotkeys.SNAPAIM_ANGLE1_KEYBIND.getKeybind().setCallback(hotkeyCallback);
24+
Configs.Hotkeys.SNAPAIM_ANGLE2_KEYBIND.getKeybind().setCallback(hotkeyCallback);
25+
Configs.Hotkeys.SNAPAIM_ANGLE3_KEYBIND.getKeybind().setCallback(hotkeyCallback);
26+
Configs.Hotkeys.SNAPAIM_ANGLE4_KEYBIND.getKeybind().setCallback(hotkeyCallback);
27+
28+
Configs.Fixes.GAMMA_OVERRIDE_FIX.getKeybind().setCallback(hotkeyCallback);
29+
30+
Configs.Disables.DISABLE_MASSCRAFT_PLAYER_INVENTORY.getKeybind().setCallback(hotkeyCallback);
31+
32+
// Configs.Renders.OVERLAY_LIGHTNING_ROD_COLOR.setValueChangeCallback((config) -> OverlayRendererBeaconRange.INSTANCE.setNeedsUpdate());
33+
// Configs.Renders.OVERLAY_LIGHTNING_ROD_RANGE.setValueChangeCallback(RendererCallbacks::onBeaconRangeToggled);
2834
}
2935

30-
public static class Callbacks implements IHotkeyCallback {
36+
public static class HotkeyCallbacks implements IHotkeyCallback {
3137
@Override
3238
public boolean onKeyAction(KeyAction action, IKeybind key) {
3339
MinecraftClient mc = MinecraftClient.getInstance();
@@ -48,30 +54,49 @@ public boolean onKeyAction(KeyAction action, IKeybind key) {
4854
} else if (key == Configs.Hotkeys.SNAPAIM_ANGLE4_KEYBIND.getKeybind()) {
4955
AimAngle.init(mc.player, Configs.Generic.SNAPAIM_ANGLE4.getStringValue());
5056
return true;
57+
} else if (key == Configs.Generic.AUTOFILL_SCHEMATIC_INVENTORY.getKeybind()) {
58+
valueChange(Configs.Generic.AUTOFILL_SCHEMATIC_INVENTORY);
59+
return true;
60+
} else if (key == Configs.Generic.AUTO_VOID_TRADE.getKeybind()) {
61+
valueChange(Configs.Generic.AUTO_VOID_TRADE);
62+
return true;
63+
} else if (key == Configs.Generic.SCHEMATIC_BLOCK_PLACEMENT_RESTRICTION_SMART_CHECK.getKeybind()) {
64+
valueChange(Configs.Generic.SCHEMATIC_BLOCK_PLACEMENT_RESTRICTION_SMART_CHECK);
65+
return true;
66+
} else if (key == Configs.Fixes.GAMMA_OVERRIDE_FIX.getKeybind()) {
67+
valueChange(Configs.Fixes.GAMMA_OVERRIDE_FIX);
68+
return true;
69+
} else if (key == Configs.Disables.DISABLE_MASSCRAFT_PLAYER_INVENTORY.getKeybind()) {
70+
valueChange(Configs.Disables.DISABLE_MASSCRAFT_PLAYER_INVENTORY);
71+
return true;
5172
}
5273
return false;
5374
}
5475
}
5576

56-
public static class RendererCallbacks {
57-
public static void onSpawnChunksRealToggled(IConfigBoolean config) {
58-
if (config.getBooleanValue()) {
59-
60-
BlockPos spawn = DataStorage.getInstance().getWorldSpawn();
61-
String green = GuiBase.TXT_GREEN;
62-
String rst = GuiBase.TXT_RST;
63-
String strStatus = green + StringUtils.translate("malilib.message.value.on") + rst;
64-
String strPos = String.format("x: %d, y: %d, z: %d", spawn.getX(), spawn.getY(), spawn.getZ());
65-
String message = StringUtils.translate("minihud.message.toggled_using_world_spawn", config.getPrettyName(), strStatus, strPos);
66-
67-
InfoUtils.printActionbarMessage(message);
68-
}
69-
}
70-
71-
public static void onBeaconRangeToggled(IConfigBoolean config) {
72-
if (config.getBooleanValue()) {
73-
OverlayRendererBeaconRange.INSTANCE.setNeedsUpdate();
74-
}
75-
}
77+
public static void valueChange(ConfigBoolean config) {
78+
config.setBooleanValue(!config.getBooleanValue());
7679
}
80+
81+
// public static class RendererCallbacks {
82+
// public static void onSpawnChunksRealToggled(IConfigBoolean config) {
83+
// if (config.getBooleanValue()) {
84+
//
85+
// BlockPos spawn = DataStorage.getInstance().getWorldSpawn();
86+
// String green = GuiBase.TXT_GREEN;
87+
// String rst = GuiBase.TXT_RST;
88+
// String strStatus = green + StringUtils.translate("malilib.message.value.on") + rst;
89+
// String strPos = String.format("x: %d, y: %d, z: %d", spawn.getX(), spawn.getY(), spawn.getZ());
90+
// String message = StringUtils.translate("minihud.message.toggled_using_world_spawn", config.getPrettyName(), strStatus, strPos);
91+
//
92+
// InfoUtils.printActionbarMessage(message);
93+
// }
94+
// }
95+
//
96+
// public static void onBeaconRangeToggled(IConfigBoolean config) {
97+
// if (config.getBooleanValue()) {
98+
// OverlayRendererBeaconRange.INSTANCE.setNeedsUpdate();
99+
// }
100+
// }
101+
// }
77102
}

‎src/main/java/org/taichiserver/taichitweaks/config/Configs.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public static class Hotkeys {
6363
}
6464

6565
public static class Renders {
66-
public static final ConfigBooleanHotkeyed OVERLAY_LIGHTNING_ROD_RANGE = new ConfigBooleanHotkeyed("overlayLightningRodRange", false, "", "");
67-
public static final ConfigColor OVERLAY_LIGHTNING_ROD_COLOR = new ConfigColor("overlayLightningRodColor", "#302050D0", "");
66+
public static final ConfigBooleanHotkeyed OVERLAY_LIGHTNING_ROD_RANGE = new ConfigBooleanHotkeyed("overlayLightningRodRange", false, "", "overlayLightningRodRange");
67+
public static final ConfigColor OVERLAY_LIGHTNING_ROD_COLOR = new ConfigColor("overlayLightningRodColor", "#302050D0", "overlayLightningRodColor");
6868
public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
6969
//OVERLAY_LIGHTNING_ROD_RANGE,
7070
//OVERLAY_LIGHTNING_ROD_COLOR
@@ -73,7 +73,7 @@ public static class Renders {
7373

7474

7575
public static class Fixes {
76-
public static ConfigBoolean GAMMA_OVERRIDE_FIX = new ConfigBoolean("gammaOverrideFix", false, "Fixes gamma override not applying when starting the game");
76+
public static ConfigBooleanHotkeyed GAMMA_OVERRIDE_FIX = new ConfigBooleanHotkeyed("gammaOverrideFix", false, "", "Fixes gamma override not applying when starting the game");
7777

7878
public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
7979
GAMMA_OVERRIDE_FIX
@@ -82,7 +82,10 @@ public static class Fixes {
8282

8383
public static class Disables {
8484

85+
public static final ConfigBooleanHotkeyed DISABLE_MASSCRAFT_PLAYER_INVENTORY = new ConfigBooleanHotkeyed("disableMassCraftPlayerInventory", false, "", "disableMassCraftPlayerInventory");
86+
8587
public static final ImmutableList<IConfigBase> OPTIONS = ImmutableList.of(
88+
DISABLE_MASSCRAFT_PLAYER_INVENTORY
8689
);
8790
}
8891

‎src/main/java/org/taichiserver/taichitweaks/mixins/disableMassCraftPlayerInventory/KeybindCallbacksMixin.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.taichiserver.taichitweaks.mixins.disableMassCraftPlayerInventory;
2+
3+
import fi.dy.masa.itemscroller.event.KeybindCallbacks;
4+
import fi.dy.masa.malilib.util.GuiUtils;
5+
import net.minecraft.client.MinecraftClient;
6+
import net.minecraft.client.gui.screen.Screen;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
import org.taichiserver.taichitweaks.config.Configs;
12+
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
13+
14+
@Mixin(KeybindCallbacks.class)
15+
public class KeybindCallbacksMixin {
16+
@Inject(method = "onClientTick", at = @At("HEAD"), cancellable = true)
17+
private void onClientTick(MinecraftClient mc, CallbackInfo ci) {
18+
if(!Configs.Disables.DISABLE_MASSCRAFT_PLAYER_INVENTORY.getBooleanValue()) return;
19+
Screen screen = GuiUtils.getCurrentScreen();
20+
if(screen instanceof InventoryScreen) {
21+
ci.cancel();
22+
}
23+
}
24+
}

‎src/main/java/org/taichiserver/taichitweaks/mixins/schemBlockPlacementRestcintionSmartCheck/BlockInteractionRestrictorMixin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.spongepowered.asm.mixin.injection.Inject;
1414
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1515
import org.taichiserver.taichitweaks.config.Configs;
16-
import org.taichiserver.taichitweaks.util.items.ItemTypeEquals;
1716

1817
@Mixin(BlockInteractionRestrictor.class)
1918
public class BlockInteractionRestrictorMixin {

‎src/main/java/org/taichiserver/taichitweaks/mixins/schemBlockPlacementRestcintionSmartCheck/SchematicBlockPickerMixin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.minecraft.block.BlockState;
77
import net.minecraft.client.MinecraftClient;
88
import net.minecraft.item.Item;
9-
import net.minecraft.item.ItemStack;
109
import net.minecraft.util.Hand;
1110
import net.minecraft.util.math.BlockPos;
1211
import net.minecraft.world.World;

0 commit comments

Comments
 (0)