Skip to content

Commit

Permalink
less than 100 to go
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Feb 2, 2014
1 parent f936434 commit a8c1f32
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 66 deletions.
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/BlockLandmine.java
View file
Expand Up @@ -155,9 +155,9 @@ public void func_149749_a (World par1World, int par2, int par3, int par4, Block
if (this != null)
{
ItemStack is = new ItemStack(this, 1, func_149692_a(tileentity.triggerType));
if (tileentity.isInvNameLocalized())
if (tileentity.func_145818_k_())
{
is.func_151001_c(tileentity.getInvName());
is.func_151001_c(tileentity.func_145825_b());
}
func_149642_a(par1World, par2, par3, par4, new ItemStack(this, 1, func_149692_a(tileentity.triggerType)));
}
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/tconstruct/blocks/LavaTankBlock.java
View file
Expand Up @@ -198,7 +198,7 @@ else if (FluidContainerRegistry.isBucket(heldItem))

if (!player.inventory.addItemStackToInventory(fillStack))
{
player.dropPlayerItem(fillStack);
player.dropPlayerItemWithRandomChoice(fillStack, false);
}
}
}
Expand Down Expand Up @@ -231,12 +231,6 @@ public static ItemStack consumeItem (ItemStack stack)
}
}

@Override
public TileEntity createNewTileEntity (World world)
{
return func_149915_a(world, 0);
}

@Override
public void func_149666_a (Item i, CreativeTabs tab, List list)
{
Expand Down
25 changes: 8 additions & 17 deletions src/main/java/tconstruct/client/TControls.java
View file
Expand Up @@ -2,6 +2,8 @@

import java.io.*;
import java.util.EnumSet;

import cpw.mods.fml.common.gameevent.TickEvent.Type;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.*;
import net.minecraft.client.settings.KeyBinding;
Expand All @@ -14,8 +16,8 @@ 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 refreshCapes = new KeyBinding("key.tcapes.reload", 88);
public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24, null);
public static KeyBinding refreshCapes = new KeyBinding("key.tcapes.reload", 88, null);
static KeyBinding jumpKey;
static KeyBinding invKey;
static Minecraft mc;
Expand Down Expand Up @@ -45,13 +47,7 @@ private static KeyBinding[] getVanillaKeyBindings ()
}

@Override
public String getLabel ()
{
return null;
}

