Start work on new description system, UNSTABLE BUILD
This commit is contained in:
parent
cb9900bbc7
commit
84ab705170
5 changed files with 165 additions and 95 deletions
common/mekanism
|
@ -52,86 +52,89 @@ public class ClientPlayerTickHandler implements ITickHandler
|
|||
|
||||
ItemStack stack = entityPlayer.getCurrentEquippedItem();
|
||||
|
||||
if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemConfigurator)
|
||||
if(mc.currentScreen == null)
|
||||
{
|
||||
ItemConfigurator item = (ItemConfigurator)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
item.setState(stack, (byte)(item.getState(stack) < 3 ? item.getState(stack)+1 : 0));
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState().setParams(item.getState(stack)));
|
||||
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getStateDisplay(item.getState(stack))));
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemElectricBow)
|
||||
{
|
||||
ItemElectricBow item = (ItemElectricBow)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemConfigurator)
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
ItemConfigurator item = (ItemConfigurator)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
item.setState(stack, (byte)(item.getState(stack) < 3 ? item.getState(stack)+1 : 0));
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState().setParams(item.getState(stack)));
|
||||
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getStateDisplay(item.getState(stack))));
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemElectricBow)
|
||||
{
|
||||
ItemElectricBow item = (ItemElectricBow)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
{
|
||||
item.setFireState(stack, !item.getFireState(stack));
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState().setParams(item.getFireState(stack)));
|
||||
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF"))));
|
||||
lastTickUpdate = true;
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
item.setFireState(stack, !item.getFireState(stack));
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState().setParams(item.getFireState(stack)));
|
||||
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF"))));
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemWalkieTalkie)
|
||||
{
|
||||
ItemWalkieTalkie item = (ItemWalkieTalkie)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed && item.getOn(stack))
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
int newChan = item.getChannel(stack) < 9 ? item.getChannel(stack)+1 : 1;
|
||||
item.setChannel(stack, newChan);
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketWalkieTalkieState().setParams(newChan));
|
||||
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.getCurrentItemOrArmor(3) != null && entityPlayer.getCurrentItemOrArmor(3).getItem() instanceof ItemJetpack)
|
||||
{
|
||||
ItemStack jetpack = entityPlayer.getCurrentItemOrArmor(3);
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
((ItemJetpack)jetpack.getItem()).incrementMode(jetpack);
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(PacketType.MODE));
|
||||
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F);
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.isSneaking() && StackUtils.getItem(entityPlayer.getCurrentEquippedItem()) instanceof ItemWalkieTalkie)
|
||||
{
|
||||
ItemWalkieTalkie item = (ItemWalkieTalkie)entityPlayer.getCurrentEquippedItem().getItem();
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed && item.getOn(stack))
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
int newChan = item.getChannel(stack) < 9 ? item.getChannel(stack)+1 : 1;
|
||||
item.setChannel(stack, newChan);
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketWalkieTalkieState().setParams(newChan));
|
||||
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Ding", 1.0F, 1.0F);
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else if(entityPlayer.getCurrentItemOrArmor(3) != null && entityPlayer.getCurrentItemOrArmor(3).getItem() instanceof ItemJetpack)
|
||||
{
|
||||
ItemStack jetpack = entityPlayer.getCurrentItemOrArmor(3);
|
||||
|
||||
if(MekanismKeyHandler.modeSwitchKey.pressed)
|
||||
{
|
||||
if(!lastTickUpdate)
|
||||
{
|
||||
((ItemJetpack)jetpack.getItem()).incrementMode(jetpack);
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(PacketType.MODE));
|
||||
Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F);
|
||||
lastTickUpdate = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
lastTickUpdate = false;
|
||||
}
|
||||
|
||||
if(Mekanism.jetpackOn.contains(entityPlayer) != isJetpackOn(entityPlayer))
|
||||
{
|
||||
if(isJetpackOn(entityPlayer))
|
||||
if(isJetpackOn(entityPlayer) && mc.currentScreen == null)
|
||||
{
|
||||
Mekanism.jetpackOn.add(entityPlayer);
|
||||
}
|
||||
|
@ -139,7 +142,26 @@ public class ClientPlayerTickHandler implements ITickHandler
|
|||
Mekanism.jetpackOn.remove(entityPlayer);
|
||||
}
|
||||
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(PacketType.UPDATE, entityPlayer, isJetpackOn(entityPlayer)));
|
||||
if(!isGasMaskOn(entityPlayer) || mc.currentScreen == null)
|
||||
{
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketJetpackData().setParams(PacketType.UPDATE, entityPlayer, isJetpackOn(entityPlayer)));
|
||||
}
|
||||
}
|
||||
|
||||
if(Mekanism.gasmaskOn.contains(entityPlayer) != isGasMaskOn(entityPlayer))
|
||||
{
|
||||
if(isGasMaskOn(entityPlayer) && mc.currentScreen == null)
|
||||
{
|
||||
Mekanism.gasmaskOn.add(entityPlayer);
|
||||
}
|
||||
else {
|
||||
Mekanism.gasmaskOn.remove(entityPlayer);
|
||||
}
|
||||
|
||||
if(!isGasMaskOn(entityPlayer) || mc.currentScreen == null)
|
||||
{
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketScubaTankData().setParams(PacketType.UPDATE, entityPlayer, isGasMaskOn(entityPlayer)));
|
||||
}
|
||||
}
|
||||
|
||||
for(EntityPlayer entry : Mekanism.jetpackOn)
|
||||
|
@ -150,19 +172,6 @@ public class ClientPlayerTickHandler implements ITickHandler
|
|||
}
|
||||
}
|
||||
|
||||
if(Mekanism.gasmaskOn.contains(entityPlayer) != isGasMaskOn(entityPlayer))
|
||||
{
|
||||
if(isGasMaskOn(entityPlayer))
|
||||
{
|
||||
Mekanism.gasmaskOn.add(entityPlayer);
|
||||
}
|
||||
else {
|
||||
Mekanism.gasmaskOn.remove(entityPlayer);
|
||||
}
|
||||
|
||||
PacketHandler.sendPacket(Transmission.SERVER, new PacketScubaTankData().setParams(PacketType.UPDATE, entityPlayer, isGasMaskOn(entityPlayer)));
|
||||
}
|
||||
|
||||
for(EntityPlayer entry : Mekanism.gasmaskOn)
|
||||
{
|
||||
if(MekanismClient.audioHandler.getFrom(entry) == null)
|
||||
|
@ -171,24 +180,27 @@ public class ClientPlayerTickHandler implements ITickHandler
|
|||
}
|
||||
}
|
||||
|
||||
if(entityPlayer.getCurrentItemOrArmor(3) != null && entityPlayer.getCurrentItemOrArmor(3).getItem() instanceof ItemJetpack)
|
||||
if(mc.currentScreen == null)
|
||||
{
|
||||
MekanismClient.updateKey(entityPlayer, Keyboard.KEY_SPACE);
|
||||
MekanismClient.updateKey(entityPlayer, Keyboard.KEY_LSHIFT);
|
||||
if(entityPlayer.getCurrentItemOrArmor(3) != null && entityPlayer.getCurrentItemOrArmor(3).getItem() instanceof ItemJetpack)
|
||||
{
|
||||
MekanismClient.updateKey(entityPlayer, Keyboard.KEY_SPACE);
|
||||
MekanismClient.updateKey(entityPlayer, Keyboard.KEY_LSHIFT);
|
||||
}
|
||||
}
|
||||
|
||||
if(isJetpackOn(entityPlayer))
|
||||
{
|
||||
ItemJetpack jetpack = (ItemJetpack)entityPlayer.getCurrentItemOrArmor(3).getItem();
|
||||
|
||||
if(jetpack.getMode(entityPlayer.getCurrentItemOrArmor(3)) == JetpackMode.NORMAL)
|
||||
if(jetpack.getMode(entityPlayer.getCurrentItemOrArmor(3)) == JetpackMode.NORMAL && mc.currentScreen == null)
|
||||
{
|
||||
entityPlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0.5D);
|
||||
entityPlayer.fallDistance = 0.0F;
|
||||
}
|
||||
else if(jetpack.getMode(entityPlayer.getCurrentItemOrArmor(3)) == JetpackMode.HOVER)
|
||||
{
|
||||
if((!Keyboard.isKeyDown(Keyboard.KEY_SPACE) && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) || (Keyboard.isKeyDown(Keyboard.KEY_SPACE) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)))
|
||||
if(((!Keyboard.isKeyDown(Keyboard.KEY_SPACE) && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) || (Keyboard.isKeyDown(Keyboard.KEY_SPACE) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))) || mc.currentScreen != null)
|
||||
{
|
||||
if(entityPlayer.motionY > 0)
|
||||
{
|
||||
|
|
|
@ -5,8 +5,10 @@ import java.util.EnumSet;
|
|||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import mekanism.common.PacketHandler.Transmission;
|
||||
import mekanism.common.item.ItemGasMask;
|
||||
import mekanism.common.item.ItemJetpack;
|
||||
import mekanism.common.item.ItemPortableTeleporter;
|
||||
import mekanism.common.item.ItemScubaTank;
|
||||
import mekanism.common.item.ItemJetpack.JetpackMode;
|
||||
import mekanism.common.network.PacketStatusUpdate;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
|
@ -123,6 +125,14 @@ public class CommonPlayerTickHandler implements ITickHandler
|
|||
|
||||
jetpack.useGas(player.getCurrentItemOrArmor(3));
|
||||
}
|
||||
|
||||
if(isGasMaskOn(player))
|
||||
{
|
||||
ItemScubaTank tank = (ItemScubaTank)player.getCurrentItemOrArmor(3).getItem();
|
||||
|
||||
tank.useGas(player.getCurrentItemOrArmor(3));
|
||||
player.setAir(300);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -152,6 +162,30 @@ public class CommonPlayerTickHandler implements ITickHandler
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isGasMaskOn(EntityPlayer player)
|
||||
{
|
||||
ItemStack tank = player.inventory.armorInventory[2];
|
||||
ItemStack mask = player.inventory.armorInventory[3];
|
||||
|
||||
if(tank != null && mask != null)
|
||||
{
|
||||
if(tank.getItem() instanceof ItemScubaTank && mask.getItem() instanceof ItemGasMask)
|
||||
{
|
||||
ItemScubaTank scubaTank = (ItemScubaTank)tank.getItem();
|
||||
|
||||
if(scubaTank.getGas(tank) != null)
|
||||
{
|
||||
if(scubaTank.getFlowing(tank))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumSet<TickType> ticks()
|
||||
|
|
|
@ -120,9 +120,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
|
|||
|
||||
if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
|
||||
{
|
||||
list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " for more details.");
|
||||
list.add("Hold " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " for a description.");
|
||||
list.add("Hold " + EnumColor.AQUA + "shift-M" + EnumColor.GREY + " for more details.");
|
||||
}
|
||||
else {
|
||||
else if(Keyboard.isKeyDown(Keyboard.KEY_M))
|
||||
{
|
||||
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
|
||||
{
|
||||
list.add(EnumColor.INDIGO + "Recipe Type: " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getName());
|
||||
|
@ -166,6 +168,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
|
|||
list.add(EnumColor.AQUA + "Inventory: " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0));
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -243,12 +243,9 @@ public class ItemJetpack extends ItemArmor implements IGasItem
|
|||
empty.setItemDamage(100);
|
||||
list.add(empty);
|
||||
|
||||
for(Gas type : GasRegistry.getRegisteredGasses())
|
||||
{
|
||||
ItemStack filled = new ItemStack(this);
|
||||
setGas(new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled)), filled);
|
||||
list.add(filled);
|
||||
}
|
||||
ItemStack filled = new ItemStack(this);
|
||||
setGas(new GasStack(GasRegistry.getGas("hydrogen"), ((IGasItem)filled.getItem()).getMaxGas(filled)), filled);
|
||||
list.add(filled);
|
||||
}
|
||||
|
||||
public static enum JetpackMode
|
||||
|
|
|
@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel;
|
|||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.item.ItemJetpack.JetpackMode;
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -225,4 +226,25 @@ public class ItemScubaTank extends ItemArmor implements IGasItem
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ItemStack getEmptyItem()
|
||||
{
|
||||
ItemStack empty = new ItemStack(this);
|
||||
setGas(null, empty);
|
||||
empty.setItemDamage(100);
|
||||
return empty;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(int i, CreativeTabs tabs, List list)
|
||||
{
|
||||
ItemStack empty = new ItemStack(this);
|
||||
setGas(null, empty);
|
||||
empty.setItemDamage(100);
|
||||
list.add(empty);
|
||||
|
||||
ItemStack filled = new ItemStack(this);
|
||||
setGas(new GasStack(GasRegistry.getGas("oxygen"), ((IGasItem)filled.getItem()).getMaxGas(filled)), filled);
|
||||
list.add(filled);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue