From 17ed2d163d967b2cb6976b22fc7eaa75c88eb96b Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 31 May 2015 01:59:43 +0100 Subject: [PATCH 1/6] Ores can now be silk tuched Started on ores returning ItemGems TODO finish --- src/main/java/techreborn/blocks/BlockOre.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 7d55936f1..4b0815cc5 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,8 +1,12 @@ package techreborn.blocks; +import java.util.ArrayList; import java.util.List; import java.util.Random; + + + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,8 +15,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTabMisc; +import techreborn.init.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,10 +40,17 @@ public class BlockOre extends Block { } @Override - public Item getItemDropped(int meta, Random random, int fortune) - { + public Item getItemDropped(int meta, Random random, int fortune){ + if (meta == 5){ + return new ItemStack(ModItems.dusts, 1, 60).getItem(); + } return Item.getItemFromBlock(this); } + + @Override + protected boolean canSilkHarvest() { + return true; + } @Override @SideOnly(Side.CLIENT) @@ -50,9 +63,7 @@ public class BlockOre extends Block { } @Override - public int damageDropped(int metaData) - { - // TODO RubyOre Returns Rubys + public int damageDropped(int metaData){ return metaData; } From 1e656b26e70973ef0be0543f8ed5d70d89728e3d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 31 May 2015 10:45:08 +0100 Subject: [PATCH 2/6] Now sync to the client side tile, not the container. --- src/main/java/techreborn/api/recipe/RecipeCrafter.java | 1 + .../client/container/ContainerAlloySmelter.java | 3 ++- .../techreborn/client/container/ContainerCrafting.java | 9 ++++++--- src/main/java/techreborn/client/gui/GuiAlloySmelter.java | 2 +- .../java/techreborn/client/gui/GuiAssemblingMachine.java | 6 +++--- .../java/techreborn/client/gui/GuiChemicalReactor.java | 6 +++--- .../techreborn/client/gui/GuiImplosionCompressor.java | 6 +++--- src/main/java/techreborn/client/gui/GuiLathe.java | 6 +++--- .../techreborn/client/gui/GuiPlateCuttingMachine.java | 6 +++--- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index 92fd425f1..4a2b1061f 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -117,6 +117,7 @@ public class RecipeCrafter { for (int i = 0; i < recipe.getOutputs().size(); i++) {//This checks to see if it can fit all of the outputs if (!canFitStack(recipe.getOutputs().get(i), outputSlots[i])) { canGiveInvAll = false; + break; } } if (canGiveInvAll) { diff --git a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java index 50d964364..207a2dbb6 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java +++ b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot; import techreborn.client.SlotOutput; import techreborn.tiles.TileAlloySmelter; -public class ContainerAlloySmelter extends TechRebornContainer { +public class ContainerAlloySmelter extends ContainerCrafting { EntityPlayer player; @@ -22,6 +22,7 @@ public class ContainerAlloySmelter extends TechRebornContainer { public ContainerAlloySmelter(TileAlloySmelter tileAlloysmelter, EntityPlayer player) { + super(tileAlloysmelter.crafter); tile = tileAlloysmelter; this.player = player; diff --git a/src/main/java/techreborn/client/container/ContainerCrafting.java b/src/main/java/techreborn/client/container/ContainerCrafting.java index 22007340a..c9a3ed037 100644 --- a/src/main/java/techreborn/client/container/ContainerCrafting.java +++ b/src/main/java/techreborn/client/container/ContainerCrafting.java @@ -9,9 +9,9 @@ public abstract class ContainerCrafting extends TechRebornContainer { RecipeCrafter crafter; - public int currentTickTime = 0; - public int currentNeededTicks = 0; - public int energy; + int currentTickTime = 0; + int currentNeededTicks = 0; + int energy; public ContainerCrafting(RecipeCrafter crafter) { this.crafter = crafter; @@ -52,5 +52,8 @@ public abstract class ContainerCrafting extends TechRebornContainer { } else if(id == 2){ this.energy = value; } + this.crafter.currentTickTime = currentTickTime; + this.crafter.currentNeededTicks = currentNeededTicks; + this.crafter.energy.setEnergyStored(energy); } } diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 4674bea7c..4c755e090 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -40,7 +40,7 @@ public class GuiAlloySmelter extends GuiContainer { int j = 0; - if(alloysmelter.crafter.currentRecipe != null) { + if(alloysmelter.crafter.currentTickTime != 0) { j = this.alloysmelter.crafter.currentTickTime * 24 / this.alloysmelter.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 79, l + 34, 176, 14, j + 1, 16); diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index 65bd9d716..2d8123d68 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -42,12 +42,12 @@ public class GuiAssemblingMachine extends GuiContainer { int j = 0; - if(this.containerAssemblingMachine.currentTickTime != 0){ - j = this.containerAssemblingMachine.currentTickTime * 20 / this.containerAssemblingMachine.currentNeededTicks; + if(this.assemblingmachine.crafter.currentTickTime != 0){ + j = this.assemblingmachine.crafter.currentTickTime * 20 / this.assemblingmachine.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 86, l + 34, 176, 14, j + 1, 16); - j = this.containerAssemblingMachine.energy * 12 / this.assemblingmachine.energy.getCapacity(); + j = (int) (this.assemblingmachine.energy.getEnergyStored() * 12 / this.assemblingmachine.energy.getCapacity()); if(j > 0) { this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); } diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 7aecf2349..ed583da5f 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -42,12 +42,12 @@ public class GuiChemicalReactor extends GuiContainer { int j = 0; - if(this.containerChemicalReactor.currentTickTime != 0){ - j = this.containerChemicalReactor.currentTickTime * 20 / this.containerChemicalReactor.currentNeededTicks; + if(this.chemicalReactor.crafter.currentTickTime != 0){ + j = this.chemicalReactor.crafter.currentTickTime * 20 / this.chemicalReactor.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 73, l + 39, 177, 15, 30, j); - j = this.containerChemicalReactor.energy * 12 / this.chemicalReactor.energy.getCapacity(); + j = (int) (this.chemicalReactor.crafter.energy.getEnergyStored() * 12 / this.chemicalReactor.energy.getCapacity()); if(j > 0) { this.drawTexturedModalRect(k + 9, l + 32 + 12 - j, 176, 12 - j, 14, j + 2); } diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 7aa95d0ed..88b5d2351 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -42,13 +42,13 @@ public class GuiImplosionCompressor extends GuiContainer{ this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int j = 0; - if(this.containerImplosionCompressor.currentTickTime != 0){ - j = this.containerImplosionCompressor.currentTickTime * 20 / this.containerImplosionCompressor.currentNeededTicks; + if(this.compresser.crafter.currentTickTime != 0){ + j = this.compresser.crafter.currentTickTime * 20 / this.compresser.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 60, l + 38, 176, 14, j + 1, 16); - j = this.containerImplosionCompressor.energy * 12 / this.compresser.energy.getCapacity(); + j = (int) (this.compresser.crafter.energy.getEnergyStored() * 12 / this.compresser.energy.getCapacity()); if(j > 0) { this.drawTexturedModalRect(k + 16, l + 37 + 12 - j, 176, 12 - j, 14, j + 2); } diff --git a/src/main/java/techreborn/client/gui/GuiLathe.java b/src/main/java/techreborn/client/gui/GuiLathe.java index a62d73bd3..a9a96edb6 100644 --- a/src/main/java/techreborn/client/gui/GuiLathe.java +++ b/src/main/java/techreborn/client/gui/GuiLathe.java @@ -42,12 +42,12 @@ public class GuiLathe extends GuiContainer { int j = 0; - if(this.containerLathe.currentTickTime != 0){ - j = this.containerLathe.currentTickTime * 20 / this.containerLathe.currentNeededTicks; + if(this.lathe.crafter.currentTickTime != 0){ + j = this.lathe.crafter.currentTickTime * 20 / this.lathe.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 80, l + 34, 176, 14, j, 16); - j = this.containerLathe.energy * 12 / this.lathe.energy.getCapacity(); + j = (int) (this.lathe.energy.getEnergyStored() * 12 / this.lathe.energy.getCapacity()); if(j > 0) { this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); } diff --git a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java index 2d43b2228..ebe8768e8 100644 --- a/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiPlateCuttingMachine.java @@ -43,12 +43,12 @@ public class GuiPlateCuttingMachine extends GuiContainer { int j = 0; - if(this.containerPlateCuttingMachine.currentTickTime != 0){ - j = this.containerPlateCuttingMachine.currentTickTime * 20 / this.containerPlateCuttingMachine.currentNeededTicks; + if(this.platecuttingmachine.crafter.currentTickTime != 0){ + j = this.platecuttingmachine.crafter.currentTickTime * 20 / this.platecuttingmachine.crafter.currentNeededTicks; } this.drawTexturedModalRect(k + 83, l + 34, 176, 14, j, 16); - j = this.containerPlateCuttingMachine.energy * 12 / this.platecuttingmachine.energy.getCapacity(); + j = (int) (this.platecuttingmachine.energy.getEnergyStored() * 12 / this.platecuttingmachine.energy.getCapacity()); if(j > 0) { this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); } From 0419c0dfa639f50490a108585978f5645aefa46b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 31 May 2015 11:10:43 +0100 Subject: [PATCH 3/6] Fixed progress bar outputs --- src/main/java/techreborn/api/recipe/RecipeCrafter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index 4a2b1061f..f90538ab7 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -111,6 +111,7 @@ public class RecipeCrafter { return; } if (currentRecipe == null) {//It will now look for new recipes. + currentTickTime = 0; for (IBaseRecipeType recipe : RecipeHanderer.getRecipeClassFromName(recipeName)) { if (recipe.canCraft(parentTile) && hasAllInputs(recipe)) {//This checks to see if it has all of the inputs boolean canGiveInvAll = true; @@ -130,8 +131,7 @@ public class RecipeCrafter { } else { if (!hasAllInputs()) {//If it doesn't have all the inputs reset currentRecipe = null; - currentTickTime = 0; - parentTile.syncWithAll();//update texture + currentTickTime = -1; } if (currentRecipe != null && currentTickTime >= currentNeededTicks) {//If it has reached the recipe tick time boolean canGiveInvAll = true; From 31574f2cdd5f0086130d66d1a301b24cf3220dcf Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 31 May 2015 18:54:58 +0100 Subject: [PATCH 4/6] Some fixes, some breakages --- src/main/java/techreborn/api/recipe/RecipeCrafter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index f90538ab7..f3b16a1c5 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -107,6 +107,7 @@ public class RecipeCrafter { * Call this on the tile tick */ public void updateEntity() { + speedMultiplier = 0.9; if(parentTile.getWorldObj().isRemote){ return; } @@ -124,7 +125,9 @@ public class RecipeCrafter { if (canGiveInvAll) { currentRecipe = recipe;//Sets the current recipe then syncs this.currentNeededTicks = (int)(currentRecipe.tickTime() * (1.0 - speedMultiplier)); - parentTile.syncWithAll();//update texture + this.currentTickTime = 0; + } else { + this.currentTickTime = 0; } } } @@ -151,8 +154,6 @@ public class RecipeCrafter { useAllInputs();//this uses all the inputs currentRecipe = null;//resets currentTickTime = 0; - //Force sync after craft to update texture - parentTile.syncWithAll(); } } else if (currentRecipe != null && currentTickTime < currentNeededTicks) { if (energy.useEnergy(getEuPerTick())) {//This uses the power From 34530fa6ca653fe4e3c665963d0b94e19fc80674 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 1 Jun 2015 21:08:28 +0100 Subject: [PATCH 5/6] Improve part server peformance --- .../techreborn/partSystem/parts/CablePart.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/techreborn/partSystem/parts/CablePart.java b/src/main/java/techreborn/partSystem/parts/CablePart.java index 98372ec3f..3ccc6c226 100644 --- a/src/main/java/techreborn/partSystem/parts/CablePart.java +++ b/src/main/java/techreborn/partSystem/parts/CablePart.java @@ -151,21 +151,6 @@ public class CablePart extends ModPart implements IEnergyConductor { @Override public void tick() { - if (ticks == 0) { - checkConnectedSides(); - ticks += 1; - } else if (ticks == 40) { - ticks = 0; - } else { - ticks += 1; - } - - if (IC2.platform.isSimulating()) { - MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); - this.addedToEnergyNet = true; - checkConnectedSides(); - } - } @Override From 0749385e494cced04786e0e8945773554fe4752b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 1 Jun 2015 21:29:39 +0100 Subject: [PATCH 6/6] About to give up. Here is what ive got. --- .../techreborn/api/recipe/RecipeCrafter.java | 33 ++++++++++++-- .../techreborn/tiles/TileAlloySmelter.java | 7 --- .../tiles/TileAssemblingMachine.java | 8 ---- .../java/techreborn/tiles/TileCentrifuge.java | 8 ---- .../techreborn/tiles/TileChemicalReactor.java | 8 ---- .../java/techreborn/tiles/TileGrinder.java | 11 +---- .../techreborn/tiles/TileHeatGenerator.java | 7 --- .../tiles/TileImplosionCompressor.java | 8 ---- .../tiles/TileIndustrialElectrolyzer.java | 8 ---- .../tiles/TileIndustrialSawmill.java | 8 ---- src/main/java/techreborn/tiles/TileLathe.java | 8 ---- .../techreborn/tiles/TileMachineBase.java | 43 +++++-------------- .../tiles/TileMatterFabricator.java | 7 --- .../tiles/TilePlateCuttingMachine.java | 8 ---- 14 files changed, 41 insertions(+), 131 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index f3b16a1c5..dce870480 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -3,6 +3,9 @@ package techreborn.api.recipe; import ic2.api.energy.prefab.BasicSink; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import techreborn.packets.PacketHandler; import techreborn.tiles.TileMachineBase; import techreborn.util.Inventory; import techreborn.util.ItemUtils; @@ -80,7 +83,7 @@ public class RecipeCrafter { public IBaseRecipeType currentRecipe; public int currentTickTime = 0; - public int currentNeededTicks = 0; + public int currentNeededTicks = 1;//Set to 1 to stop rare crashes double lastEnergy; public boolean isactive = false; @@ -107,7 +110,6 @@ public class RecipeCrafter { * Call this on the tile tick */ public void updateEntity() { - speedMultiplier = 0.9; if(parentTile.getWorldObj().isRemote){ return; } @@ -126,6 +128,7 @@ public class RecipeCrafter { currentRecipe = recipe;//Sets the current recipe then syncs this.currentNeededTicks = (int)(currentRecipe.tickTime() * (1.0 - speedMultiplier)); this.currentTickTime = 0; + syncIsActive(); } else { this.currentTickTime = 0; } @@ -135,6 +138,7 @@ public class RecipeCrafter { if (!hasAllInputs()) {//If it doesn't have all the inputs reset currentRecipe = null; currentTickTime = -1; + syncIsActive(); } if (currentRecipe != null && currentTickTime >= currentNeededTicks) {//If it has reached the recipe tick time boolean canGiveInvAll = true; @@ -154,6 +158,7 @@ public class RecipeCrafter { useAllInputs();//this uses all the inputs currentRecipe = null;//resets currentTickTime = 0; + syncIsActive(); } } else if (currentRecipe != null && currentTickTime < currentNeededTicks) { if (energy.useEnergy(getEuPerTick())) {//This uses the power @@ -246,9 +251,15 @@ public class RecipeCrafter { public void readFromNBT(NBTTagCompound tag) { NBTTagCompound data = tag.getCompoundTag("Crater"); - currentTickTime = data.getInteger("currentTickTime"); + if(data.hasKey("currentTickTime")) + currentTickTime = data.getInteger("currentTickTime"); isactive = data.getBoolean("isActive"); + if(parentTile.getWorldObj().isRemote){ + System.out.println(isactive); + parentTile.getWorldObj().markBlockForUpdate(parentTile.xCoord, parentTile.yCoord, parentTile.zCoord); + parentTile.getWorldObj().markBlockRangeForRenderUpdate(parentTile.xCoord, parentTile.yCoord, parentTile.zCoord, parentTile.xCoord, parentTile.yCoord, parentTile.zCoord); + } } public void writeToNBT(NBTTagCompound tag) { @@ -261,6 +272,7 @@ public class RecipeCrafter { tag.setTag("Crater", data); } + private boolean isActiveServer() { return currentRecipe != null; } @@ -297,4 +309,19 @@ public class RecipeCrafter { public double getEuPerTick(){ return currentRecipe.euPerTick() * powerMultiplier; } + + + public void syncIsActive() { + if (!parentTile.getWorldObj().isRemote) { + PacketHandler.sendPacketToAllPlayers(parentTile.getDescriptionPacket(), + parentTile.getWorldObj()); + } + } + + public Packet getSyncPacket() { + NBTTagCompound nbtTag = new NBTTagCompound(); + writeToNBT(nbtTag); + return new S35PacketUpdateTileEntity(this.parentTile.xCoord, this.parentTile.yCoord, + this.parentTile.zCoord, 1, nbtTag); + } } diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index 8167e66a9..cfd71ff9d 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -91,13 +91,6 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - @Override public void invalidate(){ energy.invalidate(); diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 738c3a6a2..49f28704f 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -102,14 +102,6 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 5cbe6f6d0..c34a79df3 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -109,14 +109,6 @@ public class TileCentrifuge extends TileMachineBase implements IWrenchable, IEn crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 743dbe968..bdcb9f102 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -102,14 +102,6 @@ public class TileChemicalReactor extends TileMachineBase implements IWrenchable, crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileGrinder.java b/src/main/java/techreborn/tiles/TileGrinder.java index 08295f2e2..76fcc4ef4 100644 --- a/src/main/java/techreborn/tiles/TileGrinder.java +++ b/src/main/java/techreborn/tiles/TileGrinder.java @@ -98,16 +98,7 @@ public class TileGrinder extends TileMachineBase implements IWrenchable, IEnergy tank.writeToNBT(tagCompound); crafter.writeToNBT(tagCompound); } - - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - tank.writeToNBT(tagCompound); - } - - + @Override public void invalidate() { energy.invalidate(); diff --git a/src/main/java/techreborn/tiles/TileHeatGenerator.java b/src/main/java/techreborn/tiles/TileHeatGenerator.java index fa7a96258..a03825804 100644 --- a/src/main/java/techreborn/tiles/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/TileHeatGenerator.java @@ -123,13 +123,6 @@ public class TileHeatGenerator extends TileMachineBase implements IWrenchable, I energy.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - } - - @Override public void addWailaInfo(List info) { diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index 6fc2cf020..72cf44a5c 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -95,14 +95,6 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void addWailaInfo(List info) { diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 30f50d216..9996a5329 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -100,14 +100,6 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren energy.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 7686e2d69..e9183818f 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -104,14 +104,6 @@ public class TileIndustrialSawmill extends TileMachineBase implements IWrenchabl crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileLathe.java b/src/main/java/techreborn/tiles/TileLathe.java index 51e759481..60e427d86 100644 --- a/src/main/java/techreborn/tiles/TileLathe.java +++ b/src/main/java/techreborn/tiles/TileLathe.java @@ -101,14 +101,6 @@ public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTi crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TileMachineBase.java b/src/main/java/techreborn/tiles/TileMachineBase.java index e5053c77b..151b151a8 100644 --- a/src/main/java/techreborn/tiles/TileMachineBase.java +++ b/src/main/java/techreborn/tiles/TileMachineBase.java @@ -11,42 +11,24 @@ import techreborn.packets.PacketHandler; import java.util.List; -public class TileMachineBase extends TileEntity { +public abstract class TileMachineBase extends TileEntity { - public boolean needsSync = false; - public int ticksSinceLastSync = 0; - - @Override - public void updateEntity() { - super.updateEntity(); - //Force a sync evey 10 seconds - if(needsSync && !worldObj.isRemote){ - syncWithAll(); + @Deprecated + /** + * Try not to use this + */ + public void syncWithAll() { + if (!worldObj.isRemote) { + PacketHandler.sendPacketToAllPlayers(getDescriptionPacket(), + worldObj); } - ticksSinceLastSync ++; - } + } @SideOnly(Side.CLIENT) public void addWailaInfo(List info) { } - public void syncWithAll() { - if (!worldObj.isRemote) { - PacketHandler.sendPacketToAllPlayers(getSyncPacket(), - worldObj); - } - needsSync = false; - ticksSinceLastSync = 0; - } - - public Packet getSyncPacket() { - NBTTagCompound nbtTag = new NBTTagCompound(); - writeSyncToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, - this.zCoord, 1, nbtTag); - } - public Packet getDescriptionPacket() { NBTTagCompound nbtTag = new NBTTagCompound(); writeToNBT(nbtTag); @@ -61,9 +43,4 @@ public class TileMachineBase extends TileEntity { readFromNBT(packet.func_148857_g()); } - public void writeSyncToNBT(NBTTagCompound tagCompound) { - - } - - } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 0c0ccf05a..dcf8334a0 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -83,13 +83,6 @@ public class TileMatterFabricator extends TileMachineBase implements IWrenchable energy.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - } - - @Override public void invalidate() { diff --git a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java index 47a016fa9..c960360f4 100644 --- a/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java +++ b/src/main/java/techreborn/tiles/TilePlateCuttingMachine.java @@ -101,14 +101,6 @@ public class TilePlateCuttingMachine extends TileMachineBase implements IWrencha crafter.writeToNBT(tagCompound); } - @Override - public void writeSyncToNBT(NBTTagCompound tagCompound) { - super.writeSyncToNBT(tagCompound); - energy.writeToNBT(tagCompound); - crafter.writeToNBT(tagCompound); - } - - @Override public void addWailaInfo(List info) {