Skip to content

Commit

Permalink
Network stuffs -> 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@fuj1n
fuj1n committed Feb 1, 2014
1 parent bb98f77 commit 8cd760e
Show file tree
Hide file tree
Showing 34 changed files with 528 additions and 596 deletions.
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/DryingRack.java
View file
Expand Up @@ -108,7 +108,7 @@ boolean activateDryingRack (World world, int x, int y, int z, EntityPlayer playe
}
}

world.markBlockForUpdate(x, y, z);
world.func_147471_g(x, y, z);
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/SmelteryBlock.java
View file
Expand Up @@ -220,7 +220,7 @@ public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer pla
}
else
{
//world.markBlockForUpdate(x, y, z);
//world.func_147471_g(x, y, z);
player.openGui(getModInstance(), integer, world, x, y, z);
return true;
}
Expand Down
23 changes: 9 additions & 14 deletions src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java
View file
@@ -1,20 +1,15 @@
package tconstruct.blocks.logic;

import mantle.blocks.iface.IFacingLogic;
import mantle.blocks.iface.IMasterLogic;
import mantle.blocks.abstracts.MultiServantLogic;
import mantle.blocks.iface.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.network.*;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.*;

public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic//, ISwitchableMaster
{
Expand Down Expand Up @@ -164,17 +159,17 @@ public void func_145841_b (NBTTagCompound tags)

/* Packets */
@Override
public Packet getDescriptionPacket ()
public Packet func_145844_m ()
{
NBTTagCompound tag = new NBTTagCompound();
func_145841_b(tag);
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag);
}

@Override
public void onDataPacket (NetworkManager net, Packet132TileEntityData packet)
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
func_145839_a(packet.data);
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
func_145839_a(packet.func_148857_g());
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
}
}
47 changes: 16 additions & 31 deletions src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
View file
@@ -1,41 +1,26 @@
package tconstruct.blocks.logic;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import java.util.*;
import mantle.blocks.abstracts.AdaptiveInventoryLogic;
import mantle.blocks.iface.*;
import mantle.world.CoordTuple;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.network.*;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.*;
import tconstruct.TConstruct;
import tconstruct.blocks.component.SmelteryComponent;
import tconstruct.blocks.component.SmelteryScan;
import tconstruct.common.TContent;
import tconstruct.blocks.component.*;
import tconstruct.common.TRepo;
import tconstruct.inventory.AdaptiveSmelteryContainer;
import mantle.blocks.abstracts.AdaptiveInventoryLogic;
import tconstruct.library.component.IComponentHolder;
import tconstruct.library.component.LogicComponent;
import tconstruct.library.component.MultiFluidTank;
import mantle.blocks.iface.IActiveLogic;
import mantle.world.CoordTuple;
import mantle.blocks.iface.IMasterLogic;
import mantle.blocks.iface.IServantLogic;
import tconstruct.library.component.*;

public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder, IFluidHandler
{
Expand Down Expand Up @@ -160,7 +145,7 @@ void validateSmeltery ()
smeltery.adjustSize(structure.getAirSize(), true);
multitank.setCapacity(structure.getAirSize() * (TConstruct.ingotLiquidValue * 18));
smeltery.setActiveLavaTank(structure.lavaTanks.get(0));
field_145850_b.markBlockForUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e);
}

@Override
Expand Down Expand Up @@ -420,7 +405,7 @@ protected void updateFluidBlocks ()
public void updateAir ()
{
for (CoordTuple loc : structure.airCoords)
field_145850_b.markBlockForUpdate(loc.x, loc.y, loc.z);
field_145850_b.func_147471_g(loc.x, loc.y, loc.z);
}

class LiquidData
Expand Down Expand Up @@ -571,17 +556,17 @@ public void writeNetworkNBT (NBTTagCompound tags)
}

@Override
public void onDataPacket (NetworkManager net, Packet132TileEntityData packet)
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
readNetworkNBT(packet.data);
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
readNetworkNBT(packet.func_148857_g());
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
}

@Override
public Packet getDescriptionPacket ()
public Packet func_145844_m ()
{
NBTTagCompound tag = new NBTTagCompound();
writeNetworkNBT(tag);
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag);
}
}
47 changes: 20 additions & 27 deletions src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
View file
@@ -1,25 +1,18 @@
package tconstruct.blocks.logic;

import tconstruct.TConstruct;
import mantle.blocks.abstracts.InventoryLogic;
import tconstruct.library.crafting.CastingRecipe;
import tconstruct.library.util.IPattern;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.*;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.network.*;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidEvent;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.*;
import tconstruct.TConstruct;
import tconstruct.library.crafting.CastingRecipe;
import tconstruct.library.util.IPattern;

