DevComp/elytra-lock-fabric
1
0
Fork 0
mirror of https://github.com/CompeyDev/elytra-lock-fabric.git synced 2025-04-05 10:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: fall flying prevention & allow manual equip

Browse source 
* User can manually drag the elytra into their chestplate slot even when
  it is locked, although this would display a log
* Locking the elytra now prevents fall flying if the user has it
  equipped at the time of lock
This commit is contained in:
Erica Marigold 2024-05-21 18:23:51 +05:30
parent 6e9cb2c04a
commit 14dd54adb8
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
3 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/xyz/devcomp/elytralock/events/ClientTickEndHandler.java
View file

@ -4,31 +4,29 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents.EndTic
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.Items;
import xyz.devcomp.elytralock.ElytraLock;
public class ClientTickEndHandler implements EndTick {
private static boolean hasWarned = false;
public void onEndTick(MinecraftClient client) {
if (client.isWindowFocused() && ElytraLock.isLocked() && client.player != null) {
PlayerInventory inventory = client.player.getInventory();
// 0 -> boots
// 1 -> leggings
// 2 -> chestplate
// 3 -> helmet
ItemStack chestArmor = inventory.armor.get(2);
if (chestArmor.isOf(Items.ELYTRA)) {
ElytraLock.LOGGER.info("Detected player wearing elytra even though it's locked");
ItemStack elytra = chestArmor.copyAndEmpty();
int inventorySlot = inventory.getSwappableHotbarSlot();
boolean ok = inventory.insertStack(inventorySlot, elytra);
if (!ok) {
ElytraLock.LOGGER.warn("Failed to remove equipped elytra, which is locked");
if (ElytraLock.isLocked()) {
if (!hasWarned && client.isWindowFocused() && client.player != null) {
PlayerInventory inventory = client.player.getInventory();
// 0 -> boots
// 1 -> leggings
// 2 -> chestplate
// 3 -> helmet
ItemStack chestArmor = inventory.armor.get(2);
if (chestArmor.isOf(Items.ELYTRA)) {
ElytraLock.LOGGER.info("Detected player wearing elytra even though it's locked");
hasWarned = true;
}
}
} else {
hasWarned = false;
}
}
}

25
src/main/java/xyz/devcomp/elytralock/mixin/PlayerEntityMixin.java Normal file
View file

@ -0,0 +1,25 @@
package xyz.devcomp.elytralock.mixin;
import xyz.devcomp.elytralock.ElytraLock;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.entity.player.PlayerEntity;
// TODO: In the future, make fall flying prevention and elytra lock separate
// Fall flying prevention should be subset of elytra locking which should be
// individually toggleable
@Mixin(PlayerEntity.class)
public class PlayerEntityMixin {
@Inject(method = "checkFallFlying()Z", at = @At("HEAD"), cancellable = true)
private void preventFallFlying(CallbackInfoReturnable<Boolean> info) {
if (ElytraLock.isLocked()) {
ElytraLock.LOGGER.info("Elytra is locked, so preventing fall flying");
info.setReturnValue(false);
}
}
}

3
src/main/resources/elytra-lock.mixins.json
View file

@ -3,7 +3,8 @@
"package": "xyz.devcomp.elytralock.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ClientPlayerInteractionManagerMixin"
"ClientPlayerInteractionManagerMixin",
"PlayerEntityMixin"
],
"injectors": {
"defaultRequire": 1