From 6f78c19cb202b131ec729483678c1ce3e3904146 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Wed, 19 Jul 2017 15:15:35 +0200 Subject: [PATCH] Add disable toggle to freerunners. Adds feature #3808. --- .../mekanism/client/ClientPlayerTracker.java | 1 + .../mekanism/client/ClientTickHandler.java | 41 ++++- .../java/mekanism/client/MekanismClient.java | 1 + .../mekanism/client/MekanismKeyHandler.java | 31 +++- .../mekanism/common/CommonPlayerTracker.java | 7 +- src/main/java/mekanism/common/Mekanism.java | 10 +- .../java/mekanism/common/PacketHandler.java | 3 + .../mekanism/common/item/ItemFreeRunners.java | 43 +++++- .../common/network/PacketFreeRunnerData.java | 140 ++++++++++++++++++ .../resources/assets/mekanism/lang/en_us.lang | 4 + 10 files changed, 271 insertions(+), 10 deletions(-) create mode 100644 src/main/java/mekanism/common/network/PacketFreeRunnerData.java diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 20ef79bb0..c0e7cc6da 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -15,5 +15,6 @@ public class ClientPlayerTracker Mekanism.jetpackOn.remove(event.player); Mekanism.gasmaskOn.remove(event.player); Mekanism.flamethrowerActive.remove(event.player); + Mekanism.freeRunnerOn.remove(event.player); } } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 83647a516..4a284ffba 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -35,6 +35,7 @@ import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; +import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketItemStack.ItemStackMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; @@ -220,10 +221,24 @@ public class ClientTickHandler } } } - + + if(Mekanism.freeRunnerOn.contains(mc.player.getName()) != isFreeRunnerOn(mc.player)) + { + if(isFreeRunnerOn(mc.player) && mc.currentScreen == null) + { + Mekanism.freeRunnerOn.add(mc.player.getName()); + } + else + { + Mekanism.freeRunnerOn.remove(mc.player.getName()); + } + + Mekanism.packetHandler.sendToServer(new PacketFreeRunnerData.FreeRunnerDataMessage(PacketFreeRunnerData.FreeRunnerPacket.UPDATE, mc.player.getName(), isFreeRunnerOn(mc.player))); + } + ItemStack bootStack = mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET); - if(!bootStack.isEmpty() && bootStack.getItem() instanceof ItemFreeRunners) + if(!bootStack.isEmpty() && bootStack.getItem() instanceof ItemFreeRunners && isFreeRunnerOn(mc.player)) { mc.player.stepHeight = 1.002F; } @@ -562,6 +577,28 @@ public class ClientTickHandler return false; } + + public static boolean isFreeRunnerOn(EntityPlayer player) + { + if(player != mc.player) + { + return Mekanism.freeRunnerOn.contains(player.getName()); + } + + ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); + + if(!stack.isEmpty() && stack.getItem() instanceof ItemFreeRunners) + { + ItemFreeRunners freeRunners = (ItemFreeRunners) stack.getItem(); + + if(/*freeRunners.getEnergy(stack) > 0 && */freeRunners.getMode(stack) == ItemFreeRunners.FreeRunnerMode.NORMAL) + { + return true; + } + } + + return false; + } public static boolean isFlamethrowerOn(EntityPlayer player) { diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index b61f107e2..dcbf3beb6 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -65,6 +65,7 @@ public class MekanismClient extends Mekanism Mekanism.gasmaskOn.clear(); Mekanism.flamethrowerActive.clear(); Mekanism.activeVibrators.clear(); + Mekanism.freeRunnerOn.clear(); SynchronizedBoilerData.clientHotMap.clear(); diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index a9166a75d..cf9fa63f7 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -10,11 +10,13 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketFlamethrowerData; +import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketItemStack.ItemStackMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; @@ -46,17 +48,19 @@ public class MekanismKeyHandler extends MekKeyHandler { public static final String keybindCategory = "Mekanism"; public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); - public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.armorMode"), Keyboard.KEY_F, keybindCategory); + public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.armorMode"), Keyboard.KEY_G, keybindCategory); + public static KeyBinding freeRunnerModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.feetMode"), Keyboard.KEY_H, keybindCategory); public static KeyBinding voiceKey = new KeyBinding("Mekanism " + LangUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory); public static KeyBinding sneakKey = Minecraft.getMinecraft().gameSettings.keyBindSneak; public static KeyBinding jumpKey = Minecraft.getMinecraft().gameSettings.keyBindJump; public MekanismKeyHandler() { - super(new KeyBinding[] {modeSwitchKey, armorModeSwitchKey, voiceKey}, new boolean[] {false, false, true}); + super(new KeyBinding[] {modeSwitchKey, armorModeSwitchKey, freeRunnerModeSwitchKey, voiceKey}, new boolean[] {false, false, true}); ClientRegistry.registerKeyBinding(modeSwitchKey); ClientRegistry.registerKeyBinding(armorModeSwitchKey); + ClientRegistry.registerKeyBinding(freeRunnerModeSwitchKey); ClientRegistry.registerKeyBinding(voiceKey); MinecraftForge.EVENT_BUS.register(this); @@ -157,6 +161,29 @@ public class MekanismKeyHandler extends MekKeyHandler SoundHandler.playSound(MekanismSounds.HYDRAULIC); } } + else if(kb == freeRunnerModeSwitchKey) + { + EntityPlayer player = FMLClientHandler.instance().getClient().player; + ItemStack feetStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET); + Item feetItem = StackUtils.getItem(feetStack); + + if(feetItem instanceof ItemFreeRunners) + { + ItemFreeRunners freeRunners = (ItemFreeRunners)feetItem; + + if(player.isSneaking()) + { + freeRunners.setMode(feetStack, ItemFreeRunners.FreeRunnerMode.DISABLED); + } + else + { + freeRunners.incrementMode(feetStack); + } + + Mekanism.packetHandler.sendToServer(new PacketFreeRunnerData.FreeRunnerDataMessage(PacketFreeRunnerData.FreeRunnerPacket.MODE, null, player.isSneaking())); + SoundHandler.playSound(MekanismSounds.HYDRAULIC); + } + } } @Override diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index bc293c82f..be4e60651 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; +import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; @@ -32,8 +33,9 @@ public class CommonPlayerTracker Mekanism.packetHandler.sendTo(new JetpackDataMessage(JetpackPacket.FULL, null, false), (EntityPlayerMP)event.player); Mekanism.packetHandler.sendTo(new ScubaTankDataMessage(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)event.player); Mekanism.packetHandler.sendTo(new SecurityUpdateMessage(SecurityPacket.FULL, null, null), (EntityPlayerMP)event.player); + Mekanism.packetHandler.sendTo(new PacketFreeRunnerData.FreeRunnerDataMessage(PacketFreeRunnerData.FreeRunnerPacket.FULL, null, false), (EntityPlayerMP)event.player); - Mekanism.logger.info("Sent config to '" + event.player.getDisplayName() + ".'"); + Mekanism.logger.info("Sent config to '" + event.player.getDisplayNameString() + ".'"); } } @@ -43,6 +45,7 @@ public class CommonPlayerTracker Mekanism.jetpackOn.remove(event.player.getName()); Mekanism.gasmaskOn.remove(event.player.getName()); Mekanism.flamethrowerActive.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getName()); } @SubscribeEvent @@ -51,11 +54,13 @@ public class CommonPlayerTracker Mekanism.jetpackOn.remove(event.player.getName()); Mekanism.gasmaskOn.remove(event.player.getName()); Mekanism.flamethrowerActive.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getName()); if(!event.player.world.isRemote) { Mekanism.packetHandler.sendTo(new JetpackDataMessage(JetpackPacket.FULL, null, false), (EntityPlayerMP)event.player); Mekanism.packetHandler.sendTo(new ScubaTankDataMessage(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)event.player); + Mekanism.packetHandler.sendTo(new PacketFreeRunnerData.FreeRunnerDataMessage(PacketFreeRunnerData.FreeRunnerPacket.FULL, null, false), (EntityPlayerMP)event.player); } } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a2860b183..6d56a5424 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -240,11 +240,12 @@ public class Mekanism public static KeySync keyMap = new KeySync(); - public static Set jetpackOn = new HashSet(); - public static Set gasmaskOn = new HashSet(); - public static Set flamethrowerActive = new HashSet(); + public static Set jetpackOn = new HashSet<>(); + public static Set gasmaskOn = new HashSet<>(); + public static Set freeRunnerOn = new HashSet<>(); + public static Set flamethrowerActive = new HashSet<>(); - public static Set activeVibrators = new HashSet(); + public static Set activeVibrators = new HashSet<>(); static { MekanismFluids.register(); @@ -1202,6 +1203,7 @@ public class Mekanism worldTickHandler.resetRegenChunks(); privateTeleporters.clear(); privateEntangloporters.clear(); + freeRunnerOn.clear(); //Reset consistent managers MultiblockManager.reset(); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index a4043602c..ab5407453 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -28,6 +28,7 @@ import mekanism.common.network.PacketEntityMove; import mekanism.common.network.PacketEntityMove.EntityMoveMessage; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; +import mekanism.common.network.PacketFreeRunnerData; import mekanism.common.network.PacketItemStack; import mekanism.common.network.PacketItemStack.ItemStackMessage; import mekanism.common.network.PacketJetpackData; @@ -132,6 +133,8 @@ public class PacketHandler netHandler.registerMessage(PacketDropperUse.class, DropperUseMessage.class, 28, Side.SERVER); netHandler.registerMessage(PacketEntityMove.class, EntityMoveMessage.class, 29, Side.CLIENT); netHandler.registerMessage(PacketSecurityUpdate.class, SecurityUpdateMessage.class, 30, Side.CLIENT); + netHandler.registerMessage(PacketFreeRunnerData.class, PacketFreeRunnerData.FreeRunnerDataMessage.class, 31, Side.CLIENT); + netHandler.registerMessage(PacketFreeRunnerData.class, PacketFreeRunnerData.FreeRunnerDataMessage.class, 31, Side.SERVER); } /** diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 49574a28c..df113c18c 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -83,6 +83,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName()); } public ItemStack getUnchargedItem() @@ -221,7 +222,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { ItemFreeRunners boots = (ItemFreeRunners)stack.getItem(); - if(boots.getEnergy(stack) > 0 && event.getSource() == DamageSource.FALL) + if(boots.getMode(stack) == FreeRunnerMode.NORMAL && boots.getEnergy(stack) > 0 && event.getSource() == DamageSource.FALL) { boots.setEnergy(stack, boots.getEnergy(stack)-event.getAmount()*50); event.setCanceled(true); @@ -234,4 +235,44 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { return new ItemCapabilityWrapper(stack, new TeslaItemWrapper(), new ForgeEnergyItemWrapper()); } + + public enum FreeRunnerMode + { + NORMAL("tooltip.freerunner.regular", EnumColor.DARK_GREEN), + DISABLED("tooltip.freerunner.disabled", EnumColor.DARK_RED); + + private String unlocalized; + private EnumColor color; + + FreeRunnerMode(String unlocalized, EnumColor color) + { + this.unlocalized = unlocalized; + this.color = color; + } + + public FreeRunnerMode increment() + { + return ordinal() < values().length-1 ? values()[ordinal()+1] : values()[0]; + } + + public String getName() + { + return color + LangUtils.localize(unlocalized); + } + } + + public FreeRunnerMode getMode(ItemStack itemStack) + { + return FreeRunnerMode.values()[ItemDataUtils.getInt(itemStack, "mode")]; + } + + public void setMode(ItemStack itemStack, FreeRunnerMode mode) + { + ItemDataUtils.setInt(itemStack, "mode", mode.ordinal()); + } + + public void incrementMode(ItemStack itemStack) + { + setMode(itemStack, getMode(itemStack).increment()); + } } diff --git a/src/main/java/mekanism/common/network/PacketFreeRunnerData.java b/src/main/java/mekanism/common/network/PacketFreeRunnerData.java new file mode 100644 index 000000000..18e23a93c --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketFreeRunnerData.java @@ -0,0 +1,140 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.item.ItemFreeRunners; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + +public class PacketFreeRunnerData implements IMessageHandler +{ + @Override + public IMessage onMessage(FreeRunnerDataMessage message, MessageContext ctx) + { + EntityPlayer entityPlayer = PacketHandler.getPlayer(ctx); + + PacketHandler.handlePacket(() -> { + if(message.packetType == FreeRunnerPacket.UPDATE) + { + if(message.value) + { + Mekanism.freeRunnerOn.add(message.username); + } + else + { + Mekanism.freeRunnerOn.remove(message.username); + } + + if(!entityPlayer.world.isRemote) + { + Mekanism.packetHandler.sendToDimension(new FreeRunnerDataMessage(FreeRunnerPacket.UPDATE, message.username, message.value), entityPlayer.world.provider.getDimension()); + } + } + else if(message.packetType == FreeRunnerPacket.MODE) + { + ItemStack stack = entityPlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET); + + if(!stack.isEmpty() && stack.getItem() instanceof ItemFreeRunners) + { + if(!message.value) + { + ((ItemFreeRunners)stack.getItem()).incrementMode(stack); + } + else + { + ((ItemFreeRunners)stack.getItem()).setMode(stack, ItemFreeRunners.FreeRunnerMode.DISABLED); + } + } + } + }, entityPlayer); + + return null; + } + + public static class FreeRunnerDataMessage implements IMessage + { + public FreeRunnerPacket packetType; + + public String username; + public boolean value; + + public FreeRunnerDataMessage() {} + + public FreeRunnerDataMessage(FreeRunnerPacket packetType, String username, boolean value) + { + this.packetType = packetType; + this.value = value; + + if(packetType == FreeRunnerPacket.UPDATE) + { + this.username = username; + } + } + + @Override + public void toBytes(ByteBuf buf) + { + buf.writeInt(packetType.ordinal()); + + if(packetType == FreeRunnerPacket.MODE) + { + buf.writeBoolean(value); + } + else if(packetType == FreeRunnerPacket.UPDATE) + { + PacketHandler.writeString(buf, username); + buf.writeBoolean(value); + } + else if(packetType == FreeRunnerPacket.FULL) + { + buf.writeInt(Mekanism.freeRunnerOn.size()); + + synchronized (Mekanism.freeRunnerOn) + { + for(String usernameToSend : Mekanism.freeRunnerOn) + { + PacketHandler.writeString(buf, usernameToSend); + } + } + } + } + + @Override + public void fromBytes(ByteBuf buf) { + packetType = FreeRunnerPacket.values()[buf.readInt()]; + + if(packetType == FreeRunnerPacket.MODE) + { + value = buf.readBoolean(); + } + else if(packetType == FreeRunnerPacket.UPDATE) + { + username = PacketHandler.readString(buf); + value = buf.readBoolean(); + } + else if(packetType == FreeRunnerPacket.FULL) + { + Mekanism.freeRunnerOn.clear(); + + int amount = buf.readInt(); + + for(int i = 0; i < amount; i++) + { + Mekanism.freeRunnerOn.add(PacketHandler.readString(buf)); + } + } + } + } + + public enum FreeRunnerPacket + { + UPDATE, + FULL, + MODE + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index eb119a49d..cc727ec0c 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -394,6 +394,7 @@ upgrade.anchor.desc=Keeps a machine's chunk loaded. //Key description text key.mode=Item Mode Switch key.armorMode=Armor Mode Switch +key.feetMode=Feet Mode Switch key.voice=Voice //Entities @@ -785,6 +786,9 @@ tooltip.jetpack.regular=Regular tooltip.jetpack.hover=Hover tooltip.jetpack.disabled=Disabled +tooltip.freerunner.regular=Regular +tooltip.freerunner.disabled=Disabled + tooltip.flamethrower.combat=Combat tooltip.flamethrower.heat=Heat tooltip.flamethrower.inferno=Inferno