@Override
public void keyDown (EnumSet<TickType> types, KeyBinding kb, boolean tickEnd, boolean isRepeat)
public void keyDown (Type types, KeyBinding kb, boolean tickEnd, boolean isRepeat)
{
if (tickEnd && mc.theWorld != null)
{
Expand Down Expand Up @@ -114,17 +110,11 @@ public void keyDown (EnumSet<TickType> types, KeyBinding kb, boolean tickEnd, bo
}

@Override
public void keyUp (EnumSet<TickType> types, KeyBinding kb, boolean tickEnd)
public void keyUp (Type types, KeyBinding kb, boolean tickEnd)
{
//landOnGround();
}

@Override
public EnumSet<TickType> ticks ()
{
return EnumSet.of(TickType.CLIENT);
}

public void landOnGround ()
{
doubleJump = false;
Expand Down Expand Up @@ -234,8 +224,9 @@ static void updateServer (ByteArrayOutputStream bos)
packet.length = bos.size();
PacketDispatcher.sendPacketToServer(packet);*/

//TODO Find out what packet should be used here
TConstruct.packetPipeline.sendToServer(new PacketDoubleJump());
}

}
49 changes: 20 additions & 29 deletions src/main/java/tconstruct/client/TKeyHandler.java
View file
Expand Up @@ -7,10 +7,13 @@
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;

import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
import cpw.mods.fml.relauncher.Side;

public abstract class TKeyHandler implements ITickHandler
public abstract class TKeyHandler
{
public KeyBinding[] keyBindings;
public KeyBinding[] vKeyBindings;
Expand Down Expand Up @@ -53,30 +56,25 @@ public KeyBinding[] getKeyBindings ()
return this.keyBindings;
}

/**
* Not to be overridden - KeyBindings are tickhandlers under the covers
*/
@Override
public final void tickStart (EnumSet<TickType> type, Object... tickData)
@SubscribeEvent
public void onTick (ClientTickEvent event)
{
keyTick(type, false);
}
if (event.side == Side.CLIENT)
{
if (event.phase == Phase.START)
keyTick(event.type, false);
else if (event.phase == Phase.END)
keyTick(event.type, true);
}

/**
* Not to be overridden - KeyBindings are tickhandlers under the covers
*/
@Override
public final void tickEnd (EnumSet<TickType> type, Object... tickData)
{
keyTick(type, true);
}

public void keyTick (EnumSet<TickType> type, boolean tickEnd)
public void keyTick (Type type, boolean tickEnd)
{
for (int i = 0; i < keyBindings.length; i++)
{
KeyBinding keyBinding = keyBindings[i];
int keyCode = keyBinding.keyCode;
int keyCode = keyBinding.func_151463_i();
boolean state = (keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode));
if (state != keyDown[i] || (state && repeatings[i]))
{
Expand All @@ -97,7 +95,7 @@ public void keyTick (EnumSet<TickType> type, boolean tickEnd)
for (int i = 0; i < vKeyBindings.length; i++)
{
KeyBinding keyBinding = vKeyBindings[i];
int keyCode = keyBinding.keyCode;
int keyCode = keyBinding.func_151463_i();
boolean state = (keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode));
if (state != keyDown[i + keyBindings.length] || (state && vRepeatings[i]))
{
Expand Down Expand Up @@ -127,7 +125,7 @@ public void keyTick (EnumSet<TickType> type, boolean tickEnd)
* @param tickEnd was it an end or start tick which fired the key
* @param isRepeat is it a repeat key event
*/
public abstract void keyDown (EnumSet<TickType> types, KeyBinding kb, boolean tickEnd, boolean isRepeat);
public abstract void keyDown (Type types, KeyBinding kb, boolean tickEnd, boolean isRepeat);

/**
* Fired once when the key changes state from down to up
Expand All @@ -137,13 +135,6 @@ public void keyTick (EnumSet<TickType> type, boolean tickEnd)
* @param types the type(s) of tick that fired when this key was first down
* @param tickEnd was it an end or start tick which fired the key
*/
public abstract void keyUp (EnumSet<TickType> types, KeyBinding kb, boolean tickEnd);
public abstract void keyUp (Type types, KeyBinding kb, boolean tickEnd);

/**
* This is the list of ticks for which the key binding should trigger. The only
* valid ticks are client side ticks, obviously.
*
* @see cpw.mods.fml.common.ITickHandler#ticks()
*/
public abstract EnumSet<TickType> ticks ();
}
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/client/gui/GuiLandmine.java
View file
Expand Up @@ -33,7 +33,7 @@ public GuiLandmine(ContainerLandmine par1Container)
}

@Override
protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3)
protected void func_146285_a (ItemStack par1ItemStack, int par2, int par3)
{
List list = par1ItemStack.getTooltip(this.field_146297_k.thePlayer, this.field_146297_k.gameSettings.advancedItemTooltips);

Expand Down Expand Up @@ -64,7 +64,7 @@ protected void func_146979_b (int i, int j)
{
if (container.te != null)
{
field_146289_q.drawString(container.te.getInvName(), 8, 5, 4210752);
field_146289_q.drawString(container.te.func_145825_b(), 8, 5, 4210752);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/common/TRecipes.java
View file
Expand Up @@ -1195,9 +1195,9 @@ protected static void addRecipesForSmeltery ()
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue);
Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16);
Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.rail_powered), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.railDetector), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.railActivator), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue);
Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.cauldron), 0, TConstruct.ingotLiquidValue * 7);
Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/inventory/ContainerLandmine.java
View file
Expand Up @@ -217,13 +217,13 @@ else if (this.field_94536_g != 0)
{
if (par2 == 0)
{
par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack());
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(),false);
inventoryplayer.setItemStack((ItemStack) null);
}

if (par2 == 1)
{
par4EntityPlayer.dropPlayerItem(inventoryplayer.getItemStack().splitStack(1));
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1),false);

if (inventoryplayer.getItemStack().stackSize == 0)
{
Expand Down Expand Up @@ -458,7 +458,7 @@ else if (par3 == 4 && inventoryplayer.getItemStack() == null && par1 >= 0)
{
itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize);
slot2.onPickupFromSlot(par4EntityPlayer, itemstack1);
par4EntityPlayer.dropPlayerItem(itemstack1);
par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1,false);
}
}
else if (par3 == 6 && par1 >= 0)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/inventory/CraftingStationContainer.java
View file
Expand Up @@ -143,7 +143,7 @@ public void onContainerClosed (EntityPlayer par1EntityPlayer)

if (itemstack != null)
{
par1EntityPlayer.dropPlayerItem(itemstack);
par1EntityPlayer.dropPlayerItemWithRandomChoice(itemstack,false);
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/tconstruct/library/tools/AbilityHelper.java
View file
Expand Up @@ -491,7 +491,8 @@ public static boolean hoeGround (ItemStack stack, EntityPlayer player, World wor

if (event.getResult() == Result.ALLOW)
{
onBlockChanged(stack, world, 0, x, y, z, player, random);

onBlockChanged(stack, world, Blocks.air, x, y, z, player, random);
return true;
}

Expand All @@ -515,7 +516,7 @@ public static boolean hoeGround (ItemStack stack, EntityPlayer player, World wor
else
{
world.func_147449_b(x, y, z, block);
onBlockChanged(stack, world, 0, x, y, z, player, random);
onBlockChanged(stack, world, Blocks.air, x, y, z, player, random);
return true;
}
}
Expand Down

0 comments on commit a8c1f32

Please sign in to comment.