Enable Capes/Format Code

This commit is contained in:
Alexander committed 2014-02-11 21:35:05 -05:00
1 parent 612f7a9ca1
commit 56d348dcc7
9 files changed
+33 -31

No files matched your search

+2 -1
View File
@@ -11,6 +11,7 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
import tconstruct.achievements.TAchievements;
import tconstruct.client.TControls;
import tconstruct.client.event.EventCloakRender;
import tconstruct.common.TContent;
import tconstruct.common.TProxyCommon;
import tconstruct.common.TRecipes;
@@ -177,7 +178,7 @@ public class TConstruct
packetPipeline.initalise();
if (event.getSide() == Side.CLIENT)
{
//MinecraftForge.EVENT_BUS.register(new EventCloakRender());
MinecraftForge.EVENT_BUS.register(new EventCloakRender());
}
DimensionBlacklist.getBadBimensions();
@@ -128,7 +128,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
}
@Override
public boolean canUpdate()
public boolean canUpdate ()
{
return false;
}
@@ -199,9 +199,9 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory
public void closeInventory ()
{
}
@Override
public boolean canUpdate()
public boolean canUpdate ()
{
return false;
}
@@ -58,10 +58,10 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
public void onInventoryChanged ()
{
buildTool(toolName);
if (this.getWorld() != null)
if (this.worldObj != null)
{
this.blockMetadata = this.getWorld().getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
this.getWorld().markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this);
this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this);
}
}
@@ -96,7 +96,7 @@ public class TClientEvents
//public static int right_height = 39;
Random rand = new Random();
int updateCounter = 0;
GameSettings gs = Minecraft.getMinecraft().gameSettings;
/* HUD */
@@ -13,7 +13,8 @@ public class TClientTickHandler
{
Minecraft mc = Minecraft.getMinecraft();
TControls controlInstance = ((TProxyClient)TConstruct.proxy).controlInstance;
TControls controlInstance = ((TProxyClient) TConstruct.proxy).controlInstance;
public TClientTickHandler()
{
}
+13 -13
View File
@@ -70,22 +70,22 @@ public class TControls extends TKeyHandler
if (mc.thePlayer.capabilities.isCreativeMode)
return;
if (jumping && midairJumps >0)
{
mc.thePlayer.motionY = 0.42D;
mc.thePlayer.fallDistance = 0;
if (jumping && midairJumps > 0)
{
mc.thePlayer.motionY = 0.42D;
mc.thePlayer.fallDistance = 0;
if (mc.thePlayer.isPotionActive(Potion.jump))
{
mc.thePlayer.motionY += (double) ((float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F);
}
if (mc.thePlayer.isPotionActive(Potion.jump))
{
mc.thePlayer.motionY += (double) ((float) (mc.thePlayer.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F);
}
midairJumps --;
resetFallDamage(mc.thePlayer.getDisplayName());
}
midairJumps--;
resetFallDamage(mc.thePlayer.getDisplayName());
}
if (!jumping)
jumping = mc.thePlayer.isAirBorne;
if (!jumping)
jumping = mc.thePlayer.isAirBorne;
}
}
/*else if (kb == stiltsKey) //Stilts
@@ -22,7 +22,7 @@ public class AModInteger extends ArmorMod
color = c;
tooltipName = tip;
}
@Override
protected boolean canModify (ItemStack armor, ItemStack[] input)
{
@@ -34,7 +34,7 @@ public class AModInteger extends ArmorMod
}
return false;
}
@Override
public void modify (ItemStack[] input, ItemStack tool)
{
@@ -26,7 +26,7 @@ public class AModDoubleJump extends AModInteger
}
return false;
}
@Override
protected int addToolTip (ItemStack tool, String tooltip, String modifierTip)
{
@@ -57,16 +57,16 @@ public class AModDoubleJump extends AModInteger
}
}
}
@Override
protected String getProperName (String tooltip, String tag)
{
if (tag.contains("Double-Jump"))
return color+"Triple-Jump";
if (tag.contains("Triple-Jump"))
return color+"Quadruple-Jump";
return color + "Triple-Jump";
return color+"Double-Jump";
if (tag.contains("Triple-Jump"))
return color + "Quadruple-Jump";
return color + "Double-Jump";
}
}