public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory
{
Expand Down Expand Up @@ -142,7 +135,7 @@ public int fill (FluidStack resource, boolean doFill)
castingDelay = recipe.coolTime;
}
renderOffset = copyLiquid.amount;
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
this.liquid = copyLiquid;
needsUpdate = true;
}
Expand All @@ -164,7 +157,7 @@ else if (resource.isFluidEqual(this.liquid))
renderOffset = roomInTank;
castingDelay = TConstruct.basinCasting.getCastingDelay(this.liquid, inventory[0]);
this.liquid.amount = this.capacity;
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
needsUpdate = true;
}
return roomInTank;
Expand All @@ -175,7 +168,7 @@ else if (resource.isFluidEqual(this.liquid))
if (doFill)
{
this.liquid.amount += resource.amount;
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
needsUpdate = true;
}
return resource.amount;
Expand All @@ -192,14 +185,14 @@ else if (resource.isFluidEqual(this.liquid))
public void onInventoryChanged () //Isn't actually called?
{
super.onInventoryChanged();
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
needsUpdate = true;
}

public ItemStack decrStackSize (int slot, int quantity)
{
ItemStack stack = super.decrStackSize(slot, quantity);
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
return stack;
}

Expand Down Expand Up @@ -312,15 +305,15 @@ public void updateEntity ()
if (renderOffset > 0)
{
renderOffset -= 6;
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
}

tick++;
if (tick % 20 == 0)
{
tick = 0;
if (needsUpdate)
field_145850_b.markBlockForUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e);
}
}

Expand All @@ -333,7 +326,7 @@ public void castLiquid ()
if (recipe.consumeCast)
inventory[0] = null;
liquid = null;
field_145850_b.markBlockForUpdate(field_145851_c, field_145848_d, field_145849_e);
field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e);
}
}

Expand Down Expand Up @@ -387,18 +380,18 @@ public void writeCustomNBT (NBTTagCompound tags)

/* Packets */
@Override
public Packet getDescriptionPacket ()
public Packet func_145844_m ()
{
NBTTagCompound tag = new NBTTagCompound();
func_145841_b(tag);
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag);
}

@Override
public void onDataPacket (NetworkManager net, Packet132TileEntityData packet)
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
func_145839_a(packet.data);
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
func_145839_a(packet.func_148857_g());
field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
}

@Override
Expand Down
38 changes: 15 additions & 23 deletions src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java
View file
@@ -1,23 +1,15 @@
package tconstruct.blocks.logic;

import cpw.mods.fml.relauncher.*;
import java.util.HashMap;

import mantle.blocks.iface.IActiveLogic;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.network.*;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidEvent;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.*;
import tconstruct.TConstruct;
import mantle.blocks.iface.IActiveLogic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

/**
* @author BluSunrize
Expand Down Expand Up @@ -52,7 +44,7 @@ public void func_145845_h ()
if (this.pullingLiquids)
pullLiquids();
}
//this.field_145850_b.markBlockForUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
//this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e);
if (ticks == 20)
{
if (recentlyFilledDelay != 0)
Expand Down Expand Up @@ -420,7 +412,7 @@ public int fill (FluidStack stack, boolean doFill)

if (doFill)
{
this.field_145850_b.markBlockForUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e);
this.liquid = transfered;
}
recentlyFilledDelay = 2;
Expand All @@ -437,15 +429,15 @@ public int fill (FluidStack stack, boolean doFill)
if ((doFill) && (spaceInTank > 0))
{
this.liquid.amount = this.fillMax;
this.field_145850_b.markBlockForUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e);
}
return spaceInTank;
}

if (doFill)
{
this.liquid.amount += stack.amount;
this.field_145850_b.markBlockForUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e);
}
return stack.amount;
}
Expand Down Expand Up @@ -492,7 +484,7 @@ public FluidStack drain (int maxDrain, boolean doDrain)
}
if (doDrain)
{
this.field_145850_b.markBlockForUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e);
FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e, this));
}
return drained;
Expand Down Expand Up @@ -563,18 +555,18 @@ public void writeCustomNBT (NBTTagCompound tags)
}

@Override
public Packet getDescriptionPacket ()
public Packet func_145844_m ()
{
NBTTagCompound tag = new NBTTagCompound();
writeCustomNBT(tag);
return new Packet132TileEntityData(this.field_145851_c, this.field_145848_d, this.field_145849_e, 1, tag);
return new S35PacketUpdateTileEntity(this.field_145851_c, this.field_145848_d, this.field_145849_e, 1, tag);
}

@Override
public void onDataPacket (NetworkManager net, Packet132TileEntityData packet)
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
readCustomNBT(packet.data);
this.field_145850_b.markBlockForRenderUpdate(this.field_145851_c, this.field_145848_d, this.field_145849_e);
readCustomNBT(packet.func_148857_g());
this.field_145850_b.func_147479_m(this.field_145851_c, this.field_145848_d, this.field_145849_e);
}

public int convertFDToInt (ForgeDirection dir)
Expand Down

2 comments on commit 8cd760e

@fuj1n
Copy link
Member Author

@fuj1n fuj1n commented on 8cd760e Feb 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, feel free to do so!

@progwml6
Copy link
Member

@progwml6 progwml6 commented on 8cd760e Feb 1, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.