Skip to content

Move from Deprecated Keybind to SyncedKeyMappings and add Hotkey for StepAssist #4291

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

Open
zetrock1 wants to merge 5 commits into
base: 1.20.1
Choose a base branch
from
Open

Move from Deprecated Keybind to SyncedKeyMappings and add Hotkey for StepAssist #4291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9426b4
Add hotkey (default apostrophe) for toggle stepAssist QuarkTechSuite …
zetrock1 Dec 8, 2025
25be45b
add hotkey name in controls settings
zetrock1 Dec 8, 2025
f3322ad
move from deprecated KeyBind to SyncedKeyMappings
zetrock1 Dec 8, 2025
ac2d9c3
Move others hotkeys from Deprecated KeyBind to SyncedKeyMappings
zetrock1 Dec 8, 2025
a695f15
add to LangHandler
zetrock1 Dec 9, 2025
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
17 changes: 12 additions & 5 deletions src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2589,6 +2589,7 @@
"gtceu.key.enable_boots": "Enable Boosted Jump",
"gtceu.key.enable_jetpack": "Enable Jetpack",
"gtceu.key.tool_aoe_change": "Tool AoE Mode Switch",
"gtceu.key.enable_step_assist": "Enable StepAssist",
"gtceu.large_boiler": "Large Boiler",
"gtceu.large_chemical_reactor": "Large Chemical Reactor",
"gtceu.laser_engraver": "Laser Engraver",
Expand Down Expand Up @@ -5659,20 +5660,26 @@
"metaarmor.message.nightvision.disabled": "§bNightVision: §cOff",
"metaarmor.message.nightvision.enabled": "§bNightVision: §aOn",
"metaarmor.message.nightvision.error": "§cNot enough power!",
"metaarmor.nms.boosted_jump.disabled": "NanoMuscle™ Suite: Jump Boost Disabled",
"metaarmor.nms.boosted_jump.enabled": "NanoMuscle™ Suite: Jump Boost Enabled",
"metaarmor.message.step_assist.disabled": "StepAssist: §cOff",
"metaarmor.message.step_assist.enabled": "StepAssist: §aOn",
"metaarmor.nms.nightvision.disabled": "NanoMuscle™ Suite: NightVision Disabled",
"metaarmor.nms.nightvision.enabled": "NanoMuscle™ Suite: NightVision Enabled",
"metaarmor.nms.nightvision.error": "NanoMuscle™ Suite: §cNot enough power!",
"metaarmor.nms.share.disable": "NanoMuscle™ Suite: Charging Disabled",
"metaarmor.nms.share.enable": "NanoMuscle™ Suite: Charging Enabled",
"metaarmor.nms.share.error": "NanoMuscle™ Suite: §cNot enough power for charging!",
"metaarmor.qts.nightvision.disabled": "QuarkTech™ Suite: NightVision Disabled",
"metaarmor.qts.nightvision.enabled": "QuarkTech™ Suite: NightVision Enabled",
"metaarmor.qts.nightvision.error": "QuarkTech™ Suite: §cNot enough power!",
"metaarmor.nms.step_assist.disabled": "NanoMuscle™ Suite: StepAssist Disabled",
"metaarmor.nms.step_assist.enabled": "NanoMuscle™ Suite: StepAssist Enabled",
"metaarmor.qts.step_assist.disabled": "QuarkTech™ Suite: StepAssist Disabled",
"metaarmor.qts.step_assist.enabled": "QuarkTech™ Suite: StepAssist Enabled",
"metaarmor.nms.share.disable": "NanoMuscle™ Suite: Charging Disabled",
"metaarmor.nms.share.enable": "NanoMuscle™ Suite: Charging Enabled",
"metaarmor.nms.share.error": "NanoMuscle™ Suite: §cNot enough power for charging!",
"metaarmor.qts.share.disable": "QuarkTech™ Suite: Charging Disabled",
"metaarmor.qts.share.enable": "QuarkTech™ Suite: Charging Enabled",
"metaarmor.qts.share.error": "QuarkTech™ Suite: §cNot enough power for charging!",
"metaarmor.qts.boosted_jump.disabled": "QuarkTech™ Suite: Jump Boost Disabled",
"metaarmor.qts.boosted_jump.enabled": "QuarkTech™ Suite: Jump Boost Enabled",
"metaarmor.tooltip.autoeat": "Replenishes Food Bar by Using Food from Inventory",
"metaarmor.tooltip.breath": "Replenishes Underwater Breath Bar",
"metaarmor.tooltip.burning": "Nullifies Burning",
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.gregtechceu.gtceu.api.capability.IElectricItem;
import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem;
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.NonNullList;
Expand Down Expand Up @@ -64,15 +64,15 @@ public void onArmorTick(Level world, Player player, @NotNull ItemStack item) {

String messageKey = null;
if (toggleTimer == 0) {
if (KeyBind.JETPACK_ENABLE.isKeyDown(player)) {
if (SyncedKeyMappings.JETPACK_ENABLE.isKeyDown(player)) {
jetpackEnabled = !jetpackEnabled;
messageKey = "metaarmor.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
data.putBoolean("enabled", jetpackEnabled);
} else if (KeyBind.ARMOR_HOVER.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_HOVER.isKeyDown(player)) {
hoverMode = !hoverMode;
messageKey = "metaarmor.jetpack.hover." + (hoverMode ? "enable" : "disable");
data.putBoolean("hover", hoverMode);
} else if (KeyBind.ARMOR_CHARGING.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_CHARGING.isKeyDown(player)) {
canShare = !canShare;
if (canShare && cont.getCharge() == 0) { // Only allow for charging to be enabled if charge is nonzero
messageKey = "metaarmor.nms.share.error";
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem;
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.core.IFireImmuneEntity;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.NonNullList;
Expand Down Expand Up @@ -64,15 +64,15 @@ public void onArmorTick(Level world, Player player, ItemStack item) {

String messageKey = null;
if (toggleTimer == 0) {
if (KeyBind.JETPACK_ENABLE.isKeyDown(player)) {
if (SyncedKeyMappings.JETPACK_ENABLE.isKeyDown(player)) {
jetpackEnabled = !jetpackEnabled;
messageKey = "metaarmor.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
data.putBoolean("enabled", jetpackEnabled);
} else if (KeyBind.ARMOR_HOVER.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_HOVER.isKeyDown(player)) {
hoverMode = !hoverMode;
messageKey = "metaarmor.jetpack.hover." + (hoverMode ? "enable" : "disable");
data.putBoolean("hover", hoverMode);
} else if (KeyBind.ARMOR_CHARGING.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_CHARGING.isKeyDown(player)) {
canShare = !canShare;
if (canShare && cont.getCharge() == 0) { // Only allow for charging to be enabled if charge is nonzero
messageKey = "metaarmor.qts.share.error";
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/Jetpack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.gregtechceu.gtceu.api.capability.IElectricItem;
import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite;
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.particles.ParticleOptions;
Expand Down Expand Up @@ -61,11 +61,11 @@ public void onArmorTick(Level world, Player player, @NotNull ItemStack item) {

String messageKey = null;
if (toggleTimer == 0) {
if (KeyBind.JETPACK_ENABLE.isKeyDown(player)) {
if (SyncedKeyMappings.JETPACK_ENABLE.isKeyDown(player)) {
jetpackEnabled = !jetpackEnabled;
messageKey = "metaarmor.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
data.putBoolean("enabled", jetpackEnabled);
} else if (KeyBind.ARMOR_HOVER.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_HOVER.isKeyDown(player)) {
hoverMode = !hoverMode;
messageKey = "metaarmor.jetpack.hover." + (hoverMode ? "enable" : "disable");
data.putBoolean("hover", hoverMode);
Expand Down
49 changes: 33 additions & 16 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/NanoMuscleSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite;
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.common.data.GTItems;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
Expand Down Expand Up @@ -51,19 +51,36 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
return;
}
CompoundTag data = itemStack.getOrCreateTag();
byte toggleTimer = data.contains("toggleTimer") ? data.getByte("toggleTimer") : 0;
int nightVisionTimer = data.contains("nightVisionTimer") ? data.getInt("nightVisionTimer") :
ArmorUtils.NIGHTVISION_DURATION;

byte toggleStepTimer = data.getByte("toggleStepTimer");
if (type == ArmorItem.Type.BOOTS) {
boolean stepAssist = data.contains("stepAssist") && data.getBoolean("stepAssist");
if (toggleStepTimer == 0 && SyncedKeyMappings.STEP_ASSIST_ENABLE.isKeyDown(player)) {
stepAssist = !stepAssist;
toggleStepTimer = 5;
if (world.isClientSide()) player.displayClientMessage(Component
.translatable("metaarmor.nms.step_assist." + (stepAssist ? "enabled" : "disabled")), true);
data.putBoolean("stepAssist", stepAssist);
}

if (toggleStepTimer > 0) toggleStepTimer--;
data.putInt("toggleStepTimer", toggleStepTimer);
}

if (type == ArmorItem.Type.HELMET) {
byte toggleTimer = data.contains("toggleTimer") ? data.getByte("toggleTimer") : 0;
int nightVisionTimer = data.contains("nightVisionTimer") ? data.getInt("nightVisionTimer") :
ArmorUtils.NIGHTVISION_DURATION;
boolean nightVision = data.contains("nightVision") && data.getBoolean("nightVision");
if (toggleTimer == 0 && KeyBind.ARMOR_MODE_SWITCH.isKeyDown(player)) {
if (toggleTimer == 0 && SyncedKeyMappings.ARMOR_MODE_SWITCH.isKeyDown(player)) {
nightVision = !nightVision;
toggleTimer = 5;
if (item.getCharge() < ArmorUtils.MIN_NIGHTVISION_CHARGE) {
nightVision = false;
player.displayClientMessage(Component.translatable("metaarmor.nms.nightvision.error"), true);
if (world.isClientSide())
player.displayClientMessage(Component.translatable("metaarmor.nms.nightvision.error"), true);
} else {
player.displayClientMessage(Component
if (world.isClientSide()) player.displayClientMessage(Component
.translatable("metaarmor.nms.nightvision." + (nightVision ? "enabled" : "disabled")), true);
}
}
Expand All @@ -81,14 +98,11 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
player.removeEffect(MobEffects.NIGHT_VISION);
}
data.putBoolean("nightVision", nightVision);

if (nightVisionTimer > 0) nightVisionTimer--;
if (toggleTimer > 0) toggleTimer--;
data.putInt("nightVisionTimer", nightVisionTimer);
data.putByte("toggleTimer", toggleTimer);
}

if (nightVisionTimer > 0) nightVisionTimer--;
if (toggleTimer > 0) toggleTimer--;

data.putInt("nightVisionTimer", nightVisionTimer);
data.putByte("toggleTimer", toggleTimer);
}

public static void disableNightVision(@NotNull Level world, Player player, boolean sendMsg) {
Expand Down Expand Up @@ -163,16 +177,19 @@ public void drawHUD(ItemStack item, GuiGraphics guiGraphics) {
@Override
public void addInfo(ItemStack itemStack, List<Component> lines) {
super.addInfo(itemStack, lines);
CompoundTag nbtData = itemStack.getOrCreateTag();
if (type == ArmorItem.Type.HELMET) {
CompoundTag nbtData = itemStack.getOrCreateTag();

boolean nv = nbtData.getBoolean("nightVision");
if (nv) {
lines.add(Component.translatable("metaarmor.message.nightvision.enabled"));
} else {
lines.add(Component.translatable("metaarmor.message.nightvision.disabled"));
}
} else if (type == ArmorItem.Type.BOOTS) {
lines.add(Component.translatable("metaarmor.tooltip.stepassist"));
if (nbtData.getBoolean("stepAssist"))
lines.add(Component.translatable("metaarmor.message.step_assist.enabled"));
else lines.add(Component.translatable("metaarmor.message.step_assist.disabled"));
lines.add(Component.translatable("metaarmor.tooltip.falldamage"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/NightvisionGoggles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.gregtechceu.gtceu.api.capability.IElectricItem;
import com.gregtechceu.gtceu.api.item.armor.ArmorLogicSuite;
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -41,7 +41,7 @@ public void onArmorTick(Level world, @NotNull Player player, @NotNull ItemStack
ArmorUtils.NIGHTVISION_DURATION;
if (type == ArmorItem.Type.HELMET) {
boolean nightVision = data.contains("nightVision") && data.getBoolean("nightVision");
if (toggleTimer == 0 && KeyBind.ARMOR_MODE_SWITCH.isKeyDown(player)) {
if (toggleTimer == 0 && SyncedKeyMappings.ARMOR_MODE_SWITCH.isKeyDown(player)) {
nightVision = !nightVision;
toggleTimer = 5;
if (item.getCharge() < ArmorUtils.MIN_NIGHTVISION_CHARGE) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.utils.GradientUtil;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.core.NonNullList;
Expand Down Expand Up @@ -77,11 +77,11 @@ public void onArmorTick(Level world, Player player, @NotNull ItemStack stack) {

String messageKey = null;
if (toggleTimer == 0) {
if (KeyBind.JETPACK_ENABLE.isKeyDown(player)) {
if (SyncedKeyMappings.JETPACK_ENABLE.isKeyDown(player)) {
jetpackEnabled = !jetpackEnabled;
messageKey = "metaarmor.jetpack.flight." + (jetpackEnabled ? "enable" : "disable");
data.putBoolean("enabled", jetpackEnabled);
} else if (KeyBind.ARMOR_HOVER.isKeyDown(player)) {
} else if (SyncedKeyMappings.ARMOR_HOVER.isKeyDown(player)) {
hoverMode = !hoverMode;
messageKey = "metaarmor.jetpack.hover." + (hoverMode ? "enable" : "disable");
data.putBoolean("hover", hoverMode);
Expand Down
34 changes: 22 additions & 12 deletions src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.gregtechceu.gtceu.api.item.armor.ArmorUtils;
import com.gregtechceu.gtceu.common.data.GTItems;
import com.gregtechceu.gtceu.core.IFireImmuneEntity;
import com.gregtechceu.gtceu.utils.input.KeyBind;
import com.gregtechceu.gtceu.utils.input.SyncedKeyMappings;

import net.minecraft.client.Minecraft;
Expand Down Expand Up @@ -78,7 +77,7 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
int nightVisionTimer = data.contains("nightVisionTimer") ? data.getInt("nightVisionTimer") :
ArmorUtils.NIGHTVISION_DURATION;
byte runningTimer = data.contains("runningTimer") ? data.getByte("runningTimer") : RUNNING_TIMER;
byte boostedJumpTimer = data.contains("boostedJumpTimer") ? data.getByte("boostedJumpTimer") : JUMPING_TIMER;
byte toggleBootsTimer = data.contains("toggleBootsTimer") ? data.getByte("toggleBootsTimer") : JUMPING_TIMER;

if (!player.getItemBySlot(EquipmentSlot.CHEST).is(GTItems.QUANTUM_CHESTPLATE.get()) &&
!player.getItemBySlot(EquipmentSlot.CHEST).is(GTItems.QUANTUM_CHESTPLATE_ADVANCED.get())) {
Expand All @@ -92,15 +91,15 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
removeNegativeEffects(item, player);

boolean nightVision = data.contains("nightVision") && data.getBoolean("nightVision");
if (toggleTimer == 0 && KeyBind.ARMOR_MODE_SWITCH.isKeyDown(player)) {
if (toggleTimer == 0 && SyncedKeyMappings.ARMOR_MODE_SWITCH.isKeyDown(player)) {
nightVision = !nightVision;
toggleTimer = 5;
if (item.getCharge() < ArmorUtils.MIN_NIGHTVISION_CHARGE) {
nightVision = false;
player.displayClientMessage(Component.translatable("metaarmor.nms.nightvision.error"), true);
player.displayClientMessage(Component.translatable("metaarmor.qts.nightvision.error"), true);
} else {
player.displayClientMessage(Component
.translatable("metaarmor.nms.nightvision." + (nightVision ? "enabled" : "disabled")), true);
.translatable("metaarmor.qts.nightvision." + (nightVision ? "enabled" : "disabled")), true);
}
}

Expand Down Expand Up @@ -161,11 +160,11 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
boolean canUseEnergy = item.canUse(energyPerUse / 100);
boolean jumping = SyncedKeyMappings.VANILLA_JUMP.isKeyDown(player);
boolean boostedJump = data.contains("boostedJump") && data.getBoolean("boostedJump");
if (boostedJumpTimer == 0 && KeyBind.BOOTS_ENABLE.isKeyDown(player)) {
if (toggleBootsTimer == 0 && SyncedKeyMappings.BOOTS_ENABLE.isKeyDown(player)) {
boostedJump = !boostedJump;
boostedJumpTimer = JUMPING_TIMER;
toggleBootsTimer = JUMPING_TIMER;
player.displayClientMessage(Component
.translatable("metaarmor.nms.boosted_jump." + (boostedJump ? "enabled" : "disabled")), true);
.translatable("metaarmor.qts.boosted_jump." + (boostedJump ? "enabled" : "disabled")), true);
}
if (boostedJump) {
if (!world.isClientSide) {
Expand Down Expand Up @@ -198,11 +197,19 @@ public void onArmorTick(Level world, Player player, ItemStack itemStack) {
}
}
}
data.putBoolean("boostedJump", boostedJump);

if (boostedJumpTimer > 0) boostedJumpTimer--;
boolean stepAssist = data.contains("stepAssist") && data.getBoolean("stepAssist");
if (toggleBootsTimer == 0 && SyncedKeyMappings.STEP_ASSIST_ENABLE.isKeyDown(player)) {
stepAssist = !stepAssist;
toggleBootsTimer = 5;
if (world.isClientSide()) player.displayClientMessage(Component
.translatable("metaarmor.qts.step_assist." + (stepAssist ? "enabled" : "disabled")), true);
data.putBoolean("stepAssist", stepAssist);
}

data.putInt("boostedJumpTimer", boostedJumpTimer);
data.putBoolean("boostedJump", boostedJump);
if (toggleBootsTimer > 0) toggleBootsTimer--;
data.putInt("toggleBootsTimer", toggleBootsTimer);
}

if (ret) {
Expand Down Expand Up @@ -356,7 +363,10 @@ public void addInfo(ItemStack itemStack, List<Component> lines) {
} else if (type == ArmorItem.Type.LEGGINGS) {
lines.add(Component.translatable("metaarmor.tooltip.speed"));
} else if (type == ArmorItem.Type.BOOTS) {
lines.add(Component.translatable("metaarmor.tooltip.stepassist"));
CompoundTag nbtData = itemStack.getOrCreateTag();
if (nbtData.getBoolean("stepAssist"))
lines.add(Component.translatable("metaarmor.message.step_assist.enabled"));
else lines.add(Component.translatable("metaarmor.message.step_assist.disabled"));
lines.add(Component.translatable("metaarmor.tooltip.falldamage"));
lines.add(Component.translatable("metaarmor.tooltip.jump"));
}
Expand Down
Loading