More work on the syncing issues, should be all fixed :)
This commit is contained in:
parent
e930ea2a04
commit
0298621cb9
20 changed files with 67 additions and 89 deletions
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileAssemblingMachine extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -14,6 +11,8 @@ import techreborn.config.ConfigTechReborn;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileCentrifuge extends TileMachineBase implements IWrenchable, IEnergyTile{
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileChemicalReactor extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -12,12 +12,7 @@ import net.minecraft.network.Packet;
|
|||
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.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.FluidUtils;
|
||||
|
|
|
@ -7,11 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import techreborn.api.recipe.RecipeCrafter;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSource;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -13,6 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileHeatGenerator extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public BasicSource energy;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileImplosionCompressor extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
@ -106,4 +105,15 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invalidate()
|
||||
{
|
||||
energy.invalidate();
|
||||
}
|
||||
@Override
|
||||
public void onChunkUnload()
|
||||
{
|
||||
energy.onChunkUnload();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileIndustrialElectrolyzer extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileIndustrialSawmill extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
package techreborn.tiles;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import techreborn.packets.PacketHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileMachineBase extends TileEntity {
|
||||
|
||||
|
@ -19,11 +19,9 @@ public class TileMachineBase extends TileEntity {
|
|||
@Override
|
||||
public void updateEntity() {
|
||||
super.updateEntity();
|
||||
//Force a sync evey 30 seconds
|
||||
if(needsSync && ticksSinceLastSync >= 10 || ticksSinceLastSync == 600){
|
||||
//Force a sync evey 10 seconds
|
||||
if(needsSync && !worldObj.isRemote){
|
||||
syncWithAll();
|
||||
needsSync = false;
|
||||
ticksSinceLastSync = 0;
|
||||
}
|
||||
ticksSinceLastSync ++;
|
||||
}
|
||||
|
@ -40,6 +38,8 @@ public class TileMachineBase extends TileEntity {
|
|||
} else {
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
needsSync = false;
|
||||
ticksSinceLastSync = 0;
|
||||
}
|
||||
|
||||
public Packet getDescriptionPacket() {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package techreborn.tiles;
|
||||
|
||||
import techreborn.multiblocks.MultiBlockCasing;
|
||||
import erogenousbeef.coreTR.multiblock.MultiblockControllerBase;
|
||||
import erogenousbeef.coreTR.multiblock.MultiblockValidationException;
|
||||
import erogenousbeef.coreTR.multiblock.rectangular.RectangularMultiblockTileEntityBase;
|
||||
import techreborn.multiblocks.MultiBlockCasing;
|
||||
|
||||
public class TileMachineCasing extends RectangularMultiblockTileEntityBase {
|
||||
|
||||
|
|
|
@ -3,9 +3,6 @@ package techreborn.tiles;
|
|||
import ic2.api.energy.prefab.BasicSink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -13,6 +10,8 @@ import techreborn.api.recipe.RecipeCrafter;
|
|||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TilePlateCuttingMachine extends TileMachineBase implements IWrenchable, IEnergyTile {
|
||||
|
||||
public int tickTime;
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
package techreborn.tiles;
|
||||
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -15,6 +12,8 @@ import techreborn.init.ModBlocks;
|
|||
import techreborn.util.Inventory;
|
||||
import techreborn.util.ItemUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileQuantumChest extends TileMachineBase implements IInventory,
|
||||
IWrenchable {
|
||||
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
package techreborn.tiles;
|
||||
|
||||
import ic2.api.tile.IWrenchable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -21,6 +18,8 @@ import techreborn.util.FluidUtils;
|
|||
import techreborn.util.Inventory;
|
||||
import techreborn.util.Tank;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TileQuantumTank extends TileMachineBase implements IFluidHandler,
|
||||
IInventory, IWrenchable {
|
||||
|
||||
|
|
|
@ -12,12 +12,7 @@ import net.minecraft.network.Packet;
|
|||
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.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.FluidUtils;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue