mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 04:09:40 +00:00
Catch up to 1.5, fix heart rendering
This commit is contained in:
1 parent
76d72dfcb1
commit
cfe61da4e3
29 files changed
+386
-779
No files matched your search
@@ -21,11 +21,6 @@ public class TControls extends TKeyHandler
|
||||
//static KeyBinding grabKey = new KeyBinding("key.grab", 29);
|
||||
//static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46);
|
||||
public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24);
|
||||
/*public static KeyBinding skillOne = new KeyBinding("key.skill.one", 44);
|
||||
public static KeyBinding skillTwo = new KeyBinding("key.skill.two", 45);
|
||||
public static KeyBinding skillThree = new KeyBinding("key.skill.three", 46);
|
||||
public static KeyBinding skillFour = new KeyBinding("key.skill.four", 47);
|
||||
public static KeyBinding skillFive = new KeyBinding("key.skill.five", 48);*/
|
||||
static KeyBinding jumpKey;
|
||||
static KeyBinding invKey;
|
||||
static Minecraft mc;
|
||||
@@ -42,9 +37,9 @@ public class TControls extends TKeyHandler
|
||||
|
||||
public TControls()
|
||||
{
|
||||
super(new KeyBinding[] { armorKey ,/* skillOne, skillTwo, skillThree, skillFour, skillFive*/}, new boolean[] { false , /*false, false, false, false, false*/}, getVanillaKeyBindings(),
|
||||
super(new KeyBinding[] { armorKey }, new boolean[] { false}, getVanillaKeyBindings(),
|
||||
new boolean[] { false, false });
|
||||
//System.out.println("Controls registered");Natura
|
||||
//System.out.println("Controls registered");
|
||||
}
|
||||
|
||||
private static KeyBinding[] getVanillaKeyBindings ()
|
||||
@@ -74,26 +69,6 @@ public class TControls extends TKeyHandler
|
||||
{
|
||||
TProxyClient.addTabsToInventory((GuiContainer) mc.currentScreen);
|
||||
}
|
||||
/*if (kb == skillOne)
|
||||
{
|
||||
sendSkillkey(mc.thePlayer, (byte) 0);//, mc.thePlayer.dimension, mc.thePlayer.entityId);
|
||||
}
|
||||
if (kb == skillTwo)
|
||||
{
|
||||
sendSkillkey(mc.thePlayer, (byte) 1);//, mc.thePlayer.dimension, mc.thePlayer.entityId);
|
||||
}
|
||||
if (kb == skillThree)
|
||||
{
|
||||
sendSkillkey(mc.thePlayer, (byte) 2);//, mc.thePlayer.dimension, mc.thePlayer.entityId);
|
||||
}
|
||||
if (kb == skillFour)
|
||||
{
|
||||
sendSkillkey(mc.thePlayer, (byte) 3);//, mc.thePlayer.dimension, mc.thePlayer.entityId);
|
||||
}
|
||||
if (kb == skillFive)
|
||||
{
|
||||
sendSkillkey(mc.thePlayer, (byte) 4);//, mc.thePlayer.dimension, mc.thePlayer.entityId);
|
||||
}*/
|
||||
/*if (kb == jumpKey) //Double jump
|
||||
{
|
||||
if (jumping && !doubleJump)
|
||||
@@ -249,42 +224,6 @@ public class TControls extends TKeyHandler
|
||||
updateServer(bos);
|
||||
}
|
||||
|
||||
/*public void activateSkill (EntityPlayer player, int slot)
|
||||
{
|
||||
if (TProxyClient.skillList.size() > slot)
|
||||
{
|
||||
Skill skill = TProxyClient.skillList.get(slot);
|
||||
if (skill != null)
|
||||
{
|
||||
skill.activate(player, player.worldObj);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
public void sendSkillkey (EntityPlayer player, byte key)
|
||||
{
|
||||
TConstruct.playerTracker.activateSkill(player, key);
|
||||
|
||||
//System.out.println(MinecraftServer.getServer());
|
||||
if (MinecraftServer.getServer().isDedicatedServer())
|
||||
{
|
||||
//System.out.println("Send");
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream(8);
|
||||
DataOutputStream outputStream = new DataOutputStream(bos);
|
||||
try
|
||||
{
|
||||
outputStream.writeByte(4);
|
||||
outputStream.writeByte(key);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
updateServer(bos);
|
||||
}
|
||||
}
|
||||
|
||||
static void updateServer (ByteArrayOutputStream bos)
|
||||
{
|
||||
Packet250CustomPayload packet = new Packet250CustomPayload();
|
||||
|
||||
Reference in new issue
Block a user