Updated FML:

MinecraftForge/FML@9c8ca4a4e3 Unlink banner block and item id. Mojang should of matched these up but they didn't -.-
MinecraftForge/FML@84a101f344 Update Dev mcp mappings to 11-30 snapshot.
This commit is contained in:
Lex Manos committed 2014-12-01 19:11:17 -08:00
1 parent 4caf09cd33
commit 59df94bd90
17 files changed
+70 -63

No files matched your search

@@ -57,7 +57,7 @@ public class ClientCommandHandler extends CommandHandler
return 0;
}
if (icommand.canCommandSenderUseCommand(sender))
if (icommand.canCommandSenderUse(sender))
{
CommandEvent event = new CommandEvent(icommand, sender, args);
if (MinecraftForge.EVENT_BUS.post(event))
@@ -69,7 +69,7 @@ public class ClientCommandHandler extends CommandHandler
return 0;
}
icommand.processCommand(sender, args);
icommand.execute(sender, args);
return 1;
}
else
@@ -79,11 +79,11 @@ public class ClientCommandHandler extends CommandHandler
}
catch (WrongUsageException wue)
{
sender.addChatMessage(format(RED, "commands.generic.usage", format(RED, wue.getMessage(), wue.getErrorOjbects())));
sender.addChatMessage(format(RED, "commands.generic.usage", format(RED, wue.getMessage(), wue.getErrorObjects())));
}
catch (CommandException ce)
{
sender.addChatMessage(format(RED, ce.getMessage(), ce.getErrorOjbects()));
sender.addChatMessage(format(RED, ce.getMessage(), ce.getErrorObjects()));
}
catch (Throwable t)
{
@@ -357,7 +357,7 @@ public class ForgeHooksClient
{
BlockPos pos = center.add(x, 0, z);
BiomeGenBase biome = world.getBiomeGenForCoords(pos);
int colour = biome.getSkyColorByTemp(biome.func_180626_a(pos));
int colour = biome.getSkyColorByTemp(biome.getFloatTemperature(pos));
r += (colour & 0xFF0000) >> 16;
g += (colour & 0x00FF00) >> 8;
b += colour & 0x0000FF;
@@ -92,7 +92,7 @@ public class GuiIngameForge extends GuiIngame
}
@Override
public void func_175180_a(float partialTicks)
public void renderGameOverlay(float partialTicks)
{
res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
eventParent = new RenderGameOverlayEvent(partialTicks, res);
@@ -127,7 +127,7 @@ public class GuiIngameForge extends GuiIngame
renderPortal(res, partialTicks);
}
if (renderHotbar) func_180479_a(res, partialTicks);
if (renderHotbar) renderTooltip(res, partialTicks);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
zLevel = -90.0F;
@@ -136,7 +136,7 @@ public class GuiIngameForge extends GuiIngame
if (renderCrosshairs) renderCrosshairs(width, height);
if (renderBossHealth) renderBossHealth();
if (this.mc.playerController.shouldDrawHUD() && this.mc.func_175606_aa() instanceof EntityPlayer)
if (this.mc.playerController.shouldDrawHUD() && this.mc.getRenderViewEntity() instanceof EntityPlayer)
{
if (renderHealth) renderHealth(width, height);
if (renderArmor) renderArmor(width, height);
@@ -166,7 +166,7 @@ public class GuiIngameForge extends GuiIngame
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.thePlayer.getName());
if (scoreplayerteam != null)
{
int slot = scoreplayerteam.func_178775_l().func_175746_b();
int slot = scoreplayerteam.func_178775_l().getColorIndex();
if (slot >= 0) objective = scoreboard.getObjectiveInDisplaySlot(3 + slot);
}
ScoreObjective scoreobjective1 = objective != null ? objective : scoreboard.getObjectiveInDisplaySlot(1);
@@ -198,7 +198,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderCrosshairs(int width, int height)
{
if (pre(CROSSHAIRS)) return;
if (this.func_175183_b())
if (this.showCrosshair())
{
bind(Gui.icons);
GlStateManager.enableBlend();
@@ -292,17 +292,18 @@ public class GuiIngameForge extends GuiIngame
post(PORTAL);
}
protected void func_180479_a(ScaledResolution res, float partialTicks)
@Override
protected void renderTooltip(ScaledResolution res, float partialTicks)
{
if (pre(HOTBAR)) return;
if (mc.playerController.enableEverythingIsScrewedUpMode())
if (mc.playerController.isSpectator())
{
this.field_175197_u.func_175264_a(res, partialTicks);
this.spectatorGui.renderTooltip(res, partialTicks);
}
else
{
super.func_180479_a(res, partialTicks);
super.renderTooltip(res, partialTicks);
}
post(HOTBAR);
@@ -312,7 +313,7 @@ public class GuiIngameForge extends GuiIngame
{
if (pre(AIR)) return;
mc.mcProfiler.startSection("air");
EntityPlayer player = (EntityPlayer)this.mc.func_175606_aa();
EntityPlayer player = (EntityPlayer)this.mc.getRenderViewEntity();
GlStateManager.enableBlend();
int left = width / 2 + 91;
int top = height - right_height;
@@ -342,26 +343,26 @@ public class GuiIngameForge extends GuiIngame
mc.mcProfiler.startSection("health");
GlStateManager.enableBlend();
EntityPlayer player = (EntityPlayer)this.mc.func_175606_aa();
EntityPlayer player = (EntityPlayer)this.mc.getRenderViewEntity();
int health = MathHelper.ceiling_float_int(player.getHealth());
boolean highlight = field_175191_F > (long)updateCounter && (field_175191_F - (long)updateCounter) / 3L %2L == 1L;
if (health < this.field_175194_C && player.hurtResistantTime > 0)
{
this.field_175190_E = Minecraft.getSystemTime();
this.lastSystemTime = Minecraft.getSystemTime();
this.field_175191_F = (long)(this.updateCounter + 20);
}
else if (health > this.field_175194_C && player.hurtResistantTime > 0)
{
this.field_175190_E = Minecraft.getSystemTime();
this.lastSystemTime = Minecraft.getSystemTime();
this.field_175191_F = (long)(this.updateCounter + 10);
}
if (Minecraft.getSystemTime() - this.field_175190_E > 1000L)
if (Minecraft.getSystemTime() - this.lastSystemTime > 1000L)
{
this.field_175194_C = health;
this.field_175189_D = health;
this.field_175190_E = Minecraft.getSystemTime();
this.lastSystemTime = Minecraft.getSystemTime();
}
this.field_175194_C = health;
@@ -441,7 +442,7 @@ public class GuiIngameForge extends GuiIngame
if (pre(FOOD)) return;
mc.mcProfiler.startSection("food");
EntityPlayer player = (EntityPlayer)this.mc.func_175606_aa();
EntityPlayer player = (EntityPlayer)this.mc.getRenderViewEntity();
GlStateManager.enableBlend();
int left = width / 2 + 91;
int top = height - right_height;
@@ -596,7 +597,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderToolHightlight(ScaledResolution res)
{
if (this.mc.gameSettings.heldItemTooltips && !this.mc.playerController.enableEverythingIsScrewedUpMode())
if (this.mc.gameSettings.heldItemTooltips && !this.mc.playerController.isSpectator())
{
mc.mcProfiler.startSection("toolHighlight");
@@ -621,12 +622,12 @@ public class GuiIngameForge extends GuiIngame
if (font != null)
{
int x = (res.getScaledWidth() - font.getStringWidth(name)) / 2;
font.func_175063_a(name, x, y, WHITE | (opacity << 24));
font.drawStringWithShadow(name, x, y, WHITE | (opacity << 24));
}
else
{
int x = (res.getScaledWidth() - fontrenderer.getStringWidth(name)) / 2;
fontrenderer.func_175063_a(name, x, y, WHITE | (opacity << 24));
fontrenderer.drawStringWithShadow(name, x, y, WHITE | (opacity << 24));
}
GlStateManager.disableBlend();
GlStateManager.popMatrix();
@@ -635,9 +636,9 @@ public class GuiIngameForge extends GuiIngame
mc.mcProfiler.endSection();
}
else if (this.mc.thePlayer.func_175149_v())
else if (this.mc.thePlayer.isSpectator())
{
this.field_175197_u.func_175263_a(res);
this.spectatorGui.func_175263_a(res);
}
}
@@ -747,11 +748,11 @@ public class GuiIngameForge extends GuiIngame
GlStateManager.pushMatrix();
GlStateManager.scale(4.0F, 4.0F, 4.0F);
int l = opacity << 24 & -16777216;
this.func_175179_f().func_175065_a(this.field_175201_x, (float)(-this.func_175179_f().getStringWidth(this.field_175201_x) / 2), -10.0F, 16777215 | l, true);
this.func_175179_f().drawString(this.field_175201_x, (float)(-this.func_175179_f().getStringWidth(this.field_175201_x) / 2), -10.0F, 16777215 | l, true);
GlStateManager.popMatrix();
GlStateManager.pushMatrix();
GlStateManager.scale(2.0F, 2.0F, 2.0F);
this.func_175179_f().func_175065_a(this.field_175200_y, (float)(-this.func_175179_f().getStringWidth(this.field_175200_y) / 2), 5.0F, 16777215 | l, true);
this.func_175179_f().drawString(this.field_175200_y, (float)(-this.func_175179_f().getStringWidth(this.field_175200_y) / 2), 5.0F, 16777215 | l, true);
GlStateManager.popMatrix();
GlStateManager.disableBlend();
GlStateManager.popMatrix();
@@ -783,7 +784,7 @@ public class GuiIngameForge extends GuiIngame
ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().getObjectiveInDisplaySlot(0);
NetHandlerPlayClient handler = mc.thePlayer.sendQueue;
if (mc.gameSettings.keyBindPlayerList.getIsKeyPressed() && (!mc.isIntegratedServerRunning() || handler.func_175106_d().size() > 1 || scoreobjective != null))
if (mc.gameSettings.keyBindPlayerList.isKeyDown() && (!mc.isIntegratedServerRunning() || handler.func_175106_d().size() > 1 || scoreobjective != null))
{
this.overlayPlayerList.func_175246_a(true);
if (pre(PLAYER_LIST)) return;
@@ -798,7 +799,7 @@ public class GuiIngameForge extends GuiIngame
protected void renderHealthMount(int width, int height)
{
EntityPlayer player = (EntityPlayer)mc.func_175606_aa();
EntityPlayer player = (EntityPlayer)mc.getRenderViewEntity();
Entity tmp = player.ridingEntity;
if (!(tmp instanceof EntityLivingBase)) return;
@@ -864,9 +865,9 @@ public class GuiIngameForge extends GuiIngame
private class GuiOverlayDebugForge extends GuiOverlayDebug
{
private GuiOverlayDebugForge(Minecraft mc){ super(mc); }
@Override protected void func_180798_a(){}
@Override protected void func_175239_b(ScaledResolution res){}
@Override protected void renderDebugInfoLeft(){}
@Override protected void renderDebugInfoRight(ScaledResolution res){}
private List<String> getLeft(){ return this.call(); }
private List<String> getRight(){ return this.func_175238_c(); }
private List<String> getRight(){ return this.getDebugInfoRight(); }
}
}
@@ -193,7 +193,7 @@ public class DimensionManager
worlds.put(id, world);
weakWorldMap.put(world, world);
MinecraftServer.getServer().worldTickTimes.put(id, new long[100]);
FMLLog.info("Loading dimension %d (%s) (%s)", id, world.getWorldInfo().getWorldName(), world.func_73046_m());
FMLLog.info("Loading dimension %d (%s) (%s)", id, world.getWorldInfo().getWorldName(), world.getMinecraftServer());
}
else
{
@@ -238,7 +238,7 @@ public class DimensionManager
System.err.println("Cannot Hotload Dim: " + e.getMessage());
return; // If a provider hasn't been registered then we can't hotload the dim
}
MinecraftServer mcServer = overworld.func_73046_m();
MinecraftServer mcServer = overworld.getMinecraftServer();
ISaveHandler savehandler = overworld.getSaveHandler();
WorldSettings worldSettings = new WorldSettings(overworld.getWorldInfo());
@@ -95,7 +95,7 @@ public class FishingHooks
{
fish.addAll(EntityFishHook.FISH);
junk.addAll(EntityFishHook.JUNK);
treasure.addAll(EntityFishHook.VALUABLES);
treasure.addAll(EntityFishHook.TREASURE);
}
public static enum FishableCategory
@@ -244,17 +244,17 @@ public class ForgeHooks
if (target.typeOfHit == MovingObjectType.BLOCK)
{
IBlockState state = world.getBlockState(target.func_178782_a());
IBlockState state = world.getBlockState(target.getBlockPos());
if (state.getBlock().isAir(world, target.func_178782_a()))
if (state.getBlock().isAir(world, target.getBlockPos()))
{
return false;
}
if (isCreative && GuiScreen.isCtrlKeyDown())
te = world.getTileEntity(target.func_178782_a());
te = world.getTileEntity(target.getBlockPos());
result = state.getBlock().getPickBlock(target, world, target.func_178782_a());
result = state.getBlock().getPickBlock(target, world, target.getBlockPos());
}
else
{
@@ -353,7 +353,7 @@ public class ForgeHooks
public static boolean isLivingOnLadder(Block block, World world, BlockPos pos, EntityLivingBase entity)
{
boolean isSpectator = (entity instanceof EntityPlayer && ((EntityPlayer)entity).func_175149_v());
boolean isSpectator = (entity instanceof EntityPlayer && ((EntityPlayer)entity).isSpectator());
if (isSpectator) return false;
if (!ForgeModContainer.fullBoundingBoxLadders)
{
@@ -391,7 +391,7 @@ public class ForgeHooks
public static EntityItem onPlayerTossEvent(EntityPlayer player, ItemStack item, boolean includeName)
{
player.captureDrops = true;
EntityItem ret = player.func_146097_a(item, false, includeName);
EntityItem ret = player.dropItem(item, false, includeName);
player.capturedDrops.clear();
player.captureDrops = false;
@@ -444,7 +444,7 @@ public class ForgeHooks
if (gameType == WorldSettings.GameType.SPECTATOR)
preCancelEvent = true;
if (!entityPlayer.func_175142_cm())
if (!entityPlayer.isAllowEdit())
{
ItemStack itemstack = entityPlayer.getCurrentEquippedItem();
if (itemstack == null || !itemstack.canDestroy(world.getBlockState(pos).getBlock()))
@@ -46,7 +46,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
chunk.onChunkLoad();
if (queuedChunk.provider.serverChunkGenerator != null) {
queuedChunk.provider.serverChunkGenerator.func_180514_a(chunk, queuedChunk.x, queuedChunk.z);
queuedChunk.provider.serverChunkGenerator.recreateStructures(chunk, queuedChunk.x, queuedChunk.z);
}
chunk.populateChunk(queuedChunk.provider, queuedChunk.provider, queuedChunk.x, queuedChunk.z);
@@ -23,11 +23,11 @@ public class FakePlayer extends EntityPlayerMP
}
@Override public Vec3 getPositionVector(){ return new Vec3(0, 0, 0); }
@Override public boolean canCommandSenderUseCommand(int i, String s){ return false; }
@Override public boolean canUseCommand(int i, String s){ return false; }
@Override public void addChatComponentMessage(IChatComponent chatmessagecomponent){}
@Override public void addStat(StatBase par1StatBase, int par2){}
@Override public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){}
@Override public boolean func_180431_b(DamageSource source){ return true; }
@Override public boolean isEntityInvulnerable(DamageSource source){ return true; }
@Override public boolean canAttackPlayer(EntityPlayer player){ return false; }
@Override public void onDeath(DamageSource source){ return; }
@Override public void onUpdate(){ return; }
@@ -16,11 +16,11 @@ public class DeferredBiomeDecorator extends BiomeDecorator {
}
@Override
public void func_180292_a(World par1World, Random par2Random, BiomeGenBase biome, BlockPos pos)
public void decorate(World par1World, Random par2Random, BiomeGenBase biome, BlockPos pos)
{
fireCreateEventAndReplace(biome);
// On first call to decorate, we fire and substitute ourselves, if we haven't already done so
biome.theBiomeDecorator.func_180292_a(par1World, par2Random, biome, pos);
biome.theBiomeDecorator.decorate(par1World, par2Random, biome, pos);
}
public void fireCreateEventAndReplace(BiomeGenBase biome)
{
@@ -369,7 +369,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
public int getMixedBrightnessForBlock(IBlockAccess world, BlockPos pos)
{
int lightThis = world.getCombinedLight(pos, 0);
int lightUp = world.getCombinedLight(pos.offsetUp(), 0);
int lightUp = world.getCombinedLight(pos.up(), 0);
int lightThisBase = lightThis & 255;
int lightUpBase = lightUp & 255;
int lightThisExt = lightThis >> 16 & 255;
@@ -478,7 +478,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
{
if (!world.getBlockState(pos2).getBlock().getMaterial().blocksMovement())
{
otherDecay = quantaPerBlock - getQuantaValue(world, pos2.offsetDown());
otherDecay = quantaPerBlock - getQuantaValue(world, pos2.down());
if (otherDecay >= 0)
{
int power = otherDecay - (decay - quantaPerBlock);
@@ -493,7 +493,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
}
}
if (world.getBlockState(pos.offsetUp()).getBlock() == this)
if (world.getBlockState(pos.up()).getBlock() == this)
{
boolean flag =
isBlockSolid(world, pos.add( 0, 0, -1), EnumFacing.NORTH) ||
@@ -135,9 +135,9 @@ public class BlockFluidClassic extends BlockFluidBase
}
// Flow vertically if possible
if (canDisplace(world, pos.offsetUp(densityDir)))
if (canDisplace(world, pos.up(densityDir)))
{
flowIntoBlock(world, pos.offsetUp(densityDir), 1);
flowIntoBlock(world, pos.up(densityDir), 1);
return;
}
@@ -150,7 +150,7 @@ public class BlockFluidClassic extends BlockFluidBase
if (isSourceBlock(world, pos) || !isFlowingVertically(world, pos))
{
if (world.getBlockState(pos.offsetDown(densityDir)).getBlock() == this)
if (world.getBlockState(pos.down(densityDir)).getBlock() == this)
{
flowMeta = 1;
}
@@ -165,8 +165,8 @@ public class BlockFluidClassic extends BlockFluidBase
public boolean isFlowingVertically(IBlockAccess world, BlockPos pos)
{
return world.getBlockState(pos.offsetUp(densityDir)).getBlock() == this ||
(world.getBlockState(pos).getBlock() == this && canFlowInto(world, pos.offsetUp(densityDir)));
return world.getBlockState(pos.up(densityDir)).getBlock() == this ||
(world.getBlockState(pos).getBlock() == this && canFlowInto(world, pos.up(densityDir)));
}
public boolean isSourceBlock(IBlockAccess world, BlockPos pos)
@@ -257,7 +257,7 @@ public class ShapedOreRecipe implements IRecipe
}
@Override
public ItemStack[] func_179532_b(InventoryCrafting inv) //getRecipeLeftovers
public ItemStack[] getRemainingItems(InventoryCrafting inv) //getRecipeLeftovers
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
@@ -148,7 +148,7 @@ public class ShapelessOreRecipe implements IRecipe
}
@Override
public ItemStack[] func_179532_b(InventoryCrafting inv) //getRecipeLeftovers
public ItemStack[] getRemainingItems(InventoryCrafting inv) //getRecipeLeftovers
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
@@ -23,7 +23,7 @@ public class ForgeCommand extends CommandBase {
}
@Override
public String getCommandName()
public String getName()
{
return "forge";
}
@@ -40,7 +40,7 @@ public class ForgeCommand extends CommandBase {
return 2;
}
@Override
public void processCommand(ICommandSender sender, String[] args) throws CommandException
public void execute(ICommandSender sender, String[] args) throws CommandException
{
if (args.length == 0)
{